diff --git a/.cargo/config.toml b/.cargo/config.toml
index e27705d7a3..8cc5779db4 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -42,3 +42,8 @@ rustflags = [
   #  "-Lnative=/home/me/Android/Sdk/ndk/27.3.13750724/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android",
   #  "-lstatic=c++abi",
 ]
+
+# Increase the default thread stack size to 40 MiB.
+# Our callstack can get pretty big (especially in debug mode).
+[env]
+RUST_MIN_STACK = "41943040"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97649afc23..a835ea765e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,14 +87,14 @@ jobs:
           - target: x86_64-pc-windows-gnu
             os: ubuntu-22.04
 
-    runs-on: ${{ matrix.host }}
+    runs-on: ${{ matrix.os }}
     if: github.event_name == 'push' || !github.event.pull_request.draft
     steps:
       - uses: actions/checkout@v4
       - name: Setup build environment (cli tools, dependencies)
         uses: ./.github/actions/setup-build-environment
         with:
-          host: ${{ matrix.host }}
+          host: ${{ matrix.os }}
           target: ${{ matrix.target }}
 
       - name: Build binary
@@ -117,21 +117,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, macos-15]
-    runs-on: ${{ matrix.host }}
+    runs-on: ${{ matrix.os }}
     if: github.event_name == 'push' || !github.event.pull_request.draft
     steps:
       - uses: actions/checkout@v4
       - name: Setup build environment (cli tools, dependencies)
         uses: ./.github/actions/setup-build-environment
         with:
-          host: ${{ matrix.host }}
+          host: ${{ matrix.os }}
 
       - name: Run monero-harness tests
-        if: matrix.host == 'ubuntu-22.04'
+        if: matrix.os == 'ubuntu-22.04'
         run: cargo test --package monero-harness --all-features
 
-      - name: Run library tests for swap
-        run: cargo test --package swap --lib
+      - name: Run library tests
+        run: cargo test  --lib
 
   docker_tests:
     strategy:
@@ -182,6 +182,20 @@ jobs:
             test_name: alice_broken_wallet_rpc_after_started_btc_early_refund
           - package: swap
             test_name: happy_path_alice_does_not_send_transfer_proof
+          - package: swap
+            test_name: partial_refund_bob_claims_amnesty
+          - package: swap
+            test_name: partial_refund_alice_burns
+          - package: swap
+            test_name: partial_refund_alice_grants_final_amnesty
+          - package: swap
+            test_name: swap_rejected_deposit_too_small
+          - package: swap
+            test_name: partial_refund_bob_restart_detects_withhold
+          - package: swap
+            test_name: alice_and_bob_refund_using_cancel_and_refund_command_partial_refund
+          - package: swap
+            test_name: alice_and_bob_refund_using_cancel_and_refund_command_partial_refund_withheld
           - package: monero-tests
             test_name: reserve_proof
           - package: monero-tests
diff --git a/.helix/ignore b/.helix/ignore
index 47f73afa1a..a53623a692 100644
--- a/.helix/ignore
+++ b/.helix/ignore
@@ -1,2 +1,4 @@
 src-tauri/gen/
+monero-sys/monero/
+monero-sys/monero-depends/
 
diff --git a/AGENT.md b/AGENT.md
deleted file mode 100644
index 178c899058..0000000000
--- a/AGENT.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Repo Overview
-
-This repository hosts the core of the eigenwallet project. The code base is a Rust workspace with multiple crates and a Tauri based GUI.
-
-## Important directories
-
-- **swap/** – contains the main Rust crate with two binaries:
-  - `swap` – command line interface for performing swaps.
-  - `asb` – Automated Swap Backend for market makers.
-    It also hosts library code shared between the binaries and integration tests.
-- **src-tauri/** – Rust crate that exposes the `swap` functionality to the Tauri front end and bundles the application.
-- **src-gui/** – The front‑end written in TypeScript/React and bundled by Tauri. Communicates with `src-tauri` via Tauri commands.
-- **monero-wallet/** – helper crates for interacting with the Monero ecosystem.
-- **docs/** – Next.js documentation site.
-- **dev-docs/** – additional markdown documentation for CLI and ASB.
-
-## Frequently edited files
-
-Looking at the latest ten pull requests in `git log`, the following files appear most often:
-
-| File                        | Times Changed |
-| --------------------------- | ------------- |
-| `src-tauri/Cargo.toml`      | 7             |
-| `Cargo.lock`                | 7             |
-| `CHANGELOG.md`              | 7             |
-| `swap/Cargo.toml`           | 6             |
-| `src-tauri/tauri.conf.json` | 5             |
-| `.github/workflows/ci.yml`  | 3             |
-
-Other files such as `swap/src/bin/asb.rs`, `swap/src/cli/api.rs`, and `src-gui/package.json` showed up less frequently.
-
-## Component interaction
-
-- The **swap** crate implements the atomic swap logic and provides a CLI. The binaries under `swap/src/bin` (`swap.rs` and `asb.rs`) start the client and maker services respectively.
-- **src-tauri** wraps the swap crate and exposes its functionality to the GUI via Tauri commands. It also bundles the application with the `src-gui` assets.
-- **src-gui** is the TypeScript/React interface. It communicates with the Rust back end through the commands defined in `src-tauri`.
-- Helper crates like **monero-wallet** provide abstractions over external services. They are used by the swap crate to interact with Monero.
-- Continuous integration and release workflows live in `.github/workflows`. They build binaries, create releases and lint the code base.
-
-## Pull request titles
-
-Use descriptive titles following the `<type>(<scope>): <description>` format. Examples include:
-
-- `feat(gui): New feature`
-- `fix(swap): Issue fixed`
-- `refactor(ci): Ci changes`
diff --git a/AGENT.md b/AGENT.md
new file mode 120000
index 0000000000..47dc3e3d86
--- /dev/null
+++ b/AGENT.md
@@ -0,0 +1 @@
+AGENTS.md
\ No newline at end of file
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000000..5b5c206e31
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,50 @@
+ - Read CONTRIBUTING.md and the code style guidelines!
+ - When asked about libp2p, check if a rust-libp2p folder exists which contains the cloned rust libp2p codebase. Read through to figure out what the best response it. If its a question about best practice when implementing protocols read @rust-libp2p/protocols/ specificially.
+ - Never do `cargo clean`. Building `monero-sys` takes ages, and cleaning the build cache will cause a full rebuilt (horrible).
+   `cargo clean` has never fixed a build problem.
+ - Before suggesting a change, always give at least a short (1 sentence) summary of which function you are editing and why.
+ - When being asked to add something, check whether there is a similar thing already implemented, the architecture of which you can follow.
+   For example, when asked to add a new Tauri command, check out how other tauri commands are implemented and what conventions they follow.
+ - 
+
+ - Think about seperation of concerns. This has many facets. But the most ofen there are questions like:
+   "Which part of the code should decide how to handle this situation". In the context of an error, the solution is:
+   - Never use fallback values. They lead to
+     - swallowed errors
+     - breaking invariances
+     - breaking other implicit assumptions
+     - destroy any meaning the value might have had.
+     Instead, if an error/invlaid state is encountered, the error should be propagated.
+     This is most often correctly done by using anyhow's "Context" and the question mark operator`.context("Failed to <foo>")?`.
+   - Keep error handling simple: it is basically never wrong to just propagate the error using `?` and maybe add some basic context.
+
+  Other facetts of seperation of concern include:
+   - should this function need to have access to this <implementation detail>?
+   - should this function decide a parameter itself or just take an argument?
+
+  We follow the principle of LEAST SURPRISE. Take a step back, and come back with a fresh view. Then ask yourself: "would I expect this function to do <X>?".
+  If not, then don't do it. 
+
+- coding style tips:
+  - keep the code succint. Prefer `if let` and `let ... else` to `match` whenever possible.
+  - avoid nesting if possible.
+  - prefer early returns to nesting.
+
+- Docker tests: We have an extended test suite that simulates a whole blockchain environment for the purpose of testing swaps end to end.
+  The docker tests are located in `swap/tests` and can be executed using `just docker_test <name>`. Get a list of all docker tests by `just list-docker-tests`.
+- If you changed something could possibly affect the success of a swap, make sure to run the integration tests that could possibly be affected.
+  Be very liberal with assuming what might be affected.
+- If not explicitly instructed yet, ask the user whether you should add {unit, integration} tests if you just added / changed some behaviour/code
+- The docker tests are long (multiple minutes) and produce tens of thousands of log messages.
+  Don't try to read all of that output, it will fill you context up before finishing
+  the initialization.
+  Instead, spawn them as a background-task (each as it's own).
+  Then you can simply check in on the current status by checking it's output every minute or so.
+  If you are claude, use claude codes native background task system and read from the `/tmp/claude/tasks/foo/output.tmp` pipe file, or whatever the path is.
+  If you are not claude, then do the thing that best accomplishises this.
+
+- Before claiming you finished, make sure everything compiles (`cargo c --all-features`).
+  Also all tests (`cargo c --tests`) and all targets (`cargo c --all-targets`) must compile.
+
+
+  
diff --git a/CLAUDE.md b/CLAUDE.md
deleted file mode 100644
index eb3a82a418..0000000000
--- a/CLAUDE.md
+++ /dev/null
@@ -1 +0,0 @@
-- When asked about libp2p, check if a rust-libp2p folder exists which contains the cloned rust libp2p codebase. Read through to figure out what the best response it. If its a question about best practice when implementing protocols read @rust-libp2p/protocols/ specificially.
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 120000
index 0000000000..47dc3e3d86
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1 @@
+AGENTS.md
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 65a65cdf5e..d50ba6b8dc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,21 +6,38 @@ Thank you for wanting to contribute to this project!
 
 There are a couple of things we are going to look out for in PRs and knowing them upfront is going to reduce the number of times we will be going back and forth, making things more efficient.
 
+0. **Read and comply with our [AI Policy](AI_POLICY.md)**
 1. We have CI checks in place that validate formatting and code style.
-   Make sure `dprint check` and `cargo clippy` both finish without any warnings or errors.
-   If you don't already have it installed, you can obtain in [various ways](https://dprint.dev/install/).
-2. Run the test suite with [cargo-nextest](https://nexte.st/docs/running/).
-   Install it using `cargo install cargo-nextest` and execute `cargo nextest run`.
-3. All text document (`CHANGELOG.md`, `README.md`, etc) should follow the [semantic linebreaks](https://sembr.org/) specification.
-4. We strive for atomic commits with good commit messages.
+   Make sure the branch is building with `--all-features` and `--all-targets` without errors
+   and all tests are passed.
+2. All text document (`CHANGELOG.md`, `README.md`, etc) should follow the [semantic linebreaks](https://sembr.org/) specification.
+3. We strive for atomic commits with good commit messages.
    As an inspiration, read [this](https://chris.beams.io/posts/git-commit/) blogpost.
    An atomic commit is a cohesive diff with formatting checks, linter and build passing.
    Ideally, all tests are passing as well but we acknowledge that this is not always possible depending on the change you are making.
-5. If you are making any user visible changes, include a changelog entry.
+4. If you are making any user visible changes, include a changelog entry.
 
 ## Contributing issues
 
 When contributing a feature request, please focus on your _problem_ as much as possible.
 It is okay to include ideas on how the feature should be implemented but they should be 2nd nature of your request.
 
-For more loosely-defined problems and ideas, consider starting a [discussion](https://github.com/comit-network/xmr-btc-swap/discussions/new) instead of opening an issue.
+## Code style
+
+### General
+
+ - File structure
+   - The content of each file should be ordered in terms of importance / level of abstraction
+   - Public `struct`s, `enum`s and important constants should be at the top
+   - `impl` blocks should be below the type declarations
+   - Both the type declaration part and the implementation part of the file should be internally ordered by level of abstraction/ importance
+   - For example, `fn main` should always be at least at the top of the implementation 
+ - Prefer early returns over nested `if`/`match` statements
+ - Don't use fallback values or silent failures
+
+### Rust
+
+ - Use `cargo fmt` for formatting
+ - Make use of the powerful `if let` and `let ... else` pattern to enable early returns
+ - Make use of anyhows `.context` method and the `?` operator for concise error reporting
+
diff --git a/Cargo.lock b/Cargo.lock
index ff296cc2a9..1bc8febb02 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -50,7 +50,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "once_cell",
  "version_check",
 ]
@@ -106,7 +106,7 @@ dependencies = [
  "amplify_derive",
  "amplify_num",
  "ascii",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "getrandom 0.3.4",
  "wasm-bindgen",
 ]
@@ -274,7 +274,7 @@ dependencies = [
  "cfg-if",
  "derive-deftly",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "educe",
  "fs-mistrust",
  "futures",
@@ -287,7 +287,7 @@ dependencies = [
  "rand 0.9.2",
  "safelog",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -322,27 +322,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
 
-[[package]]
-name = "ashpd"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
-dependencies = [
- "enumflags2",
- "futures-channel",
- "futures-util",
- "rand 0.9.2",
- "raw-window-handle",
- "serde",
- "serde_repr",
- "tokio",
- "url",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols",
- "zbus",
-]
-
 [[package]]
 name = "asn1-rs"
 version = "0.5.2"
@@ -387,7 +366,7 @@ dependencies = [
  "nom 7.1.3",
  "num-traits",
  "rusticata-macros",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -410,7 +389,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "synstructure 0.13.2",
 ]
 
@@ -422,7 +401,7 @@ checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "synstructure 0.13.2",
 ]
 
@@ -445,7 +424,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -496,13 +475,12 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.36"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37"
+checksum = "d10e4f991a553474232bc0a31799f6d24b034a84c0971d80d2e2f78b2e576e40"
 dependencies = [
  "compression-codecs",
  "compression-core",
- "futures-core",
  "futures-io",
  "pin-project-lite",
 ]
@@ -541,9 +519,9 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.4.1"
+version = "3.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
 dependencies = [
  "event-listener",
  "event-listener-strategy",
@@ -576,7 +554,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -597,28 +575,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "async-stream"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.111",
-]
-
 [[package]]
 name = "async-task"
 version = "4.7.1"
@@ -633,7 +589,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -760,9 +716,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.15.1"
+version = "1.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b5ce75405893cd713f9ab8e297d8e438f624dde7d706108285f7e17a25a180f"
+checksum = "7b7b6141e96a8c160799cc2d5adecd5cbbe5054cb8c7c4af53da0f83bb7ad256"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -770,9 +726,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.34.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "179c3777a8b5e70e90ea426114ffc565b2c1a9f82f6c4a0c5a34aa6ef5e781b6"
+checksum = "5c34dda4df7017c8db52132f0f8a2e0f8161649d15723ed63fc00c82d0f2081a"
 dependencies = [
  "cc",
  "cmake",
@@ -782,9 +738,9 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425"
+checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
 dependencies = [
  "axum-core",
  "axum-macros",
@@ -816,9 +772,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
+checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -841,7 +797,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -851,7 +807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
 dependencies = [
  "futures-core",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "instant",
  "pin-project-lite",
  "rand 0.8.5",
@@ -916,9 +872,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
-version = "1.8.1"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
 [[package]]
 name = "bdk"
@@ -930,7 +886,7 @@ dependencies = [
  "bdk-macros",
  "bitcoin 0.29.2",
  "electrum-client 0.12.1",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "js-sys",
  "log",
  "miniscript 9.2.1",
@@ -1109,7 +1065,7 @@ dependencies = [
  "hmac",
  "jsonrpc_client",
  "rand 0.8.5",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "serde",
  "serde_json",
  "sha2",
@@ -1163,7 +1119,7 @@ dependencies = [
  "futures",
  "moka",
  "proptest",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "rust_decimal",
  "serde",
  "serde_json",
@@ -1250,7 +1206,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1333,7 +1289,7 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1379,9 +1335,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 
 [[package]]
 name = "by_address"
@@ -1474,9 +1430,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
+checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"
 dependencies = [
  "serde_core",
 ]
@@ -1506,7 +1462,7 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -1516,7 +1472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
 dependencies = [
  "serde",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
 ]
 
 [[package]]
@@ -1536,9 +1492,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.49"
+version = "1.2.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
+checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1611,9 +1567,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -1678,9 +1634,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.53"
+version = "4.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
+checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1688,9 +1644,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.53"
+version = "4.5.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
+checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1707,14 +1663,14 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
 
 [[package]]
 name = "clipboard-win"
@@ -1727,18 +1683,18 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.56"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b042e5d8a74ae91bb0961acd039822472ec99f8ab0948cbf6d1369588f8be586"
+checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "coarsetime"
-version = "0.1.36"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91849686042de1b41cd81490edc83afbcb0abe5a9b6f2c4114f23ce8cca1bcf4"
+checksum = "e58eb270476aa4fc7843849f8a35063e8743b4dbcdf6dd0f8ea0886980c204c2"
 dependencies = [
  "libc",
  "wasix",
@@ -1764,11 +1720,11 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "colored"
-version = "3.0.0"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
+checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1783,9 +1739,9 @@ dependencies = [
 
 [[package]]
 name = "comfy-table"
-version = "7.2.1"
+version = "7.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03b7db8e0b4b2fdad6c551e634134e99ec000e5c8c3b6856c65e8bbaded7a3b"
+checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47"
 dependencies = [
  "crossterm",
  "unicode-segmentation",
@@ -1799,7 +1755,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fd9b9dc67f2b3024582ec6d861950f0af0aeaabb8350ccda1f0e51ff8e5895c"
 dependencies = [
  "compose_spec_macros",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "ipnet",
  "itoa",
  "serde",
@@ -1816,14 +1772,14 @@ checksum = "b77735bd89be8da01c8d7e61faec5a9ccb0e313cece3c773c6b3ae251b90c7d4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "compression-codecs"
-version = "0.4.35"
+version = "0.4.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2"
+checksum = "00828ba6fd27b45a448e57dbfe84f1029d4c9f26b368157e9a448a5f49a2ec2a"
 dependencies = [
  "compression-core",
  "flate2",
@@ -1871,9 +1827,9 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b430743a6eb14e9764d4260d4c0d8123087d504eeb9c48f2b2a5e810dd369df4"
+checksum = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
 dependencies = [
  "encode_unicode",
  "libc",
@@ -2035,7 +1991,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.5.53",
+ "clap 4.5.54",
  "criterion-plot",
  "itertools 0.13.0",
  "num-traits",
@@ -2200,7 +2156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2210,7 +2166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
 dependencies = [
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2232,7 +2188,7 @@ dependencies = [
  "cuprate-hex",
  "paste",
  "ref-cast",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2241,7 +2197,7 @@ version = "0.1.0"
 source = "git+https://github.com/Cuprate/cuprate.git#27eec55f5b7851a2b36e158065a6be95c091e904"
 dependencies = [
  "bytes",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2279,7 +2235,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2298,9 +2254,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.190"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7620f6cfc4dcca21f2b085b7a890e16c60fd66f560cd69ee60594908dc72ab1"
+checksum = "747d8437319e3a2f43d93b341c137927ca70c0f5dabeea7a005a73665e247c7e"
 dependencies = [
  "cc",
  "cxx-build",
@@ -2313,49 +2269,49 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.190"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9bc1a22964ff6a355fbec24cf68266a0ed28f8b84c0864c386474ea3d0e479"
+checksum = "b0f4697d190a142477b16aef7da8a99bfdc41e7e8b1687583c0d23a79c7afc1e"
 dependencies = [
  "cc",
  "codespan-reporting",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "cxxbridge-cmd"
-version = "1.0.190"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f29a879d35f7906e3c9b77d7a1005a6a0787d330c09dfe4ffb5f617728cb44"
+checksum = "d0956799fa8678d4c50eed028f2de1c0552ae183c76e976cf7ca8c4e36a7c328"
 dependencies = [
- "clap 4.5.53",
+ "clap 4.5.54",
  "codespan-reporting",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.190"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d67109015f93f683e364085aa6489a5b2118b4a40058482101d699936a7836d6"
+checksum = "23384a836ab4f0ad98ace7e3955ad2de39de42378ab487dc28d3990392cb283a"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.190"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d187e019e7b05a1f3e69a8396b70800ee867aa9fc2ab972761173ccee03742df"
+checksum = "e6acc6b5822b9526adfb4fc377b67128fdd60aac757cc4a741a6278603f763cf"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2437,7 +2393,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2451,7 +2407,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2484,7 +2440,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2495,20 +2451,20 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
+checksum = "8142a83c17aa9461d637e649271eae18bf2edd00e91f2e105df36c3c16355bdb"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -2516,12 +2472,12 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
+checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de"
 dependencies = [
  "data-encoding",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2610,14 +2566,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "337f65eb93d9996551b9442423480eca4532586b337484446eb5138d0cd8fcf0"
 dependencies = [
  "heck 0.5.0",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "itertools 0.14.0",
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
  "sha3",
  "strum 0.27.2",
- "syn 2.0.111",
+ "syn 2.0.114",
  "void",
 ]
 
@@ -2629,7 +2585,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2650,7 +2606,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2681,7 +2637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2704,29 +2660,29 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "derive_more"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10b768e943bed7bf2cab53df09f4bc34bfd217cdb57d971e769874c9a6710618"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d286bfdaf75e988b4a78e013ecd79c581e06399ab53fbacd2d916c2f904f30b"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
 dependencies = [
  "convert_case 0.10.0",
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.111",
+ "syn 2.0.114",
  "unicode-xid",
 ]
 
@@ -2889,16 +2845,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
-]
-
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading 0.8.9",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2921,7 +2868,7 @@ checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2962,9 +2909,9 @@ dependencies = [
 
 [[package]]
 name = "dtoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
+checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590"
 
 [[package]]
 name = "dtoa-short"
@@ -3088,7 +3035,7 @@ dependencies = [
  "byteorder",
  "libc",
  "log",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "serde",
  "serde_json",
  "webpki-roots 0.25.4",
@@ -3136,7 +3083,7 @@ dependencies = [
  "cc",
  "memchr",
  "rustc_version",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "vswhom",
  "winreg 0.55.0",
 ]
@@ -3183,7 +3130,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3196,7 +3143,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3208,7 +3155,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3229,7 +3176,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3250,7 +3197,7 @@ dependencies = [
  "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3363,7 +3310,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3427,21 +3374,20 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.26"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
+checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db"
 dependencies = [
  "cfg-if",
  "libc",
  "libredox",
- "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
 
 [[package]]
 name = "fixedbitset"
@@ -3451,13 +3397,13 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.1.5"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"
 dependencies = [
  "crc32fast",
- "libz-rs-sys",
  "miniz_oxide",
+ "zlib-rs",
 ]
 
 [[package]]
@@ -3522,7 +3468,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3556,7 +3502,7 @@ dependencies = [
  "libc",
  "pwd-grp",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "walkdir",
 ]
 
@@ -3602,7 +3548,7 @@ version = "0.5.1"
 source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_arti_1_8_0#2a5db5823e2a5eb413d8ad433a4d3aba902bac07"
 dependencies = [
  "fslock-arti-fork",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "winapi",
 ]
 
@@ -3713,7 +3659,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3733,7 +3679,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "rustls-pki-types",
 ]
 
@@ -3927,9 +3873,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3961,7 +3907,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4053,7 +3999,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4161,7 +4107,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4176,7 +4122,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4185,9 +4131,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -4195,7 +4141,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.4.0",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4548,7 +4494,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
- "h2 0.4.12",
+ "h2 0.4.13",
  "http 1.4.0",
  "http-body 1.0.1",
  "httparse",
@@ -4571,13 +4517,13 @@ dependencies = [
  "hyper 1.8.1",
  "hyper-util",
  "log",
- "rustls 0.23.35",
- "rustls-native-certs 0.8.2",
+ "rustls 0.23.36",
+ "rustls-native-certs 0.8.3",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.4",
  "tower-service",
- "webpki-roots 1.0.4",
+ "webpki-roots 1.0.5",
 ]
 
 [[package]]
@@ -4611,7 +4557,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.1",
+ "socket2 0.6.2",
  "system-configuration 0.6.1",
  "tokio",
  "tower-layer",
@@ -4841,9 +4787,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.12.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
  "hashbrown 0.16.1",
@@ -4930,9 +4876,9 @@ dependencies = [
 
 [[package]]
 name = "iri-string"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
+checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
 dependencies = [
  "memchr",
  "serde",
@@ -4983,9 +4929,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
 [[package]]
 name = "javascriptcore-rs"
@@ -5044,9 +4990,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.83"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
+checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -5092,7 +5038,7 @@ source = "git+https://github.com/delta1/rust-jsonrpc-client.git?rev=3b6081697cd6
 dependencies = [
  "async-trait",
  "jsonrpc_client_macro",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "serde",
  "serde_json",
  "url",
@@ -5141,7 +5087,7 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "tracing",
@@ -5160,11 +5106,11 @@ dependencies = [
  "hyper-util",
  "jsonrpsee-core",
  "jsonrpsee-types",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "rustls-platform-verifier",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "url",
@@ -5180,7 +5126,7 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5202,7 +5148,7 @@ dependencies = [
  "serde",
  "serde_json",
  "soketto",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -5219,7 +5165,7 @@ dependencies = [
  "http 1.4.0",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -5280,7 +5226,7 @@ checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
 dependencies = [
  "cssparser",
  "html5ever",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "selectors",
 ]
 
@@ -5313,7 +5259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
 dependencies = [
  "gtk-sys",
- "libloading 0.7.4",
+ "libloading",
  "once_cell",
 ]
 
@@ -5325,9 +5271,9 @@ checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7"
 
 [[package]]
 name = "libc"
-version = "0.2.178"
+version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
 [[package]]
 name = "libgit2-sys"
@@ -5351,16 +5297,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "libloading"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "liblzma"
 version = "0.4.5"
@@ -5372,9 +5308,9 @@ dependencies = [
 
 [[package]]
 name = "liblzma-sys"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b9596486f6d60c3bbe644c0e1be1aa6ccc472ad630fe8927b456973d7cb736"
+checksum = "9f2db66f3268487b5033077f266da6777d057949b8f93c8ad82e441df25e6186"
 dependencies = [
  "cc",
  "libc",
@@ -5383,9 +5319,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libp2p"
@@ -5397,7 +5333,7 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "instant",
  "libp2p-allow-block-list",
  "libp2p-connection-limits",
@@ -5509,7 +5445,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-ticker",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "hex_fmt",
  "instant",
  "libp2p-core",
@@ -5566,7 +5502,7 @@ dependencies = [
  "ring 0.17.14",
  "serde",
  "sha2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
  "zeroize",
 ]
@@ -5700,7 +5636,7 @@ dependencies = [
  "quinn",
  "rand 0.8.5",
  "ring 0.17.14",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "socket2 0.5.10",
  "thiserror 1.0.69",
  "tokio",
@@ -5787,7 +5723,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5838,7 +5774,7 @@ dependencies = [
  "libp2p-identity",
  "rcgen",
  "ring 0.17.14",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "rustls-webpki 0.101.7",
  "thiserror 1.0.69",
  "x509-parser 0.16.0",
@@ -5920,13 +5856,13 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 dependencies = [
  "bitflags 2.10.0",
  "libc",
- "redox_syscall 0.5.18",
+ "redox_syscall 0.7.0",
 ]
 
 [[package]]
@@ -5940,15 +5876,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "libz-rs-sys"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15413ef615ad868d4d65dce091cb233b229419c7c0c4bcaa746c0901c49ff39c"
-dependencies = [
- "zlib-rs",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.1.23"
@@ -6055,13 +5982,13 @@ dependencies = [
 
 [[package]]
 name = "match-lookup"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1265724d8cb29dbbc2b0f06fffb8bf1a8c0cf73a78eede9ba73a4a66c52a981e"
+checksum = "757aee279b8bdbb9f9e676796fd459e4207a1f986e87886700abf589f5abf771"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6072,7 +5999,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6240,9 +6167,9 @@ dependencies = [
 
 [[package]]
 name = "moka"
-version = "0.12.11"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077"
+checksum = "a3dec6bd31b08944e08b58fd99373893a6c17054d6f3ea5006cc894f4f4eee2a"
 dependencies = [
  "async-lock",
  "crossbeam-channel",
@@ -6253,7 +6180,6 @@ dependencies = [
  "futures-util",
  "parking_lot 0.12.5",
  "portable-atomic",
- "rustc_version",
  "smallvec",
  "tagptr",
  "uuid",
@@ -6262,20 +6188,20 @@ dependencies = [
 [[package]]
 name = "monero-address"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "monero-base58",
  "monero-ed25519",
  "monero-io",
  "monero-primitives",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "zeroize",
 ]
 
 [[package]]
 name = "monero-base58"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "monero-primitives",
  "std-shims",
@@ -6284,7 +6210,7 @@ dependencies = [
 [[package]]
 name = "monero-borromean"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "curve25519-dalek",
  "monero-ed25519",
@@ -6296,7 +6222,7 @@ dependencies = [
 [[package]]
 name = "monero-bulletproofs"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "curve25519-dalek",
  "monero-bulletproofs-generators",
@@ -6305,14 +6231,14 @@ dependencies = [
  "monero-primitives",
  "rand_core 0.6.4",
  "std-shims",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "zeroize",
 ]
 
 [[package]]
 name = "monero-bulletproofs-generators"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "curve25519-dalek",
  "monero-ed25519",
@@ -6324,7 +6250,7 @@ dependencies = [
 [[package]]
 name = "monero-clsag"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "curve25519-dalek",
  "group",
@@ -6334,14 +6260,14 @@ dependencies = [
  "rand_core 0.6.4",
  "std-shims",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "zeroize",
 ]
 
 [[package]]
 name = "monero-daemon-rpc"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "hex",
  "monero-address",
@@ -6356,7 +6282,7 @@ dependencies = [
 [[package]]
 name = "monero-ed25519"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "crypto-bigint",
  "curve25519-dalek",
@@ -6371,7 +6297,7 @@ dependencies = [
 [[package]]
 name = "monero-epee"
 version = "0.2.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 
 [[package]]
 name = "monero-harness"
@@ -6384,7 +6310,7 @@ dependencies = [
  "monero-simple-request-rpc",
  "monero-sys",
  "rand 0.8.5",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "testcontainers",
  "tokio",
  "tracing",
@@ -6394,19 +6320,19 @@ dependencies = [
 [[package]]
 name = "monero-interface"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "hex",
  "monero-oxide",
  "std-shims",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "zeroize",
 ]
 
 [[package]]
 name = "monero-io"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "std-shims",
 ]
@@ -6414,20 +6340,20 @@ dependencies = [
 [[package]]
 name = "monero-mlsag"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "curve25519-dalek",
  "monero-ed25519",
  "monero-io",
  "std-shims",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "zeroize",
 ]
 
 [[package]]
 name = "monero-oxide"
 version = "0.1.4-alpha"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "curve25519-dalek",
  "hex-literal",
@@ -6451,7 +6377,7 @@ dependencies = [
  "curve25519-dalek-ng",
  "hex",
  "monero-address",
- "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite)",
+ "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git)",
  "serde",
  "typeshare",
 ]
@@ -6459,7 +6385,7 @@ dependencies = [
 [[package]]
 name = "monero-primitives"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "sha3",
 ]
@@ -6472,7 +6398,7 @@ dependencies = [
  "arti-client",
  "axum",
  "chrono",
- "clap 4.5.53",
+ "clap 4.5.54",
  "crossbeam",
  "cuprate-epee-encoding",
  "futures",
@@ -6511,7 +6437,7 @@ dependencies = [
 [[package]]
 name = "monero-simple-request-rpc"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "digest_auth",
  "hex",
@@ -6543,7 +6469,7 @@ dependencies = [
  "sqlx",
  "swap-serde",
  "tempfile",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "throttle",
  "tokio",
  "tracing",
@@ -6565,7 +6491,7 @@ dependencies = [
  "monero-oxide-ext",
  "monero-simple-request-rpc",
  "monero-sys",
- "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite)",
+ "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git)",
  "monero-wallet-ng",
  "testcontainers",
  "tokio",
@@ -6588,7 +6514,7 @@ dependencies = [
  "monero-oxide-ext",
  "monero-simple-request-rpc",
  "monero-sys",
- "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite)",
+ "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git)",
  "monero-wallet-ng",
  "swap-core",
  "throttle",
@@ -6602,7 +6528,7 @@ dependencies = [
 [[package]]
 name = "monero-wallet"
 version = "0.1.0"
-source = "git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite#1a8662faf352e0b7a7b11e157286c0fdb4a65db4"
+source = "git+https://github.com/kayabaNerve/monero-oxide.git#c8be5d3d1287669946a83fbfcb296ce2a8852e47"
 dependencies = [
  "curve25519-dalek",
  "hex",
@@ -6616,7 +6542,7 @@ dependencies = [
  "rand_distr",
  "std-shims",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "zeroize",
 ]
 
@@ -6632,7 +6558,7 @@ dependencies = [
  "monero-interface",
  "monero-oxide",
  "monero-simple-request-rpc",
- "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite)",
+ "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git)",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -6643,9 +6569,9 @@ dependencies = [
 
 [[package]]
 name = "moxcms"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80986bbbcf925ebd3be54c26613d861255284584501595cf418320c078945608"
+checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
 dependencies = [
  "num-traits",
  "pxfm",
@@ -6668,7 +6594,7 @@ dependencies = [
  "once_cell",
  "png 0.17.16",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "windows-sys 0.60.2",
 ]
 
@@ -6737,7 +6663,7 @@ dependencies = [
  "libc",
  "log",
  "openssl",
- "openssl-probe",
+ "openssl-probe 0.1.6",
  "openssl-sys",
  "schannel",
  "security-framework 2.11.1",
@@ -6823,17 +6749,17 @@ dependencies = [
  "log",
  "netlink-packet-core",
  "netlink-sys",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "netlink-sys"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23"
+checksum = "cd6c30ed10fa69cc491d491b85cc971f6bdeb8e7367b7cde2ee6cc878d583fae"
 dependencies = [
  "bytes",
- "futures",
+ "futures-util",
  "libc",
  "log",
  "tokio",
@@ -6875,7 +6801,6 @@ dependencies = [
  "cfg-if",
  "cfg_aliases",
  "libc",
- "memoffset",
 ]
 
 [[package]]
@@ -6934,15 +6859,18 @@ dependencies = [
 
 [[package]]
 name = "notify-types"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
+checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
+dependencies = [
+ "bitflags 2.10.0",
+]
 
 [[package]]
 name = "ntapi"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081"
 dependencies = [
  "winapi",
 ]
@@ -6984,9 +6912,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
 
 [[package]]
 name = "num-integer"
@@ -7047,7 +6975,7 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7378,7 +7306,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7387,6 +7315,12 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.111"
@@ -7454,7 +7388,7 @@ dependencies = [
  "objc2-osa-kit",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -7623,9 +7557,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
-version = "2.8.4"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbcfd20a6d4eeba40179f05735784ad32bdaef05ce8e8af05f180d45bb3e7e22"
+checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7"
 dependencies = [
  "memchr",
  "ucd-trie",
@@ -7633,9 +7567,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.8.4"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f72981ade67b1ca6adc26ec221be9f463f2b5839c7508998daa17c23d94d7f"
+checksum = "68f9dbced329c441fa79d80472764b1a2c7e57123553b8519b36663a2fb234ed"
 dependencies = [
  "pest",
  "pest_generator",
@@ -7643,22 +7577,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.8.4"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee9efd8cdb50d719a80088b76f81aec7c41ed6d522ee750178f83883d271625"
+checksum = "3bb96d5051a78f44f43c8f712d8e810adb0ebf923fc9ed2655a7f66f63ba8ee5"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.8.4"
+version = "2.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf1d70880e76bdc13ba52eafa6239ce793d85c8e43896507e43dd8984ff05b82"
+checksum = "602113b5b5e8621770cfd490cfd90b9f84ab29bd2b0e49ad83eb6d186cef2365"
 dependencies = [
  "pest",
  "sha2",
@@ -7672,7 +7606,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 dependencies = [
  "fixedbitset",
  "hashbrown 0.15.5",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
 ]
 
 [[package]]
@@ -7800,7 +7734,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7813,7 +7747,7 @@ dependencies = [
  "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7869,7 +7803,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7929,8 +7863,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07"
 dependencies = [
  "base64 0.22.1",
- "indexmap 2.12.1",
- "quick-xml 0.38.4",
+ "indexmap 2.13.0",
+ "quick-xml",
  "serde",
  "time",
 ]
@@ -8028,9 +7962,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
 
 [[package]]
 name = "postage"
@@ -8064,9 +7998,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppmd-rust"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d558c559f0450f16f2a27a1f017ef38468c1090c9ce63c8e51366232d53717b4"
+checksum = "efca4c95a19a79d1c98f791f10aebd5c1363b473244630bb7dbde1dc98455a24"
 
 [[package]]
 name = "ppv-lite86"
@@ -8099,7 +8033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93980406f12d9f8140ed5abe7155acb10bb1e69ea55c88960b9c2f117445ef96"
 dependencies = [
  "equivalent",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "serde",
 ]
 
@@ -8129,7 +8063,7 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "toml_edit 0.23.9",
+ "toml_edit 0.23.10+spec-1.0.0",
 ]
 
 [[package]]
@@ -8175,7 +8109,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -8186,9 +8120,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.103"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -8213,7 +8147,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -8264,7 +8198,7 @@ dependencies = [
  "derive-deftly",
  "libc",
  "paste",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -8323,15 +8257,6 @@ dependencies = [
  "unsigned-varint 0.8.0",
 ]
 
-[[package]]
-name = "quick-xml"
-version = "0.37.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quick-xml"
 version = "0.38.4"
@@ -8360,7 +8285,7 @@ checksum = "f71ee38b42f8459a88d3362be6f9b841ad2d5421844f61eb1c59c11bff3ac14a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -8376,9 +8301,9 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.35",
- "socket2 0.6.1",
- "thiserror 2.0.17",
+ "rustls 0.23.36",
+ "socket2 0.6.2",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
  "web-time",
@@ -8396,10 +8321,10 @@ dependencies = [
  "rand 0.9.2",
  "ring 0.17.14",
  "rustc-hash",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tinyvec",
  "tracing",
  "web-time",
@@ -8414,16 +8339,16 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.6.1",
+ "socket2 0.6.2",
  "tracing",
  "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.42"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 dependencies = [
  "proc-macro2",
 ]
@@ -8482,7 +8407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha 0.9.0",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -8512,7 +8437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -8530,14 +8455,14 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
  "getrandom 0.3.4",
 ]
@@ -8568,7 +8493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b16df48f071248e67b8fc5e866d9448d45c08ad8b672baaaf796e2f15e606ff0"
 dependencies = [
  "libc",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
  "winapi",
 ]
 
@@ -8587,7 +8512,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
 dependencies = [
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -8655,13 +8580,22 @@ dependencies = [
  "bitflags 2.10.0",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libredox",
  "thiserror 1.0.69",
 ]
@@ -8672,9 +8606,9 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libredox",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -8694,7 +8628,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -8797,15 +8731,15 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.25"
+version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures-core",
  "futures-util",
- "h2 0.4.12",
+ "h2 0.4.13",
  "http 1.4.0",
  "http-body 1.0.1",
  "http-body-util",
@@ -8817,8 +8751,8 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.35",
- "rustls-native-certs 0.8.2",
+ "rustls 0.23.36",
+ "rustls-native-certs 0.8.3",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -8835,7 +8769,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots 1.0.4",
+ "webpki-roots 1.0.5",
 ]
 
 [[package]]
@@ -8861,11 +8795,10 @@ dependencies = [
 
 [[package]]
 name = "rfd"
-version = "0.15.4"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed"
+checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
 dependencies = [
- "ashpd",
  "block2",
  "dispatch2",
  "glib-sys",
@@ -8881,7 +8814,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -8907,7 +8840,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libc",
  "untrusted 0.9.0",
  "windows-sys 0.52.0",
@@ -8915,9 +8848,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv"
-version = "0.7.45"
+version = "0.7.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
+checksum = "2297bf9c81a3f0dc96bc9521370b88f054168c29826a75e89c55ff196e7ed6a1"
 dependencies = [
  "bitvec",
  "bytecheck",
@@ -8933,9 +8866,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv_derive"
-version = "0.7.45"
+version = "0.7.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
+checksum = "84d7b42d4b8d06048d3ac8db0eb31bcb942cbeb709f0b5f2b2ebde398d3038f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8950,9 +8883,9 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
 
 [[package]]
 name = "rsa"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40a0376c50d0358279d9d643e4bf7b7be212f1f4ff1da9070a7b54d22ef75c88"
+checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -9004,9 +8937,9 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.39.0"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
+checksum = "61f703d19852dbf87cbc513643fa81428361eb6940f1ac14fd58155d295a3eb0"
 dependencies = [
  "arrayvec",
  "borsh",
@@ -9044,9 +8977,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
  "bitflags 2.10.0",
  "errno",
@@ -9094,16 +9027,16 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.35"
+version = "0.23.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
+checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
  "ring 0.17.14",
  "rustls-pki-types",
- "rustls-webpki 0.103.8",
+ "rustls-webpki 0.103.9",
  "subtle",
  "zeroize",
 ]
@@ -9114,7 +9047,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
 dependencies = [
- "openssl-probe",
+ "openssl-probe 0.1.6",
  "rustls 0.19.1",
  "schannel",
  "security-framework 2.11.1",
@@ -9122,11 +9055,11 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
 dependencies = [
- "openssl-probe",
+ "openssl-probe 0.2.1",
  "rustls-pki-types",
  "schannel",
  "security-framework 3.5.1",
@@ -9143,9 +9076,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c"
+checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
 dependencies = [
  "web-time",
  "zeroize",
@@ -9162,10 +9095,10 @@ dependencies = [
  "jni",
  "log",
  "once_cell",
- "rustls 0.23.35",
- "rustls-native-certs 0.8.2",
+ "rustls 0.23.36",
+ "rustls-native-certs 0.8.3",
  "rustls-platform-verifier-android",
- "rustls-webpki 0.103.8",
+ "rustls-webpki 0.103.9",
  "security-framework 3.5.1",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
@@ -9190,9 +9123,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.8"
+version = "0.103.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
+checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
 dependencies = [
  "aws-lc-rs",
  "ring 0.17.14",
@@ -9253,20 +9186,20 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
 
 [[package]]
 name = "safelog"
 version = "0.7.1"
 source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_arti_1_8_0#2a5db5823e2a5eb413d8ad433a4d3aba902bac07"
 dependencies = [
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "educe",
  "either",
  "fluid-let",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -9325,9 +9258,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289"
+checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2"
 dependencies = [
  "dyn-clone",
  "ref-cast",
@@ -9344,15 +9277,9 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
-[[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"
@@ -9644,7 +9571,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -9655,7 +9582,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -9670,15 +9597,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "itoa",
  "memchr",
- "ryu",
  "serde",
  "serde_core",
+ "zmij",
 ]
 
 [[package]]
@@ -9700,7 +9627,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -9714,9 +9641,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
 dependencies = [
  "serde_core",
 ]
@@ -9753,9 +9680,9 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "schemars 0.9.0",
- "schemars 1.1.0",
+ "schemars 1.2.0",
  "serde_core",
  "serde_json",
  "serde_with_macros 3.16.1",
@@ -9783,7 +9710,7 @@ dependencies = [
  "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -9792,7 +9719,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "itoa",
  "ryu",
  "serde",
@@ -9818,7 +9745,7 @@ checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -9924,10 +9851,11 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.7"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
 dependencies = [
+ "errno",
  "libc",
 ]
 
@@ -10026,7 +9954,7 @@ dependencies = [
  "paste",
  "serde",
  "slotmap",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "void",
 ]
 
@@ -10068,9 +9996,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
 dependencies = [
  "libc",
  "windows-sys 0.60.2",
@@ -10216,7 +10144,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hashlink",
  "hex",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "log",
  "memchr",
  "once_cell",
@@ -10247,7 +10175,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -10270,7 +10198,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.111",
+ "syn 2.0.114",
  "tempfile",
  "tokio",
  "url",
@@ -10553,7 +10481,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -10565,7 +10493,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -10582,7 +10510,7 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
 
 [[package]]
 name = "swap"
-version = "3.6.7"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "arti-client",
@@ -10616,9 +10544,9 @@ dependencies = [
  "proptest",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "rust_decimal",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "semver",
  "serde",
  "serde_json",
@@ -10657,7 +10585,7 @@ dependencies = [
 
 [[package]]
 name = "swap-asb"
-version = "3.6.7"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "bitcoin 0.32.8",
@@ -10667,9 +10595,9 @@ dependencies = [
  "monero-address",
  "monero-rpc-pool",
  "monero-sys",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "rust_decimal",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "serde",
  "serde_json",
  "structopt",
@@ -10688,30 +10616,33 @@ dependencies = [
 
 [[package]]
 name = "swap-controller"
-version = "3.6.7"
+version = "4.0.0"
 dependencies = [
  "anyhow",
- "clap 4.5.53",
+ "clap 4.5.54",
+ "comfy-table",
  "jsonrpsee",
  "monero-oxide-ext",
  "rustyline",
  "shell-words",
  "swap-controller-api",
  "tokio",
+ "uuid",
 ]
 
 [[package]]
 name = "swap-controller-api"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "bitcoin 0.32.8",
  "jsonrpsee",
  "serde",
+ "uuid",
 ]
 
 [[package]]
 name = "swap-core"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "bdk_wallet",
@@ -10723,7 +10654,7 @@ dependencies = [
  "futures",
  "monero-address",
  "monero-oxide-ext",
- "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite)",
+ "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git)",
  "proptest",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -10743,7 +10674,7 @@ dependencies = [
 
 [[package]]
 name = "swap-db"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "bitcoin 0.32.8",
  "serde",
@@ -10755,12 +10686,12 @@ dependencies = [
 
 [[package]]
 name = "swap-env"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "bitcoin 0.32.8",
  "config",
- "console 0.16.1",
+ "console 0.16.2",
  "dialoguer",
  "libp2p",
  "monero-address",
@@ -10770,21 +10701,21 @@ dependencies = [
  "swap-serde",
  "thiserror 1.0.69",
  "time",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "tracing",
  "url",
 ]
 
 [[package]]
 name = "swap-feed"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "backoff",
  "bitcoin 0.32.8",
  "futures",
  "monero-oxide-ext",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "rust_decimal",
  "serde",
  "serde_json",
@@ -10798,7 +10729,7 @@ dependencies = [
 
 [[package]]
 name = "swap-fs"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "directories-next",
@@ -10807,7 +10738,7 @@ dependencies = [
 
 [[package]]
 name = "swap-machine"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -10820,6 +10751,7 @@ dependencies = [
  "monero-oxide-ext",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
+ "rust_decimal",
  "serde",
  "sha2",
  "sigma_fun",
@@ -10828,12 +10760,13 @@ dependencies = [
  "swap-serde",
  "thiserror 1.0.69",
  "tokio",
+ "tracing",
  "uuid",
 ]
 
 [[package]]
 name = "swap-orchestrator"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "bitcoin 0.32.8",
@@ -10843,16 +10776,17 @@ dependencies = [
  "monero-address",
  "serde_yaml",
  "swap-env",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "url",
  "vergen 8.3.2",
 ]
 
 [[package]]
 name = "swap-p2p"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
+ "arti-client",
  "async-trait",
  "asynchronous-codec 0.7.0",
  "backoff",
@@ -10861,8 +10795,10 @@ dependencies = [
  "bmrng",
  "futures",
  "libp2p",
+ "libp2p-tor",
  "monero-address",
  "rand 0.8.5",
+ "rust_decimal",
  "semver",
  "serde",
  "serde_cbor",
@@ -10873,7 +10809,9 @@ dependencies = [
  "swap-serde",
  "thiserror 1.0.69",
  "tokio",
+ "tor-rtcompat",
  "tracing",
+ "tracing-subscriber",
  "typeshare",
  "unsigned-varint 0.8.0",
  "uuid",
@@ -10882,7 +10820,7 @@ dependencies = [
 
 [[package]]
 name = "swap-proptest"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "bitcoin 0.32.8",
  "ecdsa_fun",
@@ -10891,7 +10829,7 @@ dependencies = [
 
 [[package]]
 name = "swap-serde"
-version = "0.1.0"
+version = "4.0.0"
 dependencies = [
  "anyhow",
  "bitcoin 0.32.8",
@@ -10899,7 +10837,7 @@ dependencies = [
  "libp2p",
  "monero-address",
  "monero-oxide-ext",
- "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git?branch=rpc-rewrite)",
+ "monero-wallet 0.1.0 (git+https://github.com/kayabaNerve/monero-oxide.git)",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -10930,9 +10868,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10974,7 +10912,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -11100,7 +11038,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -11156,7 +11094,7 @@ dependencies = [
  "percent-encoding",
  "plist",
  "raw-window-handle",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "serde",
  "serde_json",
  "serde_repr",
@@ -11167,7 +11105,7 @@ dependencies = [
  "tauri-runtime",
  "tauri-runtime-wry",
  "tauri-utils",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tray-icon",
  "url",
@@ -11195,7 +11133,7 @@ dependencies = [
  "serde_json",
  "tauri-utils",
  "tauri-winres",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "walkdir",
 ]
 
@@ -11217,9 +11155,9 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
- "syn 2.0.111",
+ "syn 2.0.114",
  "tauri-utils",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "url",
  "uuid",
@@ -11235,7 +11173,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "tauri-codegen",
  "tauri-utils",
 ]
@@ -11253,7 +11191,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tauri-utils",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
  "walkdir",
 ]
 
@@ -11263,13 +11201,13 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28e78fb2c09a81546bcd376d34db4bda5769270d00990daa9f0d6e7ac1107e25"
 dependencies = [
- "clap 4.5.53",
+ "clap 4.5.54",
  "log",
  "serde",
  "serde_json",
  "tauri",
  "tauri-plugin",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -11284,14 +11222,14 @@ dependencies = [
  "serde_json",
  "tauri",
  "tauri-plugin",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.4.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "313f8138692ddc4a2127c4c9607d616a46f5c042e77b3722450866da0aad2f19"
+checksum = "9204b425d9be8d12aa60c2a83a289cf7d1caae40f57f336ed1155b3a5c0e359b"
 dependencies = [
  "log",
  "raw-window-handle",
@@ -11301,15 +11239,15 @@ dependencies = [
  "tauri",
  "tauri-plugin",
  "tauri-plugin-fs",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "url",
 ]
 
 [[package]]
 name = "tauri-plugin-fs"
-version = "2.4.4"
+version = "2.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47df422695255ecbe7bac7012440eddaeefd026656171eac9559f5243d3230d9"
+checksum = "ed390cc669f937afeb8b28032ce837bac8ea023d975a2e207375ec05afaf1804"
 dependencies = [
  "anyhow",
  "dunce",
@@ -11322,16 +11260,16 @@ dependencies = [
  "tauri",
  "tauri-plugin",
  "tauri-utils",
- "thiserror 2.0.17",
- "toml 0.9.8",
+ "thiserror 2.0.18",
+ "toml 0.9.11+spec-1.1.0",
  "url",
 ]
 
 [[package]]
 name = "tauri-plugin-opener"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c26b72571d25dee25667940027114e60f569fc3974f8cefbe50c2cbc5fd65e3b"
+checksum = "fc624469b06f59f5a29f874bbc61a2ed737c0f9c23ef09855a292c389c42e83f"
 dependencies = [
  "dunce",
  "glob",
@@ -11343,7 +11281,7 @@ dependencies = [
  "serde_json",
  "tauri",
  "tauri-plugin",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "url",
  "windows 0.61.3",
  "zbus",
@@ -11361,14 +11299,14 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-single-instance"
-version = "2.3.6"
+version = "2.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd707f8c86b4e3004e2c141fa24351f1909ba40ce1b8437e30d5ed5277dd3710"
+checksum = "acba6b5ca527a96cdfcc96ae09b09ccb91ddff5e33978ca6873b96ea16bb404c"
 dependencies = [
  "serde",
  "serde_json",
  "tauri",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
  "windows-sys 0.60.2",
  "zbus",
@@ -11376,16 +11314,16 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-store"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a77036340a97eb5bbe1b3209c31e5f27f75e6f92a52fd9dd4b211ef08bf310"
+checksum = "5ca1a8ff83c269b115e98726ffc13f9e548a10161544a92ad121d6d0a96e16ea"
 dependencies = [
  "dunce",
  "serde",
  "serde_json",
  "tauri",
  "tauri-plugin",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -11406,7 +11344,7 @@ dependencies = [
  "minisign-verify",
  "osakit",
  "percent-encoding",
- "reqwest 0.12.25",
+ "reqwest 0.12.28",
  "semver",
  "serde",
  "serde_json",
@@ -11414,7 +11352,7 @@ dependencies = [
  "tauri",
  "tauri-plugin",
  "tempfile",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "tokio",
  "url",
@@ -11440,7 +11378,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tauri-utils",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "url",
  "webkit2gtk",
  "webview2-com",
@@ -11505,8 +11443,8 @@ dependencies = [
  "serde_json",
  "serde_with 3.16.1",
  "swift-rs",
- "thiserror 2.0.17",
- "toml 0.9.8",
+ "thiserror 2.0.18",
+ "toml 0.9.11+spec-1.1.0",
  "url",
  "urlpattern",
  "uuid",
@@ -11521,14 +11459,14 @@ checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0"
 dependencies = [
  "dunce",
  "embed-resource",
- "toml 0.9.8",
+ "toml 0.9.11+spec-1.1.0",
 ]
 
 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 dependencies = [
  "fastrand",
  "getrandom 0.3.4",
@@ -11594,11 +11532,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -11609,18 +11547,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -11655,9 +11593,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.44"
+version = "0.3.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5"
 dependencies = [
  "deranged",
  "itoa",
@@ -11665,22 +11603,22 @@ dependencies = [
  "num-conv",
  "num_threads",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.24"
+version = "0.2.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4"
 dependencies = [
  "num-conv",
  "time-core",
@@ -11724,9 +11662,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.48.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
  "bytes",
  "libc",
@@ -11734,9 +11672,8 @@ dependencies = [
  "parking_lot 0.12.5",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.1",
+ "socket2 0.6.2",
  "tokio-macros",
- "tracing",
  "windows-sys 0.61.2",
 ]
 
@@ -11748,7 +11685,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -11778,15 +11715,15 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -11796,12 +11733,10 @@ dependencies = [
 
 [[package]]
 name = "tokio-test"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7"
+checksum = "3f6d24790a10a7af737693a3e8f1d03faef7e6ca0cc99aae5066f533766de545"
 dependencies = [
- "async-stream",
- "bytes",
  "futures-core",
  "tokio",
  "tokio-stream",
@@ -11826,9 +11761,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.17"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
  "bytes",
  "futures-core",
@@ -11853,14 +11788,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.9.8"
+version = "0.9.11+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
+checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "serde_core",
- "serde_spanned 1.0.3",
- "toml_datetime 0.7.3",
+ "serde_spanned 1.0.4",
+ "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
  "toml_writer",
  "winnow 0.7.14",
@@ -11877,9 +11812,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.3"
+version = "0.7.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
 dependencies = [
  "serde_core",
 ]
@@ -11890,7 +11825,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "toml_datetime 0.6.3",
  "winnow 0.5.40",
 ]
@@ -11901,7 +11836,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.3",
@@ -11910,30 +11845,30 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.23.9"
+version = "0.23.10+spec-1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d7cbc3b4b49633d57a0509303158ca50de80ae32c265093b24c414705807832"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 dependencies = [
- "indexmap 2.12.1",
- "toml_datetime 0.7.3",
+ "indexmap 2.13.0",
+ "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
  "winnow 0.7.14",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
 dependencies = [
  "winnow 0.7.14",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
 
 [[package]]
 name = "tor-async-utils"
@@ -11946,7 +11881,7 @@ dependencies = [
  "oneshot-fused-workaround",
  "pin-project",
  "postage",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "void",
 ]
 
@@ -11955,7 +11890,7 @@ name = "tor-basic-utils"
 version = "0.37.0"
 source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_arti_1_8_0#2a5db5823e2a5eb413d8ad433a4d3aba902bac07"
 dependencies = [
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "hex",
  "itertools 0.14.0",
  "libc",
@@ -11965,7 +11900,7 @@ dependencies = [
  "serde",
  "slab",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -11979,7 +11914,7 @@ dependencies = [
  "educe",
  "getrandom 0.3.4",
  "safelog",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-error",
  "tor-llcrypto",
  "zeroize",
@@ -11995,13 +11930,13 @@ dependencies = [
  "bytes",
  "caret",
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "educe",
  "itertools 0.14.0",
  "paste",
  "rand 0.9.2",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-basic-utils",
  "tor-bytes",
  "tor-cert",
@@ -12022,9 +11957,9 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "caret",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "digest 0.10.7",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-bytes",
  "tor-checkable",
  "tor-error",
@@ -12039,7 +11974,7 @@ dependencies = [
  "async-trait",
  "caret",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "educe",
  "futures",
  "oneshot-fused-workaround",
@@ -12047,7 +11982,7 @@ dependencies = [
  "rand 0.9.2",
  "safelog",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-cell",
@@ -12073,7 +12008,7 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "humantime",
  "signature",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-llcrypto",
 ]
 
@@ -12087,7 +12022,7 @@ dependencies = [
  "cfg-if",
  "derive-deftly",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "downcast-rs 2.0.2",
  "dyn-clone",
  "educe",
@@ -12101,7 +12036,7 @@ dependencies = [
  "retry-error",
  "safelog",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-cell",
@@ -12148,8 +12083,8 @@ dependencies = [
  "serde-value",
  "serde_ignored",
  "strum 0.27.2",
- "thiserror 2.0.17",
- "toml 0.9.8",
+ "thiserror 2.0.18",
+ "toml 0.9.11+spec-1.1.0",
  "tor-basic-utils",
  "tor-error",
  "tor-rtcompat",
@@ -12165,7 +12100,7 @@ dependencies = [
  "directories",
  "serde",
  "shellexpand",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-error",
  "tor-general-addr",
 ]
@@ -12177,7 +12112,7 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "digest 0.10.7",
  "hex",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-llcrypto",
 ]
 
@@ -12188,7 +12123,7 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "async-compression",
  "base64ct",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "futures",
  "hex",
  "http 1.4.0",
@@ -12196,7 +12131,7 @@ dependencies = [
  "httpdate",
  "itertools 0.14.0",
  "memchr",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-circmgr",
  "tor-error",
  "tor-hscrypto",
@@ -12236,7 +12171,7 @@ dependencies = [
  "async-trait",
  "base64ct",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "digest 0.10.7",
  "educe",
  "event-listener",
@@ -12260,7 +12195,7 @@ dependencies = [
  "signature",
  "static_assertions",
  "strum 0.27.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -12287,13 +12222,13 @@ name = "tor-error"
 version = "0.37.0"
 source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_arti_1_8_0#2a5db5823e2a5eb413d8ad433a4d3aba902bac07"
 dependencies = [
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "futures",
  "paste",
  "retry-error",
  "static_assertions",
  "strum 0.27.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tracing",
  "void",
 ]
@@ -12303,8 +12238,8 @@ name = "tor-general-addr"
 version = "0.37.0"
 source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_arti_1_8_0#2a5db5823e2a5eb413d8ad433a4d3aba902bac07"
 dependencies = [
- "derive_more 2.1.0",
- "thiserror 2.0.17",
+ "derive_more 2.1.1",
+ "thiserror 2.0.18",
  "void",
 ]
 
@@ -12317,7 +12252,7 @@ dependencies = [
  "base64ct",
  "derive-deftly",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "dyn-clone",
  "educe",
  "futures",
@@ -12332,7 +12267,7 @@ dependencies = [
  "safelog",
  "serde",
  "strum 0.27.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-config",
@@ -12357,7 +12292,7 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "async-trait",
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "educe",
  "either",
  "futures",
@@ -12369,7 +12304,7 @@ dependencies = [
  "safelog",
  "slotmap-careful",
  "strum 0.27.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-bytes",
@@ -12401,7 +12336,7 @@ dependencies = [
  "cipher",
  "data-encoding",
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "digest 0.10.7",
  "hex",
  "humantime",
@@ -12412,7 +12347,7 @@ dependencies = [
  "serde",
  "signature",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-basic-utils",
  "tor-bytes",
  "tor-error",
@@ -12435,7 +12370,7 @@ dependencies = [
  "cfg-if",
  "derive-deftly",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "digest 0.10.7",
  "educe",
  "fs-mistrust",
@@ -12449,13 +12384,13 @@ dependencies = [
  "oneshot-fused-workaround",
  "postage",
  "rand 0.9.2",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
  "retry-error",
  "safelog",
  "serde",
  "serde_with 3.16.1",
  "strum 0.27.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-bytes",
@@ -12487,14 +12422,14 @@ version = "0.37.0"
 source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_arti_1_8_0#2a5db5823e2a5eb413d8ad433a4d3aba902bac07"
 dependencies = [
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "downcast-rs 2.0.2",
  "paste",
  "rand 0.9.2",
  "rsa",
  "signature",
  "ssh-key",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-bytes",
  "tor-cert",
  "tor-checkable",
@@ -12512,7 +12447,7 @@ dependencies = [
  "cfg-if",
  "derive-deftly",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "downcast-rs 2.0.2",
  "dyn-clone",
  "fs-mistrust",
@@ -12525,7 +12460,7 @@ dependencies = [
  "serde",
  "signature",
  "ssh-key",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-basic-utils",
  "tor-bytes",
  "tor-config",
@@ -12551,14 +12486,14 @@ dependencies = [
  "caret",
  "derive-deftly",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "hex",
  "itertools 0.14.0",
  "safelog",
  "serde",
  "serde_with 3.16.1",
  "strum 0.27.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-basic-utils",
  "tor-bytes",
  "tor-config",
@@ -12578,7 +12513,7 @@ dependencies = [
  "curve25519-dalek",
  "der-parser 10.0.0",
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "digest 0.10.7",
  "ed25519-dalek",
  "educe",
@@ -12587,7 +12522,7 @@ dependencies = [
  "rand 0.9.2",
  "rand_chacha 0.9.0",
  "rand_core 0.6.4",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
  "rand_jitter",
  "rdrand",
  "rsa",
@@ -12598,7 +12533,7 @@ dependencies = [
  "sha3",
  "signature",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-error",
  "tor-memquota",
  "visibility",
@@ -12613,7 +12548,7 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "futures",
  "humantime",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-error",
  "tor-rtcompat",
  "tracing",
@@ -12627,7 +12562,7 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "cfg-if",
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "dyn-clone",
  "educe",
  "futures",
@@ -12638,7 +12573,7 @@ dependencies = [
  "slotmap-careful",
  "static_assertions",
  "sysinfo",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-async-utils",
  "tor-basic-utils",
  "tor-config",
@@ -12656,7 +12591,7 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "async-trait",
  "bitflags 2.10.0",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "digest 0.10.7",
  "futures",
  "hex",
@@ -12666,7 +12601,7 @@ dependencies = [
  "rand 0.9.2",
  "serde",
  "strum 0.27.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "tor-basic-utils",
  "tor-error",
@@ -12690,7 +12625,7 @@ dependencies = [
  "cipher",
  "derive-deftly",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "digest 0.10.7",
  "educe",
  "enumset",
@@ -12707,7 +12642,7 @@ dependencies = [
  "smallvec",
  "strum 0.27.2",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "tinystr",
  "tor-basic-utils",
@@ -12733,7 +12668,7 @@ source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_art
 dependencies = [
  "amplify",
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "filetime",
  "fs-mistrust",
  "fslock",
@@ -12745,7 +12680,7 @@ dependencies = [
  "sanitize-filename",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "tor-async-utils",
  "tor-basic-utils",
@@ -12770,7 +12705,7 @@ dependencies = [
  "criterion-cycles-per-byte",
  "derive-deftly",
  "derive_builder_fork_arti",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "digest 0.10.7",
  "educe",
  "enum_dispatch",
@@ -12784,14 +12719,14 @@ dependencies = [
  "pin-project",
  "postage",
  "rand 0.9.2",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
  "safelog",
  "slotmap-careful",
  "smallvec",
  "static_assertions",
  "subtle",
  "sync_wrapper 1.0.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-util",
  "tor-async-utils",
@@ -12827,7 +12762,7 @@ dependencies = [
  "caret",
  "paste",
  "serde_with 3.16.1",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-bytes",
 ]
 
@@ -12837,7 +12772,7 @@ version = "0.37.0"
 source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_arti_1_8_0#2a5db5823e2a5eb413d8ad433a4d3aba902bac07"
 dependencies = [
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "humantime",
  "tor-cert",
  "tor-checkable",
@@ -12870,7 +12805,7 @@ dependencies = [
  "async_executors",
  "asynchronous-codec 0.7.0",
  "coarsetime",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "dyn-clone",
  "educe",
  "futures",
@@ -12880,9 +12815,9 @@ dependencies = [
  "paste",
  "pin-project",
  "rustls-pki-types",
- "rustls-webpki 0.103.8",
- "socket2 0.6.1",
- "thiserror 2.0.17",
+ "rustls-webpki 0.103.9",
+ "socket2 0.6.2",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-util",
  "tor-error",
@@ -12900,7 +12835,7 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "educe",
  "futures",
  "humantime",
@@ -12910,7 +12845,7 @@ dependencies = [
  "priority-queue",
  "slotmap-careful",
  "strum 0.27.2",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-error",
  "tor-general-addr",
  "tor-rtcompat",
@@ -12930,7 +12865,7 @@ dependencies = [
  "educe",
  "safelog",
  "subtle",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-bytes",
  "tor-error",
 ]
@@ -12941,17 +12876,17 @@ version = "0.37.0"
 source = "git+https://github.com/eigenwallet/arti?branch=downgraded_rusqlite_arti_1_8_0#2a5db5823e2a5eb413d8ad433a4d3aba902bac07"
 dependencies = [
  "derive-deftly",
- "derive_more 2.1.0",
+ "derive_more 2.1.1",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tor-memquota",
 ]
 
 [[package]]
 name = "tower"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -12995,9 +12930,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -13012,7 +12947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf"
 dependencies = [
  "crossbeam-channel",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "time",
  "tracing-subscriber",
 ]
@@ -13025,14 +12960,14 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -13108,14 +13043,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
 dependencies = [
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "tray-icon"
-version = "0.21.2"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b"
+checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c"
 dependencies = [
  "crossbeam-channel",
  "dirs",
@@ -13129,7 +13064,7 @@ dependencies = [
  "once_cell",
  "png 0.17.16",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "windows-sys 0.60.2",
 ]
 
@@ -13174,9 +13109,9 @@ dependencies = [
 
 [[package]]
 name = "typed-index-collections"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5318ee4ce62a4e948a33915574021a7a953d83e84fba6e25c72ffcfd7dad35ff"
+checksum = "898160f1dfd383b4e92e17f0512a7d62f3c51c44937b23b6ffc3a1614a8eaccd"
 dependencies = [
  "bincode 2.0.1",
  "serde",
@@ -13196,9 +13131,9 @@ checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "typeshare"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19be0f411120091e76e13e5a0186d8e2bcc3e7e244afdb70152197f1a8486ceb"
+checksum = "da1bf9fe204f358ffea7f8f779b53923a20278b3ab8e8d97962c5e1b3a54edb7"
 dependencies = [
  "chrono",
  "serde",
@@ -13213,7 +13148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "621963e302416b389a1ec177397e9e62de849a78bd8205d428608553def75350"
 dependencies = [
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -13303,9 +13238,9 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.8.1"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 
 [[package]]
 name = "unicode-bidi"
@@ -13406,7 +13341,7 @@ name = "unstoppableswap-gui-rs"
 version = "3.6.7"
 dependencies = [
  "dfx-swiss-sdk",
- "rustls 0.23.35",
+ "rustls 0.23.36",
  "serde",
  "serde_json",
  "swap",
@@ -13447,14 +13382,15 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
 
 [[package]]
 name = "url"
-version = "2.5.7"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -13489,9 +13425,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.19.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
+checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
 dependencies = [
  "getrandom 0.3.4",
  "js-sys",
@@ -13532,15 +13468,15 @@ dependencies = [
 
 [[package]]
 name = "vergen"
-version = "9.0.6"
+version = "9.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b2bf58be11fc9414104c6d3a2e464163db5ef74b12296bda593cac37b6e4777"
+checksum = "b849a1f6d8639e8de261e81ee0fc881e3e3620db1af9f2e0da015d4382ceaf75"
 dependencies = [
  "anyhow",
  "derive_builder",
  "rustversion",
  "time",
- "vergen-lib",
+ "vergen-lib 9.1.0",
 ]
 
 [[package]]
@@ -13554,8 +13490,8 @@ dependencies = [
  "git2",
  "rustversion",
  "time",
- "vergen 9.0.6",
- "vergen-lib",
+ "vergen 9.1.0",
+ "vergen-lib 0.1.6",
 ]
 
 [[package]]
@@ -13569,6 +13505,17 @@ dependencies = [
  "rustversion",
 ]
 
+[[package]]
+name = "vergen-lib"
+version = "9.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b34a29ba7e9c59e62f229ae1932fb1b8fb8a6fdcc99215a641913f5f5a59a569"
+dependencies = [
+ "anyhow",
+ "derive_builder",
+ "rustversion",
+]
+
 [[package]]
 name = "version-compare"
 version = "0.2.1"
@@ -13595,7 +13542,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -13666,9 +13613,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
  "wit-bindgen",
 ]
@@ -13681,18 +13628,18 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasix"
-version = "0.12.21"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d"
+checksum = "1757e0d1f8456693c7e5c6c629bdb54884e032aa0bb53c155f6a39f94440d332"
 dependencies = [
  "wasi 0.11.1+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
+checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -13703,11 +13650,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.56"
+version = "0.4.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
+checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
 dependencies = [
  "cfg-if",
+ "futures-util",
  "js-sys",
  "once_cell",
  "wasm-bindgen",
@@ -13716,9 +13664,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
+checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -13726,22 +13674,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
+checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.106"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
+checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
 dependencies = [
  "unicode-ident",
 ]
@@ -13761,23 +13709,22 @@ dependencies = [
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
+checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
 dependencies = [
  "cc",
  "downcast-rs 1.2.1",
  "rustix",
- "scoped-tls",
  "smallvec",
  "wayland-sys",
 ]
 
 [[package]]
 name = "wayland-client"
-version = "0.31.11"
+version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
+checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
 dependencies = [
  "bitflags 2.10.0",
  "rustix",
@@ -13787,9 +13734,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.9"
+version = "0.32.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
+checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -13799,9 +13746,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
+checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -13812,23 +13759,21 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
+checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
 dependencies = [
  "proc-macro2",
- "quick-xml 0.37.5",
+ "quick-xml",
  "quote",
 ]
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
+checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
 dependencies = [
- "dlib",
- "log",
  "pkg-config",
 ]
 
@@ -13840,9 +13785,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
 
 [[package]]
 name = "web-sys"
-version = "0.3.83"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
+checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -13928,14 +13873,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e"
 dependencies = [
- "webpki-root-certs 1.0.4",
+ "webpki-root-certs 1.0.5",
 ]
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee3e3b5f5e80bc89f30ce8d0343bf4e5f12341c51f3e26cbeecbc7c85443e85b"
+checksum = "36a29fc0408b113f68cf32637857ab740edfafdf460c326cd2afaa2d84cc05dc"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -13966,18 +13911,18 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
+checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "webview2-com"
-version = "0.38.0"
+version = "0.38.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ba622a989277ef3886dd5afb3e280e3dd6d974b766118950a08f8f678ad6a4"
+checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
@@ -13989,22 +13934,22 @@ dependencies = [
 
 [[package]]
 name = "webview2-com-macros"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
+checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "webview2-com-sys"
-version = "0.38.0"
+version = "0.38.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c"
+checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "windows 0.61.3",
  "windows-core 0.61.2",
 ]
@@ -14164,7 +14109,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -14175,7 +14120,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -14611,9 +14556,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.46.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 
 [[package]]
 name = "wl-clipboard-rs"
@@ -14625,7 +14570,7 @@ dependencies = [
  "log",
  "os_pipe",
  "rustix",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "tree_magic_mini",
  "wayland-backend",
  "wayland-client",
@@ -14673,7 +14618,7 @@ dependencies = [
  "sha2",
  "soup3",
  "tao-macros",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "url",
  "webkit2gtk",
  "webkit2gtk-sys",
@@ -14867,15 +14812,15 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "synstructure 0.13.2",
 ]
 
 [[package]]
 name = "zbus"
-version = "5.12.0"
+version = "5.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91"
+checksum = "1bfeff997a0aaa3eb20c4652baf788d2dfa6d2839a0ead0b3ff69ce2f9c4bdd1"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -14891,11 +14836,11 @@ dependencies = [
  "futures-core",
  "futures-lite",
  "hex",
- "nix 0.30.1",
+ "libc",
  "ordered-stream",
+ "rustix",
  "serde",
  "serde_repr",
- "tokio",
  "tracing",
  "uds_windows",
  "uuid",
@@ -14908,14 +14853,14 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.12.0"
+version = "5.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdb94821ca8a87ca9c298b5d1cbd80e2a8b67115d99f6e4551ac49e42b6a314"
+checksum = "0bbd5a90dbe8feee5b13def448427ae314ccd26a49cac47905cafefb9ff846f1"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -14923,34 +14868,33 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.2.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
+checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
 dependencies = [
  "serde",
- "static_assertions",
  "winnow 0.7.14",
  "zvariant",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.31"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
+checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.31"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
+checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -14970,7 +14914,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "synstructure 0.13.2",
 ]
 
@@ -14985,13 +14929,13 @@ dependencies = [
 
 [[package]]
 name = "zeroize_derive"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -15025,7 +14969,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -15043,7 +14987,7 @@ dependencies = [
  "flate2",
  "getrandom 0.3.4",
  "hmac",
- "indexmap 2.12.1",
+ "indexmap 2.13.0",
  "liblzma",
  "memchr",
  "pbkdf2",
@@ -15057,9 +15001,15 @@ dependencies = [
 
 [[package]]
 name = "zlib-rs"
-version = "0.5.4"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3"
+
+[[package]]
+name = "zmij"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51f936044d677be1a1168fae1d03b583a285a5dd9d8cbf7b24c23aa1fc775235"
+checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65"
 
 [[package]]
 name = "zopfli"
@@ -15118,14 +15068,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.8.0"
+version = "5.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2be61892e4f2b1772727be11630a62664a1826b62efa43a6fe7449521cb8744c"
+checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "url",
  "winnow 0.7.14",
  "zvariant_derive",
  "zvariant_utils",
@@ -15133,26 +15082,26 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "5.8.0"
+version = "5.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da58575a1b2b20766513b1ec59d8e2e68db2745379f961f86650655e862d2006"
+checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_utils"
-version = "3.2.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599"
+checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.111",
+ "syn 2.0.114",
  "winnow 0.7.14",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 27bbbe56cd..0ebd9f497b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,12 +40,12 @@ bdk_wallet = "2.0.0"
 bitcoin = { version = "0.32", features = ["rand", "serde"] }
 
 # monero-oxide
-monero-address = { git = "https://github.com/kayabaNerve/monero-oxide.git", branch = "rpc-rewrite" }
-monero-daemon-rpc = { git = "https://github.com/kayabaNerve/monero-oxide.git", branch = "rpc-rewrite" }
-monero-interface = { git = "https://github.com/kayabaNerve/monero-oxide.git", branch = "rpc-rewrite" }
-monero-oxide = { git = "https://github.com/kayabaNerve/monero-oxide.git", branch = "rpc-rewrite" }
-monero-oxide-wallet = { git = "https://github.com/kayabaNerve/monero-oxide.git", package = "monero-wallet", branch = "rpc-rewrite" }
-monero-simple-request-rpc = { git = "https://github.com/kayabaNerve/monero-oxide.git", branch = "rpc-rewrite" }
+monero-address = { git = "https://github.com/kayabaNerve/monero-oxide.git"  }
+monero-daemon-rpc = { git = "https://github.com/kayabaNerve/monero-oxide.git"  }
+monero-interface = { git = "https://github.com/kayabaNerve/monero-oxide.git"  }
+monero-oxide = { git = "https://github.com/kayabaNerve/monero-oxide.git"  }
+monero-oxide-wallet = { git = "https://github.com/kayabaNerve/monero-oxide.git", package = "monero-wallet"  }
+monero-simple-request-rpc = { git = "https://github.com/kayabaNerve/monero-oxide.git"  }
 
 # Cryptography
 curve25519-dalek = { version = "4", package = "curve25519-dalek", features = ["rand_core", "serde"] }
@@ -101,6 +101,7 @@ tor-cell = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_r
 tor-hsservice = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_1_8_0" }
 tor-proto = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_1_8_0" }
 tor-rtcompat = { git = "https://github.com/eigenwallet/arti", branch = "downgraded_rusqlite_arti_1_8_0" }
+libp2p-tor = { path = "./libp2p-tor" }
 
 # Terminal Utilities
 console = "0.16"
@@ -122,6 +123,8 @@ crunchy = { git = "https://github.com/eira-fransham/crunchy", rev = "ba7b86cea6b
 
 [workspace.lints]
 rust.unused_crate_dependencies = "warn"
+# prevents accidental infinite recursion when implementing a trait method by calling a method with the same name
+rust.unconditional_recursion = "deny" 
 
 [profile.release]
 codegen-units = 1
diff --git a/bitcoin-wallet/Cargo.toml b/bitcoin-wallet/Cargo.toml
index dd4f62af4a..430dc56e6b 100644
--- a/bitcoin-wallet/Cargo.toml
+++ b/bitcoin-wallet/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "bitcoin-wallet"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = { workspace = true }
diff --git a/bitcoin-wallet/src/lib.rs b/bitcoin-wallet/src/lib.rs
index 28778567fa..69959ae161 100644
--- a/bitcoin-wallet/src/lib.rs
+++ b/bitcoin-wallet/src/lib.rs
@@ -41,7 +41,7 @@ pub trait BitcoinWallet: Send + Sync {
 
     async fn sign_and_finalize(&self, psbt: bitcoin::psbt::Psbt) -> Result<bitcoin::Transaction>;
 
-    async fn broadcast(
+    async fn ensure_broadcasted(
         &self,
         transaction: bitcoin::Transaction,
         kind: &str,
diff --git a/bitcoin-wallet/src/primitives.rs b/bitcoin-wallet/src/primitives.rs
index 4755c1369c..2104d0fa5b 100644
--- a/bitcoin-wallet/src/primitives.rs
+++ b/bitcoin-wallet/src/primitives.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use bitcoin::{FeeRate, ScriptBuf, Txid};
+use bitcoin::{FeeRate, ScriptBuf, Transaction, Txid};
 
 /// An object that can estimate fee rates and minimum relay fees.
 pub trait EstimateFeeRate {
@@ -192,6 +192,20 @@ impl Watchable for (Txid, ScriptBuf) {
     }
 }
 
+// Watching a transaction by watching it's first output
+// (because Electrum expects a script hash). This works
+// because all outputs of a transaction have the same status.
+impl Watchable for Transaction {
+    fn id(&self) -> Txid {
+        self.compute_txid()
+    }
+
+    fn script(&self) -> ScriptBuf {
+        debug_assert!(!self.output.is_empty(), "Transaction has no outputs");
+        self.output[0].script_pubkey.clone()
+    }
+}
+
 impl Watchable for &dyn Watchable {
     fn id(&self) -> Txid {
         (*self).id()
@@ -252,4 +266,13 @@ impl ScriptStatus {
     pub fn has_been_seen(&self) -> bool {
         matches!(self, ScriptStatus::InMempool | ScriptStatus::Confirmed(_))
     }
+
+    pub fn confirmations(&self) -> u32 {
+        match self {
+            ScriptStatus::Unseen => 0,
+            ScriptStatus::InMempool => 0,
+            ScriptStatus::Retrying => 0,
+            ScriptStatus::Confirmed(confirmed) => confirmed.confirmations(),
+        }
+    }
 }
diff --git a/bitcoin-wallet/src/wallet.rs b/bitcoin-wallet/src/wallet.rs
index 3648d866b6..fd63abe8b9 100644
--- a/bitcoin-wallet/src/wallet.rs
+++ b/bitcoin-wallet/src/wallet.rs
@@ -13,8 +13,6 @@ use bdk_wallet::template::{Bip84, DescriptorTemplate};
 use bdk_wallet::KeychainKind;
 use bdk_wallet::WalletPersister;
 use bdk_wallet::{Balance, PersistedWallet};
-#[allow(deprecated)]
-use bitcoin::bip32::ExtendedPrivKey;
 use bitcoin::bip32::Xpriv;
 use bitcoin::{psbt::Psbt as PartiallySignedTransaction, Address, Amount, Transaction, Txid};
 use bitcoin::{Psbt, ScriptBuf, Weight};
@@ -68,7 +66,7 @@ pub trait BitcoinTauriBackgroundTask: Send + Sync {
 }
 
 pub trait BitcoinWalletSeed {
-    fn derive_extended_private_key(&self, network: bitcoin::Network) -> Result<ExtendedPrivKey>;
+    fn derive_extended_private_key(&self, network: bitcoin::Network) -> Result<Xpriv>;
 
     /// Same as `derive_extended_private_key`, but using the legacy BDK API.
     ///
@@ -84,7 +82,8 @@ pub trait BitcoinWalletSeed {
 const TWENTY_PERCENT: Decimal = Decimal::from_parts(20, 0, 0, false, 2);
 pub const MAX_RELATIVE_TX_FEE: Decimal = TWENTY_PERCENT;
 pub const MAX_ABSOLUTE_TX_FEE: Amount = Amount::from_sat(100_000);
-pub const MIN_ABSOLUTE_TX_FEE: Amount = Amount::from_sat(1000);
+pub const MIN_ABSOLUTE_TX_FEE_SATS: u64 = 1000;
+pub const MIN_ABSOLUTE_TX_FEE: Amount = Amount::from_sat(MIN_ABSOLUTE_TX_FEE_SATS);
 pub const DUST_AMOUNT: Amount = Amount::from_sat(546);
 
 /// This is our wrapper around a bdk wallet and a corresponding
@@ -760,6 +759,25 @@ impl Wallet {
         Ok((txid, subscription))
     }
 
+    /// Broadcast a transaction, but only if it's not already in the mempool/blockchain.
+    /// Return txid and a subcription to it's status in either case.
+    pub async fn ensure_broadcasted(
+        &self,
+        tx: Transaction,
+        kind: &str,
+    ) -> Result<(Txid, Subscription)> {
+        let txid = tx.compute_txid();
+
+        let status = self.status_of_script(&tx).await?;
+
+        if matches!(status, ScriptStatus::InMempool | ScriptStatus::Confirmed(_)) {
+            let subscription = self.subscribe_to(Box::new(tx)).await;
+            return Ok((txid, subscription));
+        }
+
+        self.broadcast(tx, kind).await
+    }
+
     pub async fn get_raw_transaction(&self, txid: Txid) -> Result<Option<Arc<Transaction>>> {
         self.get_tx(txid)
             .await
@@ -1756,11 +1774,15 @@ impl Client {
 
         // Collect all successful history entries from all servers.
         let mut all_history_items: Vec<GetHistoryRes> = Vec::new();
+        let mut any_success = false;
         let mut first_error = None;
 
         for result in results {
             match result {
-                Ok(history) => all_history_items.extend(history),
+                Ok(history) => {
+                    any_success = true;
+                    all_history_items.extend(history);
+                }
                 Err(e) => {
                     if first_error.is_none() {
                         first_error = Some(e);
@@ -1769,12 +1791,10 @@ impl Client {
             }
         }
 
-        // If we got no history items at all, and there was an error, propagate it.
-        // Otherwise, it's valid for a script to have no history.
-        if all_history_items.is_empty() {
-            if let Some(err) = first_error {
-                return Err(err.into());
-            }
+        // If any of the calls succeeded, that is fine. Only if none
+        // succeeded we return the error.
+        if !any_success && let Some(err) = first_error {
+            return Err(err.into());
         }
 
         // Use a map to find the best (highest confirmation) entry for each transaction.
@@ -2122,12 +2142,12 @@ impl BitcoinWallet for Wallet {
         Wallet::sign_and_finalize(self, psbt).await
     }
 
-    async fn broadcast(
+    async fn ensure_broadcasted(
         &self,
-        transaction: bitcoin::Transaction,
+        tx: bitcoin::Transaction,
         kind: &str,
     ) -> Result<(Txid, Subscription)> {
-        Wallet::broadcast(self, transaction, kind).await
+        Wallet::ensure_broadcasted(self, tx, kind).await
     }
 
     async fn sync(&self) -> Result<()> {
@@ -2220,7 +2240,7 @@ impl EstimateFeeRate for Client {
     }
 
     async fn min_relay_fee(&self) -> Result<FeeRate> {
-        self.min_relay_fee().await
+        Client::min_relay_fee(self).await
     }
 }
 
@@ -2893,6 +2913,14 @@ impl TestWalletBuilder {
 #[async_trait::async_trait]
 #[allow(unused)]
 impl BitcoinWallet for Wallet<Connection, StaticFeeRate> {
+    async fn ensure_broadcasted(
+        &self,
+        tx: bitcoin::Transaction,
+        kind: &str,
+    ) -> Result<(Txid, Subscription)> {
+        unimplemented!("stub method called erroneously")
+    }
+
     async fn balance(&self) -> Result<Amount> {
         unimplemented!("stub method called erroneously")
     }
@@ -2932,14 +2960,6 @@ impl BitcoinWallet for Wallet<Connection, StaticFeeRate> {
         unimplemented!("stub method called erroneously")
     }
 
-    async fn broadcast(
-        &self,
-        transaction: bitcoin::Transaction,
-        kind: &str,
-    ) -> Result<(Txid, Subscription)> {
-        unimplemented!("stub method called erroneously")
-    }
-
     async fn sync(&self) -> Result<()> {
         unimplemented!("stub method called erroneously")
     }
diff --git a/docs/.yarn/install-state.gz b/docs/.yarn/install-state.gz
new file mode 100644
index 0000000000..bb32762de2
Binary files /dev/null and b/docs/.yarn/install-state.gz differ
diff --git a/docs/.yarnrc.yml b/docs/.yarnrc.yml
new file mode 100644
index 0000000000..3186f3f079
--- /dev/null
+++ b/docs/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/docs/app/[[...mdxPath]]/page.tsx b/docs/app/[[...mdxPath]]/page.tsx
new file mode 100644
index 0000000000..e4c12507c4
--- /dev/null
+++ b/docs/app/[[...mdxPath]]/page.tsx
@@ -0,0 +1,28 @@
+import { generateStaticParamsFor, importPage } from "nextra/pages";
+import { useMDXComponents as getMDXComponents } from "../../mdx-components";
+
+export const generateStaticParams = generateStaticParamsFor("mdxPath");
+
+export async function generateMetadata(props: {
+  params: Promise<{ mdxPath?: string[] }>;
+}) {
+  const params = await props.params;
+  const { metadata } = await importPage(params.mdxPath);
+  return metadata;
+}
+
+const Wrapper = getMDXComponents().wrapper;
+
+export default async function Page(props: {
+  params: Promise<{ mdxPath?: string[] }>;
+}) {
+  const params = await props.params;
+  const { default: MDXContent, toc, metadata, sourceCode } = await importPage(
+    params.mdxPath
+  );
+  return (
+    <Wrapper toc={toc} metadata={metadata} sourceCode={sourceCode}>
+      <MDXContent {...props} params={params} />
+    </Wrapper>
+  );
+}
diff --git a/docs/app/layout.tsx b/docs/app/layout.tsx
new file mode 100644
index 0000000000..4e84e86589
--- /dev/null
+++ b/docs/app/layout.tsx
@@ -0,0 +1,47 @@
+import { Footer, Layout, Navbar } from "nextra-theme-docs";
+import { Head } from "nextra/components";
+import { getPageMap } from "nextra/page-map";
+import Logo from "../components/Logo";
+import "nextra-theme-docs/style.css";
+
+export const metadata = {
+  title: "eigenwallet Docs",
+  description: "eigenwallet Docs",
+  icons: {
+    icon: [
+      { url: "/favicon.ico", sizes: "any" },
+      { url: "/icon.svg", type: "image/svg+xml" },
+    ],
+    apple: "/apple-touch-icon.png",
+  },
+  manifest: "/manifest.webmanifest",
+};
+
+export default async function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en" dir="ltr" suppressHydrationWarning>
+      <Head color={{ hue: 38, saturation: 100 }} />
+      <body>
+        <Layout
+          pageMap={await getPageMap()}
+          editLink={null}
+          feedback={{ content: null }}
+          sidebar={{ defaultMenuCollapseLevel: 1 }}
+          navbar={
+            <Navbar
+              logo={<Logo />}
+              projectLink="https://github.com/eigenwallet/core"
+            />
+          }
+          footer={<Footer />}
+        >
+          {children}
+        </Layout>
+      </body>
+    </html>
+  );
+}
diff --git a/docs/components/Logo.tsx b/docs/components/Logo.tsx
index 48387720d2..81a762a8dc 100644
--- a/docs/components/Logo.tsx
+++ b/docs/components/Logo.tsx
@@ -1,16 +1,17 @@
-import Image from "next/image";
-
 export default function Logo() {
   return (
-    <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
-      <Image
-        src="/favicon.svg"
-        alt="eigenwallet"
-        width={32}
-        height={32}
-        style={{ borderRadius: "20%" }}
-      />
-      <span>eigenwallet</span>
-    </div>
+    <div
+      style={{
+        height: "2rem",
+        aspectRatio: "90.38 / 40.33",
+        backgroundColor: "currentColor",
+        maskImage: "url(/favicon.svg)",
+        maskSize: "contain",
+        maskRepeat: "no-repeat",
+        WebkitMaskImage: "url(/favicon.svg)",
+        WebkitMaskSize: "contain",
+        WebkitMaskRepeat: "no-repeat",
+      }}
+    />
   );
 }
diff --git a/docs/components/SwapProviderTable.tsx b/docs/components/SwapProviderTable.tsx
index 3e0fb1544e..5492d15498 100644
--- a/docs/components/SwapProviderTable.tsx
+++ b/docs/components/SwapProviderTable.tsx
@@ -1,5 +1,6 @@
+"use client";
+
 import { useState, useEffect } from "react";
-import { Table, Td, Th, Tr } from "nextra/components";
 
 export default function SwapMakerTable() {
   function satsToBtc(sats) {
@@ -26,30 +27,30 @@ export default function SwapMakerTable() {
         overflowX: "scroll",
       }}
     >
-      <Table>
+      <table>
         <thead>
-          <Tr>
-            <Th>Network</Th>
-            <Th>Multiaddress</Th>
-            <Th>Peer ID</Th>
-            <Th>Minimum Amount</Th>
-            <Th>Maximum Amount</Th>
-            <Th>Exchange Rate</Th>
-          </Tr>
+          <tr>
+            <th>Network</th>
+            <th>Multiaddress</th>
+            <th>Peer ID</th>
+            <th>Minimum Amount</th>
+            <th>Maximum Amount</th>
+            <th>Exchange Rate</th>
+          </tr>
         </thead>
         <tbody>
           {makers.map((maker) => (
-            <Tr key={maker.peerId}>
-              <Td>{maker.testnet ? "Testnet" : "Mainnet"}</Td>
-              <Td>{maker.multiAddr}</Td>
-              <Td>{maker.peerId}</Td>
-              <Td>{satsToBtc(maker.minSwapAmount)} BTC</Td>
-              <Td>{satsToBtc(maker.maxSwapAmount)} BTC</Td>
-              <Td>{satsToBtc(maker.price)} XMR/BTC</Td>
-            </Tr>
+            <tr key={maker.peerId}>
+              <td>{maker.testnet ? "Testnet" : "Mainnet"}</td>
+              <td>{maker.multiAddr}</td>
+              <td>{maker.peerId}</td>
+              <td>{satsToBtc(maker.minSwapAmount)} BTC</td>
+              <td>{satsToBtc(maker.maxSwapAmount)} BTC</td>
+              <td>{satsToBtc(maker.price)} XMR/BTC</td>
+            </tr>
           ))}
         </tbody>
-      </Table>
+      </table>
     </div>
   );
 }
diff --git a/docs/content/_meta.ts b/docs/content/_meta.ts
new file mode 100644
index 0000000000..248c830ab5
--- /dev/null
+++ b/docs/content/_meta.ts
@@ -0,0 +1,10 @@
+export default {
+  index: "Introduction",
+  getting_started: "Getting Started",
+  usage: "Usage",
+  advanced: "Advanced",
+  becoming_a_maker: "Becoming a Maker",
+  contributing: "Contributing",
+  send_feedback: "Support / Feedback",
+  donate: "Donate",
+};
diff --git a/docs/content/advanced/_meta.ts b/docs/content/advanced/_meta.ts
new file mode 100644
index 0000000000..a0f529dae5
--- /dev/null
+++ b/docs/content/advanced/_meta.ts
@@ -0,0 +1,3 @@
+export default {
+  swap_on_testnet: "How to swap on Testnet",
+};
diff --git a/docs/pages/advanced/swap_on_testnet.mdx b/docs/content/advanced/swap_on_testnet.mdx
similarity index 91%
rename from docs/pages/advanced/swap_on_testnet.mdx
rename to docs/content/advanced/swap_on_testnet.mdx
index c0a9fc7b57..40003e2dc7 100644
--- a/docs/pages/advanced/swap_on_testnet.mdx
+++ b/docs/content/advanced/swap_on_testnet.mdx
@@ -12,22 +12,22 @@ Here are the steps to set up the wallets using Electrum and Monero GUI.
 
 Download Electrum from the official [site](https://electrum.org/#download) and then start the wallet in testnet mode.
 
-import { Tabs, Tab } from 'nextra/components'
+import { Tabs } from 'nextra/components'
 
 <Tabs items={['Linux', 'macOS', 'Windows']}>
-  <Tab>
+  <Tabs.Tab>
     ```bash
     ./electrum --testnet
     ```
-  </Tab>
-  <Tab>
+  </Tabs.Tab>
+  <Tabs.Tab>
     ```bash
     open -n /Applications/Electrum.app --args --testnet
     ```
-  </Tab>
-  <Tab>
+  </Tabs.Tab>
+  <Tabs.Tab>
     Open the `Electrum Testnet` program from your start menu.
-  </Tab>
+  </Tabs.Tab>
 </Tabs>
 
 To get some free Testnet coins visit a faucet like [this](https://testnet-faucet.mempool.co) one.
@@ -44,16 +44,16 @@ View the [Installation Instructions](../getting_started/install_instructions) if
 Then start the GUI in testnet mode.
 
 <Tabs items={['Linux', 'macOS']}>
-  <Tab>
+  <Tabs.Tab>
     ```bash
     ./UnstoppableSwap_*_amd64.AppImage --testnet
     ```
-  </Tab>
-  <Tab>
+  </Tabs.Tab>
+  <Tabs.Tab>
     ```bash
     open -n /Applications/UnstoppableSwap.app --args --testnet
     ```
-  </Tab>
+  </Tabs.Tab>
 </Tabs>
 
 From here on you can follow the [Complete your first swap](../usage/first_swap) guide.
diff --git a/docs/content/becoming_a_maker/_meta.ts b/docs/content/becoming_a_maker/_meta.ts
new file mode 100644
index 0000000000..0768c96512
--- /dev/null
+++ b/docs/content/becoming_a_maker/_meta.ts
@@ -0,0 +1,3 @@
+export default {
+  overview: "Overview",
+};
diff --git a/docs/pages/becoming_a_maker/overview.mdx b/docs/content/becoming_a_maker/overview.mdx
similarity index 100%
rename from docs/pages/becoming_a_maker/overview.mdx
rename to docs/content/becoming_a_maker/overview.mdx
diff --git a/docs/content/contributing/_meta.ts b/docs/content/contributing/_meta.ts
new file mode 100644
index 0000000000..22eee26272
--- /dev/null
+++ b/docs/content/contributing/_meta.ts
@@ -0,0 +1,3 @@
+export default {
+  building_from_source: "Building from Source",
+};
diff --git a/docs/content/contributing/building_from_source.mdx b/docs/content/contributing/building_from_source.mdx
new file mode 100644
index 0000000000..aca64215e6
--- /dev/null
+++ b/docs/content/contributing/building_from_source.mdx
@@ -0,0 +1,4 @@
+# Building from Source
+
+
+
diff --git a/docs/pages/donate.mdx b/docs/content/donate.mdx
similarity index 100%
rename from docs/pages/donate.mdx
rename to docs/content/donate.mdx
diff --git a/docs/content/getting_started/_meta.ts b/docs/content/getting_started/_meta.ts
new file mode 100644
index 0000000000..9ec71749d6
--- /dev/null
+++ b/docs/content/getting_started/_meta.ts
@@ -0,0 +1,4 @@
+export default {
+  install_instructions: "Installation",
+  verify_tauri_signature: "Verify Signatures",
+};
diff --git a/docs/content/getting_started/install_instructions.mdx b/docs/content/getting_started/install_instructions.mdx
new file mode 100644
index 0000000000..0bd4215b80
--- /dev/null
+++ b/docs/content/getting_started/install_instructions.mdx
@@ -0,0 +1,128 @@
+import { Tabs, Callout, Steps } from 'nextra/components'
+
+# Installation
+
+## Download
+
+Ready-to-use binaries of the app are available for all desktop platforms. 
+Choose your platform and follow the instructions.
+
+<Tabs items={['Windows', 'macOS (Silicon)', 'macOS (Intel)', 'Linux (x86_64)', 'Linux (arm64)', 'Flatpak', 'Arch']}>
+  <Tabs.Tab>
+    <Steps>
+    ### Download
+    Download the latest release from our [download page](https://eigenwallet.org/download/)
+    ### Install
+    Open the downloaded `eigenwallet_<version>.exe` installer
+    ### Setup
+    Follow the installation wizard
+    ### Launch
+    Open the `eigenwallet` application from your Start menu
+    </Steps>
+  </Tabs.Tab>
+  <Tabs.Tab>
+    <Steps>
+    ### Download
+    Download the latest release from our [download page](https://eigenwallet.org/download/)
+    ### Open
+    Open the downloaded `eigenwallet_<version>.dmg` file
+    ### Install
+    Drag the `eigenwallet` icon to your Applications folder
+    ### Launch
+    Open the `eigenwallet` application from your Applications folder
+    </Steps>
+  </Tabs.Tab>
+  <Tabs.Tab>
+    <Steps>
+    ### Download
+    Download the latest release from our [download page](https://eigenwallet.org/download/)
+    ### Open
+    Open the downloaded `eigenwallet_<version>.dmg` file
+    ### Install
+    Drag the `eigenwallet` icon to your Applications folder
+    ### Launch
+    Open the `eigenwallet` application from your Applications folder
+    </Steps>
+  </Tabs.Tab>
+  <Tabs.Tab>
+    <Callout type="info">
+      The AppImage might not work on less new distributions (older than Ubuntu 24) due to an upstream bug. Try the Flatpak instead.
+    </Callout>
+
+    For newer Linux distributions, you can download the AppImage and run it directly. It includes all dependencies.
+    Simply download the latest release from our [download page](https://eigenwallet.org/download/) and execute it.
+
+    Alternatively you can download it from your terminal:
+
+    ```bash filename="install.sh" copy
+    # Find the latest AppImage file
+    EIGENWALLET_APPIMAGE=$(curl -s https://api.github.com/repos/eigenwallet/core/releases/latest | grep -o 'https://[^"]*\.AppImage' | head -1 | xargs basename)
+    # Download the lastest file
+    wget https://github.com/eigenwallet/core/releases/latest/download/$EIGENWALLET_APPIMAGE
+    # Make it executable
+    chmod +x $EIGENWALLET_APPIMAGE
+    # Start eigenwallet
+    ./$EIGENWALLET_APPIMAGE
+    ```
+  </Tabs.Tab>
+  <Tabs.Tab>
+    <Callout type="error">
+      Due to limitations with our CI pipeline, we currently can't provide precompiled binaries for arm64 linux systems.
+    </Callout>
+  </Tabs.Tab>
+  <Tabs.Tab>
+    For **x86-64** Linux systems with Flatpak support (version 1.0 or newer), you can install eigenwallet directly from our Flatpak repository:
+
+    <Steps>
+    ### Install
+
+    ```bash filename="install.sh" copy
+    # Add eigenwallet repo
+    flatpak remote-add --if-not-exists eigenwallet https://eigenwallet.github.io/core/eigenwallet.flatpakrepo
+    # Add dependencies
+    flatpak install flathub org.gnome.Platform//47
+    # Install eigenwallet
+    flatpak install eigenwallet org.eigenwallet.app
+    ```
+
+    ### Run
+
+    ```bash filename="run.sh" copy
+    flatpak run org.eigenwallet.app
+    ```
+
+    ### Update
+
+    ```bash filename="update.sh" copy
+    flatpak update org.eigenwallet.app
+    ```
+    </Steps>
+  </Tabs.Tab>
+
+  <Tabs.Tab>
+    <Callout type="info">
+      The AUR package is **community maintained**.
+      We cannot take responsibility for it being up to date, working or secure.
+      Check the build script yourself.
+    </Callout>
+
+    For Arch based systems you can install the **community maintained** `eigenwallet-bin` AUR package:
+
+    ```bash filename="install.sh" copy
+    yay -S eigenwallet-bin
+    ```
+
+  </Tabs.Tab>
+</Tabs>
+
+
+-------
+
+Sometimes the website does not display the latest release.
+In that case you can also find the binaries on our latest [Github release](https://github.com/eigenwallet/core/releases/latest).
+Search for the `eigenwallet_<version>_<platform>.<extension>` file that fits to your system.
+
+## Building from source
+
+You can build `eigenwallet` from source.
+Read the [Contributing](/contributing/building_from_source) guide for instructions.
diff --git a/docs/pages/getting_started/verify_tauri_signature.mdx b/docs/content/getting_started/verify_tauri_signature.mdx
similarity index 100%
rename from docs/pages/getting_started/verify_tauri_signature.mdx
rename to docs/content/getting_started/verify_tauri_signature.mdx
diff --git a/docs/pages/index.mdx b/docs/content/index.mdx
similarity index 59%
rename from docs/pages/index.mdx
rename to docs/content/index.mdx
index 005b7de226..411a0af29d 100644
--- a/docs/pages/index.mdx
+++ b/docs/content/index.mdx
@@ -1,14 +1,29 @@
 
-import { Cards } from 'nextra/components'
+import { Cards, Steps } from 'nextra/components'
 
-# Introduction
+# eigenwallet
 
-**eigenwallet** is a protocol _and_ desktop application for swapping Monero and Bitcoin. 
-It uses atomic swaps to make trustless and private trades possible without the need for a centralized exchange.
+eigenwallet is a Monero and Bitcoin wallet and a decentalized exchange (DEX) which can be used to safely swap your Bitcoin for Monero:
+
+<Steps>
+
+### Peer to Peer
+
+Trustless swaps between two peers -- without any third party involved.
+
+### Open Source
+
+Built by the community for the community.
+
+### Battle tested
+
+eigenwallet (formerly UnstoppableSwap) has been live for more than 3 years.
+
+</Steps>
 
 ## Quick Start
 
-To start using eigenwallet, you need to install the application. Then you can do your first swap.
+To start using eigenwallet, you need to install the application first.
 
 <Cards num={2}>
   <Cards.Card arrow title="Installation" href="/getting_started/install_instructions">
@@ -30,4 +45,4 @@ _Makers_ are users who run the eigenwallet protocol on their own computer or ser
 They buy your Bitcoin and in return give you Monero.
 Each maker can set their own prices and fees.
 
-[^1]: The guarantee only holds when the protocol is followed.
\ No newline at end of file
+[^1]: The guarantee only holds when the protocol is followed.
diff --git a/docs/pages/send_feedback.mdx b/docs/content/send_feedback.mdx
similarity index 67%
rename from docs/pages/send_feedback.mdx
rename to docs/content/send_feedback.mdx
index 4a20808410..87439b77e6 100644
--- a/docs/pages/send_feedback.mdx
+++ b/docs/content/send_feedback.mdx
@@ -1,8 +1,11 @@
 import Image from 'next/image'
 
-# Send Feedback
+# Feedback and Support
 
-We value your feedback and are committed to providing the best support possible. There are two ways to send feedback:
+
+We are an open source project, so you can help by contributing feedback and suggestions!
+
+You can also reach us on a variety of channels to get support directly from the developers. 
 
 ## In-App Feedback
 
@@ -15,7 +18,6 @@ The easiest way to send feedback is through the app:
    - Select the relevant swap from the dropdown menu
    - Check "Attach logs from the current session"
    - Review the logs before sending (you can click the eye icon to view them)
-   - Use the redaction option if you want to remove sensitive information
 
 Your feedback will be answered directly in the app under the Feedback tab.
 
@@ -26,7 +28,11 @@ If you prefer to send an email, please include:
 1. A clear description of your issue or feedback
 2. Swap logs you want to share or encountered problems with (You can use the "Export Logs" functionality in the history tab)
 
-Send your email to: [help@unstoppableswap.net](mailto:help@unstoppableswap.net)
+Send your email to: [help@unstoppableswap.net](mailto:help@unstoppableswap.net) (this is our email address from before the rename).
+
+## Discord and Matrix
+
+You can also ask for help on our [Discord](https://eigenwallet.org/discord) and [Matrix](https://eigenwallet.org/matrix) servers. They are bridged.
 
 ## Tips for Effective Feedback
 
@@ -39,7 +45,7 @@ To help us assist you better:
 
 ## What to Expect
 
-- We try to answer within 24 hours, but please be patient if you don't receive a message directly.
-- You can continue the conversation through the app or email
+- We try to answer as quickly as possible, but please be patient if this takes up to a few days.
+  We are an open source project and do the support in our free time.
 - We may ask for additional information to help resolve your issue
 
diff --git a/docs/content/usage/_meta.ts b/docs/content/usage/_meta.ts
new file mode 100644
index 0000000000..218167b44e
--- /dev/null
+++ b/docs/content/usage/_meta.ts
@@ -0,0 +1,5 @@
+export default {
+  first_swap: "Complete your first swap",
+  market_maker_discovery: "Maker discovery",
+  refund_punish: "Cancel, Refund and Punish explained",
+};
diff --git a/docs/pages/usage/first_swap.mdx b/docs/content/usage/first_swap.mdx
similarity index 100%
rename from docs/pages/usage/first_swap.mdx
rename to docs/content/usage/first_swap.mdx
diff --git a/docs/pages/usage/market_maker_discovery.mdx b/docs/content/usage/market_maker_discovery.mdx
similarity index 100%
rename from docs/pages/usage/market_maker_discovery.mdx
rename to docs/content/usage/market_maker_discovery.mdx
diff --git a/docs/pages/usage/refund_punish.mdx b/docs/content/usage/refund_punish.mdx
similarity index 100%
rename from docs/pages/usage/refund_punish.mdx
rename to docs/content/usage/refund_punish.mdx
diff --git a/docs/mdx-components.tsx b/docs/mdx-components.tsx
new file mode 100644
index 0000000000..3d87b6b66e
--- /dev/null
+++ b/docs/mdx-components.tsx
@@ -0,0 +1,8 @@
+import { useMDXComponents as getDocsMDXComponents } from "nextra-theme-docs";
+
+const docsComponents = getDocsMDXComponents();
+
+export const useMDXComponents = (components?: Record<string, unknown>) => ({
+  ...docsComponents,
+  ...components,
+});
diff --git a/docs/next-env.d.ts b/docs/next-env.d.ts
index a4a7b3f5cf..40c3d68096 100644
--- a/docs/next-env.d.ts
+++ b/docs/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/docs/next.config.js b/docs/next.config.js
deleted file mode 100644
index 15124fcfe9..0000000000
--- a/docs/next.config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const withNextra = require("nextra")({
-  theme: "nextra-theme-docs",
-  themeConfig: "./theme.config.jsx",
-});
-
-module.exports = withNextra({
-  output: "standalone",
-});
-
-// If you have other Next.js configurations, you can pass them as the parameter:
-// module.exports = withNextra({ /* other next.js config */ })
diff --git a/docs/next.config.mjs b/docs/next.config.mjs
new file mode 100644
index 0000000000..1653272583
--- /dev/null
+++ b/docs/next.config.mjs
@@ -0,0 +1,7 @@
+import nextra from "nextra";
+
+const withNextra = nextra({});
+
+export default withNextra({
+  output: "standalone",
+});
diff --git a/docs/package.json b/docs/package.json
index 3efe72022f..3b109ee9ce 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -11,13 +11,15 @@
   },
   "dependencies": {
     "next": "^15.0.3",
-    "nextra": "^2.13.4",
-    "nextra-theme-docs": "^2.13.4",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "nextra": "^4",
+    "nextra-theme-docs": "^4",
+    "react": "^19",
+    "react-dom": "^19"
   },
   "devDependencies": {
     "@types/node": "20.14.5",
+    "@types/react": "^19",
     "typescript": "5.4.5"
-  }
+  },
+  "packageManager": "yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8"
 }
diff --git a/docs/pages/_meta.json b/docs/pages/_meta.json
deleted file mode 100644
index 6995521d0f..0000000000
--- a/docs/pages/_meta.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "index": "Introduction",
-  "getting_started": "Getting Started",
-  "usage": "Usage",
-  "advanced": "Advanced",
-  "becoming_a_maker": "Becoming a Maker",
-  "send_feedback": "Send Feedback",
-  "donate": "Donate"
-}
diff --git a/docs/pages/advanced/_meta.json b/docs/pages/advanced/_meta.json
deleted file mode 100644
index e0fd5d46e8..0000000000
--- a/docs/pages/advanced/_meta.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "swap_on_testnet": "How to swap on Testnet"
-}
diff --git a/docs/pages/becoming_a_maker/_meta.json b/docs/pages/becoming_a_maker/_meta.json
deleted file mode 100644
index 6875e2c4ea..0000000000
--- a/docs/pages/becoming_a_maker/_meta.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "overview": "Overview"
-}
diff --git a/docs/pages/getting_started/_meta.json b/docs/pages/getting_started/_meta.json
deleted file mode 100644
index 555a344eeb..0000000000
--- a/docs/pages/getting_started/_meta.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "install_instructions": "Installation",
-  "verify_tauri_signature": "Verify Signatures"
-}
diff --git a/docs/pages/getting_started/install_instructions.mdx b/docs/pages/getting_started/install_instructions.mdx
deleted file mode 100644
index 32eacebf6d..0000000000
--- a/docs/pages/getting_started/install_instructions.mdx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Tabs } from 'nextra/components'
-
-# Installation
-
-To install the app you can either download ready-to-use binaries or build it from source.
-Unless you know what you're doing, you probably want to use the precompiled binaries.
-
-## Precompiled binaries
-
-Precompiled binaries of the _GUI_ are available for most platforms. Simply download the appropriate binary for your system and follow the instructions.
-
-<Tabs items={['Windows', 'macOS (Silicon)', 'macOS (Intel)', 'Linux (x86_64)', 'Linux (arm64)', 'Flatpak']}>
-  <Tabs.Tab>
-    1. Download the latest release from GitHub [here](https://github.com/eigenwallet/core/releases/download/1.0.0-rc.4/UnstoppableSwap_1.0.0-rc.4_x64-setup.exe)
-    2. Open the downloaded `.exe` installer
-    3. Follow the installation instructions
-    4. Open the `UnstoppableSwap` application from your Start menu
-  </Tabs.Tab>
-  <Tabs.Tab>
-    1. Download the latest release from GitHub [here](https://github.com/eigenwallet/core/releases/download/1.0.0-rc.4/UnstoppableSwap_1.0.0-rc.4_aarch64.dmg)
-    2. Open the downloaded `.dmg` file
-    3. Drag the `UnstoppableSwap` icon to your Applications folder
-    4. Open the `UnstoppableSwap` application from your Applications folder
-  </Tabs.Tab>
-  <Tabs.Tab>
-    1. Download the latest release from GitHub [here](https://github.com/eigenwallet/core/releases/download/1.0.0-rc.4/UnstoppableSwap_1.0.0-rc.4_x64.dmg)
-    2. Open the downloaded `.dmg` file
-    3. Drag the `UnstoppableSwap` icon to your Applications folder
-    4. Open the `UnstoppableSwap` application from your Applications folder
-  </Tabs.Tab>
-  <Tabs.Tab>
-    For other Linux distributions, you can download the AppImage and run it directly. It includes all dependencies and will work on most systems.
-
-    ```bash filename="install.sh"
-    wget https://github.com/eigenwallet/core/releases/download/1.0.0-rc.4/UnstoppableSwap_1.0.0-rc.4_amd64.AppImage
-    chmod +x UnstoppableSwap_1.0.0-rc.4_amd64.AppImage
-    ./UnstoppableSwap_1.0.0-rc.4_amd64.AppImage
-    ```
-  </Tabs.Tab>
-  <Tabs.Tab>
-    Due to limitations with our CI pipeline, we currently can't provide precompiled binaries for arm64 linux systems.
-  </Tabs.Tab>
-  <Tabs.Tab>
-    For Linux systems with Flatpak support, you can install UnstoppableSwap directly from our Flatpak repository:
-
-    ```bash filename="install.sh"
-    # Add the eigenwallet repository
-    flatpak remote-add --user unstoppableswap https://unstoppableswap.github.io/core/unstoppableswap.flatpakrepo
-
-    # Install the application
-    flatpak install unstoppableswap net.unstoppableswap.gui
-
-    # Run the application
-    flatpak run net.unstoppableswap.gui
-    ```
-
-    **Requirements:**
-    - Flatpak 1.0 or newer
-    - x86_64 architecture
-
-    **Updates:**
-    ```bash
-    flatpak update net.unstoppableswap.gui
-    ```
-  </Tabs.Tab>
-</Tabs>
-
-## Building from source
-
-If you want to build the application from source you'll need to have the following tools installed:
-
-- `cargo` ([installation](https://www.rust-lang.org/tools/install)) and `cargo tauri` ([installation](https://v2.tauri.app/reference/cli/) and [prerequisites](https://v2.tauri.app/start/prerequisites/))
-- `node` ([installation](https://nodejs.org/en/download/)) and `yarn` (version 1.22, not 4.x)
-- `dprint` (`cargo install dprint@0.50.0`)
-- `typeshare` (`cargo install typeshare-cli`)
-
-After that you only need to clone the repository and run the following commands:
-
-```bash
-git clone https://github.com/eigenwallet/core.git
-cd core/src-tauri
-cargo tauri build # may take a while
-```
-
-This will create the `core/target/release/bundle` folder which contains the executable in a platform specific folder.
-By default this will compile the binary the platform you are currently on.
-You can configure this using options for the `cargo tauri build` command ([docs](https://v2.tauri.app/reference/cli/#build)).
diff --git a/docs/pages/usage/_meta.json b/docs/pages/usage/_meta.json
deleted file mode 100644
index 15f76b6246..0000000000
--- a/docs/pages/usage/_meta.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "first_swap": "Complete your first swap",
-  "market_maker_discovery": "Maker discovery",
-  "refund_punish": "Cancel, Refund and Punish explained"
-}
diff --git a/docs/public/favicon.svg b/docs/public/favicon.svg
index 9308c0c65e..ff1f037def 100644
--- a/docs/public/favicon.svg
+++ b/docs/public/favicon.svg
@@ -1,114 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="body_1" width="547" height="548">
-
-  <g transform="matrix(1 0 0 1 0 0)">
-    <path d="M0 0L0 340L128 340L126 308L63 309L62 267C 77.7197 267 93.2802 266 109 266C 113.257 266 122.788 267.779 126.258 264.972C 129.486 262.361 128.573 251.965 129.13 248C 131.107 233.937 134.262 218.967 140.178 206C 155.971 171.382 198.573 154.973 233 173.12C 244.655 179.264 251.779 188.298 259 199L259 199L260 199C 267.09 180.509 273.681 162.881 291 151.363C 327.818 126.875 386.281 146.327 407.547 182C 417.787 199.177 422.5 218.482 425.753 238C 426.813 244.361 426.284 260.842 430.742 265.397C 433.943 268.666 442.81 267 447 267L447 267L494 267L494 308L430 309L430 338L547 338L547 0L0 0z" stroke="none" fill="#FF5901" fill-rule="nonzero"/>
-    <path d="M317 142L317 143L327 143L317 142z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M261 201C 250.203 191.105 245.619 178.641 231 172.465C 222.712 168.963 213.987 167.014 205 167C 191.772 166.979 178.733 168.653 167 175.338C 137.218 192.305 128.003 235.149 128 267L128 267L63 268L63 308C 82.142 308 107.677 312.416 126 307L126 307L128 341L0 341L0 381L173 381L173 311C 173 294.616 172.807 276.583 181.454 262C 196.166 237.186 228.591 237.066 243.522 262C 256.18 283.14 255 313.325 255 337L255 337L293 337C 293 306.144 287.282 270.301 303.529 242C 317.437 217.773 349.082 216.478 365.211 239C 375.936 253.975 379.252 274.121 381.166 292C 384.318 321.445 383 351.384 383 381L383 381L547 381L547 339L430 339C 430 331.674 425.823 316.619 430.028 310.318C 432.718 306.286 441.836 308 446 308C 461.601 308 477.52 308.956 493 307L493 307L493 268L447 268C 442.754 268 433.877 269.662 430.603 266.397C 425.748 261.554 426.379 243.781 425.247 237C 421.84 216.599 416.646 196.698 405.535 179C 371.04 124.051 270.591 129.836 261 201z" stroke="none" fill="#FFFEFE" fill-rule="nonzero"/>
-    <path d="M334 142L334 143L345 143L334 142zM311 143L311 144L316 144L311 143zM346 143L346 144L351 144L346 143zM307 144L307 145L311 145L307 144zM352 144L352 145L356 145L352 144zM304 145L304 146L307 146L304 145zM357 145L357 146L360 146L357 145zM301.667 146.333L302.333 146.667L301.667 146.333zM361 146L361 147L364 147L361 146zM298.667 147.333L299.333 147.667L298.667 147.333zM365.667 147.333L366.333 147.667L365.667 147.333zM295.667 148.333L296.333 148.667L295.667 148.333zM368.667 148.333L369.333 148.667L368.667 148.333zM293.667 149.333L294.333 149.667L293.667 149.333zM370.667 149.333L371.333 149.667L370.667 149.333zM292 150L293 151L292 150zM373 150L374 151L373 150zM290.667 151.333L291.333 151.667L290.667 151.333zM375 151L376 152L375 151zM289 152L290 153L289 152zM377 152L378 153L377 152zM287.667 153.333L288.333 153.667L287.667 153.333zM378.667 153.333L379.333 153.667L378.667 153.333zM286 154L287 155L286 154zM380 154L381 155L380 154zM285 155L286 156L285 155zM382 155L383 156L382 155zM284 156L285 157L284 156zM383 156L384 157L383 156zM283 157L284 158L283 157zM384.667 157.333L385.333 157.667L384.667 157.333zM281 158L281 160L283 158L281 158zM386 158L387 159L386 158zM387 159L388 160L387 159zM280 160L281 161L280 160zM388 160L389 161L388 160zM279 161L280 162L279 161zM389.667 161.333L390.333 161.667L389.667 161.333zM278 162L279 163L278 162zM391 162L392 163L391 162zM277 163L278 164L277 163zM392 163L393 164L392 163zM276 164L277 165L276 164zM393 164L394 165L393 164zM275.333 165.667L275.667 166.333L275.333 165.667zM394 165L395 166L394 165zM192 166L192 167L213 167L192 166zM395 166L396 167L395 166zM186 167L186 168L191 168L186 167zM213 167L213 168L218 168L213 167zM274 167L275 168L274 167zM396 167L397 168L396 167zM182 168L182 169L186 169L182 168zM219 168L219 169L222 169L219 168zM273.333 168.667L273.667 169.333L273.333 168.667zM397 168L398 169L397 168zM179 169L179 170L182 170L179 169zM222 169L222 170L225 170L222 169zM398 169L399 170L398 169zM176 170L176 171L179 171L176 170zM225 170L225 171L228 171L225 170zM272 170L273 171L272 170zM399 170L401 173L399 170zM174.667 171.333L175.333 171.667L174.667 171.333zM228.667 171.333L229.333 171.667L228.667 171.333zM271.333 171.667L271.667 172.333L271.333 171.667zM171.667 172.333L172.333 172.667L171.667 172.333zM231.667 172.333L232.333 172.667L231.667 172.333zM169.667 173.333L170.333 173.667L169.667 173.333zM233 173L234 174L233 173zM270.333 173.667L270.667 174.333L270.333 173.667zM401 173L402 174L401 173zM167.667 174.333L168.333 174.667L167.667 174.333zM235 174L236 175L235 174zM402 174L403 175L402 174zM165.667 175.333L166.333 175.667L165.667 175.333zM236.667 175.333L237.333 175.667L236.667 175.333zM269.333 175.667L269.667 176.333L269.333 175.667zM403 175L404 176L403 175zM164 176L165 177L164 176zM238 176L239 177L238 176zM163 177L164 178L163 177zM239.667 177.333L240.333 177.667L239.667 177.333zM268.333 177.667L268.667 178.333L268.333 177.667zM404 177L405 178L404 177zM161.667 178.333L162.333 178.667L161.667 178.333zM241 178L242 179L241 178zM405 178L406 179L405 178zM160 179L161 180L160 179zM242.667 179.333L243.333 179.667L242.667 179.333zM267.333 179.667L267.667 180.333L267.333 179.667zM159 180L160 181L159 180zM244 180L245 181L244 180zM406 180L407 181L406 180zM157.667 181.333L158.333 181.667L157.667 181.333zM245 181L246 182L245 181zM266 181L266 184L267 184L266 181zM407.333 181.667L407.667 182.333L407.333 181.667zM156 182L157 183L156 182zM246 182L247 183L246 182zM155 183L156 184L155 183zM247 183L248 184L247 183zM408.333 183.667L408.667 184.333L408.333 183.667zM154 184L155 185L154 184zM248 184L249 185L248 184zM265.333 184.667L265.667 185.333L265.333 184.667zM153 185L154 186L153 185zM249 185L250 186L249 185zM409 185L410 186L409 185zM152 186L153 187L152 186zM250.333 186.667L250.667 187.333L250.333 186.667zM264 186L264 189L265 189L264 186zM151.333 187.667L151.667 188.333L151.333 187.667zM410 187L411 188L410 187zM251 188L252 189L251 188zM150 189L151 190L150 189zM252 189L253 190L252 189zM263.333 189.667L263.667 190.333L263.333 189.667zM411 189L412 190L411 189zM149 190L150 191L149 190zM253.333 190.667L253.667 191.333L253.333 190.667zM148.333 191.667L148.667 192.333L148.333 191.667zM262 191L262 194L263 194L262 191zM412 191L413 192L412 191zM254 192L255 193L254 192zM147 193L148 194L147 193zM255.333 193.667L255.667 194.333L255.333 193.667zM413.333 193.667L413.667 194.333L413.333 193.667zM146 194L147 195L146 194zM261 194L261 198L262 198L261 194zM256 195L257 196L256 195zM414.333 195.667L414.667 196.333L414.333 195.667zM145 196L146 197L145 196zM257.333 196.667L257.667 197.333L257.333 196.667zM144.333 197.667L144.667 198.333L144.333 197.667zM258 198L259 199L258 198zM260 198L259 201L260 198zM415 198L416 199L415 198zM143 199L144 200L143 199zM416.333 200.667L416.667 201.333L416.333 200.667zM142 201L143 202L142 201zM141.333 202.667L141.667 203.333L141.333 202.667zM417.333 203.667L417.667 204.333L417.333 203.667zM140 205L141 206L140 205zM418 206L419 207L418 206zM139.333 207.667L139.667 208.333L139.333 207.667zM138.333 209.667L138.667 210.333L138.333 209.667zM419.333 209.667L419.667 210.333L419.333 209.667zM137.333 212.667L137.667 213.333L137.333 212.667zM420.333 212.667L420.667 213.333L420.333 212.667zM136 215L136 218L137 218L136 215zM421.333 216.667L421.667 217.333L421.333 216.667zM135.333 219.667L135.667 220.333L135.333 219.667zM422 220L422 223L423 223L422 220zM134.333 222.667L134.667 223.333L134.333 222.667zM332 222L332 223L339 223L332 222zM326.667 223.333L327.333 223.667L326.667 223.333z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M328 223L328 224L333 224L328 223z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M294 338L254 338C 254 313.598 255.552 281.566 241.867 260C 227.779 237.8 195.715 239.116 182.465 261C 173.716 275.449 174 293.71 174 310L174 310L174 382L0 382L0 548L547 548L547 382L382 382C 382 348.2 384.324 313.435 378.753 280C 376.316 265.372 372.756 248.992 363.471 237.001C 347.86 216.84 316.453 219.96 304.313 242C 288.366 270.953 294 306.563 294 338z" stroke="none" fill="#4D4D4D" fill-rule="nonzero"/>
-    <path d="M339 223L339 224L344 224L339 223z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M344 223L345 224L344 223zM323 224L324 225L323 224z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M324 224L324 225L327 225L324 224zM345.667 224.333L346.333 224.667L345.667 224.333z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M347 224L348 225L347 224zM321 225L322 226L321 225z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M322 225L323 226L322 225zM348 225L349 226L348 225z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M349 225L350 226L349 225zM423 225L423 228L424 228L423 225zM133.333 226.667L133.667 227.333L133.333 226.667z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M319.667 226.333L320.333 226.667L319.667 226.333zM350.667 226.333L351.333 226.667L350.667 226.333zM317.667 227.333L318.333 227.667L317.667 227.333zM352 227L353 228L352 227z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M353 227L354 228L353 227zM315 228L316 229L315 228z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M316 228L317 229L316 228zM354 228L357 230L357 229L354 228z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M355 228L356 229L355 228z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M314 229L315 230L314 229z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M132.333 230.667L132.667 231.333L132.333 230.667zM312 230L309 234L312 230z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M313 230L314 231L313 230zM357 230L358 231L357 230z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M424 230L424 233L425 233L424 230z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M312 231L313 232L312 231zM358 231L359 232L358 231zM311 232L312 233L311 232zM359 232L360 233L359 232zM310 233L311 234L310 233zM360 233L361 234L360 233z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M131 234L131 237L132 237L131 234z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M309 234L310 235L309 234zM361 234L362 235L361 234zM308 235L309 236L308 235zM362 235L363 236L362 235zM307 236L308 237L307 236zM363 236L364 237L363 236z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M425 236L425 239L426 239L425 236z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M306 237L305 240L306 237z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M364 237L365 238L364 237zM305 238L306 239L305 238z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M364 238L365 239L364 238z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M130 239L130 242L131 242L130 239z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M365 239L366 240L365 239zM304 240L302 246L303 246L304 240z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M366 240L367 241L366 240zM303 241L304 242L303 241z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M366 241L367 242L366 241z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M367 242L368 243L367 242zM426 242L426 245L427 245L426 242zM205.667 243.333L206.333 243.667L205.667 243.333z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M207 243L207 244L219 244L207 243z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M219 243L220 244L219 243zM302 243L303 244L302 243z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M367 243L368 244L367 243z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M200 244L201 245L200 244z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M201 244L201 245L205 245L201 244zM220 244L220 245L223 245L220 244z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M223 244L224 245L223 244zM368 244L369 245L368 244zM129 245L129 249L130 249L129 245z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M198 245L198 246L201 246L198 245zM224.667 245.333L225.333 245.667L224.667 245.333zM368 245L369 246L368 245zM196.667 246.333L197.333 246.667L196.667 246.333zM226 246L226 247L230 248L230 247L226 246z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M228 246L229 247L228 246z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M301.333 246.667L301.667 247.333L301.333 246.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M369 246L370 247L369 246z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M194.667 247.333L195.333 247.667L194.667 247.333zM369 247L370 248L369 247z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M192 248L193 249L192 248z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M193 248L194 249L193 248zM230 248L231 249L230 248z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M231 248L232 249L231 248zM300 248L301 249L300 248zM370 248L371 249L370 248zM427 248L427 252L428 252L427 248z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M191.667 249.333L192.333 249.667L191.667 249.333zM232 249L233 250L232 249zM300.333 249.667L300.667 250.333L300.333 249.667zM370 249L371 250L370 249zM190 250L191 251L190 250zM233 250L234 251L233 250z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M371 250L372 251L371 250z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M189 251L190 252L189 251zM234 251L235 252L234 251z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M299 251L300 252L299 251z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M371 251L372 252L371 251z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M128 252L128 257L129 257L128 252z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M188 252L189 253L188 252zM235 252L238 255L235 252z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M236 252L237 253L236 252z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M299.333 252.667L299.667 253.333L299.333 252.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M372 252L373 253L372 252z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M187 253L188 254L187 253z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M237 253L238 254L237 253z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M372.333 253.667L372.667 254.333L372.333 253.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M186 254L185 256L186 254z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M298 254L298 257L299 257L298 254zM186 255L187 256L186 255zM238 255L239 256L238 255z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M373 255L374 256L373 255zM428 255L428 259L429 259L428 255z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M185 256L186 257L185 256zM239 256L240 257L239 256zM373.333 256.667L373.667 257.333L373.333 256.667zM184 257L185 258L184 257zM240 257L241 258L240 257z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M297 257L298 258L297 257z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M183.333 258.667L183.667 259.333L183.333 258.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M241 258L242 259L241 258z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M297 258L297 261L298 261L297 258z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M374 258L375 259L374 258z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M241 259L242 260L241 259zM374.333 259.667L374.667 260.333L374.333 259.667zM182 260L183 261L182 260zM242 260L243 261L242 260z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M181 261L182 262L181 261zM243 261L244 262L243 261z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M296 261L296 265L297 265L296 261z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M375.333 261.667L375.667 262.333L375.333 261.667z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M181 262L182 263L181 262zM243 262L244 263L243 262zM180.333 263.667L180.667 264.333L180.333 263.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M244 263L245 264L244 263z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M375.333 263.667L375.667 264.333L375.333 263.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M127 264L108 266L62 267L62 278L63 278L63 268C 79.7227 268 96.2681 267 113 267C 115.957 267 128.773 268.704 127 264z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M244 264L247 275L248 275L244 264z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M429 264C 430.999 270.024 439.749 268 445 268L445 268L493 268L493 307L489 307L489 308L494 308L494 267L450 267C 442.851 267 435.055 268.372 429 264zM179 265L180 266L179 265zM245 265L246 266L245 265zM295 265L296 266L295 265zM376.333 265.667L376.667 266.333L376.333 265.667z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M179 266L180 267L179 266zM295 266L295 270L296 270L295 266z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M178 267L179 268L178 267z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M376.333 267.667L376.667 268.333L376.333 267.667zM178.333 268.667L178.667 269.333L178.333 268.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M246 268L247 269L246 268zM377.333 269.667L377.667 270.333L377.333 269.667zM177 270L178 271L177 270zM294 270L295 271L294 270z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M177.333 271.667L177.667 272.333L177.333 271.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M247 271L248 272L247 271z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M294 271L294 277L295 277L294 271zM377.333 271.667L377.667 272.333L377.333 271.667z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M176.333 273.667L176.667 274.333L176.333 273.667zM378 273L378 276L379 276L378 273z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M176.333 275.667L176.667 276.333L176.333 275.667zM248 275L248 278L249 278L248 275zM378 276L378 279L379 279L378 276z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M175 277L175 280L176 280L175 277zM293 277L294 278L293 277zM249 278L250 279L249 278z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M293 278L293 288L294 288L293 278zM249 279L249 282L250 282L249 279z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M379 279L379 282L380 282L379 279z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M175 280L175 283L176 283L175 280z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M250 282L251 283L250 282z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M379 282L379 285L380 285L379 282z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M174 283L174 286L175 286L174 283z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M250 283L251 292L252 292L250 283z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M380 285L380 290L381 290L380 285z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M174 286L174 290L175 290L174 286z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M251 286L252 287L251 286zM292 286L292 290L293 290L292 286zM173 290L173 302L174 302L173 290z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M292 290L292 313L293 313L292 290zM380 290L380 294L381 294L380 290z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M252 292L253 293L252 292z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M252 293L252 299L253 299L252 293z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M381 294L381 301L382 301L381 294zM253 299L254 300L253 299z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M253 300L253 311L254 311L253 300zM381 301L381 307L382 307L381 301zM173 302L173 319L174 319L173 302z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M125 307L126 308L125 307zM63 308L63 309L124 309L104 308L63 308zM126 308L127 309L126 308zM382 308L382 381L383 381L383 331L382 308zM430 308L430 309L489 309L470 308L430 308zM254 309L254 312L255 312L254 309zM429 309L429 327L430 327L429 309z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M254 312L254 338L294 338L294 318L293 318L293 337L255 337L254 312z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-    <path d="M292 313L292 321L293 321L292 313zM127 319L127 333L128 333L127 319zM173 319L173 381L174 381L174 339L173 319zM430 338L430 339L547 339L512 338L430 338zM0 340L0 341L128 341C 117.734 336.692 100.158 340 89 340L89 340L0 340z" stroke="none" fill="#FFB693" fill-rule="nonzero"/>
-    <path d="M0 381L0 382L174 382L157 381L122 381L0 381zM382 381L382 382L547 382C 534.355 376.694 511.777 381 498 381L498 381L382 381z" stroke="none" fill="#9A9A9A" fill-rule="nonzero"/>
-  </g>
-</svg>
\ No newline at end of file
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 90.38 40.33"> <path d="M16.0399 11.68C16.0399 13.12 15.2666 14.32 13.7199 15.28C12.1733 16.2133 10.2133 16.68 7.83994 16.68C6.98661 16.68 6.03994 16.6133 4.99994 16.48C4.01328 18.5333 3.51994 20.44 3.51994 22.2C3.51994 24.5733 4.57328 25.76 6.67994 25.76C8.30661 25.76 9.89328 24.9067 11.4399 23.2C11.7866 22.8267 12.0133 22.64 12.1199 22.64C12.2533 22.64 12.3199 22.7067 12.3199 22.84C12.3199 23.4533 11.6933 24.2133 10.4399 25.12C8.99994 26.16 7.50661 26.68 5.95994 26.68C4.22661 26.68 2.79994 26.1733 1.67994 25.16C0.559941 24.1467 -5.85765e-05 22.8667 -5.85765e-05 21.32C-5.85765e-05 18.3333 1.62661 15.44 4.87994 12.64C7.73328 10.1867 10.2799 8.96 12.5199 8.96C14.8666 8.96 16.0399 9.86667 16.0399 11.68ZM13.1999 11C13.1999 10.1733 12.7866 9.76 11.9599 9.76C11.1066 9.76 10.2666 10.08 9.43994 10.72C7.94661 11.8933 6.57327 13.64 5.31994 15.96C5.63994 15.9867 5.99994 16 6.39994 16C7.89327 16 9.34661 15.5467 10.7599 14.64C12.3866 13.6267 13.1999 12.4133 13.1999 11ZM27.6353 1.72C27.6353 2.84 27.1153 3.4 26.0753 3.4C25.5419 3.4 25.1019 3.24 24.7553 2.92C24.4086 2.57334 24.2353 2.14667 24.2353 1.64C24.2353 0.546669 24.8486 1.90735e-06 26.0753 1.90735e-06C27.1153 1.90735e-06 27.6353 0.573336 27.6353 1.72ZM24.8753 9.2C24.8753 9.28 24.8086 9.44 24.6753 9.68C24.4886 10 24.1819 10.6533 23.7553 11.64L19.1553 22.16C18.5419 23.5733 18.2353 24.4533 18.2353 24.8C18.2353 25.52 18.6086 25.88 19.3553 25.88C19.8619 25.88 20.4353 25.7067 21.0753 25.36C21.7419 24.9867 22.2486 24.5467 22.5953 24.04C22.8353 23.72 23.0219 23.56 23.1553 23.56C23.3153 23.56 23.3953 23.64 23.3953 23.8C23.3953 24.12 23.0219 24.6 22.2753 25.24C21.1553 26.2 19.8886 26.68 18.4753 26.68C17.5419 26.68 16.7686 26.44 16.1553 25.96C15.5686 25.48 15.2753 24.8667 15.2753 24.12C15.2753 23.4533 15.6086 22.3733 16.2753 20.88L20.4353 11.6C20.5686 11.1467 20.7286 10.8 20.9153 10.56C20.9953 10.4533 21.0353 10.36 21.0353 10.28C21.0353 10.04 20.4486 9.88 19.2753 9.8C19.0619 9.74667 18.9553 9.65334 18.9553 9.52C18.9553 9.28 19.0619 9.16 19.2753 9.16C19.3019 9.16 19.5019 9.18667 19.8753 9.24C20.2486 9.29334 20.8486 9.32 21.6753 9.32C22.7953 9.32 23.5819 9.22667 24.0353 9.04C24.3019 8.93334 24.4886 8.88 24.5953 8.88C24.7819 8.88 24.8753 8.98667 24.8753 9.2ZM43.5646 10.48C43.5646 11.3333 43.1646 11.76 42.3646 11.76C41.618 11.76 41.2446 11.4 41.2446 10.68C41.2446 10.6 41.258 10.52 41.2846 10.44C41.3113 10.3333 41.338 10.2 41.3646 10.04C41.3646 9.90667 41.2846 9.84 41.1246 9.84C40.858 9.84 40.4713 10.1333 39.9646 10.72C39.4846 11.28 39.2446 11.7067 39.2446 12C39.2446 12.1333 39.298 12.2933 39.4046 12.48C39.7246 13.2267 39.8846 14.04 39.8846 14.92C39.8846 16.8133 39.2446 18.4267 37.9646 19.76C36.7113 21.0667 35.0313 21.72 32.9246 21.72C31.378 21.72 29.9913 21.28 28.7646 20.4C26.7113 21.12 25.6846 21.92 25.6846 22.8C25.6846 23.36 26.0846 23.7067 26.8846 23.84C28.378 24.08 29.218 24.1733 29.4046 24.12H32.7246C34.2446 24.12 35.338 24.2 36.0046 24.36C37.978 24.84 38.9646 26.28 38.9646 28.68C38.9646 30.8133 38.2046 32.6533 36.6846 34.2C35.058 35.8533 32.8046 36.68 29.9246 36.68C27.8446 36.68 26.0046 36.2 24.4046 35.24C22.458 34.0667 21.4846 32.6933 21.4846 31.12C21.4846 30.0267 21.978 29.12 22.9646 28.4C23.418 28.08 24.418 27.6267 25.9646 27.04C24.418 26.4 23.6446 25.4667 23.6446 24.24C23.6446 22.2133 25.1913 20.76 28.2846 19.88C27.4313 18.76 27.0046 17.6267 27.0046 16.48C27.0046 14.4267 27.7513 12.6667 29.2446 11.2C30.7646 9.70667 32.5646 8.96 34.6446 8.96C36.2446 8.96 37.6046 9.68 38.7246 11.12C39.7113 9.6 40.7513 8.84 41.8446 8.84C42.9913 8.84 43.5646 9.38667 43.5646 10.48ZM37.0846 12.44C37.0846 10.5733 36.3113 9.64 34.7646 9.64C33.4846 9.64 32.338 10.76 31.3246 13C30.4446 14.92 30.0046 16.72 30.0046 18.4C30.0046 20.1333 30.858 21 32.5646 21C33.818 21 34.898 19.9733 35.8046 17.92C36.658 16 37.0846 14.1733 37.0846 12.44ZM37.8046 30.16C37.8046 29.4933 37.5913 28.8933 37.1646 28.36C36.738 27.8533 36.2046 27.5333 35.5646 27.4C34.6846 27.2133 33.2846 27.1333 31.3646 27.16L26.8446 27.24C25.1913 28.0667 24.3646 29.3467 24.3646 31.08C24.3646 32.5467 24.8846 33.72 25.9246 34.6C26.9913 35.5067 28.3913 35.96 30.1246 35.96C32.178 35.96 33.9646 35.3733 35.4846 34.2C37.0313 33.0533 37.8046 31.7067 37.8046 30.16ZM58.1493 11.68C58.1493 13.12 57.376 14.32 55.8293 15.28C54.2827 16.2133 52.3227 16.68 49.9493 16.68C49.096 16.68 48.1493 16.6133 47.1093 16.48C46.1227 18.5333 45.6293 20.44 45.6293 22.2C45.6293 24.5733 46.6827 25.76 48.7893 25.76C50.416 25.76 52.0027 24.9067 53.5493 23.2C53.896 22.8267 54.1227 22.64 54.2293 22.64C54.3627 22.64 54.4293 22.7067 54.4293 22.84C54.4293 23.4533 53.8027 24.2133 52.5493 25.12C51.1093 26.16 49.616 26.68 48.0693 26.68C46.336 26.68 44.9093 26.1733 43.7893 25.16C42.6693 24.1467 42.1093 22.8667 42.1093 21.32C42.1093 18.3333 43.736 15.44 46.9893 12.64C49.8427 10.1867 52.3893 8.96 54.6293 8.96C56.976 8.96 58.1493 9.86667 58.1493 11.68ZM55.3093 11C55.3093 10.1733 54.896 9.76 54.0693 9.76C53.216 9.76 52.376 10.08 51.5493 10.72C50.056 11.8933 48.6826 13.64 47.4293 15.96C47.7493 15.9867 48.1093 16 48.5093 16C50.0026 16 51.456 15.5467 52.8693 14.64C54.496 13.6267 55.3093 12.4133 55.3093 11ZM75.3046 12.12C75.3046 12.76 74.958 13.8667 74.2646 15.44L71.0246 22.76C70.6513 23.6133 70.4646 24.1867 70.4646 24.48C70.4646 25.04 70.7713 25.32 71.3846 25.32C72.1313 25.32 73.2246 24.7067 74.6646 23.48C74.798 23.4 74.9046 23.36 74.9846 23.36C75.1446 23.36 75.2246 23.4267 75.2246 23.56C75.2246 23.88 74.7846 24.3467 73.9046 24.96C72.7046 25.7867 71.4246 26.2 70.0646 26.2C69.238 26.2 68.558 26.0267 68.0246 25.68C67.4913 25.3067 67.2246 24.84 67.2246 24.28C67.2246 23.8267 67.478 23.0267 67.9846 21.88L71.1846 14.72C71.958 12.9867 72.3446 11.8133 72.3446 11.2C72.3446 10.2933 71.878 9.84 70.9446 9.84C69.718 9.84 68.278 10.72 66.6246 12.48C65.3713 13.8133 64.2246 15.68 63.1846 18.08L59.9046 25.68C59.7713 26.08 59.598 26.28 59.3846 26.28C59.3313 26.28 59.038 26.2533 58.5046 26.2C58.4246 26.1733 58.2646 26.16 58.0246 26.16C57.8113 26.16 57.4513 26.1867 56.9446 26.24C56.8646 26.2667 56.7713 26.28 56.6646 26.28C56.478 26.28 56.3846 26.2133 56.3846 26.08C56.3846 26.0267 56.4246 25.9467 56.5046 25.84L56.7846 25.24L62.9046 10.52C62.9846 10.3867 63.0513 10.2667 63.1046 10.16C63.078 9.97334 62.7446 9.86667 62.1046 9.84C61.3046 9.81334 60.9046 9.66667 60.9046 9.4C60.9046 9.21334 61.0513 9.12 61.3446 9.12C61.5313 9.12 61.8246 9.14667 62.2246 9.2C62.6246 9.25334 62.9313 9.28 63.1446 9.28C64.5846 9.28 65.5313 9.17334 65.9846 8.96C66.1713 8.88 66.2913 8.84 66.3446 8.84C66.5046 8.84 66.5846 8.92 66.5846 9.08C66.5846 9.16 66.5713 9.22667 66.5446 9.28L65.0646 13.04C65.278 12.8 65.5846 12.4667 65.9846 12.04C67.958 9.96 69.8646 8.92 71.7046 8.92C72.7713 8.92 73.638 9.22667 74.3046 9.84C74.9713 10.4267 75.3046 11.1867 75.3046 12.12Z" fill="#F3F3F3"></path> <path d="M46.1274 40.16L43.7524 31.4327H46.2013L47.5536 37.2964H47.6331L49.0422 31.4327H51.4456L52.8774 37.2623H52.9513L54.2809 31.4327H56.724L54.3547 40.16H51.7922L50.2922 34.6714H50.1843L48.6843 40.16H46.1274ZM60.5039 40.3248C59.947 40.3248 59.4508 40.2282 59.0152 40.035C58.5796 39.838 58.2349 39.5483 57.9811 39.1657C57.7311 38.7793 57.6061 38.2983 57.6061 37.7225C57.6061 37.2377 57.6951 36.8305 57.8732 36.5009C58.0512 36.1714 58.2936 35.9062 58.6005 35.7055C58.9073 35.5047 59.2558 35.3532 59.6459 35.2509C60.0398 35.1486 60.4527 35.0767 60.8845 35.035C61.3921 34.982 61.8012 34.9327 62.1118 34.8873C62.4224 34.838 62.6478 34.7661 62.788 34.6714C62.9281 34.5767 62.9982 34.4365 62.9982 34.2509V34.2168C62.9982 33.857 62.8845 33.5786 62.6573 33.3816C62.4338 33.1846 62.1156 33.0861 61.7027 33.0861C61.2671 33.0861 60.9205 33.1827 60.663 33.3759C60.4054 33.5653 60.2349 33.8039 60.1516 34.0918L57.913 33.91C58.0266 33.3797 58.2501 32.9214 58.5834 32.535C58.9167 32.1449 59.3467 31.8456 59.8732 31.6373C60.4035 31.4252 61.0171 31.3191 61.7141 31.3191C62.1989 31.3191 62.663 31.3759 63.1061 31.4895C63.5531 31.6032 63.9489 31.7793 64.2936 32.018C64.6421 32.2566 64.9167 32.5634 65.1175 32.9384C65.3183 33.3096 65.4186 33.7547 65.4186 34.2736V40.16H63.1232V38.9498H63.055C62.9148 39.2225 62.7273 39.463 62.4925 39.6714C62.2576 39.8759 61.9755 40.0369 61.6459 40.1543C61.3164 40.268 60.9357 40.3248 60.5039 40.3248ZM61.197 38.6543C61.5531 38.6543 61.8675 38.5842 62.1402 38.4441C62.413 38.3002 62.627 38.107 62.7823 37.8645C62.9376 37.6221 63.0152 37.3475 63.0152 37.0407V36.1145C62.9395 36.1638 62.8353 36.2092 62.7027 36.2509C62.5739 36.2888 62.4281 36.3248 62.2652 36.3589C62.1023 36.3892 61.9395 36.4176 61.7766 36.4441C61.6137 36.4668 61.466 36.4877 61.3334 36.5066C61.0493 36.5483 60.8012 36.6145 60.5891 36.7055C60.377 36.7964 60.2122 36.9195 60.0948 37.0748C59.9773 37.2263 59.9186 37.4157 59.9186 37.643C59.9186 37.9725 60.038 38.2244 60.2766 38.3986C60.519 38.5691 60.8258 38.6543 61.197 38.6543ZM69.7169 28.5236V40.16H67.2965V28.5236H69.7169ZM74.0763 28.5236V40.16H71.6559V28.5236H74.0763ZM79.9925 40.3305C79.0948 40.3305 78.322 40.1486 77.6743 39.785C77.0304 39.4176 76.5342 38.8986 76.1857 38.2282C75.8372 37.5539 75.663 36.7566 75.663 35.8361C75.663 34.9384 75.8372 34.1505 76.1857 33.4725C76.5342 32.7945 77.0247 32.2661 77.6573 31.8873C78.2936 31.5085 79.0398 31.3191 79.8959 31.3191C80.4717 31.3191 81.0076 31.4119 81.5039 31.5975C82.0039 31.7793 82.4395 32.0539 82.8107 32.4214C83.1857 32.7888 83.4773 33.2509 83.6857 33.8077C83.894 34.3608 83.9982 35.0085 83.9982 35.7509V36.4157H76.6289V34.9157H81.7198C81.7198 34.5672 81.644 34.2585 81.4925 33.9895C81.341 33.7206 81.1308 33.5104 80.8618 33.3589C80.5967 33.2036 80.288 33.1259 79.9357 33.1259C79.5683 33.1259 79.2425 33.2111 78.9584 33.3816C78.6781 33.5483 78.4584 33.7736 78.2993 34.0577C78.1402 34.338 78.0588 34.6505 78.055 34.9952V36.4214C78.055 36.8532 78.1345 37.2263 78.2936 37.5407C78.4565 37.8551 78.6857 38.0975 78.9811 38.268C79.2766 38.4384 79.627 38.5236 80.0323 38.5236C80.3012 38.5236 80.5474 38.4858 80.7709 38.41C80.9944 38.3342 81.1857 38.2206 81.3448 38.0691C81.5039 37.9176 81.6251 37.732 81.7084 37.5123L83.947 37.66C83.8334 38.1979 83.6005 38.6676 83.2482 39.0691C82.8997 39.4668 82.4489 39.7774 81.8959 40.0009C81.3467 40.2206 80.7122 40.3305 79.9925 40.3305ZM90.2198 31.4327V33.2509H84.9641V31.4327H90.2198ZM86.1573 29.3418H88.5777V37.4782C88.5777 37.7017 88.6118 37.8759 88.68 38.0009C88.7482 38.1221 88.8429 38.2074 88.9641 38.2566C89.0891 38.3058 89.233 38.3305 89.3959 38.3305C89.5095 38.3305 89.6232 38.321 89.7368 38.302C89.8505 38.2793 89.9376 38.2623 89.9982 38.2509L90.3789 40.052C90.2576 40.0899 90.0872 40.1335 89.8675 40.1827C89.6478 40.2358 89.3808 40.268 89.0664 40.2793C88.483 40.302 87.9717 40.2244 87.5323 40.0464C87.0967 39.8683 86.7576 39.5918 86.5152 39.2168C86.2728 38.8418 86.1535 38.3683 86.1573 37.7964V29.3418Z" fill="#F3F3F3"></path> </svg>
diff --git a/docs/theme.config.jsx b/docs/theme.config.jsx
deleted file mode 100644
index a7dffb2a14..0000000000
--- a/docs/theme.config.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import Logo from "./components/Logo";
-
-export default {
-  logo: <Logo />,
-  project: {
-    link: "https://github.com/eigenwallet/core",
-  },
-  head: (
-    <>
-      <title>eigenwallet Docs</title>
-      <meta name="description" content="eigenwallet Docs" />
-      <meta name="viewport" content="width=device-width, initial-scale=1" />
-      <link rel="icon" href="/favicon.ico" sizes="any" />
-      <link rel="icon" href="/icon.svg" type="image/svg+xml" />
-      <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
-      <link rel="manifest" href="/manifest.webmanifest" />
-    </>
-  ),
-  primaryHue: 14.3,
-  primarySaturation: 90.68,
-};
diff --git a/docs/tsconfig.json b/docs/tsconfig.json
index 1ed394a99a..b497137a23 100644
--- a/docs/tsconfig.json
+++ b/docs/tsconfig.json
@@ -1,6 +1,10 @@
 {
   "compilerOptions": {
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": false,
@@ -8,12 +12,24 @@
     "incremental": true,
     "module": "esnext",
     "esModuleInterop": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "target": "ES2017"
+    "target": "ES2017",
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"]
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "next-env.d.ts",
+    ".next/types/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }
diff --git a/docs/yarn.lock b/docs/yarn.lock
index ec6dd8434a..70a3b61150 100644
--- a/docs/yarn.lock
+++ b/docs/yarn.lock
@@ -1,3016 +1,5142 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@babel/runtime@^7.23.8":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12"
-  integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==
-  dependencies:
-    regenerator-runtime "^0.14.0"
-
-"@braintree/sanitize-url@^6.0.1":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz#923ca57e173c6b232bbbb07347b1be982f03e783"
-  integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==
-
-"@emnapi/runtime@^1.2.0":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.3.1.tgz#0fcaa575afc31f455fd33534c19381cfce6c6f60"
-  integrity sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==
-  dependencies:
-    tslib "^2.4.0"
-
-"@headlessui/react@^1.7.17":
-  version "1.7.19"
-  resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.19.tgz#91c78cf5fcb254f4a0ebe96936d48421caf75f40"
-  integrity sha512-Ll+8q3OlMJfJbAKM/+/Y2q6PPYbryqNTXDbryx7SXLIDamkF6iQFbriYHga0dY44PvDhvvBWCx1Xj4U5+G4hOw==
-  dependencies:
-    "@tanstack/react-virtual" "^3.0.0-beta.60"
-    client-only "^0.0.1"
-
-"@img/sharp-darwin-arm64@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz#ef5b5a07862805f1e8145a377c8ba6e98813ca08"
-  integrity sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==
-  optionalDependencies:
-    "@img/sharp-libvips-darwin-arm64" "1.0.4"
-
-"@img/sharp-darwin-x64@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz#e03d3451cd9e664faa72948cc70a403ea4063d61"
-  integrity sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==
-  optionalDependencies:
-    "@img/sharp-libvips-darwin-x64" "1.0.4"
-
-"@img/sharp-libvips-darwin-arm64@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz#447c5026700c01a993c7804eb8af5f6e9868c07f"
-  integrity sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==
-
-"@img/sharp-libvips-darwin-x64@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz#e0456f8f7c623f9dbfbdc77383caa72281d86062"
-  integrity sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==
-
-"@img/sharp-libvips-linux-arm64@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz#979b1c66c9a91f7ff2893556ef267f90ebe51704"
-  integrity sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==
-
-"@img/sharp-libvips-linux-arm@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz#99f922d4e15216ec205dcb6891b721bfd2884197"
-  integrity sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==
-
-"@img/sharp-libvips-linux-s390x@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz#f8a5eb1f374a082f72b3f45e2fb25b8118a8a5ce"
-  integrity sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==
-
-"@img/sharp-libvips-linux-x64@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz#d4c4619cdd157774906e15770ee119931c7ef5e0"
-  integrity sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==
-
-"@img/sharp-libvips-linuxmusl-arm64@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz#166778da0f48dd2bded1fa3033cee6b588f0d5d5"
-  integrity sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==
-
-"@img/sharp-libvips-linuxmusl-x64@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz#93794e4d7720b077fcad3e02982f2f1c246751ff"
-  integrity sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==
-
-"@img/sharp-linux-arm64@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz#edb0697e7a8279c9fc829a60fc35644c4839bb22"
-  integrity sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==
-  optionalDependencies:
-    "@img/sharp-libvips-linux-arm64" "1.0.4"
-
-"@img/sharp-linux-arm@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz#422c1a352e7b5832842577dc51602bcd5b6f5eff"
-  integrity sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==
-  optionalDependencies:
-    "@img/sharp-libvips-linux-arm" "1.0.5"
-
-"@img/sharp-linux-s390x@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz#f5c077926b48e97e4a04d004dfaf175972059667"
-  integrity sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==
-  optionalDependencies:
-    "@img/sharp-libvips-linux-s390x" "1.0.4"
-
-"@img/sharp-linux-x64@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz#d806e0afd71ae6775cc87f0da8f2d03a7c2209cb"
-  integrity sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==
-  optionalDependencies:
-    "@img/sharp-libvips-linux-x64" "1.0.4"
-
-"@img/sharp-linuxmusl-arm64@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz#252975b915894fb315af5deea174651e208d3d6b"
-  integrity sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==
-  optionalDependencies:
-    "@img/sharp-libvips-linuxmusl-arm64" "1.0.4"
-
-"@img/sharp-linuxmusl-x64@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz#3f4609ac5d8ef8ec7dadee80b560961a60fd4f48"
-  integrity sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==
-  optionalDependencies:
-    "@img/sharp-libvips-linuxmusl-x64" "1.0.4"
-
-"@img/sharp-wasm32@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz#6f44f3283069d935bb5ca5813153572f3e6f61a1"
-  integrity sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==
-  dependencies:
-    "@emnapi/runtime" "^1.2.0"
-
-"@img/sharp-win32-ia32@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz#1a0c839a40c5351e9885628c85f2e5dfd02b52a9"
-  integrity sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==
-
-"@img/sharp-win32-x64@0.33.5":
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342"
-  integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==
-
-"@mdx-js/mdx@^2.2.1", "@mdx-js/mdx@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-2.3.0.tgz#d65d8c3c28f3f46bb0e7cb3bf7613b39980671a9"
-  integrity sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/mdx" "^2.0.0"
-    estree-util-build-jsx "^2.0.0"
-    estree-util-is-identifier-name "^2.0.0"
-    estree-util-to-js "^1.1.0"
-    estree-walker "^3.0.0"
-    hast-util-to-estree "^2.0.0"
-    markdown-extensions "^1.0.0"
-    periscopic "^3.0.0"
-    remark-mdx "^2.0.0"
-    remark-parse "^10.0.0"
-    remark-rehype "^10.0.0"
-    unified "^10.0.0"
-    unist-util-position-from-estree "^1.0.0"
-    unist-util-stringify-position "^3.0.0"
-    unist-util-visit "^4.0.0"
-    vfile "^5.0.0"
-
-"@mdx-js/react@^2.2.1", "@mdx-js/react@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-2.3.0.tgz#4208bd6d70f0d0831def28ef28c26149b03180b3"
-  integrity sha512-zQH//gdOmuu7nt2oJR29vFhDv88oGPmVw6BggmrHeMI+xgEkp1B2dX9/bMBSYtK0dyLX/aOmesKS09g222K1/g==
-  dependencies:
-    "@types/mdx" "^2.0.0"
-    "@types/react" ">=16"
-
-"@napi-rs/simple-git-android-arm-eabi@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-android-arm-eabi/-/simple-git-android-arm-eabi-0.1.16.tgz#36b752f84a7e75a9dada3d8b307817f0b015a57d"
-  integrity sha512-dbrCL0Pl5KZG7x7tXdtVsA5CO6At5ohDX3myf5xIYn9kN4jDFxsocl8bNt6Vb/hZQoJd8fI+k5VlJt+rFhbdVw==
-
-"@napi-rs/simple-git-android-arm64@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-android-arm64/-/simple-git-android-arm64-0.1.16.tgz#f84d9e2fdae91bb810b55ffc30a42ce5fe020c76"
-  integrity sha512-xYz+TW5J09iK8SuTAKK2D5MMIsBUXVSs8nYp7HcMi8q6FCRO7yJj96YfP9PvKsc/k64hOyqGmL5DhCzY9Cu1FQ==
-
-"@napi-rs/simple-git-darwin-arm64@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-darwin-arm64/-/simple-git-darwin-arm64-0.1.16.tgz#8d995a920146c320bf13b32d1b1654f44beaa16b"
-  integrity sha512-XfgsYqxhUE022MJobeiX563TJqyQyX4FmYCnqrtJwAfivESVeAJiH6bQIum8dDEYMHXCsG7nL8Ok0Dp8k2m42g==
-
-"@napi-rs/simple-git-darwin-x64@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-darwin-x64/-/simple-git-darwin-x64-0.1.16.tgz#7cc7155392c62f885d248af5f720e108d0aad2b5"
-  integrity sha512-tkEVBhD6vgRCbeWsaAQqM3bTfpIVGeitamPPRVSbsq8qgzJ5Dx6ZedH27R7KSsA/uao7mZ3dsrNLXbu1Wy5MzA==
-
-"@napi-rs/simple-git-linux-arm-gnueabihf@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-linux-arm-gnueabihf/-/simple-git-linux-arm-gnueabihf-0.1.16.tgz#d5135543d372e0571d7c19928e75751eb407d7dd"
-  integrity sha512-R6VAyNnp/yRaT7DV1Ao3r67SqTWDa+fNq2LrNy0Z8gXk2wB9ZKlrxFtLPE1WSpWknWtyRDLpRlsorh7Evk7+7w==
-
-"@napi-rs/simple-git-linux-arm64-gnu@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-linux-arm64-gnu/-/simple-git-linux-arm64-gnu-0.1.16.tgz#4e293005b2fd62d1eb399b50e53d983378c19fb7"
-  integrity sha512-LAGI0opFKw/HBMCV2qIBK3uWSEW9h4xd2ireZKLJy8DBPymX6NrWIamuxYNyCuACnFdPRxR4LaRFy4J5ZwuMdw==
-
-"@napi-rs/simple-git-linux-arm64-musl@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-linux-arm64-musl/-/simple-git-linux-arm64-musl-0.1.16.tgz#679edd2c6d88de6aa35993401722ade04595869b"
-  integrity sha512-I57Ph0F0Yn2KW93ep+V1EzKhACqX0x49vvSiapqIsdDA2PifdEWLc1LJarBolmK7NKoPqKmf6lAKKO9lhiZzkg==
-
-"@napi-rs/simple-git-linux-x64-gnu@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-linux-x64-gnu/-/simple-git-linux-x64-gnu-0.1.16.tgz#b33054b14a88335f19261b812f65f8d567e7d199"
-  integrity sha512-AZYYFY2V7hlcQASPEOWyOa3e1skzTct9QPzz0LiDM3f/hCFY/wBaU2M6NC5iG3d2Kr38heuyFS/+JqxLm5WaKA==
-
-"@napi-rs/simple-git-linux-x64-musl@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-linux-x64-musl/-/simple-git-linux-x64-musl-0.1.16.tgz#8cfc8f5f35951dacae86e72b5535ea401f868b7a"
-  integrity sha512-9TyMcYSBJwjT8jwjY9m24BZbu7ozyWTjsmYBYNtK3B0Um1Ov6jthSNneLVvouQ6x+k3Ow+00TiFh6bvmT00r8g==
-
-"@napi-rs/simple-git-win32-arm64-msvc@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-win32-arm64-msvc/-/simple-git-win32-arm64-msvc-0.1.16.tgz#e6b220574421695f4c05be4e065b1fd46ffb7007"
-  integrity sha512-uslJ1WuAHCYJWui6xjsyT47SjX6KOHDtClmNO8hqKz1pmDSNY7AjyUY8HxvD1lK9bDnWwc4JYhikS9cxCqHybw==
-
-"@napi-rs/simple-git-win32-x64-msvc@0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git-win32-x64-msvc/-/simple-git-win32-x64-msvc-0.1.16.tgz#4ec44d57fc2c069544ffb923a2871d81d5db7cfc"
-  integrity sha512-SoEaVeCZCDF1MP+M9bMSXsZWgEjk4On9GWADO5JOulvzR1bKjk0s9PMHwe/YztR9F0sJzrCxwtvBZowhSJsQPg==
-
-"@napi-rs/simple-git@^0.1.9":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@napi-rs/simple-git/-/simple-git-0.1.16.tgz#c48d03b27956ddcd2c886a5e3d5c8bdc0d7ad5fe"
-  integrity sha512-C5wRPw9waqL2jk3jEDeJv+f7ScuO3N0a39HVdyFLkwKxHH4Sya4ZbzZsu2JLi6eEqe7RuHipHL6mC7B2OfYZZw==
-  optionalDependencies:
-    "@napi-rs/simple-git-android-arm-eabi" "0.1.16"
-    "@napi-rs/simple-git-android-arm64" "0.1.16"
-    "@napi-rs/simple-git-darwin-arm64" "0.1.16"
-    "@napi-rs/simple-git-darwin-x64" "0.1.16"
-    "@napi-rs/simple-git-linux-arm-gnueabihf" "0.1.16"
-    "@napi-rs/simple-git-linux-arm64-gnu" "0.1.16"
-    "@napi-rs/simple-git-linux-arm64-musl" "0.1.16"
-    "@napi-rs/simple-git-linux-x64-gnu" "0.1.16"
-    "@napi-rs/simple-git-linux-x64-musl" "0.1.16"
-    "@napi-rs/simple-git-win32-arm64-msvc" "0.1.16"
-    "@napi-rs/simple-git-win32-x64-msvc" "0.1.16"
-
-"@next/env@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.0.3.tgz#a2e9bf274743c52b74d30f415f3eba750d51313a"
-  integrity sha512-t9Xy32pjNOvVn2AS+Utt6VmyrshbpfUMhIjFO60gI58deSo/KgLOp31XZ4O+kY/Is8WAGYwA5gR7kOb1eORDBA==
-
-"@next/swc-darwin-arm64@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.0.3.tgz#4c40c506cf3d4d87da0204f4cccf39e6bdc46a71"
-  integrity sha512-s3Q/NOorCsLYdCKvQlWU+a+GeAd3C8Rb3L1YnetsgwXzhc3UTWrtQpB/3eCjFOdGUj5QmXfRak12uocd1ZiiQw==
-
-"@next/swc-darwin-x64@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.3.tgz#8e06cacae3dae279744f9fbe88dea679ec2c1ca3"
-  integrity sha512-Zxl/TwyXVZPCFSf0u2BNj5sE0F2uR6iSKxWpq4Wlk/Sv9Ob6YCKByQTkV2y6BCic+fkabp9190hyrDdPA/dNrw==
-
-"@next/swc-linux-arm64-gnu@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.3.tgz#c144ad1f21091b9c6e1e330ecc2d56188763191d"
-  integrity sha512-T5+gg2EwpsY3OoaLxUIofmMb7ohAUlcNZW0fPQ6YAutaWJaxt1Z1h+8zdl4FRIOr5ABAAhXtBcpkZNwUcKI2fw==
-
-"@next/swc-linux-arm64-musl@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.3.tgz#3ccb71c6703bf421332f177d1bb0e10528bc73a2"
-  integrity sha512-WkAk6R60mwDjH4lG/JBpb2xHl2/0Vj0ZRu1TIzWuOYfQ9tt9NFsIinI1Epma77JVgy81F32X/AeD+B2cBu/YQA==
-
-"@next/swc-linux-x64-gnu@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.3.tgz#b90aa9b07001b4000427c35ab347a9273cbeebb3"
-  integrity sha512-gWL/Cta1aPVqIGgDb6nxkqy06DkwJ9gAnKORdHWX1QBbSZZB+biFYPFti8aKIQL7otCE1pjyPaXpFzGeG2OS2w==
-
-"@next/swc-linux-x64-musl@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.3.tgz#0ac9724fb44718fc97bfea971ac3fe17e486590e"
-  integrity sha512-QQEMwFd8r7C0GxQS62Zcdy6GKx999I/rTO2ubdXEe+MlZk9ZiinsrjwoiBL5/57tfyjikgh6GOU2WRQVUej3UA==
-
-"@next/swc-win32-arm64-msvc@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.3.tgz#932437d4cf27814e963ba8ae5f033b4421fab9ca"
-  integrity sha512-9TEp47AAd/ms9fPNgtgnT7F3M1Hf7koIYYWCMQ9neOwjbVWJsHZxrFbI3iEDJ8rf1TDGpmHbKxXf2IFpAvheIQ==
-
-"@next/swc-win32-x64-msvc@15.0.3":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.3.tgz#940a6f7b370cdde0cc67eabe945d9e6d97e0be9f"
-  integrity sha512-VNAz+HN4OGgvZs6MOoVfnn41kBzT+M+tB+OK4cww6DNyWS6wKaDpaAm/qLeOUbnMh0oVx1+mg0uoYARF69dJyA==
-
-"@popperjs/core@^2.11.8":
-  version "2.11.8"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
-  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
-
-"@swc/counter@0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
-  integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
-
-"@swc/helpers@0.5.13":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.13.tgz#33e63ff3cd0cade557672bd7888a39ce7d115a8c"
-  integrity sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==
-  dependencies:
-    tslib "^2.4.0"
-
-"@tanstack/react-virtual@^3.0.0-beta.60":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@tanstack/react-virtual/-/react-virtual-3.5.1.tgz#1ce466f530a10f781871360ed2bf7ff83e664f85"
-  integrity sha512-jIsuhfgy8GqA67PdWqg73ZB2LFE+HD9hjWL1L6ifEIZVyZVAKpYmgUG4WsKQ005aEyImJmbuimPiEvc57IY0Aw==
-  dependencies:
-    "@tanstack/virtual-core" "3.5.1"
-
-"@tanstack/virtual-core@3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.5.1.tgz#f519149bce9156d0e7954b9531df15f446f2fc12"
-  integrity sha512-046+AUSiDru/V9pajE1du8WayvBKeCvJ2NmKPy/mR8/SbKKrqmSbj7LJBfXE+nSq4f5TBXvnCzu0kcYebI9WdQ==
-
-"@theguild/remark-mermaid@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@theguild/remark-mermaid/-/remark-mermaid-0.0.5.tgz#0f95671d247381f416e528e937be08bb7a695224"
-  integrity sha512-e+ZIyJkEv9jabI4m7q29wZtZv+2iwPGsXJ2d46Zi7e+QcFudiyuqhLhHG/3gX3ZEB+hxTch+fpItyMS8jwbIcw==
-  dependencies:
-    mermaid "^10.2.2"
-    unist-util-visit "^5.0.0"
-
-"@theguild/remark-npm2yarn@^0.2.0":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@theguild/remark-npm2yarn/-/remark-npm2yarn-0.2.1.tgz#63bf5a8c85d7fe505d4808812dbc56d9c2ce00f8"
-  integrity sha512-jUTFWwDxtLEFtGZh/TW/w30ySaDJ8atKWH8dq2/IiQF61dPrGfETpl0WxD0VdBfuLOeU14/kop466oBSRO/5CA==
-  dependencies:
-    npm-to-yarn "^2.1.0"
-    unist-util-visit "^5.0.0"
-
-"@types/acorn@^4.0.0":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.6.tgz#d61ca5480300ac41a7d973dd5b84d0a591154a22"
-  integrity sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==
-  dependencies:
-    "@types/estree" "*"
-
-"@types/d3-scale-chromatic@^3.0.0":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.3.tgz#fc0db9c10e789c351f4c42d96f31f2e4df8f5644"
-  integrity sha512-laXM4+1o5ImZv3RpFAsTRn3TEkzqkytiOY0Dz0sq5cnd1dtNlk6sHLon4OvqaiJb28T0S/TdsBI3Sjsy+keJrw==
-
-"@types/d3-scale@^4.0.3":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.8.tgz#d409b5f9dcf63074464bf8ddfb8ee5a1f95945bb"
-  integrity sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==
-  dependencies:
-    "@types/d3-time" "*"
-
-"@types/d3-time@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.3.tgz#3c186bbd9d12b9d84253b6be6487ca56b54f88be"
-  integrity sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==
-
-"@types/debug@^4.0.0":
-  version "4.1.12"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
-  integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==
-  dependencies:
-    "@types/ms" "*"
-
-"@types/estree-jsx@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.5.tgz#858a88ea20f34fe65111f005a689fa1ebf70dc18"
-  integrity sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==
-  dependencies:
-    "@types/estree" "*"
-
-"@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
-"@types/hast@^2.0.0":
-  version "2.3.10"
-  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.10.tgz#5c9d9e0b304bbb8879b857225c5ebab2d81d7643"
-  integrity sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==
-  dependencies:
-    "@types/unist" "^2"
-
-"@types/hast@^3.0.0":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-3.0.4.tgz#1d6b39993b82cea6ad783945b0508c25903e15aa"
-  integrity sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==
-  dependencies:
-    "@types/unist" "*"
-
-"@types/js-yaml@^4.0.0":
-  version "4.0.9"
-  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.9.tgz#cd82382c4f902fed9691a2ed79ec68c5898af4c2"
-  integrity sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==
-
-"@types/katex@^0.16.0":
-  version "0.16.7"
-  resolved "https://registry.yarnpkg.com/@types/katex/-/katex-0.16.7.tgz#03ab680ab4fa4fbc6cb46ecf987ecad5d8019868"
-  integrity sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==
-
-"@types/mdast@^3.0.0":
-  version "3.0.15"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.15.tgz#49c524a263f30ffa28b71ae282f813ed000ab9f5"
-  integrity sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==
-  dependencies:
-    "@types/unist" "^2"
-
-"@types/mdast@^4.0.0":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-4.0.4.tgz#7ccf72edd2f1aa7dd3437e180c64373585804dd6"
-  integrity sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==
-  dependencies:
-    "@types/unist" "*"
-
-"@types/mdx@^2.0.0":
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.13.tgz#68f6877043d377092890ff5b298152b0a21671bd"
-  integrity sha512-+OWZQfAYyio6YkJb3HLxDrvnx6SWWDbC0zVPfBRzUk0/nqoDyf6dNxQi3eArPe8rJ473nobTMQ/8Zk+LxJ+Yuw==
-
-"@types/ms@*":
-  version "0.7.34"
-  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433"
-  integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
-
-"@types/node@20.14.5":
-  version "20.14.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.5.tgz#fe35e3022ebe58b8f201580eb24e1fcfc0f2487d"
-  integrity sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/prop-types@*":
-  version "15.7.12"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6"
-  integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==
-
-"@types/react@>=16":
-  version "18.3.3"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f"
-  integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^3.0.2"
-
-"@types/unist@*", "@types/unist@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.2.tgz#6dd61e43ef60b34086287f83683a5c1b2dc53d20"
-  integrity sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==
-
-"@types/unist@^2", "@types/unist@^2.0.0":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.10.tgz#04ffa7f406ab628f7f7e97ca23e290cd8ab15efc"
-  integrity sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==
-
-"@ungap/structured-clone@^1.0.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
-
-acorn-jsx@^5.0.0:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
-
-acorn@^8.0.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c"
-  integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==
-
-ansi-sequence-parser@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-sequence-parser/-/ansi-sequence-parser-1.1.1.tgz#e0aa1cdcbc8f8bb0b5bca625aac41f5f056973cf"
-  integrity sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==
-
-ansi-styles@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-arch@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
-  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
-
-arg@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-1.0.0.tgz#444d885a4e25b121640b55155ef7cd03975d6050"
-  integrity sha512-Wk7TEzl1KqvTGs/uyhmHO/3XLd3t1UeU4IstvPXVzGPM522cTjqjNZ99esCkcL52sjqjo8e8CTBcWhkxvGzoAw==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-astring@^1.8.0:
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.6.tgz#2c9c157cf1739d67561c56ba896e6948f6b93731"
-  integrity sha512-ISvCdHdlTDlH5IpxQJIex7BWBywFWgjJSVdwst+/iQCoEYnyOaQ95+X1JGshuBjGp6nxKUy1jMgE3zPqN7fQdg==
-
-bail@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
-  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
-
-busboy@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
-  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
-  dependencies:
-    streamsearch "^1.1.0"
-
-caniuse-lite@^1.0.30001579:
-  version "1.0.30001636"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz#b15f52d2bdb95fad32c2f53c0b68032b85188a78"
-  integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==
-
-ccount@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
-  integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
-
-chalk@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-  integrity sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
-
-character-entities-html4@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.1.0.tgz#1f1adb940c971a4b22ba39ddca6b618dc6e56b2b"
-  integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==
-
-character-entities-legacy@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b"
-  integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==
-
-character-entities@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22"
-  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
-
-character-reference-invalid@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
-  integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
-
-client-only@0.0.1, client-only@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/client-only/-/client-only-0.0.1.tgz#38bba5d403c41ab150bff64a95c85013cf73bca1"
-  integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
-
-clipboardy@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-1.2.2.tgz#2ce320b9ed9be1514f79878b53ff9765420903e2"
-  integrity sha512-16KrBOV7bHmHdxcQiCvfUFYVFyEah4FI8vYT1Fr7CGSA4G+xBWMEfUEQJS1hxeHGtI9ju1Bzs9uXSbj5HZKArw==
-  dependencies:
-    arch "^2.1.0"
-    execa "^0.8.0"
-
-clsx@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999"
-  integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-color-name@^1.0.0, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-string@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
-  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-color@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
-  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
-  dependencies:
-    color-convert "^2.0.1"
-    color-string "^1.9.0"
-
-comma-separated-tokens@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
-  integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
-
-commander@7:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-commander@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
-compute-scroll-into-view@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz#753f11d972596558d8fe7c6bcbc8497690ab4c87"
-  integrity sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==
-
-cose-base@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cose-base/-/cose-base-1.0.3.tgz#650334b41b869578a543358b80cda7e0abe0a60a"
-  integrity sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==
-  dependencies:
-    layout-base "^1.0.0"
-
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-csstype@^3.0.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
-  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
-
-cytoscape-cose-bilkent@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz#762fa121df9930ffeb51a495d87917c570ac209b"
-  integrity sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==
-  dependencies:
-    cose-base "^1.0.0"
-
-cytoscape@^3.28.1:
-  version "3.29.2"
-  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.29.2.tgz#c99f42513c80a75e2e94858add32896c860202ac"
-  integrity sha512-2G1ycU28Nh7OHT9rkXRLpCDP30MKH1dXJORZuBhtEhEW7pKwgPi77ImqlCWinouyE1PNepIOGZBOrE84DG7LyQ==
-
-"d3-array@1 - 2":
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81"
-  integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==
-  dependencies:
-    internmap "^1.0.0"
-
-"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3, d3-array@^3.2.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
-  integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
-  dependencies:
-    internmap "1 - 2"
-
-d3-axis@3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322"
-  integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==
-
-d3-brush@3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c"
-  integrity sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==
-  dependencies:
-    d3-dispatch "1 - 3"
-    d3-drag "2 - 3"
-    d3-interpolate "1 - 3"
-    d3-selection "3"
-    d3-transition "3"
-
-d3-chord@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-3.0.1.tgz#d156d61f485fce8327e6abf339cb41d8cbba6966"
-  integrity sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==
-  dependencies:
-    d3-path "1 - 3"
-
-"d3-color@1 - 3", d3-color@3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
-  integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
-
-d3-contour@4:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-4.0.2.tgz#bb92063bc8c5663acb2422f99c73cbb6c6ae3bcc"
-  integrity sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==
-  dependencies:
-    d3-array "^3.2.0"
-
-d3-delaunay@6:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/d3-delaunay/-/d3-delaunay-6.0.4.tgz#98169038733a0a5babbeda55054f795bb9e4a58b"
-  integrity sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==
-  dependencies:
-    delaunator "5"
-
-"d3-dispatch@1 - 3", d3-dispatch@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"
-  integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
-
-"d3-drag@2 - 3", d3-drag@3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"
-  integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==
-  dependencies:
-    d3-dispatch "1 - 3"
-    d3-selection "3"
-
-"d3-dsv@1 - 3", d3-dsv@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-3.0.1.tgz#c63af978f4d6a0d084a52a673922be2160789b73"
-  integrity sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==
-  dependencies:
-    commander "7"
-    iconv-lite "0.6"
-    rw "1"
-
-"d3-ease@1 - 3", d3-ease@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
-  integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
-
-d3-fetch@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-3.0.1.tgz#83141bff9856a0edb5e38de89cdcfe63d0a60a22"
-  integrity sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==
-  dependencies:
-    d3-dsv "1 - 3"
-
-d3-force@3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4"
-  integrity sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==
-  dependencies:
-    d3-dispatch "1 - 3"
-    d3-quadtree "1 - 3"
-    d3-timer "1 - 3"
-
-"d3-format@1 - 3", d3-format@3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
-  integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
-
-d3-geo@3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.1.1.tgz#6027cf51246f9b2ebd64f99e01dc7c3364033a4d"
-  integrity sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==
-  dependencies:
-    d3-array "2.5.0 - 3"
-
-d3-hierarchy@3:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6"
-  integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==
-
-"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
-  integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
-  dependencies:
-    d3-color "1 - 3"
-
-d3-path@1:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
-  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
-
-"d3-path@1 - 3", d3-path@3, d3-path@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526"
-  integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
-
-d3-polygon@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-3.0.1.tgz#0b45d3dd1c48a29c8e057e6135693ec80bf16398"
-  integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==
-
-"d3-quadtree@1 - 3", d3-quadtree@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f"
-  integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==
-
-d3-random@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4"
-  integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==
-
-d3-sankey@^0.12.3:
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/d3-sankey/-/d3-sankey-0.12.3.tgz#b3c268627bd72e5d80336e8de6acbfec9d15d01d"
-  integrity sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==
-  dependencies:
-    d3-array "1 - 2"
-    d3-shape "^1.2.0"
-
-d3-scale-chromatic@3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#34c39da298b23c20e02f1a4b239bd0f22e7f1314"
-  integrity sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==
-  dependencies:
-    d3-color "1 - 3"
-    d3-interpolate "1 - 3"
-
-d3-scale@4:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
-  integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
-  dependencies:
-    d3-array "2.10.0 - 3"
-    d3-format "1 - 3"
-    d3-interpolate "1.2.0 - 3"
-    d3-time "2.1.1 - 3"
-    d3-time-format "2 - 4"
-
-"d3-selection@2 - 3", d3-selection@3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
-  integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
-
-d3-shape@3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.2.0.tgz#a1a839cbd9ba45f28674c69d7f855bcf91dfc6a5"
-  integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==
-  dependencies:
-    d3-path "^3.1.0"
-
-d3-shape@^1.2.0:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
-  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
-  dependencies:
-    d3-path "1"
-
-"d3-time-format@2 - 4", d3-time-format@4:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a"
-  integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==
-  dependencies:
-    d3-time "1 - 3"
-
-"d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7"
-  integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==
-  dependencies:
-    d3-array "2 - 3"
-
-"d3-timer@1 - 3", d3-timer@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
-  integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
-
-"d3-transition@2 - 3", d3-transition@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f"
-  integrity sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==
-  dependencies:
-    d3-color "1 - 3"
-    d3-dispatch "1 - 3"
-    d3-ease "1 - 3"
-    d3-interpolate "1 - 3"
-    d3-timer "1 - 3"
-
-d3-zoom@3:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
-  integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==
-  dependencies:
-    d3-dispatch "1 - 3"
-    d3-drag "2 - 3"
-    d3-interpolate "1 - 3"
-    d3-selection "2 - 3"
-    d3-transition "2 - 3"
-
-d3@^7.4.0, d3@^7.8.2:
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-7.9.0.tgz#579e7acb3d749caf8860bd1741ae8d371070cd5d"
-  integrity sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==
-  dependencies:
-    d3-array "3"
-    d3-axis "3"
-    d3-brush "3"
-    d3-chord "3"
-    d3-color "3"
-    d3-contour "4"
-    d3-delaunay "6"
-    d3-dispatch "3"
-    d3-drag "3"
-    d3-dsv "3"
-    d3-ease "3"
-    d3-fetch "3"
-    d3-force "3"
-    d3-format "3"
-    d3-geo "3"
-    d3-hierarchy "3"
-    d3-interpolate "3"
-    d3-path "3"
-    d3-polygon "3"
-    d3-quadtree "3"
-    d3-random "3"
-    d3-scale "4"
-    d3-scale-chromatic "3"
-    d3-selection "3"
-    d3-shape "3"
-    d3-time "3"
-    d3-time-format "4"
-    d3-timer "3"
-    d3-transition "3"
-    d3-zoom "3"
-
-dagre-d3-es@7.0.10:
-  version "7.0.10"
-  resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.10.tgz#19800d4be674379a3cd8c86a8216a2ac6827cadc"
-  integrity sha512-qTCQmEhcynucuaZgY5/+ti3X/rnszKZhEQH/ZdWdtP1tA/y3VoHJzcVrO9pjjJCNpigfscAtoUB5ONcd2wNn0A==
-  dependencies:
-    d3 "^7.8.2"
-    lodash-es "^4.17.21"
-
-dayjs@^1.11.7:
-  version "1.11.11"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
-  integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
-
-debug@^4.0.0:
-  version "4.3.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
-  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
-  dependencies:
-    ms "2.1.2"
-
-decode-named-character-reference@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e"
-  integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==
-  dependencies:
-    character-entities "^2.0.0"
-
-delaunator@5:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.1.tgz#39032b08053923e924d6094fe2cde1a99cc51278"
-  integrity sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==
-  dependencies:
-    robust-predicates "^3.0.2"
-
-dequal@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
-  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
-
-detect-libc@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
-  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==
-
-devlop@^1.0.0, devlop@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/devlop/-/devlop-1.1.0.tgz#4db7c2ca4dc6e0e834c30be70c94bbc976dc7018"
-  integrity sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==
-  dependencies:
-    dequal "^2.0.0"
-
-diff@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531"
-  integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==
-
-dompurify@^3.0.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.5.tgz#2c6a113fc728682a0f55684b1388c58ddb79dc38"
-  integrity sha512-lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA==
-
-elkjs@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.3.tgz#16711f8ceb09f1b12b99e971b138a8384a529161"
-  integrity sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==
-
-entities@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-escape-string-regexp@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
-  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
-
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-estree-util-attach-comments@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/estree-util-attach-comments/-/estree-util-attach-comments-2.1.1.tgz#ee44f4ff6890ee7dfb3237ac7810154c94c63f84"
-  integrity sha512-+5Ba/xGGS6mnwFbXIuQiDPTbuTxuMCooq3arVv7gPZtYpjp+VXH/NkHAP35OOefPhNG/UGqU3vt/LTABwcHX0w==
-  dependencies:
-    "@types/estree" "^1.0.0"
-
-estree-util-build-jsx@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/estree-util-build-jsx/-/estree-util-build-jsx-2.2.2.tgz#32f8a239fb40dc3f3dca75bb5dcf77a831e4e47b"
-  integrity sha512-m56vOXcOBuaF+Igpb9OPAy7f9w9OIkb5yhjsZuaPm7HoGi4oTOQi0h2+yZ+AtKklYFZ+rPC4n0wYCJCEU1ONqg==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    estree-util-is-identifier-name "^2.0.0"
-    estree-walker "^3.0.0"
-
-estree-util-is-identifier-name@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz#fb70a432dcb19045e77b05c8e732f1364b4b49b2"
-  integrity sha512-bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ==
-
-estree-util-to-js@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/estree-util-to-js/-/estree-util-to-js-1.2.0.tgz#0f80d42443e3b13bd32f7012fffa6f93603f4a36"
-  integrity sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    astring "^1.8.0"
-    source-map "^0.7.0"
-
-estree-util-value-to-estree@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/estree-util-value-to-estree/-/estree-util-value-to-estree-1.3.0.tgz#1d3125594b4d6680f666644491e7ac1745a3df49"
-  integrity sha512-Y+ughcF9jSUJvncXwqRageavjrNPAI+1M/L3BI3PyLp1nmgYTGUXU6t5z1Y7OWuThoDdhPME07bQU+d5LxdJqw==
-  dependencies:
-    is-plain-obj "^3.0.0"
-
-estree-util-visit@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/estree-util-visit/-/estree-util-visit-1.2.1.tgz#8bc2bc09f25b00827294703835aabee1cc9ec69d"
-  integrity sha512-xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/unist" "^2.0.0"
-
-estree-walker@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
-  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
-  dependencies:
-    "@types/estree" "^1.0.0"
-
-execa@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
-  integrity sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==
-  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"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-flexsearch@^0.7.31:
-  version "0.7.43"
-  resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.7.43.tgz#34f89b36278a466ce379c5bf6fb341965ed3f16c"
-  integrity sha512-c5o/+Um8aqCSOXGcZoqZOm+NqtVwNsvVpWv6lfmSclU954O3wvQKxxK8zj74fPaSJbXpSLTs4PRhh+wnoCXnKg==
-
-focus-visible@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.2.0.tgz#3a9e41fccf587bd25dcc2ef045508284f0a4d6b3"
-  integrity sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==
-
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==
-
-git-up@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/git-up/-/git-up-7.0.0.tgz#bace30786e36f56ea341b6f69adfd83286337467"
-  integrity sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==
-  dependencies:
-    is-ssh "^1.4.0"
-    parse-url "^8.1.0"
-
-git-url-parse@^13.1.0:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-13.1.1.tgz#664bddf0857c6a75b3c1f0ae6239abb08a1486d4"
-  integrity sha512-PCFJyeSSdtnbfhSNRw9Wk96dDCNx+sogTe4YNXeXSJxt7xz5hvXekuRn9JX7m+Mf4OscCu8h+mtAl3+h5Fo8lQ==
-  dependencies:
-    git-up "^7.0.0"
-
-github-slugger@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-2.0.0.tgz#52cf2f9279a21eb6c59dd385b410f0c0adda8f1a"
-  integrity sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==
-
-graceful-fs@^4.2.11:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-gray-matter@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798"
-  integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==
-  dependencies:
-    js-yaml "^3.13.1"
-    kind-of "^6.0.2"
-    section-matter "^1.0.0"
-    strip-bom-string "^1.0.0"
-
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng==
-
-hash-obj@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/hash-obj/-/hash-obj-4.0.0.tgz#3fafeb0b5f17994441dbe04efbdee82e26b74c8c"
-  integrity sha512-FwO1BUVWkyHasWDW4S8o0ssQXjvyghLV2rfVhnN36b2bbcj45eGiuzdn9XOvOpjV3TKQD7Gm2BWNXdE9V4KKYg==
-  dependencies:
-    is-obj "^3.0.0"
-    sort-keys "^5.0.0"
-    type-fest "^1.0.2"
-
-hast-util-from-dom@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-from-dom/-/hast-util-from-dom-5.0.0.tgz#d32edd25bf28f4b178b5ae318f8d05762e67bd16"
-  integrity sha512-d6235voAp/XR3Hh5uy7aGLbM3S4KamdW0WEgOaU1YoewnuYw4HXb5eRtv9g65m/RFGEfUY1Mw4UqCc5Y8L4Stg==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    hastscript "^8.0.0"
-    web-namespaces "^2.0.0"
-
-hast-util-from-html-isomorphic@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-from-html-isomorphic/-/hast-util-from-html-isomorphic-2.0.0.tgz#b31baee386a899a2472326a3c5692f29f86d1d3c"
-  integrity sha512-zJfpXq44yff2hmE0XmwEOzdWin5xwH+QIhMLOScpX91e/NSGPsAzNCvLQDIEPyO2TXi+lBmU6hjLIhV8MwP2kw==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    hast-util-from-dom "^5.0.0"
-    hast-util-from-html "^2.0.0"
-    unist-util-remove-position "^5.0.0"
-
-hast-util-from-html@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/hast-util-from-html/-/hast-util-from-html-2.0.1.tgz#9cd38ee81bf40b2607368b92a04b0905fa987488"
-  integrity sha512-RXQBLMl9kjKVNkJTIO6bZyb2n+cUH8LFaSSzo82jiLT6Tfc+Pt7VQCS+/h3YwG4jaNE2TA2sdJisGWR+aJrp0g==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    devlop "^1.1.0"
-    hast-util-from-parse5 "^8.0.0"
-    parse5 "^7.0.0"
-    vfile "^6.0.0"
-    vfile-message "^4.0.0"
-
-hast-util-from-parse5@^8.0.0:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-8.0.1.tgz#654a5676a41211e14ee80d1b1758c399a0327651"
-  integrity sha512-Er/Iixbc7IEa7r/XLtuG52zoqn/b3Xng/w6aZQ0xGVxzhw5xUFxcRqdPzP6yFi/4HBYRaifaI5fQ1RH8n0ZeOQ==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/unist" "^3.0.0"
-    devlop "^1.0.0"
-    hastscript "^8.0.0"
-    property-information "^6.0.0"
-    vfile "^6.0.0"
-    vfile-location "^5.0.0"
-    web-namespaces "^2.0.0"
-
-hast-util-is-element@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz#6e31a6532c217e5b533848c7e52c9d9369ca0932"
-  integrity sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==
-  dependencies:
-    "@types/hast" "^3.0.0"
-
-hast-util-parse-selector@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-4.0.0.tgz#352879fa86e25616036037dd8931fb5f34cb4a27"
-  integrity sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==
-  dependencies:
-    "@types/hast" "^3.0.0"
-
-hast-util-raw@^9.0.0:
-  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-9.0.4.tgz#2da03e37c46eb1a6f1391f02f9b84ae65818f7ed"
-  integrity sha512-LHE65TD2YiNsHD3YuXcKPHXPLuYh/gjp12mOfU8jxSrm1f/yJpsb0F/KKljS6U9LJoP0Ux+tCe8iJ2AsPzTdgA==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/unist" "^3.0.0"
-    "@ungap/structured-clone" "^1.0.0"
-    hast-util-from-parse5 "^8.0.0"
-    hast-util-to-parse5 "^8.0.0"
-    html-void-elements "^3.0.0"
-    mdast-util-to-hast "^13.0.0"
-    parse5 "^7.0.0"
-    unist-util-position "^5.0.0"
-    unist-util-visit "^5.0.0"
-    vfile "^6.0.0"
-    web-namespaces "^2.0.0"
-    zwitch "^2.0.0"
-
-hast-util-to-estree@^2.0.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/hast-util-to-estree/-/hast-util-to-estree-2.3.3.tgz#da60142ffe19a6296923ec222aba73339c8bf470"
-  integrity sha512-ihhPIUPxN0v0w6M5+IiAZZrn0LH2uZomeWwhn7uP7avZC6TE7lIiEh2yBMPr5+zi1aUCXq6VoYRgs2Bw9xmycQ==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^2.0.0"
-    "@types/unist" "^2.0.0"
-    comma-separated-tokens "^2.0.0"
-    estree-util-attach-comments "^2.0.0"
-    estree-util-is-identifier-name "^2.0.0"
-    hast-util-whitespace "^2.0.0"
-    mdast-util-mdx-expression "^1.0.0"
-    mdast-util-mdxjs-esm "^1.0.0"
-    property-information "^6.0.0"
-    space-separated-tokens "^2.0.0"
-    style-to-object "^0.4.1"
-    unist-util-position "^4.0.0"
-    zwitch "^2.0.0"
-
-hast-util-to-parse5@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-8.0.0.tgz#477cd42d278d4f036bc2ea58586130f6f39ee6ed"
-  integrity sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    comma-separated-tokens "^2.0.0"
-    devlop "^1.0.0"
-    property-information "^6.0.0"
-    space-separated-tokens "^2.0.0"
-    web-namespaces "^2.0.0"
-    zwitch "^2.0.0"
-
-hast-util-to-text@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/hast-util-to-text/-/hast-util-to-text-4.0.2.tgz#57b676931e71bf9cb852453678495b3080bfae3e"
-  integrity sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/unist" "^3.0.0"
-    hast-util-is-element "^3.0.0"
-    unist-util-find-after "^5.0.0"
-
-hast-util-whitespace@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz#0ec64e257e6fc216c7d14c8a1b74d27d650b4557"
-  integrity sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==
-
-hastscript@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-8.0.0.tgz#4ef795ec8dee867101b9f23cc830d4baf4fd781a"
-  integrity sha512-dMOtzCEd3ABUeSIISmrETiKuyydk1w0pa+gE/uormcTpSYuaNJPbX1NU3JLyscSLjwAQM8bWMhhIlnCqnRvDTw==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    comma-separated-tokens "^2.0.0"
-    hast-util-parse-selector "^4.0.0"
-    property-information "^6.0.0"
-    space-separated-tokens "^2.0.0"
-
-html-void-elements@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-3.0.0.tgz#fc9dbd84af9e747249034d4d62602def6517f1d7"
-  integrity sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==
-
-iconv-lite@0.6:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-inline-style-parser@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
-  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
-
-"internmap@1 - 2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009"
-  integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
-
-internmap@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
-  integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
-
-intersection-observer@^0.12.2:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375"
-  integrity sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==
-
-is-alphabetical@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.1.tgz#01072053ea7c1036df3c7d19a6daaec7f19e789b"
-  integrity sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==
-
-is-alphanumerical@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz#7c03fbe96e3e931113e57f964b0a368cc2dfd875"
-  integrity sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==
-  dependencies:
-    is-alphabetical "^2.0.0"
-    is-decimal "^2.0.0"
-
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
-is-buffer@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
-  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-
-is-decimal@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.1.tgz#9469d2dc190d0214fd87d78b78caecc0cc14eef7"
-  integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==
-
-is-extendable@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
-
-is-hexadecimal@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
-  integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
-
-is-obj@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-3.0.0.tgz#b0889f1f9f8cb87e87df53a8d1230a2250f8b9be"
-  integrity sha512-IlsXEHOjtKhpN8r/tRFj2nDyTmHvcfNeu/nrRIcXE17ROeatXchkojffa1SpdqW4cr/Fj6QkEf/Gn4zf6KKvEQ==
-
-is-plain-obj@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
-  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
-
-is-plain-obj@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
-  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
-
-is-reference@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-3.0.2.tgz#154747a01f45cd962404ee89d43837af2cba247c"
-  integrity sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==
-  dependencies:
-    "@types/estree" "*"
-
-is-ssh@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.0.tgz#4f8220601d2839d8fa624b3106f8e8884f01b8b2"
-  integrity sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==
-  dependencies:
-    protocols "^2.0.1"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-"js-tokens@^3.0.0 || ^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-jsonc-parser@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a"
-  integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==
-
-katex@^0.16.0, katex@^0.16.9:
-  version "0.16.10"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.10.tgz#6f81b71ac37ff4ec7556861160f53bc5f058b185"
-  integrity sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==
-  dependencies:
-    commander "^8.3.0"
-
-khroma@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/khroma/-/khroma-2.1.0.tgz#45f2ce94ce231a437cf5b63c2e886e6eb42bbbb1"
-  integrity sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-kleur@^4.0.3:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
-  integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
-
-layout-base@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-1.0.2.tgz#1291e296883c322a9dd4c5dd82063721b53e26e2"
-  integrity sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==
-
-lodash-es@^4.17.21:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
-  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
-
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
-
-longest-streak@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
-  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
-
-loose-envify@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-markdown-extensions@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz#fea03b539faeaee9b4ef02a3769b455b189f7fc3"
-  integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==
-
-markdown-table@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.3.tgz#e6331d30e493127e031dd385488b5bd326e4a6bd"
-  integrity sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==
-
-match-sorter@^6.3.1:
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/match-sorter/-/match-sorter-6.3.4.tgz#afa779d8e922c81971fbcb4781c7003ace781be7"
-  integrity sha512-jfZW7cWS5y/1xswZo8VBOdudUiSd9nifYRWphc9M5D/ee4w4AoXLgBEdRbgVaxbMuagBPeUC5y2Hi8DO6o9aDg==
-  dependencies:
-    "@babel/runtime" "^7.23.8"
-    remove-accents "0.5.0"
-
-mdast-util-definitions@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz#9910abb60ac5d7115d6819b57ae0bcef07a3f7a7"
-  integrity sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    unist-util-visit "^4.0.0"
-
-mdast-util-find-and-replace@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.2.tgz#cc2b774f7f3630da4bd592f61966fecade8b99b1"
-  integrity sha512-MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    escape-string-regexp "^5.0.0"
-    unist-util-is "^5.0.0"
-    unist-util-visit-parents "^5.0.0"
-
-mdast-util-from-markdown@^1.0.0, mdast-util-from-markdown@^1.1.0, mdast-util-from-markdown@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz#9421a5a247f10d31d2faed2a30df5ec89ceafcf0"
-  integrity sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    decode-named-character-reference "^1.0.0"
-    mdast-util-to-string "^3.1.0"
-    micromark "^3.0.0"
-    micromark-util-decode-numeric-character-reference "^1.0.0"
-    micromark-util-decode-string "^1.0.0"
-    micromark-util-normalize-identifier "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    unist-util-stringify-position "^3.0.0"
-    uvu "^0.5.0"
-
-mdast-util-gfm-autolink-literal@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-1.0.3.tgz#67a13abe813d7eba350453a5333ae1bc0ec05c06"
-  integrity sha512-My8KJ57FYEy2W2LyNom4n3E7hKTuQk/0SES0u16tjA9Z3oFkF4RrC/hPAPgjlSpezsOvI8ObcXcElo92wn5IGA==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    ccount "^2.0.0"
-    mdast-util-find-and-replace "^2.0.0"
-    micromark-util-character "^1.0.0"
-
-mdast-util-gfm-footnote@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.2.tgz#ce5e49b639c44de68d5bf5399877a14d5020424e"
-  integrity sha512-56D19KOGbE00uKVj3sgIykpwKL179QsVFwx/DCW0u/0+URsryacI4MAdNJl0dh+u2PSsD9FtxPFbHCzJ78qJFQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-markdown "^1.3.0"
-    micromark-util-normalize-identifier "^1.0.0"
-
-mdast-util-gfm-strikethrough@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.3.tgz#5470eb105b483f7746b8805b9b989342085795b7"
-  integrity sha512-DAPhYzTYrRcXdMjUtUjKvW9z/FNAMTdU0ORyMcbmkwYNbKocDpdk+PX1L1dQgOID/+vVs1uBQ7ElrBQfZ0cuiQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-markdown "^1.3.0"
-
-mdast-util-gfm-table@^1.0.0:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.7.tgz#3552153a146379f0f9c4c1101b071d70bbed1a46"
-  integrity sha512-jjcpmNnQvrmN5Vx7y7lEc2iIOEytYv7rTvu+MeyAsSHTASGCCRA79Igg2uKssgOs1i1po8s3plW0sTu1wkkLGg==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    markdown-table "^3.0.0"
-    mdast-util-from-markdown "^1.0.0"
-    mdast-util-to-markdown "^1.3.0"
-
-mdast-util-gfm-task-list-item@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.2.tgz#b280fcf3b7be6fd0cc012bbe67a59831eb34097b"
-  integrity sha512-PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-markdown "^1.3.0"
-
-mdast-util-gfm@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-2.0.2.tgz#e92f4d8717d74bdba6de57ed21cc8b9552e2d0b6"
-  integrity sha512-qvZ608nBppZ4icQlhQQIAdc6S3Ffj9RGmzwUKUWuEICFnd1LVkN3EktF7ZHAgfcEdvZB5owU9tQgt99e2TlLjg==
-  dependencies:
-    mdast-util-from-markdown "^1.0.0"
-    mdast-util-gfm-autolink-literal "^1.0.0"
-    mdast-util-gfm-footnote "^1.0.0"
-    mdast-util-gfm-strikethrough "^1.0.0"
-    mdast-util-gfm-table "^1.0.0"
-    mdast-util-gfm-task-list-item "^1.0.0"
-    mdast-util-to-markdown "^1.0.0"
-
-mdast-util-math@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-math/-/mdast-util-math-2.0.2.tgz#19a06a81f31643f48cc805e7c31edb7ce739242c"
-  integrity sha512-8gmkKVp9v6+Tgjtq6SYx9kGPpTf6FVYRa53/DLh479aldR9AyP48qeVOgNZ5X7QUK7nOy4yw7vg6mbiGcs9jWQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    longest-streak "^3.0.0"
-    mdast-util-to-markdown "^1.3.0"
-
-mdast-util-mdx-expression@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.2.tgz#d027789e67524d541d6de543f36d51ae2586f220"
-  integrity sha512-xIPmR5ReJDu/DHH1OoIT1HkuybIfRGYRywC+gJtI7qHjCJp/M9jrmBEJW22O8lskDWm562BX2W8TiAwRTb0rKA==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-from-markdown "^1.0.0"
-    mdast-util-to-markdown "^1.0.0"
-
-mdast-util-mdx-jsx@^2.0.0:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.4.tgz#7c1f07f10751a78963cfabee38017cbc8b7786d1"
-  integrity sha512-DtMn9CmVhVzZx3f+optVDF8yFgQVt7FghCRNdlIaS3X5Bnym3hZwPbg/XW86vdpKjlc1PVj26SpnLGeJBXD3JA==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    ccount "^2.0.0"
-    mdast-util-from-markdown "^1.1.0"
-    mdast-util-to-markdown "^1.3.0"
-    parse-entities "^4.0.0"
-    stringify-entities "^4.0.0"
-    unist-util-remove-position "^4.0.0"
-    unist-util-stringify-position "^3.0.0"
-    vfile-message "^3.0.0"
-
-mdast-util-mdx@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdx/-/mdast-util-mdx-2.0.1.tgz#49b6e70819b99bb615d7223c088d295e53bb810f"
-  integrity sha512-38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw==
-  dependencies:
-    mdast-util-from-markdown "^1.0.0"
-    mdast-util-mdx-expression "^1.0.0"
-    mdast-util-mdx-jsx "^2.0.0"
-    mdast-util-mdxjs-esm "^1.0.0"
-    mdast-util-to-markdown "^1.0.0"
-
-mdast-util-mdxjs-esm@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.1.tgz#645d02cd607a227b49721d146fd81796b2e2d15b"
-  integrity sha512-SXqglS0HrEvSdUEfoXFtcg7DRl7S2cwOXc7jkuusG472Mmjag34DUDeOJUZtl+BVnyeO1frIgVpHlNRWc2gk/w==
-  dependencies:
-    "@types/estree-jsx" "^1.0.0"
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-from-markdown "^1.0.0"
-    mdast-util-to-markdown "^1.0.0"
-
-mdast-util-phrasing@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz#c7c21d0d435d7fb90956038f02e8702781f95463"
-  integrity sha512-WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    unist-util-is "^5.0.0"
-
-mdast-util-to-hast@^12.1.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz#045d2825fb04374e59970f5b3f279b5700f6fb49"
-  integrity sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-definitions "^5.0.0"
-    micromark-util-sanitize-uri "^1.1.0"
-    trim-lines "^3.0.0"
-    unist-util-generated "^2.0.0"
-    unist-util-position "^4.0.0"
-    unist-util-visit "^4.0.0"
-
-mdast-util-to-hast@^13.0.0:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz#5ca58e5b921cc0a3ded1bc02eed79a4fe4fe41f4"
-  integrity sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==
-  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"
-
-mdast-util-to-markdown@^1.0.0, mdast-util-to-markdown@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.5.0.tgz#c13343cb3fc98621911d33b5cd42e7d0731171c6"
-  integrity sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    longest-streak "^3.0.0"
-    mdast-util-phrasing "^3.0.0"
-    mdast-util-to-string "^3.0.0"
-    micromark-util-decode-string "^1.0.0"
-    unist-util-visit "^4.0.0"
-    zwitch "^2.0.0"
-
-mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.2.0.tgz#66f7bb6324756741c5f47a53557f0cbf16b6f789"
-  integrity sha512-V4Zn/ncyN1QNSqSBxTrMOLpjr+IKdHl2v3KVLoWmDPscP4r9GcCi71gjgvUV1SFSKh92AjAG4peFuBl2/YgCJg==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-
-mermaid@^10.2.2:
-  version "10.9.1"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-10.9.1.tgz#5f582c23f3186c46c6aa673e59eeb46d741b2ea6"
-  integrity sha512-Mx45Obds5W1UkW1nv/7dHRsbfMM1aOKA2+Pxs/IGHNonygDHwmng8xTHyS9z4KWVi0rbko8gjiBmuwwXQ7tiNA==
-  dependencies:
-    "@braintree/sanitize-url" "^6.0.1"
-    "@types/d3-scale" "^4.0.3"
-    "@types/d3-scale-chromatic" "^3.0.0"
-    cytoscape "^3.28.1"
-    cytoscape-cose-bilkent "^4.1.0"
-    d3 "^7.4.0"
-    d3-sankey "^0.12.3"
-    dagre-d3-es "7.0.10"
-    dayjs "^1.11.7"
-    dompurify "^3.0.5"
-    elkjs "^0.9.0"
-    katex "^0.16.9"
-    khroma "^2.0.0"
-    lodash-es "^4.17.21"
-    mdast-util-from-markdown "^1.3.0"
-    non-layered-tidy-tree-layout "^2.0.2"
-    stylis "^4.1.3"
-    ts-dedent "^2.2.0"
-    uuid "^9.0.0"
-    web-worker "^1.2.0"
-
-micromark-core-commonmark@^1.0.0, micromark-core-commonmark@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz#1386628df59946b2d39fb2edfd10f3e8e0a75bb8"
-  integrity sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==
-  dependencies:
-    decode-named-character-reference "^1.0.0"
-    micromark-factory-destination "^1.0.0"
-    micromark-factory-label "^1.0.0"
-    micromark-factory-space "^1.0.0"
-    micromark-factory-title "^1.0.0"
-    micromark-factory-whitespace "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-chunked "^1.0.0"
-    micromark-util-classify-character "^1.0.0"
-    micromark-util-html-tag-name "^1.0.0"
-    micromark-util-normalize-identifier "^1.0.0"
-    micromark-util-resolve-all "^1.0.0"
-    micromark-util-subtokenize "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.1"
-    uvu "^0.5.0"
-
-micromark-extension-gfm-autolink-literal@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-1.0.5.tgz#5853f0e579bbd8ef9e39a7c0f0f27c5a063a66e7"
-  integrity sha512-z3wJSLrDf8kRDOh2qBtoTRD53vJ+CWIyo7uyZuxf/JAbNJjiHsOpG1y5wxk8drtv3ETAHutCu6N3thkOOgueWg==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-sanitize-uri "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-extension-gfm-footnote@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.1.2.tgz#05e13034d68f95ca53c99679040bc88a6f92fe2e"
-  integrity sha512-Yxn7z7SxgyGWRNa4wzf8AhYYWNrwl5q1Z8ii+CSTTIqVkmGZF1CElX2JI8g5yGoM3GAman9/PVCUFUSJ0kB/8Q==
-  dependencies:
-    micromark-core-commonmark "^1.0.0"
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-normalize-identifier "^1.0.0"
-    micromark-util-sanitize-uri "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-extension-gfm-strikethrough@^1.0.0:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-1.0.7.tgz#c8212c9a616fa3bf47cb5c711da77f4fdc2f80af"
-  integrity sha512-sX0FawVE1o3abGk3vRjOH50L5TTLr3b5XMqnP9YDRb34M0v5OoZhG+OHFz1OffZ9dlwgpTBKaT4XW/AsUVnSDw==
-  dependencies:
-    micromark-util-chunked "^1.0.0"
-    micromark-util-classify-character "^1.0.0"
-    micromark-util-resolve-all "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-extension-gfm-table@^1.0.0:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-1.0.7.tgz#dcb46074b0c6254c3fc9cc1f6f5002c162968008"
-  integrity sha512-3ZORTHtcSnMQEKtAOsBQ9/oHp9096pI/UvdPtN7ehKvrmZZ2+bbWhi0ln+I9drmwXMt5boocn6OlwQzNXeVeqw==
-  dependencies:
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-extension-gfm-tagfilter@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-1.0.2.tgz#aa7c4dd92dabbcb80f313ebaaa8eb3dac05f13a7"
-  integrity sha512-5XWB9GbAUSHTn8VPU8/1DBXMuKYT5uOgEjJb8gN3mW0PNW5OPHpSdojoqf+iq1xo7vWzw/P8bAHY0n6ijpXF7g==
-  dependencies:
-    micromark-util-types "^1.0.0"
-
-micromark-extension-gfm-task-list-item@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-1.0.5.tgz#b52ce498dc4c69b6a9975abafc18f275b9dde9f4"
-  integrity sha512-RMFXl2uQ0pNQy6Lun2YBYT9g9INXtWJULgbt01D/x8/6yJ2qpKyzdZD3pi6UIkzF++Da49xAelVKUeUMqd5eIQ==
-  dependencies:
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-extension-gfm@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-2.0.3.tgz#e517e8579949a5024a493e49204e884aa74f5acf"
-  integrity sha512-vb9OoHqrhCmbRidQv/2+Bc6pkP0FrtlhurxZofvOEy5o8RtuuvTq+RQ1Vw5ZDNrVraQZu3HixESqbG+0iKk/MQ==
-  dependencies:
-    micromark-extension-gfm-autolink-literal "^1.0.0"
-    micromark-extension-gfm-footnote "^1.0.0"
-    micromark-extension-gfm-strikethrough "^1.0.0"
-    micromark-extension-gfm-table "^1.0.0"
-    micromark-extension-gfm-tagfilter "^1.0.0"
-    micromark-extension-gfm-task-list-item "^1.0.0"
-    micromark-util-combine-extensions "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-extension-math@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/micromark-extension-math/-/micromark-extension-math-2.1.2.tgz#52c70cc8266cd20ada1ef5a479bfed9a19b789bf"
-  integrity sha512-es0CcOV89VNS9wFmyn+wyFTKweXGW4CEvdaAca6SWRWPyYCbBisnjaHLjWO4Nszuiud84jCpkHsqAJoa768Pvg==
-  dependencies:
-    "@types/katex" "^0.16.0"
-    katex "^0.16.0"
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-extension-mdx-expression@^1.0.0:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.8.tgz#5bc1f5fd90388e8293b3ef4f7c6f06c24aff6314"
-  integrity sha512-zZpeQtc5wfWKdzDsHRBY003H2Smg+PUi2REhqgIhdzAa5xonhP03FcXxqFSerFiNUr5AWmHpaNPQTBVOS4lrXw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    micromark-factory-mdx-expression "^1.0.0"
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-events-to-acorn "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-extension-mdx-jsx@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.5.tgz#e72d24b7754a30d20fb797ece11e2c4e2cae9e82"
-  integrity sha512-gPH+9ZdmDflbu19Xkb8+gheqEDqkSpdCEubQyxuz/Hn8DOXiXvrXeikOoBA71+e8Pfi0/UYmU3wW3H58kr7akA==
-  dependencies:
-    "@types/acorn" "^4.0.0"
-    "@types/estree" "^1.0.0"
-    estree-util-is-identifier-name "^2.0.0"
-    micromark-factory-mdx-expression "^1.0.0"
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-    vfile-message "^3.0.0"
-
-micromark-extension-mdx-md@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-md/-/micromark-extension-mdx-md-1.0.1.tgz#595d4b2f692b134080dca92c12272ab5b74c6d1a"
-  integrity sha512-7MSuj2S7xjOQXAjjkbjBsHkMtb+mDGVW6uI2dBL9snOBCbZmoNgDAeZ0nSn9j3T42UE/g2xVNMn18PJxZvkBEA==
-  dependencies:
-    micromark-util-types "^1.0.0"
-
-micromark-extension-mdxjs-esm@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-1.0.5.tgz#e4f8be9c14c324a80833d8d3a227419e2b25dec1"
-  integrity sha512-xNRBw4aoURcyz/S69B19WnZAkWJMxHMT5hE36GtDAyhoyn/8TuAeqjFJQlwk+MKQsUD7b3l7kFX+vlfVWgcX1w==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    micromark-core-commonmark "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-events-to-acorn "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    unist-util-position-from-estree "^1.1.0"
-    uvu "^0.5.0"
-    vfile-message "^3.0.0"
-
-micromark-extension-mdxjs@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs/-/micromark-extension-mdxjs-1.0.1.tgz#f78d4671678d16395efeda85170c520ee795ded8"
-  integrity sha512-7YA7hF6i5eKOfFUzZ+0z6avRG52GpWR8DL+kN47y3f2KhxbBZMhmxe7auOeaTBrW2DenbbZTf1ea9tA2hDpC2Q==
-  dependencies:
-    acorn "^8.0.0"
-    acorn-jsx "^5.0.0"
-    micromark-extension-mdx-expression "^1.0.0"
-    micromark-extension-mdx-jsx "^1.0.0"
-    micromark-extension-mdx-md "^1.0.0"
-    micromark-extension-mdxjs-esm "^1.0.0"
-    micromark-util-combine-extensions "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-factory-destination@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.1.0.tgz#eb815957d83e6d44479b3df640f010edad667b9f"
-  integrity sha512-XaNDROBgx9SgSChd69pjiGKbV+nfHGDPVYFs5dOoDd7ZnMAE+Cuu91BCpsY8RT2NP9vo/B8pds2VQNCLiu0zhg==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-factory-label@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.1.0.tgz#cc95d5478269085cfa2a7282b3de26eb2e2dec68"
-  integrity sha512-OLtyez4vZo/1NjxGhcpDSbHQ+m0IIGnT8BoPamh+7jVlzLJBH98zzuCoUeMxvM6WsNeh8wx8cKvqLiPHEACn0w==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-factory-mdx-expression@^1.0.0:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.9.tgz#57ba4571b69a867a1530f34741011c71c73a4976"
-  integrity sha512-jGIWzSmNfdnkJq05c7b0+Wv0Kfz3NJ3N4cBjnbO4zjXIlxJr+f8lk+5ZmwFvqdAbUy2q6B5rCY//g0QAAaXDWA==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-events-to-acorn "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    unist-util-position-from-estree "^1.0.0"
-    uvu "^0.5.0"
-    vfile-message "^3.0.0"
-
-micromark-factory-space@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.1.0.tgz#c8f40b0640a0150751d3345ed885a080b0d15faf"
-  integrity sha512-cRzEj7c0OL4Mw2v6nwzttyOZe8XY/Z8G0rzmWQZTBi/jjwyw/U4uqKtUORXQrR5bAZZnbTI/feRV/R7hc4jQYQ==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-factory-title@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.1.0.tgz#dd0fe951d7a0ac71bdc5ee13e5d1465ad7f50ea1"
-  integrity sha512-J7n9R3vMmgjDOCY8NPw55jiyaQnH5kBdV2/UXCtZIpnHH3P6nHUKaH7XXEYuWwx/xUJcawa8plLBEjMPU24HzQ==
-  dependencies:
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-factory-whitespace@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.1.0.tgz#798fb7489f4c8abafa7ca77eed6b5745853c9705"
-  integrity sha512-v2WlmiymVSp5oMg+1Q0N1Lxmt6pMhIHD457whWM7/GUlEks1hI9xj5w3zbc4uuMKXGisksZk8DzP2UyGbGqNsQ==
-  dependencies:
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-util-character@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.2.0.tgz#4fedaa3646db249bc58caeb000eb3549a8ca5dcc"
-  integrity sha512-lXraTwcX3yH/vMDaFWCQJP1uIszLVebzUa3ZHdrgxr7KEU/9mL4mVgCpGbyhvNLNlauROiNUq7WN5u7ndbY6xg==
-  dependencies:
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-util-character@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-2.1.0.tgz#31320ace16b4644316f6bf057531689c71e2aee1"
-  integrity sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-chunked@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.1.0.tgz#37a24d33333c8c69a74ba12a14651fd9ea8a368b"
-  integrity sha512-Ye01HXpkZPNcV6FiyoW2fGZDUw4Yc7vT0E9Sad83+bEDiCJ1uXu0S3mr8WLpsz3HaG3x2q0HM6CTuPdcZcluFQ==
-  dependencies:
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-classify-character@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.1.0.tgz#6a7f8c8838e8a120c8e3c4f2ae97a2bff9190e9d"
-  integrity sha512-SL0wLxtKSnklKSUplok1WQFoGhUdWYKggKUiqhX+Swala+BtptGCu5iPRc+xvzJ4PXE/hwM3FNXsfEVgoZsWbw==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-util-combine-extensions@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.1.0.tgz#192e2b3d6567660a85f735e54d8ea6e3952dbe84"
-  integrity sha512-Q20sp4mfNf9yEqDL50WwuWZHUrCO4fEyeDCnMGmG5Pr0Cz15Uo7KBs6jq+dq0EgX4DPwwrh9m0X+zPV1ypFvUA==
-  dependencies:
-    micromark-util-chunked "^1.0.0"
-    micromark-util-types "^1.0.0"
-
-micromark-util-decode-numeric-character-reference@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.1.0.tgz#b1e6e17009b1f20bc652a521309c5f22c85eb1c6"
-  integrity sha512-m9V0ExGv0jB1OT21mrWcuf4QhP46pH1KkfWy9ZEezqHKAxkj4mPCy3nIH1rkbdMlChLHX531eOrymlwyZIf2iw==
-  dependencies:
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-decode-string@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.1.0.tgz#dc12b078cba7a3ff690d0203f95b5d5537f2809c"
-  integrity sha512-YphLGCK8gM1tG1bd54azwyrQRjCFcmgj2S2GoJDNnh4vYtnL38JS8M4gpxzOPNyHdNEpheyWXCTnnTDY3N+NVQ==
-  dependencies:
-    decode-named-character-reference "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-decode-numeric-character-reference "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.1.0.tgz#92e4f565fd4ccb19e0dcae1afab9a173bbeb19a5"
-  integrity sha512-EuEzTWSTAj9PA5GOAs992GzNh2dGQO52UvAbtSOMvXTxv3Criqb6IOzJUBCmEqrrXSblJIJBbFFv6zPxpreiJw==
-
-micromark-util-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz#0921ac7953dc3f1fd281e3d1932decfdb9382ab1"
-  integrity sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==
-
-micromark-util-events-to-acorn@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.3.tgz#a4ab157f57a380e646670e49ddee97a72b58b557"
-  integrity sha512-ij4X7Wuc4fED6UoLWkmo0xJQhsktfNh1J0m8g4PbIMPlx+ek/4YdW5mvbye8z/aZvAPUoxgXHrwVlXAPKMRp1w==
-  dependencies:
-    "@types/acorn" "^4.0.0"
-    "@types/estree" "^1.0.0"
-    "@types/unist" "^2.0.0"
-    estree-util-visit "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-    vfile-message "^3.0.0"
-
-micromark-util-html-tag-name@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.2.0.tgz#48fd7a25826f29d2f71479d3b4e83e94829b3588"
-  integrity sha512-VTQzcuQgFUD7yYztuQFKXT49KghjtETQ+Wv/zUjGSGBioZnkA4P1XXZPT1FHeJA6RwRXSF47yvJ1tsJdoxwO+Q==
-
-micromark-util-normalize-identifier@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.1.0.tgz#7a73f824eb9f10d442b4d7f120fecb9b38ebf8b7"
-  integrity sha512-N+w5vhqrBihhjdpM8+5Xsxy71QWqGn7HYNUvch71iV2PM7+E3uWGox1Qp90loa1ephtCxG2ftRV/Conitc6P2Q==
-  dependencies:
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-resolve-all@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.1.0.tgz#4652a591ee8c8fa06714c9b54cd6c8e693671188"
-  integrity sha512-b/G6BTMSg+bX+xVCshPTPyAu2tmA0E4X98NSR7eIbeC6ycCqCeE7wjfDIgzEbkzdEVJXRtOG4FbEm/uGbCRouA==
-  dependencies:
-    micromark-util-types "^1.0.0"
-
-micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz#613f738e4400c6eedbc53590c67b197e30d7f90d"
-  integrity sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==
-  dependencies:
-    micromark-util-character "^1.0.0"
-    micromark-util-encode "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-
-micromark-util-sanitize-uri@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz#ec8fbf0258e9e6d8f13d9e4770f9be64342673de"
-  integrity sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-encode "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-subtokenize@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.1.0.tgz#941c74f93a93eaf687b9054aeb94642b0e92edb1"
-  integrity sha512-kUQHyzRoxvZO2PuLzMt2P/dwVsTiivCK8icYTeR+3WgbuPqfHgPPy7nFKbeqRivBvn/3N3GBiNC+JRTMSxEC7A==
-  dependencies:
-    micromark-util-chunked "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.0"
-    uvu "^0.5.0"
-
-micromark-util-symbol@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.1.0.tgz#813cd17837bdb912d069a12ebe3a44b6f7063142"
-  integrity sha512-uEjpEYY6KMs1g7QfJ2eX1SQEV+ZT4rUD3UcF6l57acZvLNK7PBZL+ty82Z1qhK1/yXIY4bdx04FKMgR0g4IAag==
-
-micromark-util-symbol@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz#12225c8f95edf8b17254e47080ce0862d5db8044"
-  integrity sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==
-
-micromark-util-types@^1.0.0, micromark-util-types@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.1.0.tgz#e6676a8cae0bb86a2171c498167971886cb7e283"
-  integrity sha512-ukRBgie8TIAcacscVHSiddHjO4k/q3pnedmzMQ4iwDcK0FtFCohKOlFbaOL/mPgfnPsL3C1ZyxJa4sbWrBl3jg==
-
-micromark-util-types@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-2.0.0.tgz#63b4b7ffeb35d3ecf50d1ca20e68fc7caa36d95e"
-  integrity sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==
-
-micromark@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.2.0.tgz#1af9fef3f995ea1ea4ac9c7e2f19c48fd5c006e9"
-  integrity sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==
-  dependencies:
-    "@types/debug" "^4.0.0"
-    debug "^4.0.0"
-    decode-named-character-reference "^1.0.0"
-    micromark-core-commonmark "^1.0.1"
-    micromark-factory-space "^1.0.0"
-    micromark-util-character "^1.0.0"
-    micromark-util-chunked "^1.0.0"
-    micromark-util-combine-extensions "^1.0.0"
-    micromark-util-decode-numeric-character-reference "^1.0.0"
-    micromark-util-encode "^1.0.0"
-    micromark-util-normalize-identifier "^1.0.0"
-    micromark-util-resolve-all "^1.0.0"
-    micromark-util-sanitize-uri "^1.0.0"
-    micromark-util-subtokenize "^1.0.0"
-    micromark-util-symbol "^1.0.0"
-    micromark-util-types "^1.0.1"
-    uvu "^0.5.0"
-
-mri@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
-  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-nanoid@^3.3.6:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
-
-next-mdx-remote@^4.2.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/next-mdx-remote/-/next-mdx-remote-4.4.1.tgz#96b16e2adc54dbcd0a7f204a9a3c3fd269d41abf"
-  integrity sha512-1BvyXaIou6xy3XoNF4yaMZUCb6vD2GTAa5ciOa6WoO+gAUTYsb1K4rI/HSC2ogAWLrb/7VSV52skz07vOzmqIQ==
-  dependencies:
-    "@mdx-js/mdx" "^2.2.1"
-    "@mdx-js/react" "^2.2.1"
-    vfile "^5.3.0"
-    vfile-matter "^3.0.1"
-
-next-seo@^6.0.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/next-seo/-/next-seo-6.5.0.tgz#5ccfbcfaced9d296499aa88f074b9e82e252a9c8"
-  integrity sha512-MfzUeWTN/x/rsKp/1n0213eojO97lIl0unxqbeCY+6pAucViHDA8GSLRRcXpgjsSmBxfCFdfpu7LXbt4ANQoNQ==
-
-next-themes@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/next-themes/-/next-themes-0.2.1.tgz#0c9f128e847979daf6c67f70b38e6b6567856e45"
-  integrity sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==
-
-next@^15.0.3:
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/next/-/next-15.0.3.tgz#804f5b772e7570ef1f088542a59860914d3288e9"
-  integrity sha512-ontCbCRKJUIoivAdGB34yCaOcPgYXr9AAkV/IwqFfWWTXEPUgLYkSkqBhIk9KK7gGmgjc64B+RdoeIDM13Irnw==
-  dependencies:
-    "@next/env" "15.0.3"
-    "@swc/counter" "0.1.3"
-    "@swc/helpers" "0.5.13"
-    busboy "1.6.0"
-    caniuse-lite "^1.0.30001579"
-    postcss "8.4.31"
-    styled-jsx "5.1.6"
-  optionalDependencies:
-    "@next/swc-darwin-arm64" "15.0.3"
-    "@next/swc-darwin-x64" "15.0.3"
-    "@next/swc-linux-arm64-gnu" "15.0.3"
-    "@next/swc-linux-arm64-musl" "15.0.3"
-    "@next/swc-linux-x64-gnu" "15.0.3"
-    "@next/swc-linux-x64-musl" "15.0.3"
-    "@next/swc-win32-arm64-msvc" "15.0.3"
-    "@next/swc-win32-x64-msvc" "15.0.3"
-    sharp "^0.33.5"
-
-nextra-theme-docs@^2.13.4:
-  version "2.13.4"
-  resolved "https://registry.yarnpkg.com/nextra-theme-docs/-/nextra-theme-docs-2.13.4.tgz#821795e149537413f459ae4b520eba1a195e5e07"
-  integrity sha512-2XOoMfwBCTYBt8ds4ZHftt9Wyf2XsykiNo02eir/XEYB+sGeUoE77kzqfidjEOKCSzOHYbK9BDMcg2+B/2vYRw==
-  dependencies:
-    "@headlessui/react" "^1.7.17"
-    "@popperjs/core" "^2.11.8"
-    clsx "^2.0.0"
-    escape-string-regexp "^5.0.0"
-    flexsearch "^0.7.31"
-    focus-visible "^5.2.0"
-    git-url-parse "^13.1.0"
-    intersection-observer "^0.12.2"
-    match-sorter "^6.3.1"
-    next-seo "^6.0.0"
-    next-themes "^0.2.1"
-    scroll-into-view-if-needed "^3.1.0"
-    zod "^3.22.3"
-
-nextra@^2.13.4:
-  version "2.13.4"
-  resolved "https://registry.yarnpkg.com/nextra/-/nextra-2.13.4.tgz#49e9f558735d86292cd8578b5a69f6d926bc2a14"
-  integrity sha512-7of2rSBxuUa3+lbMmZwG9cqgftcoNOVQLTT6Rxf3EhBR9t1EI7b43dted8YoqSNaigdE3j1CoyNkX8N/ZzlEpw==
-  dependencies:
-    "@headlessui/react" "^1.7.17"
-    "@mdx-js/mdx" "^2.3.0"
-    "@mdx-js/react" "^2.3.0"
-    "@napi-rs/simple-git" "^0.1.9"
-    "@theguild/remark-mermaid" "^0.0.5"
-    "@theguild/remark-npm2yarn" "^0.2.0"
-    clsx "^2.0.0"
-    github-slugger "^2.0.0"
-    graceful-fs "^4.2.11"
-    gray-matter "^4.0.3"
-    katex "^0.16.9"
-    lodash.get "^4.4.2"
-    next-mdx-remote "^4.2.1"
-    p-limit "^3.1.0"
-    rehype-katex "^7.0.0"
-    rehype-pretty-code "0.9.11"
-    rehype-raw "^7.0.0"
-    remark-gfm "^3.0.1"
-    remark-math "^5.1.1"
-    remark-reading-time "^2.0.1"
-    shiki "^0.14.3"
-    slash "^3.0.0"
-    title "^3.5.3"
-    unist-util-remove "^4.0.0"
-    unist-util-visit "^5.0.0"
-    zod "^3.22.3"
-
-non-layered-tidy-tree-layout@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz#57d35d13c356643fc296a55fb11ac15e74da7804"
-  integrity sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw==
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
-  dependencies:
-    path-key "^2.0.0"
-
-npm-to-yarn@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/npm-to-yarn/-/npm-to-yarn-2.2.1.tgz#048843a6630621daffc6a239dfc89698b8abf7e8"
-  integrity sha512-O/j/ROyX0KGLG7O6Ieut/seQ0oiTpHF2tXAcFbpdTLQFiaNtkyTXXocM1fwpaa60dg1qpWj0nHlbNhx6qwuENQ==
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
-
-p-limit@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-parse-entities@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.1.tgz#4e2a01111fb1c986549b944af39eeda258fc9e4e"
-  integrity sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    character-entities "^2.0.0"
-    character-entities-legacy "^3.0.0"
-    character-reference-invalid "^2.0.0"
-    decode-named-character-reference "^1.0.0"
-    is-alphanumerical "^2.0.0"
-    is-decimal "^2.0.0"
-    is-hexadecimal "^2.0.0"
-
-parse-numeric-range@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3"
-  integrity sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ==
-
-parse-path@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-7.0.0.tgz#605a2d58d0a749c8594405d8cc3a2bf76d16099b"
-  integrity sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==
-  dependencies:
-    protocols "^2.0.0"
-
-parse-url@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-8.1.0.tgz#972e0827ed4b57fc85f0ea6b0d839f0d8a57a57d"
-  integrity sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==
-  dependencies:
-    parse-path "^7.0.0"
-
-parse5@^7.0.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
-  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
-  dependencies:
-    entities "^4.4.0"
-
-path-key@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
-
-periscopic@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/periscopic/-/periscopic-3.1.0.tgz#7e9037bf51c5855bd33b48928828db4afa79d97a"
-  integrity sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==
-  dependencies:
-    "@types/estree" "^1.0.0"
-    estree-walker "^3.0.0"
-    is-reference "^3.0.0"
-
-picocolors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
-  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
-
-postcss@8.4.31:
-  version "8.4.31"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
-  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
-  dependencies:
-    nanoid "^3.3.6"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-property-information@^6.0.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.5.0.tgz#6212fbb52ba757e92ef4fb9d657563b933b7ffec"
-  integrity sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==
-
-protocols@^2.0.0, protocols@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/protocols/-/protocols-2.0.1.tgz#8f155da3fc0f32644e83c5782c8e8212ccf70a86"
-  integrity sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
-
-react-dom@^18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
-  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
-  dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.23.2"
-
-react@^18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
-  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
-  dependencies:
-    loose-envify "^1.1.0"
-
-reading-time@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb"
-  integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==
-
-regenerator-runtime@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
-  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
-
-rehype-katex@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/rehype-katex/-/rehype-katex-7.0.0.tgz#f5e9e2825981175a7b0a4d58ed9816c33576dfed"
-  integrity sha512-h8FPkGE00r2XKU+/acgqwWUlyzve1IiOKwsEkg4pDL3k48PiE0Pt+/uLtVHDVkN1yA4iurZN6UES8ivHVEQV6Q==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    "@types/katex" "^0.16.0"
-    hast-util-from-html-isomorphic "^2.0.0"
-    hast-util-to-text "^4.0.0"
-    katex "^0.16.0"
-    unist-util-visit-parents "^6.0.0"
-    vfile "^6.0.0"
-
-rehype-pretty-code@0.9.11:
-  version "0.9.11"
-  resolved "https://registry.yarnpkg.com/rehype-pretty-code/-/rehype-pretty-code-0.9.11.tgz#742017cbcfd5bd85466dfedd65b33a954aff7f2a"
-  integrity sha512-Eq90eCYXQJISktfRZ8PPtwc5SUyH6fJcxS8XOMnHPUQZBtC6RYo67gGlley9X2nR8vlniPj0/7oCDEYHKQa/oA==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    hash-obj "^4.0.0"
-    parse-numeric-range "^1.3.0"
-
-rehype-raw@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-7.0.0.tgz#59d7348fd5dbef3807bbaa1d443efd2dd85ecee4"
-  integrity sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==
-  dependencies:
-    "@types/hast" "^3.0.0"
-    hast-util-raw "^9.0.0"
-    vfile "^6.0.0"
-
-remark-gfm@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-3.0.1.tgz#0b180f095e3036545e9dddac0e8df3fa5cfee54f"
-  integrity sha512-lEFDoi2PICJyNrACFOfDD3JlLkuSbOa5Wd8EPt06HUdptv8Gn0bxYTdbU/XXQ3swAPkEaGxxPN9cbnMHvVu1Ig==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-gfm "^2.0.0"
-    micromark-extension-gfm "^2.0.0"
-    unified "^10.0.0"
-
-remark-math@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-5.1.1.tgz#459e798d978d4ca032e745af0bac81ddcdf94964"
-  integrity sha512-cE5T2R/xLVtfFI4cCePtiRn+e6jKMtFDR3P8V3qpv8wpKjwvHoBA4eJzvX+nVrnlNy0911bdGmuspCSwetfYHw==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-math "^2.0.0"
-    micromark-extension-math "^2.0.0"
-    unified "^10.0.0"
-
-remark-mdx@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-2.3.0.tgz#efe678025a8c2726681bde8bf111af4a93943db4"
-  integrity sha512-g53hMkpM0I98MU266IzDFMrTD980gNF3BJnkyFcmN+dD873mQeD5rdMO3Y2X+x8umQfbSE0PcoEDl7ledSA+2g==
-  dependencies:
-    mdast-util-mdx "^2.0.0"
-    micromark-extension-mdxjs "^1.0.0"
-
-remark-parse@^10.0.0:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.2.tgz#ca241fde8751c2158933f031a4e3efbaeb8bc262"
-  integrity sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-from-markdown "^1.0.0"
-    unified "^10.0.0"
-
-remark-reading-time@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/remark-reading-time/-/remark-reading-time-2.0.1.tgz#fe8bb8e420db7678dc749385167adb4fc99318f7"
-  integrity sha512-fy4BKy9SRhtYbEHvp6AItbRTnrhiDGbqLQTSYVbQPGuRCncU1ubSsh9p/W5QZSxtYcUXv8KGL0xBgPLyNJA1xw==
-  dependencies:
-    estree-util-is-identifier-name "^2.0.0"
-    estree-util-value-to-estree "^1.3.0"
-    reading-time "^1.3.0"
-    unist-util-visit "^3.1.0"
-
-remark-rehype@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279"
-  integrity sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-hast "^12.1.0"
-    unified "^10.0.0"
-
-remove-accents@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/remove-accents/-/remove-accents-0.5.0.tgz#77991f37ba212afba162e375b627631315bed687"
-  integrity sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==
-
-robust-predicates@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.2.tgz#d5b28528c4824d20fc48df1928d41d9efa1ad771"
-  integrity sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==
-
-rw@1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
-  integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
-
-sade@^1.7.3:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
-  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
-  dependencies:
-    mri "^1.1.0"
-
-"safer-buffer@>= 2.1.2 < 3.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-scheduler@^0.23.2:
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
-  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
-  dependencies:
-    loose-envify "^1.1.0"
-
-scroll-into-view-if-needed@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.1.0.tgz#fa9524518c799b45a2ef6bbffb92bcad0296d01f"
-  integrity sha512-49oNpRjWRvnU8NyGVmUaYG4jtTkNonFZI86MmGRDqBphEK2EXT9gdEUoQPZhuBM8yWHxCWbobltqYO5M4XrUvQ==
-  dependencies:
-    compute-scroll-into-view "^3.0.2"
-
-section-matter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
-  integrity sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==
-  dependencies:
-    extend-shallow "^2.0.1"
-    kind-of "^6.0.0"
-
-semver@^7.6.3:
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
-  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
-
-sharp@^0.33.5:
-  version "0.33.5"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.33.5.tgz#13e0e4130cc309d6a9497596715240b2ec0c594e"
-  integrity sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==
-  dependencies:
-    color "^4.2.3"
-    detect-libc "^2.0.3"
-    semver "^7.6.3"
-  optionalDependencies:
-    "@img/sharp-darwin-arm64" "0.33.5"
-    "@img/sharp-darwin-x64" "0.33.5"
-    "@img/sharp-libvips-darwin-arm64" "1.0.4"
-    "@img/sharp-libvips-darwin-x64" "1.0.4"
-    "@img/sharp-libvips-linux-arm" "1.0.5"
-    "@img/sharp-libvips-linux-arm64" "1.0.4"
-    "@img/sharp-libvips-linux-s390x" "1.0.4"
-    "@img/sharp-libvips-linux-x64" "1.0.4"
-    "@img/sharp-libvips-linuxmusl-arm64" "1.0.4"
-    "@img/sharp-libvips-linuxmusl-x64" "1.0.4"
-    "@img/sharp-linux-arm" "0.33.5"
-    "@img/sharp-linux-arm64" "0.33.5"
-    "@img/sharp-linux-s390x" "0.33.5"
-    "@img/sharp-linux-x64" "0.33.5"
-    "@img/sharp-linuxmusl-arm64" "0.33.5"
-    "@img/sharp-linuxmusl-x64" "0.33.5"
-    "@img/sharp-wasm32" "0.33.5"
-    "@img/sharp-win32-ia32" "0.33.5"
-    "@img/sharp-win32-x64" "0.33.5"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
-
-shiki@^0.14.3:
-  version "0.14.7"
-  resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.14.7.tgz#c3c9e1853e9737845f1d2ef81b31bcfb07056d4e"
-  integrity sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==
-  dependencies:
-    ansi-sequence-parser "^1.1.0"
-    jsonc-parser "^3.2.0"
-    vscode-oniguruma "^1.7.0"
-    vscode-textmate "^8.0.0"
-
-signal-exit@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
-  dependencies:
-    is-arrayish "^0.3.1"
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-sort-keys@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-5.0.0.tgz#5d775f8ae93ecc29bc7312bbf3acac4e36e3c446"
-  integrity sha512-Pdz01AvCAottHTPQGzndktFNdbRA75BgOfeT1hH+AMnJFv8lynkPi42rfeEhpx1saTEI3YNMWxfqu0sFD1G8pw==
-  dependencies:
-    is-plain-obj "^4.0.0"
-
-source-map-js@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
-  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
-
-source-map@^0.7.0:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
-  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
-space-separated-tokens@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f"
-  integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
-
-streamsearch@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
-  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
-
-stringify-entities@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.4.tgz#b3b79ef5f277cc4ac73caeb0236c5ba939b3a4f3"
-  integrity sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==
-  dependencies:
-    character-entities-html4 "^2.0.0"
-    character-entities-legacy "^3.0.0"
-
-strip-bom-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
-  integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
-
-style-to-object@^0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.4.tgz#266e3dfd56391a7eefb7770423612d043c3f33ec"
-  integrity sha512-HYNoHZa2GorYNyqiCaBgsxvcJIn7OHq6inEga+E6Ke3m5JkoqpQbnFssk4jwe+K7AhGa2fcha4wSOf1Kn01dMg==
-  dependencies:
-    inline-style-parser "0.1.1"
-
-styled-jsx@5.1.6:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.1.6.tgz#83b90c077e6c6a80f7f5e8781d0f311b2fe41499"
-  integrity sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==
-  dependencies:
-    client-only "0.0.1"
-
-stylis@^4.1.3:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444"
-  integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==
-
-supports-color@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  integrity sha512-ycQR/UbvI9xIlEdQT1TQqwoXtEldExbCEAJgRo5YXlmSKjv6ThHnP9/vwGa1gr19Gfw+LkFd7KqYMhzrRC5JYw==
-  dependencies:
-    has-flag "^2.0.0"
-
-title@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/title/-/title-3.5.3.tgz#b338d701a3d949db6b49b2c86f409f9c2f36cd91"
-  integrity sha512-20JyowYglSEeCvZv3EZ0nZ046vLarO37prvV0mbtQV7C8DJPGgN967r8SJkqd3XK3K3lD3/Iyfp3avjfil8Q2Q==
-  dependencies:
-    arg "1.0.0"
-    chalk "2.3.0"
-    clipboardy "1.2.2"
-    titleize "1.0.0"
-
-titleize@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/titleize/-/titleize-1.0.0.tgz#7d350722061830ba6617631e0cfd3ea08398d95a"
-  integrity sha512-TARUb7z1pGvlLxgPk++7wJ6aycXF3GJ0sNSBTAsTuJrQG5QuZlkUQP+zl+nbjAh4gMX9yDw9ZYklMd7vAfJKEw==
-
-trim-lines@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
-  integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==
-
-trough@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-2.2.0.tgz#94a60bd6bd375c152c1df911a4b11d5b0256f50f"
-  integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==
-
-ts-dedent@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
-  integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==
-
-tslib@^2.4.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
-  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
-
-type-fest@^1.0.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
-  integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
-
-typescript@5.4.5:
-  version "5.4.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
-  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
-
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
-unified@^10.0.0:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df"
-  integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    bail "^2.0.0"
-    extend "^3.0.0"
-    is-buffer "^2.0.0"
-    is-plain-obj "^4.0.0"
-    trough "^2.0.0"
-    vfile "^5.0.0"
-
-unist-util-find-after@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-find-after/-/unist-util-find-after-5.0.0.tgz#3fccc1b086b56f34c8b798e1ff90b5c54468e896"
-  integrity sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-
-unist-util-generated@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.1.tgz#e37c50af35d3ed185ac6ceacb6ca0afb28a85cae"
-  integrity sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A==
-
-unist-util-is@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.2.1.tgz#b74960e145c18dcb6226bc57933597f5486deae9"
-  integrity sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
-unist-util-is@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-6.0.0.tgz#b775956486aff107a9ded971d996c173374be424"
-  integrity sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-position-from-estree@^1.0.0, unist-util-position-from-estree@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.2.tgz#8ac2480027229de76512079e377afbcabcfcce22"
-  integrity sha512-poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
-unist-util-position@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.4.tgz#93f6d8c7d6b373d9b825844645877c127455f037"
-  integrity sha512-kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
-unist-util-position@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-5.0.0.tgz#678f20ab5ca1207a97d7ea8a388373c9cf896be4"
-  integrity sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-remove-position@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-4.0.2.tgz#a89be6ea72e23b1a402350832b02a91f6a9afe51"
-  integrity sha512-TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-visit "^4.0.0"
-
-unist-util-remove-position@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-5.0.0.tgz#fea68a25658409c9460408bc6b4991b965b52163"
-  integrity sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-visit "^5.0.0"
-
-unist-util-remove@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-4.0.0.tgz#94b7d6bbd24e42d2f841e947ed087be5c82b222e"
-  integrity sha512-b4gokeGId57UVRX/eVKej5gXqGlc9+trkORhFJpu9raqZkZhU0zm8Doi05+HaiBsMEIJowL+2WtQ5ItjsngPXg==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-    unist-util-visit-parents "^6.0.0"
-
-unist-util-stringify-position@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz#03ad3348210c2d930772d64b489580c13a7db39d"
-  integrity sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-
-unist-util-stringify-position@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2"
-  integrity sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-visit-parents@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz#e83559a4ad7e6048a46b1bdb22614f2f3f4724f2"
-  integrity sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-
-unist-util-visit-parents@^5.0.0, unist-util-visit-parents@^5.1.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz#b4520811b0ca34285633785045df7a8d6776cfeb"
-  integrity sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-
-unist-util-visit-parents@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz#4d5f85755c3b8f0dc69e21eca5d6d82d22162815"
-  integrity sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-
-unist-util-visit@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz#9420d285e1aee938c7d9acbafc8e160186dbaf7b"
-  integrity sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-    unist-util-visit-parents "^4.0.0"
-
-unist-util-visit@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.2.tgz#125a42d1eb876283715a3cb5cceaa531828c72e2"
-  integrity sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-is "^5.0.0"
-    unist-util-visit-parents "^5.1.1"
-
-unist-util-visit@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-5.0.0.tgz#a7de1f31f72ffd3519ea71814cccf5fd6a9217d6"
-  integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-    unist-util-visit-parents "^6.0.0"
-
-uuid@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
-  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
-
-uvu@^0.5.0:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz#2754ca20bcb0bb59b64e9985e84d2e81058502df"
-  integrity sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==
-  dependencies:
-    dequal "^2.0.0"
-    diff "^5.0.0"
-    kleur "^4.0.3"
-    sade "^1.7.3"
-
-vfile-location@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-5.0.2.tgz#220d9ca1ab6f8b2504a4db398f7ebc149f9cb464"
-  integrity sha512-NXPYyxyBSH7zB5U6+3uDdd6Nybz6o6/od9rk8bp9H8GR3L+cm/fC0uUTbqBmUTnMCUDslAGBOIKNfvvb+gGlDg==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    vfile "^6.0.0"
-
-vfile-matter@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/vfile-matter/-/vfile-matter-3.0.1.tgz#85e26088e43aa85c04d42ffa3693635fa2bc5624"
-  integrity sha512-CAAIDwnh6ZdtrqAuxdElUqQRQDQgbbIrYtDYI8gCjXS1qQ+1XdLoK8FIZWxJwn0/I+BkSSZpar3SOgjemQz4fg==
-  dependencies:
-    "@types/js-yaml" "^4.0.0"
-    is-buffer "^2.0.0"
-    js-yaml "^4.0.0"
-
-vfile-message@^3.0.0:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.4.tgz#15a50816ae7d7c2d1fa87090a7f9f96612b59dea"
-  integrity sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-stringify-position "^3.0.0"
-
-vfile-message@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-4.0.2.tgz#c883c9f677c72c166362fd635f21fc165a7d1181"
-  integrity sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-stringify-position "^4.0.0"
-
-vfile@^5.0.0, vfile@^5.3.0:
-  version "5.3.7"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.7.tgz#de0677e6683e3380fafc46544cfe603118826ab7"
-  integrity sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    is-buffer "^2.0.0"
-    unist-util-stringify-position "^3.0.0"
-    vfile-message "^3.0.0"
-
-vfile@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-6.0.1.tgz#1e8327f41eac91947d4fe9d237a2dd9209762536"
-  integrity sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-stringify-position "^4.0.0"
-    vfile-message "^4.0.0"
-
-vscode-oniguruma@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
-  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
-
-vscode-textmate@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-8.0.0.tgz#2c7a3b1163ef0441097e0b5d6389cd5504b59e5d"
-  integrity sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==
-
-web-namespaces@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.1.tgz#1010ff7c650eccb2592cebeeaf9a1b253fd40692"
-  integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==
-
-web-worker@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.3.0.tgz#e5f2df5c7fe356755a5fb8f8410d4312627e6776"
-  integrity sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==
-
-which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
-zod@^3.22.3:
-  version "3.23.8"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
-  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==
-
-zwitch@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"
-  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"@antfu/install-pkg@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@antfu/install-pkg@npm:1.1.0"
+  dependencies:
+    package-manager-detector: "npm:^1.3.0"
+    tinyexec: "npm:^1.0.1"
+  checksum: 10c0/140d5994c76fd3d0e824c88f1ce91b3370e8066a8bc2f5729ae133bf768caa239f7915e29c78f239b7ead253113ace51293e95127fafe2b786b88eb615b3be47
+  languageName: node
+  linkType: hard
+
+"@braintree/sanitize-url@npm:^7.1.1":
+  version: 7.1.2
+  resolution: "@braintree/sanitize-url@npm:7.1.2"
+  checksum: 10c0/62f2aa0cf58626e3880b2dc1025c42064b4639abd157ae4e1c35f4c2f5031e9273772046a423979845069c814e27ff818e8e669280dc53585e6f033d5b7a59cb
+  languageName: node
+  linkType: hard
+
+"@chevrotain/cst-dts-gen@npm:11.1.2":
+  version: 11.1.2
+  resolution: "@chevrotain/cst-dts-gen@npm:11.1.2"
+  dependencies:
+    "@chevrotain/gast": "npm:11.1.2"
+    "@chevrotain/types": "npm:11.1.2"
+    lodash-es: "npm:4.17.23"
+  checksum: 10c0/372a9573a404a1d717c92875024588a53d1eb078f12d2cd1d79d9c2c888c9b429eb62bbc85501b8ff168c14b22a675da99d97bb39b0a774e9fee000dc60fd8ff
+  languageName: node
+  linkType: hard
+
+"@chevrotain/gast@npm:11.1.2":
+  version: 11.1.2
+  resolution: "@chevrotain/gast@npm:11.1.2"
+  dependencies:
+    "@chevrotain/types": "npm:11.1.2"
+    lodash-es: "npm:4.17.23"
+  checksum: 10c0/540bfc9270d752f398b29efe9c89bb907d2984a47db4308a943e50c1cbd261ee13ecbef15c0e07808cf476d835bc36e65854db0bd214c277296cc14013eca8f4
+  languageName: node
+  linkType: hard
+
+"@chevrotain/regexp-to-ast@npm:11.1.2":
+  version: 11.1.2
+  resolution: "@chevrotain/regexp-to-ast@npm:11.1.2"
+  checksum: 10c0/645f02ac94cb33e04c10547b197762c6936c7b7668966240684795ce131cb515a76b63e0cc500e787d669f1a36bd2f902ec518f27843ec857ecf9043c717527e
+  languageName: node
+  linkType: hard
+
+"@chevrotain/types@npm:11.1.2":
+  version: 11.1.2
+  resolution: "@chevrotain/types@npm:11.1.2"
+  checksum: 10c0/c0c4679a3d407df34e18d5adfa7ac599b4a2bfddbf68da6e43678b9b3e16ab911de7766b37b9fc466261c3dead3db1b620e2e344f800fa9f0f381720475eda8f
+  languageName: node
+  linkType: hard
+
+"@chevrotain/utils@npm:11.1.2":
+  version: 11.1.2
+  resolution: "@chevrotain/utils@npm:11.1.2"
+  checksum: 10c0/72989e7051781b9084252486712844c55e3b454318c7da4a5f6ded28dcd3947ba2882773a6bf09b7e744599e8c8025df8d3de0d487121734e6edb66999450438
+  languageName: node
+  linkType: hard
+
+"@emnapi/runtime@npm:^1.2.0":
+  version: 1.3.1
+  resolution: "@emnapi/runtime@npm:1.3.1"
+  dependencies:
+    tslib: "npm:^2.4.0"
+  checksum: 10c0/060ffede50f1b619c15083312b80a9e62a5b0c87aa8c1b54854c49766c9d69f8d1d3d87bd963a647071263a320db41b25eaa50b74d6a80dcc763c23dbeaafd6c
+  languageName: node
+  linkType: hard
+
+"@floating-ui/core@npm:^1.7.5":
+  version: 1.7.5
+  resolution: "@floating-ui/core@npm:1.7.5"
+  dependencies:
+    "@floating-ui/utils": "npm:^0.2.11"
+  checksum: 10c0/f9c52205e198b231d63a387b09c659aab08c46a1899e0b0bbe147b8b4f048b546f15ba17cb5d2a471da9534f1883d979425e13e5c4ceee67be63e4b0abd4db5d
+  languageName: node
+  linkType: hard
+
+"@floating-ui/dom@npm:^1.7.6":
+  version: 1.7.6
+  resolution: "@floating-ui/dom@npm:1.7.6"
+  dependencies:
+    "@floating-ui/core": "npm:^1.7.5"
+    "@floating-ui/utils": "npm:^0.2.11"
+  checksum: 10c0/5c098e0d7b58c9bc769f276cca1766994c2c9c70c92d091a61bba8b3e9be53c011e0a79a8457fc2fb2f3d91697a26eb52e0a4962ef936dc963b45f58613c212f
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react-dom@npm:^2.1.2":
+  version: 2.1.8
+  resolution: "@floating-ui/react-dom@npm:2.1.8"
+  dependencies:
+    "@floating-ui/dom": "npm:^1.7.6"
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 10c0/26260ca4bb23b57c73b824062505abf977a008ce6e0463bdacca74f7e49853c4cd1d2bbf1a77c6caa17fa37dfffda2c6c4cd07a8737ebd7474aaff7818401d75
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react@npm:^0.26.16":
+  version: 0.26.28
+  resolution: "@floating-ui/react@npm:0.26.28"
+  dependencies:
+    "@floating-ui/react-dom": "npm:^2.1.2"
+    "@floating-ui/utils": "npm:^0.2.8"
+    tabbable: "npm:^6.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 10c0/a42df129e1e976fe8ba3f4c8efdda265a0196c1b66b83f2b9b27423d08dcc765406f893aeff9d830e70e3f14a9d4c490867eb4c32983317cbaa33863b0fae6f6
+  languageName: node
+  linkType: hard
+
+"@floating-ui/utils@npm:^0.2.11, @floating-ui/utils@npm:^0.2.8":
+  version: 0.2.11
+  resolution: "@floating-ui/utils@npm:0.2.11"
+  checksum: 10c0/f4bcea1559bdbb721ecc8e8ead423ac58d6a5b6e70b602cf0810ba6ad4ed1c77211b207faa88b278a9042f0c743133de08a203ed6741c1b6443423332884d5b3
+  languageName: node
+  linkType: hard
+
+"@formatjs/intl-localematcher@npm:^0.6.0":
+  version: 0.6.2
+  resolution: "@formatjs/intl-localematcher@npm:0.6.2"
+  dependencies:
+    tslib: "npm:^2.8.0"
+  checksum: 10c0/22a17a4c67160b6c9f52667914acfb7b79cd6d80630d4ac6d4599ce447cb89d2a64f7d58fa35c3145ddb37fef893f0a45b9a55e663a4eb1f2ae8b10a89fac235
+  languageName: node
+  linkType: hard
+
+"@headlessui/react@npm:^2.1.2":
+  version: 2.2.9
+  resolution: "@headlessui/react@npm:2.2.9"
+  dependencies:
+    "@floating-ui/react": "npm:^0.26.16"
+    "@react-aria/focus": "npm:^3.20.2"
+    "@react-aria/interactions": "npm:^3.25.0"
+    "@tanstack/react-virtual": "npm:^3.13.9"
+    use-sync-external-store: "npm:^1.5.0"
+  peerDependencies:
+    react: ^18 || ^19 || ^19.0.0-rc
+    react-dom: ^18 || ^19 || ^19.0.0-rc
+  checksum: 10c0/a1bc4c473d4f58757e2bbc3b4302704030d9d56427a101bbe698b33b6b379885dd0177e5c0862d801117afa3b0a0b858be7685f1cfda5fb3ed3ede53eb24e987
+  languageName: node
+  linkType: hard
+
+"@iconify/types@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@iconify/types@npm:2.0.0"
+  checksum: 10c0/65a3be43500c7ccacf360e136d00e1717f050b7b91da644e94370256ac66f582d59212bdb30d00788aab4fc078262e91c95b805d1808d654b72f6d2072a7e4b2
+  languageName: node
+  linkType: hard
+
+"@iconify/utils@npm:^3.0.1":
+  version: 3.1.0
+  resolution: "@iconify/utils@npm:3.1.0"
+  dependencies:
+    "@antfu/install-pkg": "npm:^1.1.0"
+    "@iconify/types": "npm:^2.0.0"
+    mlly: "npm:^1.8.0"
+  checksum: 10c0/a39445e892b248486c186306e1ccba4b07ed1d5b21b143ddf279b33062063173feb84954b9a82e05713b927872787d6c0081073d23f55c44294de37615d4a1f7
+  languageName: node
+  linkType: hard
+
+"@img/sharp-darwin-arm64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-darwin-arm64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-darwin-arm64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-darwin-arm64":
+      optional: true
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@img/sharp-darwin-x64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-darwin-x64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-darwin-x64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-darwin-x64":
+      optional: true
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-darwin-arm64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.4"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-darwin-x64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.4"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linux-arm64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.4"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linux-arm@npm:1.0.5":
+  version: 1.0.5
+  resolution: "@img/sharp-libvips-linux-arm@npm:1.0.5"
+  conditions: os=linux & cpu=arm & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linux-s390x@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.4"
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linux-x64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linux-x64@npm:1.0.4"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linuxmusl-x64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.4"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linux-arm64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linux-arm64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linux-arm64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linux-arm64":
+      optional: true
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linux-arm@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linux-arm@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linux-arm": "npm:1.0.5"
+  dependenciesMeta:
+    "@img/sharp-libvips-linux-arm":
+      optional: true
+  conditions: os=linux & cpu=arm & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linux-s390x@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linux-s390x@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linux-s390x": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linux-s390x":
+      optional: true
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linux-x64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linux-x64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linux-x64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linux-x64":
+      optional: true
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linuxmusl-arm64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linuxmusl-arm64":
+      optional: true
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linuxmusl-x64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linuxmusl-x64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linuxmusl-x64":
+      optional: true
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@img/sharp-wasm32@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-wasm32@npm:0.33.5"
+  dependencies:
+    "@emnapi/runtime": "npm:^1.2.0"
+  conditions: cpu=wasm32
+  languageName: node
+  linkType: hard
+
+"@img/sharp-win32-ia32@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-win32-ia32@npm:0.33.5"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@img/sharp-win32-x64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-win32-x64@npm:0.33.5"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@mdx-js/mdx@npm:^3.0.0":
+  version: 3.1.1
+  resolution: "@mdx-js/mdx@npm:3.1.1"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    "@types/estree-jsx": "npm:^1.0.0"
+    "@types/hast": "npm:^3.0.0"
+    "@types/mdx": "npm:^2.0.0"
+    acorn: "npm:^8.0.0"
+    collapse-white-space: "npm:^2.0.0"
+    devlop: "npm:^1.0.0"
+    estree-util-is-identifier-name: "npm:^3.0.0"
+    estree-util-scope: "npm:^1.0.0"
+    estree-walker: "npm:^3.0.0"
+    hast-util-to-jsx-runtime: "npm:^2.0.0"
+    markdown-extensions: "npm:^2.0.0"
+    recma-build-jsx: "npm:^1.0.0"
+    recma-jsx: "npm:^1.0.0"
+    recma-stringify: "npm:^1.0.0"
+    rehype-recma: "npm:^1.0.0"
+    remark-mdx: "npm:^3.0.0"
+    remark-parse: "npm:^11.0.0"
+    remark-rehype: "npm:^11.0.0"
+    source-map: "npm:^0.7.0"
+    unified: "npm:^11.0.0"
+    unist-util-position-from-estree: "npm:^2.0.0"
+    unist-util-stringify-position: "npm:^4.0.0"
+    unist-util-visit: "npm:^5.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/371ed95e2bee7731f30a7ce57db66383a0b7470e66c38139427174cb456d6a40bf7d259f3652716370c1de64acfba50a1ba27eb8c556e7a431dc7940b04cb1a1
+  languageName: node
+  linkType: hard
+
+"@mermaid-js/parser@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@mermaid-js/parser@npm:1.0.0"
+  dependencies:
+    langium: "npm:^4.0.0"
+  checksum: 10c0/e311a0981d31984614eee25101c695e950cb1197befc51296d8735390433de59dc6e4a48c3cce1e23a1279b6baf60f9f724d529b741c0c86cdcb09afe3e5e046
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-android-arm-eabi@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-android-arm-eabi@npm:0.1.16"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-android-arm64@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-android-arm64@npm:0.1.16"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-darwin-arm64@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-darwin-arm64@npm:0.1.16"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-darwin-x64@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-darwin-x64@npm:0.1.16"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-linux-arm-gnueabihf@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-linux-arm-gnueabihf@npm:0.1.16"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-linux-arm64-gnu@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-linux-arm64-gnu@npm:0.1.16"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-linux-arm64-musl@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-linux-arm64-musl@npm:0.1.16"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-linux-x64-gnu@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-linux-x64-gnu@npm:0.1.16"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-linux-x64-musl@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-linux-x64-musl@npm:0.1.16"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-win32-arm64-msvc@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-win32-arm64-msvc@npm:0.1.16"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git-win32-x64-msvc@npm:0.1.16":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git-win32-x64-msvc@npm:0.1.16"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@napi-rs/simple-git@npm:^0.1.9":
+  version: 0.1.16
+  resolution: "@napi-rs/simple-git@npm:0.1.16"
+  dependencies:
+    "@napi-rs/simple-git-android-arm-eabi": "npm:0.1.16"
+    "@napi-rs/simple-git-android-arm64": "npm:0.1.16"
+    "@napi-rs/simple-git-darwin-arm64": "npm:0.1.16"
+    "@napi-rs/simple-git-darwin-x64": "npm:0.1.16"
+    "@napi-rs/simple-git-linux-arm-gnueabihf": "npm:0.1.16"
+    "@napi-rs/simple-git-linux-arm64-gnu": "npm:0.1.16"
+    "@napi-rs/simple-git-linux-arm64-musl": "npm:0.1.16"
+    "@napi-rs/simple-git-linux-x64-gnu": "npm:0.1.16"
+    "@napi-rs/simple-git-linux-x64-musl": "npm:0.1.16"
+    "@napi-rs/simple-git-win32-arm64-msvc": "npm:0.1.16"
+    "@napi-rs/simple-git-win32-x64-msvc": "npm:0.1.16"
+  dependenciesMeta:
+    "@napi-rs/simple-git-android-arm-eabi":
+      optional: true
+    "@napi-rs/simple-git-android-arm64":
+      optional: true
+    "@napi-rs/simple-git-darwin-arm64":
+      optional: true
+    "@napi-rs/simple-git-darwin-x64":
+      optional: true
+    "@napi-rs/simple-git-linux-arm-gnueabihf":
+      optional: true
+    "@napi-rs/simple-git-linux-arm64-gnu":
+      optional: true
+    "@napi-rs/simple-git-linux-arm64-musl":
+      optional: true
+    "@napi-rs/simple-git-linux-x64-gnu":
+      optional: true
+    "@napi-rs/simple-git-linux-x64-musl":
+      optional: true
+    "@napi-rs/simple-git-win32-arm64-msvc":
+      optional: true
+    "@napi-rs/simple-git-win32-x64-msvc":
+      optional: true
+  checksum: 10c0/6d17ecfe15346f744495b71fe18bfd36c2c85132060833e25690d2f23e875c7715a597a6c91348b60f495c5080a4da85b6eed55a8c695533795b2c93ce91499b
+  languageName: node
+  linkType: hard
+
+"@next/env@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/env@npm:15.0.3"
+  checksum: 10c0/63582fed80d6a28fff102c935095da71fd57ddf6b5f5d564e85ebdefdeb93298f7f7cf7d813c75b460c6627106717ea959b4c232939e7abb97d73d8b8467d4cd
+  languageName: node
+  linkType: hard
+
+"@next/swc-darwin-arm64@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/swc-darwin-arm64@npm:15.0.3"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@next/swc-darwin-x64@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/swc-darwin-x64@npm:15.0.3"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@next/swc-linux-arm64-gnu@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/swc-linux-arm64-gnu@npm:15.0.3"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@next/swc-linux-arm64-musl@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/swc-linux-arm64-musl@npm:15.0.3"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@next/swc-linux-x64-gnu@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/swc-linux-x64-gnu@npm:15.0.3"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@next/swc-linux-x64-musl@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/swc-linux-x64-musl@npm:15.0.3"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@next/swc-win32-arm64-msvc@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/swc-win32-arm64-msvc@npm:15.0.3"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@next/swc-win32-x64-msvc@npm:15.0.3":
+  version: 15.0.3
+  resolution: "@next/swc-win32-x64-msvc@npm:15.0.3"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@nodelib/fs.scandir@npm:2.1.5":
+  version: 2.1.5
+  resolution: "@nodelib/fs.scandir@npm:2.1.5"
+  dependencies:
+    "@nodelib/fs.stat": "npm:2.0.5"
+    run-parallel: "npm:^1.1.9"
+  checksum: 10c0/732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb
+  languageName: node
+  linkType: hard
+
+"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
+  version: 2.0.5
+  resolution: "@nodelib/fs.stat@npm:2.0.5"
+  checksum: 10c0/88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d
+  languageName: node
+  linkType: hard
+
+"@nodelib/fs.walk@npm:^1.2.3":
+  version: 1.2.8
+  resolution: "@nodelib/fs.walk@npm:1.2.8"
+  dependencies:
+    "@nodelib/fs.scandir": "npm:2.1.5"
+    fastq: "npm:^1.6.0"
+  checksum: 10c0/db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1
+  languageName: node
+  linkType: hard
+
+"@react-aria/focus@npm:^3.20.2":
+  version: 3.21.4
+  resolution: "@react-aria/focus@npm:3.21.4"
+  dependencies:
+    "@react-aria/interactions": "npm:^3.27.0"
+    "@react-aria/utils": "npm:^3.33.0"
+    "@react-types/shared": "npm:^3.33.0"
+    "@swc/helpers": "npm:^0.5.0"
+    clsx: "npm:^2.0.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+  checksum: 10c0/6b10ddcd1298a6177f6136e943c1a41b56c56bf53f2182c7437e31cdf5367c9449591eaa0c3f89080bbdb84b97abc1b620de4e6e4ea98c82aad7496c461ca663
+  languageName: node
+  linkType: hard
+
+"@react-aria/interactions@npm:^3.25.0, @react-aria/interactions@npm:^3.27.0":
+  version: 3.27.0
+  resolution: "@react-aria/interactions@npm:3.27.0"
+  dependencies:
+    "@react-aria/ssr": "npm:^3.9.10"
+    "@react-aria/utils": "npm:^3.33.0"
+    "@react-stately/flags": "npm:^3.1.2"
+    "@react-types/shared": "npm:^3.33.0"
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+  checksum: 10c0/52148c240e57e74fd5c78ad82f1924ebd457e9464b3b39508762672f9a1c73d789f3a5b0fec77cc48a7c27cb918f9c0aec3ba3962366818d01fd42735eff835c
+  languageName: node
+  linkType: hard
+
+"@react-aria/ssr@npm:^3.9.10":
+  version: 3.9.10
+  resolution: "@react-aria/ssr@npm:3.9.10"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+  checksum: 10c0/44acb4c441d9c5d65aab94aa81fd8368413cf2958ab458582296dd78f6ba4783583f2311fa986120060e5c26b54b1f01e8910ffd17e4f41ccc5fc8c357d84089
+  languageName: node
+  linkType: hard
+
+"@react-aria/utils@npm:^3.33.0":
+  version: 3.33.0
+  resolution: "@react-aria/utils@npm:3.33.0"
+  dependencies:
+    "@react-aria/ssr": "npm:^3.9.10"
+    "@react-stately/flags": "npm:^3.1.2"
+    "@react-stately/utils": "npm:^3.11.0"
+    "@react-types/shared": "npm:^3.33.0"
+    "@swc/helpers": "npm:^0.5.0"
+    clsx: "npm:^2.0.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+    react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+  checksum: 10c0/15e9c79102632f96c611ca10ce5a3436617f1b3979ca7b4be192cf4c65c74871edb66c72bdbcedaeeaa6498d04947184d5bccf29a2a36a28eff89c3d55d9d1ca
+  languageName: node
+  linkType: hard
+
+"@react-stately/flags@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "@react-stately/flags@npm:3.1.2"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  checksum: 10c0/d86890ce662f04c7d8984e9560527f46c9779b97757abded9e1bf7e230a6900a0ea7a3e7c22534de8d2ff278abae194e4e4ad962d710f3b04c52a4e1011c2e5b
+  languageName: node
+  linkType: hard
+
+"@react-stately/utils@npm:^3.11.0":
+  version: 3.11.0
+  resolution: "@react-stately/utils@npm:3.11.0"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+  checksum: 10c0/09b38438df19fd8ff14d3147b2f9e5d42869b3ee637b0e33d6f2ab5cba93612e640c6de339b766b8c825d7bef828851fd551d5a197a037eb1331913546b8516c
+  languageName: node
+  linkType: hard
+
+"@react-types/shared@npm:^3.33.0":
+  version: 3.33.0
+  resolution: "@react-types/shared@npm:3.33.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
+  checksum: 10c0/159758a91b5ecbf028651b07c54972f557716f52f6d31e03a581c5a6b694453a7ceb1272f4b82e03b99cb00780e6f0829624d57ac9b83189f296436dc768b956
+  languageName: node
+  linkType: hard
+
+"@shikijs/core@npm:3.23.0":
+  version: 3.23.0
+  resolution: "@shikijs/core@npm:3.23.0"
+  dependencies:
+    "@shikijs/types": "npm:3.23.0"
+    "@shikijs/vscode-textmate": "npm:^10.0.2"
+    "@types/hast": "npm:^3.0.4"
+    hast-util-to-html: "npm:^9.0.5"
+  checksum: 10c0/c595f1f2ec09cab102d2b3e03a3c64bfaace5fe52760cfbcced961d3e16571aa646c7e6f85b3d2d0242efd2c832ce4d150b5f1b7332982c17cfbe72f32bd0850
+  languageName: node
+  linkType: hard
+
+"@shikijs/engine-javascript@npm:3.23.0":
+  version: 3.23.0
+  resolution: "@shikijs/engine-javascript@npm:3.23.0"
+  dependencies:
+    "@shikijs/types": "npm:3.23.0"
+    "@shikijs/vscode-textmate": "npm:^10.0.2"
+    oniguruma-to-es: "npm:^4.3.4"
+  checksum: 10c0/884ebb7f66312c9f43e71fb33a3ac0e52f925fc6932de9f68f1bf171019c011c988a4bc0217212589985b1e1bc49452ed67eacbf3d74200b4a3725f11fd8ad98
+  languageName: node
+  linkType: hard
+
+"@shikijs/engine-oniguruma@npm:3.23.0":
+  version: 3.23.0
+  resolution: "@shikijs/engine-oniguruma@npm:3.23.0"
+  dependencies:
+    "@shikijs/types": "npm:3.23.0"
+    "@shikijs/vscode-textmate": "npm:^10.0.2"
+  checksum: 10c0/40dbda7aef55d5946c45b8cfe56f484eadb611f9f7c9eb77ff21f0dfce2bcc775686a61eda9e06401ddd71195945a522293f51d6522fce49244b1a6b9c0f61f7
+  languageName: node
+  linkType: hard
+
+"@shikijs/langs@npm:3.23.0":
+  version: 3.23.0
+  resolution: "@shikijs/langs@npm:3.23.0"
+  dependencies:
+    "@shikijs/types": "npm:3.23.0"
+  checksum: 10c0/513b90cfee0fa167d2063b7fbc2318b303a604f2e1fa156aa8b4659b49792401531a74acf68de622ecfff15738e1947a46cfe92a32fcd6a4ee5e70bcf1d06c66
+  languageName: node
+  linkType: hard
+
+"@shikijs/themes@npm:3.23.0":
+  version: 3.23.0
+  resolution: "@shikijs/themes@npm:3.23.0"
+  dependencies:
+    "@shikijs/types": "npm:3.23.0"
+  checksum: 10c0/5c99036d4a765765018f9106a354ebe5ccac204c69f00e3cda265828d493f005412659213f6574fa0e187c7d4437b3327bd6dad2e2146b2c472d2bf493d790dd
+  languageName: node
+  linkType: hard
+
+"@shikijs/twoslash@npm:^3.2.1":
+  version: 3.23.0
+  resolution: "@shikijs/twoslash@npm:3.23.0"
+  dependencies:
+    "@shikijs/core": "npm:3.23.0"
+    "@shikijs/types": "npm:3.23.0"
+    twoslash: "npm:^0.3.6"
+  peerDependencies:
+    typescript: ">=5.5.0"
+  checksum: 10c0/a2d65e414691092fef57ef01c467e341f4519dd707416f8b5222d8850ae1a9fcd2e93660fd61288273b3e9b2fcd3291aec38b0a11a3f0785f8f21e5f239a2d83
+  languageName: node
+  linkType: hard
+
+"@shikijs/types@npm:3.23.0":
+  version: 3.23.0
+  resolution: "@shikijs/types@npm:3.23.0"
+  dependencies:
+    "@shikijs/vscode-textmate": "npm:^10.0.2"
+    "@types/hast": "npm:^3.0.4"
+  checksum: 10c0/bd0d1593f830a6b4e55c77871ec1b95cc44855d6e0e26282a948a3c58827237826e4110af27eb4d3231361f1e182c4410434a1dc15ec40aea988dc92dc97e9d6
+  languageName: node
+  linkType: hard
+
+"@shikijs/vscode-textmate@npm:^10.0.2":
+  version: 10.0.2
+  resolution: "@shikijs/vscode-textmate@npm:10.0.2"
+  checksum: 10c0/36b682d691088ec244de292dc8f91b808f95c89466af421cf84cbab92230f03c8348649c14b3251991b10ce632b0c715e416e992dd5f28ff3221dc2693fd9462
+  languageName: node
+  linkType: hard
+
+"@swc/counter@npm:0.1.3":
+  version: 0.1.3
+  resolution: "@swc/counter@npm:0.1.3"
+  checksum: 10c0/8424f60f6bf8694cfd2a9bca45845bce29f26105cda8cf19cdb9fd3e78dc6338699e4db77a89ae449260bafa1cc6bec307e81e7fb96dbf7dcfce0eea55151356
+  languageName: node
+  linkType: hard
+
+"@swc/helpers@npm:0.5.13":
+  version: 0.5.13
+  resolution: "@swc/helpers@npm:0.5.13"
+  dependencies:
+    tslib: "npm:^2.4.0"
+  checksum: 10c0/b9df578401fc62405da9a6c31e79e447a2fd90f68b25b1daee12f2caf2821991bb89106f0397bc1acb4c4d84a8ce079d04b60b65f534496952e3bf8c9a52f40f
+  languageName: node
+  linkType: hard
+
+"@swc/helpers@npm:^0.5.0":
+  version: 0.5.19
+  resolution: "@swc/helpers@npm:0.5.19"
+  dependencies:
+    tslib: "npm:^2.8.0"
+  checksum: 10c0/30317ee644d390c88dd975b11b5260f7c70602bfb81ec386b3807d97a763215df7f501e43b0246e0773150fcfd835349bcdcb3b220d121e485ee528a72b5fd79
+  languageName: node
+  linkType: hard
+
+"@tanstack/react-virtual@npm:^3.13.9":
+  version: 3.13.19
+  resolution: "@tanstack/react-virtual@npm:3.13.19"
+  dependencies:
+    "@tanstack/virtual-core": "npm:3.13.19"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  checksum: 10c0/3b3d512590980ac609b1b319948c0a3f75f4ffa28677329d3dca6bd1fa3b15a88ea4229e45e4f3803cfd97a3c587ab4a7d9f016ddf7ea8f02be3c76f86fcf993
+  languageName: node
+  linkType: hard
+
+"@tanstack/virtual-core@npm:3.13.19":
+  version: 3.13.19
+  resolution: "@tanstack/virtual-core@npm:3.13.19"
+  checksum: 10c0/7bcff6560902e157bec2753d009288bc3be0251a9762532cb2f43f9e9fb9b5d9a2d441eba87e0463c7a891e5966b9cfda88555d428149f6a7a54a65e66ba6726
+  languageName: node
+  linkType: hard
+
+"@theguild/remark-mermaid@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@theguild/remark-mermaid@npm:0.3.0"
+  dependencies:
+    mermaid: "npm:^11.0.0"
+    unist-util-visit: "npm:^5.0.0"
+  peerDependencies:
+    react: ^18.2.0 || ^19.0.0
+  checksum: 10c0/c2f2953ca5cb17fe49382dcd50054ebae2f74c71201c1543559f44e6c648eefd2bae9fc147ae916dc2b440dc02ebe93472205f11636227e3a3e79e9e3bfc459d
+  languageName: node
+  linkType: hard
+
+"@theguild/remark-npm2yarn@npm:^0.3.2":
+  version: 0.3.3
+  resolution: "@theguild/remark-npm2yarn@npm:0.3.3"
+  dependencies:
+    npm-to-yarn: "npm:^3.0.0"
+    unist-util-visit: "npm:^5.0.0"
+  checksum: 10c0/913cb9be9ba7288eef1dc781f3539921c87b1684ca35f197108cc0a485ed0a5cbbddce745859f7e29016b36bd005e5f7d981a6b022f1256de2f5f0d7ef27ba66
+  languageName: node
+  linkType: hard
+
+"@ts-morph/common@npm:~0.28.1":
+  version: 0.28.1
+  resolution: "@ts-morph/common@npm:0.28.1"
+  dependencies:
+    minimatch: "npm:^10.0.1"
+    path-browserify: "npm:^1.0.1"
+    tinyglobby: "npm:^0.2.14"
+  checksum: 10c0/d51276d840997e0f8f83e04f8b1689135bb12588a7ddbed575f87848d5737eeae31e242685d6449de27573e8ed30892157fea643393cb875e175f2711200bc50
+  languageName: node
+  linkType: hard
+
+"@types/d3-array@npm:*":
+  version: 3.2.2
+  resolution: "@types/d3-array@npm:3.2.2"
+  checksum: 10c0/6137cb97302f8a4f18ca22c0560c585cfcb823f276b23d89f2c0c005d72697ec13bca671c08e68b4b0cabd622e3f0e91782ee221580d6774074050be96dd7028
+  languageName: node
+  linkType: hard
+
+"@types/d3-axis@npm:*":
+  version: 3.0.6
+  resolution: "@types/d3-axis@npm:3.0.6"
+  dependencies:
+    "@types/d3-selection": "npm:*"
+  checksum: 10c0/d756d42360261f44d8eefd0950c5bb0a4f67a46dd92069da3f723ac36a1e8cb2b9ce6347d836ef19d5b8aef725dbcf8fdbbd6cfbff676ca4b0642df2f78b599a
+  languageName: node
+  linkType: hard
+
+"@types/d3-brush@npm:*":
+  version: 3.0.6
+  resolution: "@types/d3-brush@npm:3.0.6"
+  dependencies:
+    "@types/d3-selection": "npm:*"
+  checksum: 10c0/fd6e2ac7657a354f269f6b9c58451ffae9d01b89ccb1eb6367fd36d635d2f1990967215ab498e0c0679ff269429c57fad6a2958b68f4d45bc9f81d81672edc01
+  languageName: node
+  linkType: hard
+
+"@types/d3-chord@npm:*":
+  version: 3.0.6
+  resolution: "@types/d3-chord@npm:3.0.6"
+  checksum: 10c0/c5a25eb5389db01e63faec0c5c2ec7cc41c494e9b3201630b494c4e862a60f1aa83fabbc33a829e7e1403941e3c30d206c741559b14406ac2a4239cfdf4b4c17
+  languageName: node
+  linkType: hard
+
+"@types/d3-color@npm:*":
+  version: 3.1.3
+  resolution: "@types/d3-color@npm:3.1.3"
+  checksum: 10c0/65eb0487de606eb5ad81735a9a5b3142d30bc5ea801ed9b14b77cb14c9b909f718c059f13af341264ee189acf171508053342142bdf99338667cea26a2d8d6ae
+  languageName: node
+  linkType: hard
+
+"@types/d3-contour@npm:*":
+  version: 3.0.6
+  resolution: "@types/d3-contour@npm:3.0.6"
+  dependencies:
+    "@types/d3-array": "npm:*"
+    "@types/geojson": "npm:*"
+  checksum: 10c0/e7d83e94719af4576ceb5ac7f277c5806f83ba6c3631744ae391cffc3641f09dfa279470b83053cd0b2acd6784e8749c71141d05bdffa63ca58ffb5b31a0f27c
+  languageName: node
+  linkType: hard
+
+"@types/d3-delaunay@npm:*":
+  version: 6.0.4
+  resolution: "@types/d3-delaunay@npm:6.0.4"
+  checksum: 10c0/d154a8864f08c4ea23ecb9bdabcef1c406a25baa8895f0cb08a0ed2799de0d360e597552532ce7086ff0cdffa8f3563f9109d18f0191459d32bb620a36939123
+  languageName: node
+  linkType: hard
+
+"@types/d3-dispatch@npm:*":
+  version: 3.0.7
+  resolution: "@types/d3-dispatch@npm:3.0.7"
+  checksum: 10c0/38c6605ebf0bf0099dfb70eafe0dd4ae8213368b40b8f930b72a909ff2e7259d2bd8a54d100bb5a44eb4b36f4f2a62dcb37f8be59613ca6b507c7a2f910b3145
+  languageName: node
+  linkType: hard
+
+"@types/d3-drag@npm:*":
+  version: 3.0.7
+  resolution: "@types/d3-drag@npm:3.0.7"
+  dependencies:
+    "@types/d3-selection": "npm:*"
+  checksum: 10c0/65e29fa32a87c72d26c44b5e2df3bf15af21cd128386bcc05bcacca255927c0397d0cd7e6062aed5f0abd623490544a9d061c195f5ed9f018fe0b698d99c079d
+  languageName: node
+  linkType: hard
+
+"@types/d3-dsv@npm:*":
+  version: 3.0.7
+  resolution: "@types/d3-dsv@npm:3.0.7"
+  checksum: 10c0/c0f01da862465594c8a28278b51c850af3b4239cc22b14fd1a19d7a98f93d94efa477bf59d8071beb285dca45bf614630811451e18e7c52add3a0abfee0a1871
+  languageName: node
+  linkType: hard
+
+"@types/d3-ease@npm:*":
+  version: 3.0.2
+  resolution: "@types/d3-ease@npm:3.0.2"
+  checksum: 10c0/aff5a1e572a937ee9bff6465225d7ba27d5e0c976bd9eacdac2e6f10700a7cb0c9ea2597aff6b43a6ed850a3210030870238894a77ec73e309b4a9d0333f099c
+  languageName: node
+  linkType: hard
+
+"@types/d3-fetch@npm:*":
+  version: 3.0.7
+  resolution: "@types/d3-fetch@npm:3.0.7"
+  dependencies:
+    "@types/d3-dsv": "npm:*"
+  checksum: 10c0/3d147efa52a26da1a5d40d4d73e6cebaaa964463c378068062999b93ea3731b27cc429104c21ecbba98c6090e58ef13429db6399238c5e3500162fb3015697a0
+  languageName: node
+  linkType: hard
+
+"@types/d3-force@npm:*":
+  version: 3.0.10
+  resolution: "@types/d3-force@npm:3.0.10"
+  checksum: 10c0/c82b459079a106b50e346c9b79b141f599f2fc4f598985a5211e72c7a2e20d35bd5dc6e91f306b323c8bfa325c02c629b1645f5243f1c6a55bd51bc85cccfa92
+  languageName: node
+  linkType: hard
+
+"@types/d3-format@npm:*":
+  version: 3.0.4
+  resolution: "@types/d3-format@npm:3.0.4"
+  checksum: 10c0/3ac1600bf9061a59a228998f7cd3f29e85cbf522997671ba18d4d84d10a2a1aff4f95aceb143fa9960501c3ec351e113fc75884e6a504ace44dc1744083035ee
+  languageName: node
+  linkType: hard
+
+"@types/d3-geo@npm:*":
+  version: 3.1.0
+  resolution: "@types/d3-geo@npm:3.1.0"
+  dependencies:
+    "@types/geojson": "npm:*"
+  checksum: 10c0/3745a93439038bb5b0b38facf435f7079812921d46406f5d38deaee59e90084ff742443c7ea0a8446df81a0d81eaf622fe7068cf4117a544bd4aa3b2dc182f88
+  languageName: node
+  linkType: hard
+
+"@types/d3-hierarchy@npm:*":
+  version: 3.1.7
+  resolution: "@types/d3-hierarchy@npm:3.1.7"
+  checksum: 10c0/873711737d6b8e7b6f1dda0bcd21294a48f75024909ae510c5d2c21fad2e72032e0958def4d9f68319d3aaac298ad09c49807f8bfc87a145a82693b5208613c7
+  languageName: node
+  linkType: hard
+
+"@types/d3-interpolate@npm:*":
+  version: 3.0.4
+  resolution: "@types/d3-interpolate@npm:3.0.4"
+  dependencies:
+    "@types/d3-color": "npm:*"
+  checksum: 10c0/066ebb8da570b518dd332df6b12ae3b1eaa0a7f4f0c702e3c57f812cf529cc3500ec2aac8dc094f31897790346c6b1ebd8cd7a077176727f4860c2b181a65ca4
+  languageName: node
+  linkType: hard
+
+"@types/d3-path@npm:*":
+  version: 3.1.1
+  resolution: "@types/d3-path@npm:3.1.1"
+  checksum: 10c0/2c36eb31ebaf2ce4712e793fd88087117976f7c4ed69cc2431825f999c8c77cca5cea286f3326432b770739ac6ccd5d04d851eb65e7a4dbcc10c982b49ad2c02
+  languageName: node
+  linkType: hard
+
+"@types/d3-polygon@npm:*":
+  version: 3.0.2
+  resolution: "@types/d3-polygon@npm:3.0.2"
+  checksum: 10c0/f46307bb32b6c2aef8c7624500e0f9b518de8f227ccc10170b869dc43e4c542560f6c8d62e9f087fac45e198d6e4b623e579c0422e34c85baf56717456d3f439
+  languageName: node
+  linkType: hard
+
+"@types/d3-quadtree@npm:*":
+  version: 3.0.6
+  resolution: "@types/d3-quadtree@npm:3.0.6"
+  checksum: 10c0/7eaa0a4d404adc856971c9285e1c4ab17e9135ea669d847d6db7e0066126a28ac751864e7ce99c65d526e130f56754a2e437a1617877098b3bdcc3ef23a23616
+  languageName: node
+  linkType: hard
+
+"@types/d3-random@npm:*":
+  version: 3.0.3
+  resolution: "@types/d3-random@npm:3.0.3"
+  checksum: 10c0/5f4fea40080cd6d4adfee05183d00374e73a10c530276a6455348983dda341003a251def28565a27c25d9cf5296a33e870e397c9d91ff83fb7495a21c96b6882
+  languageName: node
+  linkType: hard
+
+"@types/d3-scale-chromatic@npm:*":
+  version: 3.1.0
+  resolution: "@types/d3-scale-chromatic@npm:3.1.0"
+  checksum: 10c0/93c564e02d2e97a048e18fe8054e4a935335da6ab75a56c3df197beaa87e69122eef0dfbeb7794d4a444a00e52e3123514ee27cec084bd21f6425b7037828cc2
+  languageName: node
+  linkType: hard
+
+"@types/d3-scale@npm:*":
+  version: 4.0.9
+  resolution: "@types/d3-scale@npm:4.0.9"
+  dependencies:
+    "@types/d3-time": "npm:*"
+  checksum: 10c0/4ac44233c05cd50b65b33ecb35d99fdf07566bcdbc55bc1306b2f27d1c5134d8c560d356f2c8e76b096e9125ffb8d26d95f78d56e210d1c542cb255bdf31d6c8
+  languageName: node
+  linkType: hard
+
+"@types/d3-selection@npm:*":
+  version: 3.0.11
+  resolution: "@types/d3-selection@npm:3.0.11"
+  checksum: 10c0/0c512956c7503ff5def4bb32e0c568cc757b9a2cc400a104fc0f4cfe5e56d83ebde2a97821b6f2cb26a7148079d3b86a2f28e11d68324ed311cf35c2ed980d1d
+  languageName: node
+  linkType: hard
+
+"@types/d3-shape@npm:*":
+  version: 3.1.8
+  resolution: "@types/d3-shape@npm:3.1.8"
+  dependencies:
+    "@types/d3-path": "npm:*"
+  checksum: 10c0/49ec2172b9eb66fc1d036e2a23966216bb972e9af51ddbed134df24bd71aedf207bb1ef81903a119eb4e1f5e927cf44beacaf64c9af86474e5548594b102b574
+  languageName: node
+  linkType: hard
+
+"@types/d3-time-format@npm:*":
+  version: 4.0.3
+  resolution: "@types/d3-time-format@npm:4.0.3"
+  checksum: 10c0/9ef5e8e2b96b94799b821eed5d61a3d432c7903247966d8ad951b8ce5797fe46554b425cb7888fa5bf604b4663c369d7628c0328ffe80892156671c58d1a7f90
+  languageName: node
+  linkType: hard
+
+"@types/d3-time@npm:*":
+  version: 3.0.3
+  resolution: "@types/d3-time@npm:3.0.3"
+  checksum: 10c0/245a8aadca504df27edf730de502e47a68f16ae795c86b5ca35e7afa91c133aa9ef4d08778f8cf1ed2be732f89a4105ba4b437ce2afbdfd17d3d937b6ba5f568
+  languageName: node
+  linkType: hard
+
+"@types/d3-timer@npm:*":
+  version: 3.0.2
+  resolution: "@types/d3-timer@npm:3.0.2"
+  checksum: 10c0/c644dd9571fcc62b1aa12c03bcad40571553020feeb5811f1d8a937ac1e65b8a04b759b4873aef610e28b8714ac71c9885a4d6c127a048d95118f7e5b506d9e1
+  languageName: node
+  linkType: hard
+
+"@types/d3-transition@npm:*":
+  version: 3.0.9
+  resolution: "@types/d3-transition@npm:3.0.9"
+  dependencies:
+    "@types/d3-selection": "npm:*"
+  checksum: 10c0/4f68b9df7ac745b3491216c54203cbbfa0f117ae4c60e2609cdef2db963582152035407fdff995b10ee383bae2f05b7743493f48e1b8e46df54faa836a8fb7b5
+  languageName: node
+  linkType: hard
+
+"@types/d3-zoom@npm:*":
+  version: 3.0.8
+  resolution: "@types/d3-zoom@npm:3.0.8"
+  dependencies:
+    "@types/d3-interpolate": "npm:*"
+    "@types/d3-selection": "npm:*"
+  checksum: 10c0/1dbdbcafddcae12efb5beb6948546963f29599e18bc7f2a91fb69cc617c2299a65354f2d47e282dfb86fec0968406cd4fb7f76ba2d2fb67baa8e8d146eb4a547
+  languageName: node
+  linkType: hard
+
+"@types/d3@npm:^7.4.3":
+  version: 7.4.3
+  resolution: "@types/d3@npm:7.4.3"
+  dependencies:
+    "@types/d3-array": "npm:*"
+    "@types/d3-axis": "npm:*"
+    "@types/d3-brush": "npm:*"
+    "@types/d3-chord": "npm:*"
+    "@types/d3-color": "npm:*"
+    "@types/d3-contour": "npm:*"
+    "@types/d3-delaunay": "npm:*"
+    "@types/d3-dispatch": "npm:*"
+    "@types/d3-drag": "npm:*"
+    "@types/d3-dsv": "npm:*"
+    "@types/d3-ease": "npm:*"
+    "@types/d3-fetch": "npm:*"
+    "@types/d3-force": "npm:*"
+    "@types/d3-format": "npm:*"
+    "@types/d3-geo": "npm:*"
+    "@types/d3-hierarchy": "npm:*"
+    "@types/d3-interpolate": "npm:*"
+    "@types/d3-path": "npm:*"
+    "@types/d3-polygon": "npm:*"
+    "@types/d3-quadtree": "npm:*"
+    "@types/d3-random": "npm:*"
+    "@types/d3-scale": "npm:*"
+    "@types/d3-scale-chromatic": "npm:*"
+    "@types/d3-selection": "npm:*"
+    "@types/d3-shape": "npm:*"
+    "@types/d3-time": "npm:*"
+    "@types/d3-time-format": "npm:*"
+    "@types/d3-timer": "npm:*"
+    "@types/d3-transition": "npm:*"
+    "@types/d3-zoom": "npm:*"
+  checksum: 10c0/a9c6d65b13ef3b42c87f2a89ea63a6d5640221869f97d0657b0cb2f1dac96a0f164bf5605643c0794e0de3aa2bf05df198519aaf15d24ca135eb0e8bd8a9d879
+  languageName: node
+  linkType: hard
+
+"@types/debug@npm:^4.0.0":
+  version: 4.1.12
+  resolution: "@types/debug@npm:4.1.12"
+  dependencies:
+    "@types/ms": "npm:*"
+  checksum: 10c0/5dcd465edbb5a7f226e9a5efd1f399c6172407ef5840686b73e3608ce135eeca54ae8037dcd9f16bdb2768ac74925b820a8b9ecc588a58ca09eca6acabe33e2f
+  languageName: node
+  linkType: hard
+
+"@types/estree-jsx@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "@types/estree-jsx@npm:1.0.5"
+  dependencies:
+    "@types/estree": "npm:*"
+  checksum: 10c0/07b354331516428b27a3ab99ee397547d47eb223c34053b48f84872fafb841770834b90cc1a0068398e7c7ccb15ec51ab00ec64b31dc5e3dbefd624638a35c6d
+  languageName: node
+  linkType: hard
+
+"@types/estree@npm:*, @types/estree@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
+  languageName: node
+  linkType: hard
+
+"@types/geojson@npm:*":
+  version: 7946.0.16
+  resolution: "@types/geojson@npm:7946.0.16"
+  checksum: 10c0/1ff24a288bd5860b766b073ead337d31d73bdc715e5b50a2cee5cb0af57a1ed02cc04ef295f5fa68dc40fe3e4f104dd31282b2b818a5ba3231bc1001ba084e3c
+  languageName: node
+  linkType: hard
+
+"@types/hast@npm:^3.0.0, @types/hast@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "@types/hast@npm:3.0.4"
+  dependencies:
+    "@types/unist": "npm:*"
+  checksum: 10c0/3249781a511b38f1d330fd1e3344eed3c4e7ea8eff82e835d35da78e637480d36fad37a78be5a7aed8465d237ad0446abc1150859d0fde395354ea634decf9f7
+  languageName: node
+  linkType: hard
+
+"@types/katex@npm:^0.16.0":
+  version: 0.16.7
+  resolution: "@types/katex@npm:0.16.7"
+  checksum: 10c0/68dcb9f68a90513ec78ca0196a142e15c2a2c270b1520d752bafd47a99207115085a64087b50140359017d7e9c870b3c68e7e4d36668c9e348a9ef0c48919b5a
+  languageName: node
+  linkType: hard
+
+"@types/mdast@npm:^4.0.0":
+  version: 4.0.4
+  resolution: "@types/mdast@npm:4.0.4"
+  dependencies:
+    "@types/unist": "npm:*"
+  checksum: 10c0/84f403dbe582ee508fd9c7643ac781ad8597fcbfc9ccb8d4715a2c92e4545e5772cbd0dbdf18eda65789386d81b009967fdef01b24faf6640f817287f54d9c82
+  languageName: node
+  linkType: hard
+
+"@types/mdx@npm:^2.0.0":
+  version: 2.0.13
+  resolution: "@types/mdx@npm:2.0.13"
+  checksum: 10c0/5edf1099505ac568da55f9ae8a93e7e314e8cbc13d3445d0be61b75941226b005e1390d9b95caecf5dcb00c9d1bab2f1f60f6ff9876dc091a48b547495007720
+  languageName: node
+  linkType: hard
+
+"@types/ms@npm:*":
+  version: 0.7.34
+  resolution: "@types/ms@npm:0.7.34"
+  checksum: 10c0/ac80bd90012116ceb2d188fde62d96830ca847823e8ca71255616bc73991aa7d9f057b8bfab79e8ee44ffefb031ddd1bcce63ea82f9e66f7c31ec02d2d823ccc
+  languageName: node
+  linkType: hard
+
+"@types/nlcst@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "@types/nlcst@npm:2.0.3"
+  dependencies:
+    "@types/unist": "npm:*"
+  checksum: 10c0/d83549aaee59681ae8fa2a78d8a1b968a41eb7c0422773dff12acbf3661e4b2b2859740c3effdad9d0cd12ea14a0ec33ca302da12106476b627e09d2a029d3c1
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:20.14.5":
+  version: 20.14.5
+  resolution: "@types/node@npm:20.14.5"
+  dependencies:
+    undici-types: "npm:~5.26.4"
+  checksum: 10c0/06a8c304b5f7f190d4497807dc67ad09ee7b14ea2996bfdc823553c624698d8cab1ef9d16f8b764f20cb9eb11caa0e832787741e9ef70e1c89d620797ab28436
+  languageName: node
+  linkType: hard
+
+"@types/react@npm:^19":
+  version: 19.2.14
+  resolution: "@types/react@npm:19.2.14"
+  dependencies:
+    csstype: "npm:^3.2.2"
+  checksum: 10c0/7d25bf41b57719452d86d2ac0570b659210402707313a36ee612666bf11275a1c69824f8c3ee1fdca077ccfe15452f6da8f1224529b917050eb2d861e52b59b7
+  languageName: node
+  linkType: hard
+
+"@types/trusted-types@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@types/trusted-types@npm:2.0.7"
+  checksum: 10c0/4c4855f10de7c6c135e0d32ce462419d8abbbc33713b31d294596c0cc34ae1fa6112a2f9da729c8f7a20707782b0d69da3b1f8df6645b0366d08825ca1522e0c
+  languageName: node
+  linkType: hard
+
+"@types/unist@npm:*, @types/unist@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "@types/unist@npm:3.0.2"
+  checksum: 10c0/39f220ce184a773c55c18a127062bfc4d0d30c987250cd59bab544d97be6cfec93717a49ef96e81f024b575718f798d4d329eb81c452fc57d6d051af8b043ebf
+  languageName: node
+  linkType: hard
+
+"@types/unist@npm:^2.0.0":
+  version: 2.0.10
+  resolution: "@types/unist@npm:2.0.10"
+  checksum: 10c0/5f247dc2229944355209ad5c8e83cfe29419fa7f0a6d557421b1985a1500444719cc9efcc42c652b55aab63c931813c88033e0202c1ac684bcd4829d66e44731
+  languageName: node
+  linkType: hard
+
+"@typescript/vfs@npm:^1.6.2":
+  version: 1.6.4
+  resolution: "@typescript/vfs@npm:1.6.4"
+  dependencies:
+    debug: "npm:^4.4.3"
+  peerDependencies:
+    typescript: "*"
+  checksum: 10c0/acb9de42f23fda3f75e3d7900ba106ef323a2f4e7cf0e4a94dbb457e26d353ca63bb35193ed1a32fc8733f3ae59099612b290b06bd6221694861beb9bfb62f62
+  languageName: node
+  linkType: hard
+
+"@ungap/structured-clone@npm:^1.0.0":
+  version: 1.2.0
+  resolution: "@ungap/structured-clone@npm:1.2.0"
+  checksum: 10c0/8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d
+  languageName: node
+  linkType: hard
+
+"@xmldom/xmldom@npm:0.9.8":
+  version: 0.9.8
+  resolution: "@xmldom/xmldom@npm:0.9.8"
+  checksum: 10c0/2ea984270832de2843ab0bbb6df71bde9aa02126b69e5fd56b5512b98ace48e94aff7186e77d0b22fe4b6780483862be752bcf8577436638a9210109029a0503
+  languageName: node
+  linkType: hard
+
+"acorn-jsx@npm:^5.0.0":
+  version: 5.3.2
+  resolution: "acorn-jsx@npm:5.3.2"
+  peerDependencies:
+    acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1
+  languageName: node
+  linkType: hard
+
+"acorn@npm:^8.0.0":
+  version: 8.12.0
+  resolution: "acorn@npm:8.12.0"
+  bin:
+    acorn: bin/acorn
+  checksum: 10c0/a19f9dead009d3b430fa3c253710b47778cdaace15b316de6de93a68c355507bc1072a9956372b6c990cbeeb167d4a929249d0faeb8ae4bb6911d68d53299549
+  languageName: node
+  linkType: hard
+
+"acorn@npm:^8.15.0":
+  version: 8.16.0
+  resolution: "acorn@npm:8.16.0"
+  bin:
+    acorn: bin/acorn
+  checksum: 10c0/c9c52697227661b68d0debaf972222d4f622aa06b185824164e153438afa7b08273432ca43ea792cadb24dada1d46f6f6bb1ef8de9956979288cc1b96bf9914e
+  languageName: node
+  linkType: hard
+
+"arg@npm:^5.0.0":
+  version: 5.0.2
+  resolution: "arg@npm:5.0.2"
+  checksum: 10c0/ccaf86f4e05d342af6666c569f844bec426595c567d32a8289715087825c2ca7edd8a3d204e4d2fb2aa4602e09a57d0c13ea8c9eea75aac3dbb4af5514e6800e
+  languageName: node
+  linkType: hard
+
+"array-iterate@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "array-iterate@npm:2.0.1"
+  checksum: 10c0/756c08334f95e290f03ab2141b034514af1311ef7b62f15b0f5ea6f8f3033ee9cc6a8f1c3e9ff4803d4d723cf992aa61460acf5fce884936972db966b1da287d
+  languageName: node
+  linkType: hard
+
+"astring@npm:^1.8.0":
+  version: 1.8.6
+  resolution: "astring@npm:1.8.6"
+  bin:
+    astring: bin/astring
+  checksum: 10c0/31f09144597048c11072417959a412f208f8f95ba8dce408dfbc3367acb929f31fbcc00ed5eb61ccbf7c2f1173b9ac8bfcaaa37134a9455050c669b2b036ed88
+  languageName: node
+  linkType: hard
+
+"bail@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "bail@npm:2.0.2"
+  checksum: 10c0/25cbea309ef6a1f56214187004e8f34014eb015713ea01fa5b9b7e9e776ca88d0fdffd64143ac42dc91966c915a4b7b683411b56e14929fad16153fc026ffb8b
+  languageName: node
+  linkType: hard
+
+"balanced-match@npm:^4.0.2":
+  version: 4.0.4
+  resolution: "balanced-match@npm:4.0.4"
+  checksum: 10c0/07e86102a3eb2ee2a6a1a89164f29d0dbaebd28f2ca3f5ca786f36b8b23d9e417eb3be45a4acf754f837be5ac0a2317de90d3fcb7f4f4dc95720a1f36b26a17b
+  languageName: node
+  linkType: hard
+
+"better-react-mathjax@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "better-react-mathjax@npm:2.3.0"
+  dependencies:
+    mathjax-full: "npm:^3.2.2"
+  peerDependencies:
+    react: ">=16.8"
+  checksum: 10c0/ed529432224879b6acfc301af03df2548dba0af4805da5d03b8d5ba9eca6b1fdb16e24b272d48a76cf4233b62d58e5a9d1241b51e7281d1153044a46b1f01dc2
+  languageName: node
+  linkType: hard
+
+"brace-expansion@npm:^5.0.2":
+  version: 5.0.4
+  resolution: "brace-expansion@npm:5.0.4"
+  dependencies:
+    balanced-match: "npm:^4.0.2"
+  checksum: 10c0/359cbcfa80b2eb914ca1f3440e92313fbfe7919ee6b274c35db55bec555aded69dac5ee78f102cec90c35f98c20fa43d10936d0cd9978158823c249257e1643a
+  languageName: node
+  linkType: hard
+
+"braces@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "braces@npm:3.0.3"
+  dependencies:
+    fill-range: "npm:^7.1.1"
+  checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04
+  languageName: node
+  linkType: hard
+
+"busboy@npm:1.6.0":
+  version: 1.6.0
+  resolution: "busboy@npm:1.6.0"
+  dependencies:
+    streamsearch: "npm:^1.1.0"
+  checksum: 10c0/fa7e836a2b82699b6e074393428b91ae579d4f9e21f5ac468e1b459a244341d722d2d22d10920cdd849743dbece6dca11d72de939fb75a7448825cf2babfba1f
+  languageName: node
+  linkType: hard
+
+"caniuse-lite@npm:^1.0.30001579":
+  version: 1.0.30001636
+  resolution: "caniuse-lite@npm:1.0.30001636"
+  checksum: 10c0/e5f965b4da7bae1531fd9f93477d015729ff9e3fa12670ead39a9e6cdc4c43e62c272d47857c5cc332e7b02d697cb3f2f965a1030870ac7476da60c2fc81ee94
+  languageName: node
+  linkType: hard
+
+"ccount@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "ccount@npm:2.0.1"
+  checksum: 10c0/3939b1664390174484322bc3f45b798462e6c07ee6384cb3d645e0aa2f318502d174845198c1561930e1d431087f74cf1fe291ae9a4722821a9f4ba67e574350
+  languageName: node
+  linkType: hard
+
+"chalk@npm:^5.0.0":
+  version: 5.6.2
+  resolution: "chalk@npm:5.6.2"
+  checksum: 10c0/99a4b0f0e7991796b1e7e3f52dceb9137cae2a9dfc8fc0784a550dc4c558e15ab32ed70b14b21b52beb2679b4892b41a0aa44249bcb996f01e125d58477c6976
+  languageName: node
+  linkType: hard
+
+"character-entities-html4@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "character-entities-html4@npm:2.1.0"
+  checksum: 10c0/fe61b553f083400c20c0b0fd65095df30a0b445d960f3bbf271536ae6c3ba676f39cb7af0b4bf2755812f08ab9b88f2feed68f9aebb73bb153f7a115fe5c6e40
+  languageName: node
+  linkType: hard
+
+"character-entities-legacy@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "character-entities-legacy@npm:3.0.0"
+  checksum: 10c0/ec4b430af873661aa754a896a2b55af089b4e938d3d010fad5219299a6b6d32ab175142699ee250640678cd64bdecd6db3c9af0b8759ab7b155d970d84c4c7d1
+  languageName: node
+  linkType: hard
+
+"character-entities@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "character-entities@npm:2.0.2"
+  checksum: 10c0/b0c645a45bcc90ff24f0e0140f4875a8436b8ef13b6bcd31ec02cfb2ca502b680362aa95386f7815bdc04b6464d48cf191210b3840d7c04241a149ede591a308
+  languageName: node
+  linkType: hard
+
+"character-reference-invalid@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "character-reference-invalid@npm:2.0.1"
+  checksum: 10c0/2ae0dec770cd8659d7e8b0ce24392d83b4c2f0eb4a3395c955dce5528edd4cc030a794cfa06600fcdd700b3f2de2f9b8e40e309c0011c4180e3be64a0b42e6a1
+  languageName: node
+  linkType: hard
+
+"chevrotain-allstar@npm:~0.3.1":
+  version: 0.3.1
+  resolution: "chevrotain-allstar@npm:0.3.1"
+  dependencies:
+    lodash-es: "npm:^4.17.21"
+  peerDependencies:
+    chevrotain: ^11.0.0
+  checksum: 10c0/5cadedffd3114eb06b15fd3939bb1aa6c75412dbd737fe302b52c5c24334f9cb01cee8edc1d1067d98ba80dddf971f1d0e94b387de51423fc6cf3c5d8b7ef27a
+  languageName: node
+  linkType: hard
+
+"chevrotain@npm:~11.1.1":
+  version: 11.1.2
+  resolution: "chevrotain@npm:11.1.2"
+  dependencies:
+    "@chevrotain/cst-dts-gen": "npm:11.1.2"
+    "@chevrotain/gast": "npm:11.1.2"
+    "@chevrotain/regexp-to-ast": "npm:11.1.2"
+    "@chevrotain/types": "npm:11.1.2"
+    "@chevrotain/utils": "npm:11.1.2"
+    lodash-es: "npm:4.17.23"
+  checksum: 10c0/7f0b5780035c582d4c620c81e1fbb58c9f41a69f1c7efdae96819c7bc0928ddb4f046bb8239e71539f383b3b8ce460bd11f44b5fb5107e1d45a0cc91bd6a4198
+  languageName: node
+  linkType: hard
+
+"client-only@npm:0.0.1":
+  version: 0.0.1
+  resolution: "client-only@npm:0.0.1"
+  checksum: 10c0/9d6cfd0c19e1c96a434605added99dff48482152af791ec4172fb912a71cff9027ff174efd8cdb2160cc7f377543e0537ffc462d4f279bc4701de3f2a3c4b358
+  languageName: node
+  linkType: hard
+
+"clipboardy@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "clipboardy@npm:4.0.0"
+  dependencies:
+    execa: "npm:^8.0.1"
+    is-wsl: "npm:^3.1.0"
+    is64bit: "npm:^2.0.0"
+  checksum: 10c0/02bb5f3d0a772bd84ec26a3566c72c2319a9f3b4cb8338370c3bffcf0073c80b834abe1a6945bea4f2cbea28e1627a975aaac577e3f61a868d924ce79138b041
+  languageName: node
+  linkType: hard
+
+"clsx@npm:^2.0.0, clsx@npm:^2.1.0":
+  version: 2.1.1
+  resolution: "clsx@npm:2.1.1"
+  checksum: 10c0/c4c8eb865f8c82baab07e71bfa8897c73454881c4f99d6bc81585aecd7c441746c1399d08363dc096c550cceaf97bd4ce1e8854e1771e9998d9f94c4fe075839
+  languageName: node
+  linkType: hard
+
+"code-block-writer@npm:^13.0.3":
+  version: 13.0.3
+  resolution: "code-block-writer@npm:13.0.3"
+  checksum: 10c0/87db97b37583f71cfd7eced8bf3f0a0a0ca53af912751a734372b36c08cd27f3e8a4878ec05591c0cd9ae11bea8add1423e132d660edd86aab952656dd41fd66
+  languageName: node
+  linkType: hard
+
+"collapse-white-space@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "collapse-white-space@npm:2.1.0"
+  checksum: 10c0/b2e2800f4ab261e62eb27a1fbe853378296e3a726d6695117ed033e82d61fb6abeae4ffc1465d5454499e237005de9cfc52c9562dc7ca4ac759b9a222ef14453
+  languageName: node
+  linkType: hard
+
+"color-convert@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "color-convert@npm:2.0.1"
+  dependencies:
+    color-name: "npm:~1.1.4"
+  checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
+  languageName: node
+  linkType: hard
+
+"color-name@npm:^1.0.0, color-name@npm:~1.1.4":
+  version: 1.1.4
+  resolution: "color-name@npm:1.1.4"
+  checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
+  languageName: node
+  linkType: hard
+
+"color-string@npm:^1.9.0":
+  version: 1.9.1
+  resolution: "color-string@npm:1.9.1"
+  dependencies:
+    color-name: "npm:^1.0.0"
+    simple-swizzle: "npm:^0.2.2"
+  checksum: 10c0/b0bfd74c03b1f837f543898b512f5ea353f71630ccdd0d66f83028d1f0924a7d4272deb278b9aef376cacf1289b522ac3fb175e99895283645a2dc3a33af2404
+  languageName: node
+  linkType: hard
+
+"color@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "color@npm:4.2.3"
+  dependencies:
+    color-convert: "npm:^2.0.1"
+    color-string: "npm:^1.9.0"
+  checksum: 10c0/7fbe7cfb811054c808349de19fb380252e5e34e61d7d168ec3353e9e9aacb1802674bddc657682e4e9730c2786592a4de6f8283e7e0d3870b829bb0b7b2f6118
+  languageName: node
+  linkType: hard
+
+"comma-separated-tokens@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "comma-separated-tokens@npm:2.0.3"
+  checksum: 10c0/91f90f1aae320f1755d6957ef0b864fe4f54737f3313bd95e0802686ee2ca38bff1dd381964d00ae5db42912dd1f4ae5c2709644e82706ffc6f6842a813cdd67
+  languageName: node
+  linkType: hard
+
+"commander@npm:13.1.0":
+  version: 13.1.0
+  resolution: "commander@npm:13.1.0"
+  checksum: 10c0/7b8c5544bba704fbe84b7cab2e043df8586d5c114a4c5b607f83ae5060708940ed0b5bd5838cf8ce27539cde265c1cbd59ce3c8c6b017ed3eec8943e3a415164
+  languageName: node
+  linkType: hard
+
+"commander@npm:7":
+  version: 7.2.0
+  resolution: "commander@npm:7.2.0"
+  checksum: 10c0/8d690ff13b0356df7e0ebbe6c59b4712f754f4b724d4f473d3cc5b3fdcf978e3a5dc3078717858a2ceb50b0f84d0660a7f22a96cdc50fb877d0c9bb31593d23a
+  languageName: node
+  linkType: hard
+
+"commander@npm:^8.3.0":
+  version: 8.3.0
+  resolution: "commander@npm:8.3.0"
+  checksum: 10c0/8b043bb8322ea1c39664a1598a95e0495bfe4ca2fad0d84a92d7d1d8d213e2a155b441d2470c8e08de7c4a28cf2bc6e169211c49e1b21d9f7edc6ae4d9356060
+  languageName: node
+  linkType: hard
+
+"compute-scroll-into-view@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "compute-scroll-into-view@npm:3.1.0"
+  checksum: 10c0/bf305c4ece8e5c59ed3f7ed82b6dab5b7487ce26f56a693d903869964712870fccb08fe31d40edcbd600b03c99198f54d443acb315d674bd64fd344410c8672e
+  languageName: node
+  linkType: hard
+
+"confbox@npm:^0.1.8":
+  version: 0.1.8
+  resolution: "confbox@npm:0.1.8"
+  checksum: 10c0/fc2c68d97cb54d885b10b63e45bd8da83a8a71459d3ecf1825143dd4c7f9f1b696b3283e07d9d12a144c1301c2ebc7842380bdf0014e55acc4ae1c9550102418
+  languageName: node
+  linkType: hard
+
+"cose-base@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "cose-base@npm:1.0.3"
+  dependencies:
+    layout-base: "npm:^1.0.0"
+  checksum: 10c0/a6e400b1d101393d6af0967c1353355777c1106c40417c5acaef6ca8bdda41e2fc9398f466d6c85be30290943ad631f2590569f67b3fd5368a0d8318946bd24f
+  languageName: node
+  linkType: hard
+
+"cose-base@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "cose-base@npm:2.2.0"
+  dependencies:
+    layout-base: "npm:^2.0.0"
+  checksum: 10c0/14b9f8100ac322a00777ffb1daeb3321af368bbc9cabe3103943361273baee2003202ffe38e4ab770960b600214224e9c196195a78d589521540aa694df7cdec
+  languageName: node
+  linkType: hard
+
+"cross-spawn@npm:^7.0.3":
+  version: 7.0.6
+  resolution: "cross-spawn@npm:7.0.6"
+  dependencies:
+    path-key: "npm:^3.1.0"
+    shebang-command: "npm:^2.0.0"
+    which: "npm:^2.0.1"
+  checksum: 10c0/053ea8b2135caff68a9e81470e845613e374e7309a47731e81639de3eaeb90c3d01af0e0b44d2ab9d50b43467223b88567dfeb3262db942dc063b9976718ffc1
+  languageName: node
+  linkType: hard
+
+"csstype@npm:^3.2.2":
+  version: 3.2.3
+  resolution: "csstype@npm:3.2.3"
+  checksum: 10c0/cd29c51e70fa822f1cecd8641a1445bed7063697469d35633b516e60fe8c1bde04b08f6c5b6022136bb669b64c63d4173af54864510fbb4ee23281801841a3ce
+  languageName: node
+  linkType: hard
+
+"cytoscape-cose-bilkent@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "cytoscape-cose-bilkent@npm:4.1.0"
+  dependencies:
+    cose-base: "npm:^1.0.0"
+  peerDependencies:
+    cytoscape: ^3.2.0
+  checksum: 10c0/5e2480ddba9da1a68e700ed2c674cbfd51e9efdbd55788f1971a68de4eb30708e3b3a5e808bf5628f7a258680406bbe6586d87a9133e02a9bdc1ab1a92f512f2
+  languageName: node
+  linkType: hard
+
+"cytoscape-fcose@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "cytoscape-fcose@npm:2.2.0"
+  dependencies:
+    cose-base: "npm:^2.2.0"
+  peerDependencies:
+    cytoscape: ^3.2.0
+  checksum: 10c0/ce472c9f85b9057e75c5685396f8e1f2468895e71b184913e05ad56dcf3092618fe59a1054f29cb0995051ba8ebe566ad0dd49a58d62845145624bd60cd44917
+  languageName: node
+  linkType: hard
+
+"cytoscape@npm:^3.29.3":
+  version: 3.33.1
+  resolution: "cytoscape@npm:3.33.1"
+  checksum: 10c0/dffcf5f74df4d91517c4faf394df880d8283ce76edef19edba0c762941cf4f18daf7c4c955ec50c794f476ace39ad4394f8c98483222bd2682e1fd206e976411
+  languageName: node
+  linkType: hard
+
+"d3-array@npm:1 - 2":
+  version: 2.12.1
+  resolution: "d3-array@npm:2.12.1"
+  dependencies:
+    internmap: "npm:^1.0.0"
+  checksum: 10c0/7eca10427a9f113a4ca6a0f7301127cab26043fd5e362631ef5a0edd1c4b2dd70c56ed317566700c31e4a6d88b55f3951aaba192291817f243b730cb2352882e
+  languageName: node
+  linkType: hard
+
+"d3-array@npm:2 - 3, d3-array@npm:2.10.0 - 3, d3-array@npm:2.5.0 - 3, d3-array@npm:3, d3-array@npm:^3.2.0":
+  version: 3.2.4
+  resolution: "d3-array@npm:3.2.4"
+  dependencies:
+    internmap: "npm:1 - 2"
+  checksum: 10c0/08b95e91130f98c1375db0e0af718f4371ccacef7d5d257727fe74f79a24383e79aba280b9ffae655483ffbbad4fd1dec4ade0119d88c4749f388641c8bf8c50
+  languageName: node
+  linkType: hard
+
+"d3-axis@npm:3":
+  version: 3.0.0
+  resolution: "d3-axis@npm:3.0.0"
+  checksum: 10c0/a271e70ba1966daa5aaf6a7f959ceca3e12997b43297e757c7b945db2e1ead3c6ee226f2abcfa22abbd4e2e28bd2b71a0911794c4e5b911bbba271328a582c78
+  languageName: node
+  linkType: hard
+
+"d3-brush@npm:3":
+  version: 3.0.0
+  resolution: "d3-brush@npm:3.0.0"
+  dependencies:
+    d3-dispatch: "npm:1 - 3"
+    d3-drag: "npm:2 - 3"
+    d3-interpolate: "npm:1 - 3"
+    d3-selection: "npm:3"
+    d3-transition: "npm:3"
+  checksum: 10c0/07baf00334c576da2f68a91fc0da5732c3a5fa19bd3d7aed7fd24d1d674a773f71a93e9687c154176f7246946194d77c48c2d8fed757f5dcb1a4740067ec50a8
+  languageName: node
+  linkType: hard
+
+"d3-chord@npm:3":
+  version: 3.0.1
+  resolution: "d3-chord@npm:3.0.1"
+  dependencies:
+    d3-path: "npm:1 - 3"
+  checksum: 10c0/baa6013914af3f4fe1521f0d16de31a38eb8a71d08ff1dec4741f6f45a828661e5cd3935e39bd14e3032bdc78206c283ca37411da21d46ec3cfc520be6e7a7ce
+  languageName: node
+  linkType: hard
+
+"d3-color@npm:1 - 3, d3-color@npm:3":
+  version: 3.1.0
+  resolution: "d3-color@npm:3.1.0"
+  checksum: 10c0/a4e20e1115fa696fce041fbe13fbc80dc4c19150fa72027a7c128ade980bc0eeeba4bcf28c9e21f0bce0e0dbfe7ca5869ef67746541dcfda053e4802ad19783c
+  languageName: node
+  linkType: hard
+
+"d3-contour@npm:4":
+  version: 4.0.2
+  resolution: "d3-contour@npm:4.0.2"
+  dependencies:
+    d3-array: "npm:^3.2.0"
+  checksum: 10c0/98bc5fbed6009e08707434a952076f39f1cd6ed8b9288253cc3e6a3286e4e80c63c62d84954b20e64bf6e4ededcc69add54d3db25e990784a59c04edd3449032
+  languageName: node
+  linkType: hard
+
+"d3-delaunay@npm:6":
+  version: 6.0.4
+  resolution: "d3-delaunay@npm:6.0.4"
+  dependencies:
+    delaunator: "npm:5"
+  checksum: 10c0/57c3aecd2525664b07c4c292aa11cf49b2752c0cf3f5257f752999399fe3c592de2d418644d79df1f255471eec8057a9cc0c3062ed7128cb3348c45f69597754
+  languageName: node
+  linkType: hard
+
+"d3-dispatch@npm:1 - 3, d3-dispatch@npm:3":
+  version: 3.0.1
+  resolution: "d3-dispatch@npm:3.0.1"
+  checksum: 10c0/6eca77008ce2dc33380e45d4410c67d150941df7ab45b91d116dbe6d0a3092c0f6ac184dd4602c796dc9e790222bad3ff7142025f5fd22694efe088d1d941753
+  languageName: node
+  linkType: hard
+
+"d3-drag@npm:2 - 3, d3-drag@npm:3":
+  version: 3.0.0
+  resolution: "d3-drag@npm:3.0.0"
+  dependencies:
+    d3-dispatch: "npm:1 - 3"
+    d3-selection: "npm:3"
+  checksum: 10c0/d2556e8dc720741a443b595a30af403dd60642dfd938d44d6e9bfc4c71a962142f9a028c56b61f8b4790b65a34acad177d1263d66f103c3c527767b0926ef5aa
+  languageName: node
+  linkType: hard
+
+"d3-dsv@npm:1 - 3, d3-dsv@npm:3":
+  version: 3.0.1
+  resolution: "d3-dsv@npm:3.0.1"
+  dependencies:
+    commander: "npm:7"
+    iconv-lite: "npm:0.6"
+    rw: "npm:1"
+  bin:
+    csv2json: bin/dsv2json.js
+    csv2tsv: bin/dsv2dsv.js
+    dsv2dsv: bin/dsv2dsv.js
+    dsv2json: bin/dsv2json.js
+    json2csv: bin/json2dsv.js
+    json2dsv: bin/json2dsv.js
+    json2tsv: bin/json2dsv.js
+    tsv2csv: bin/dsv2dsv.js
+    tsv2json: bin/dsv2json.js
+  checksum: 10c0/10e6af9e331950ed258f34ab49ac1b7060128ef81dcf32afc790bd1f7e8c3cc2aac7f5f875250a83f21f39bb5925fbd0872bb209f8aca32b3b77d32bab8a65ab
+  languageName: node
+  linkType: hard
+
+"d3-ease@npm:1 - 3, d3-ease@npm:3":
+  version: 3.0.1
+  resolution: "d3-ease@npm:3.0.1"
+  checksum: 10c0/fec8ef826c0cc35cda3092c6841e07672868b1839fcaf556e19266a3a37e6bc7977d8298c0fcb9885e7799bfdcef7db1baaba9cd4dcf4bc5e952cf78574a88b0
+  languageName: node
+  linkType: hard
+
+"d3-fetch@npm:3":
+  version: 3.0.1
+  resolution: "d3-fetch@npm:3.0.1"
+  dependencies:
+    d3-dsv: "npm:1 - 3"
+  checksum: 10c0/4f467a79bf290395ac0cbb5f7562483f6a18668adc4c8eb84c9d3eff048b6f6d3b6f55079ba1ebf1908dabe000c941d46be447f8d78453b2dad5fb59fb6aa93b
+  languageName: node
+  linkType: hard
+
+"d3-force@npm:3":
+  version: 3.0.0
+  resolution: "d3-force@npm:3.0.0"
+  dependencies:
+    d3-dispatch: "npm:1 - 3"
+    d3-quadtree: "npm:1 - 3"
+    d3-timer: "npm:1 - 3"
+  checksum: 10c0/220a16a1a1ac62ba56df61028896e4b52be89c81040d20229c876efc8852191482c233f8a52bb5a4e0875c321b8e5cb6413ef3dfa4d8fe79eeb7d52c587f52cf
+  languageName: node
+  linkType: hard
+
+"d3-format@npm:1 - 3, d3-format@npm:3":
+  version: 3.1.0
+  resolution: "d3-format@npm:3.1.0"
+  checksum: 10c0/049f5c0871ebce9859fc5e2f07f336b3c5bfff52a2540e0bac7e703fce567cd9346f4ad1079dd18d6f1e0eaa0599941c1810898926f10ac21a31fd0a34b4aa75
+  languageName: node
+  linkType: hard
+
+"d3-geo@npm:3":
+  version: 3.1.1
+  resolution: "d3-geo@npm:3.1.1"
+  dependencies:
+    d3-array: "npm:2.5.0 - 3"
+  checksum: 10c0/d32270dd2dc8ac3ea63e8805d63239c4c8ec6c0d339d73b5e5a30a87f8f54db22a78fb434369799465eae169503b25f9a107c642c8a16c32a3285bc0e6d8e8c1
+  languageName: node
+  linkType: hard
+
+"d3-hierarchy@npm:3":
+  version: 3.1.2
+  resolution: "d3-hierarchy@npm:3.1.2"
+  checksum: 10c0/6dcdb480539644aa7fc0d72dfc7b03f99dfbcdf02714044e8c708577e0d5981deb9d3e99bbbb2d26422b55bcc342ac89a0fa2ea6c9d7302e2fc0951dd96f89cf
+  languageName: node
+  linkType: hard
+
+"d3-interpolate@npm:1 - 3, d3-interpolate@npm:1.2.0 - 3, d3-interpolate@npm:3":
+  version: 3.0.1
+  resolution: "d3-interpolate@npm:3.0.1"
+  dependencies:
+    d3-color: "npm:1 - 3"
+  checksum: 10c0/19f4b4daa8d733906671afff7767c19488f51a43d251f8b7f484d5d3cfc36c663f0a66c38fe91eee30f40327443d799be17169f55a293a3ba949e84e57a33e6a
+  languageName: node
+  linkType: hard
+
+"d3-path@npm:1":
+  version: 1.0.9
+  resolution: "d3-path@npm:1.0.9"
+  checksum: 10c0/e35e84df5abc18091f585725b8235e1fa97efc287571585427d3a3597301e6c506dea56b11dfb3c06ca5858b3eb7f02c1bf4f6a716aa9eade01c41b92d497eb5
+  languageName: node
+  linkType: hard
+
+"d3-path@npm:1 - 3, d3-path@npm:3, d3-path@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "d3-path@npm:3.1.0"
+  checksum: 10c0/dc1d58ec87fa8319bd240cf7689995111a124b141428354e9637aa83059eb12e681f77187e0ada5dedfce346f7e3d1f903467ceb41b379bfd01cd8e31721f5da
+  languageName: node
+  linkType: hard
+
+"d3-polygon@npm:3":
+  version: 3.0.1
+  resolution: "d3-polygon@npm:3.0.1"
+  checksum: 10c0/e236aa7f33efa9a4072907af7dc119f85b150a0716759d4fe5f12f62573018264a6cbde8617fbfa6944a7ae48c1c0c8d3f39ae72e11f66dd471e9b5e668385df
+  languageName: node
+  linkType: hard
+
+"d3-quadtree@npm:1 - 3, d3-quadtree@npm:3":
+  version: 3.0.1
+  resolution: "d3-quadtree@npm:3.0.1"
+  checksum: 10c0/18302d2548bfecaef788152397edec95a76400fd97d9d7f42a089ceb68d910f685c96579d74e3712d57477ed042b056881b47cd836a521de683c66f47ce89090
+  languageName: node
+  linkType: hard
+
+"d3-random@npm:3":
+  version: 3.0.1
+  resolution: "d3-random@npm:3.0.1"
+  checksum: 10c0/987a1a1bcbf26e6cf01fd89d5a265b463b2cea93560fc17d9b1c45e8ed6ff2db5924601bcceb808de24c94133f000039eb7fa1c469a7a844ccbf1170cbb25b41
+  languageName: node
+  linkType: hard
+
+"d3-sankey@npm:^0.12.3":
+  version: 0.12.3
+  resolution: "d3-sankey@npm:0.12.3"
+  dependencies:
+    d3-array: "npm:1 - 2"
+    d3-shape: "npm:^1.2.0"
+  checksum: 10c0/261debb01a13269f6fc53b9ebaef174a015d5ad646242c23995bf514498829ab8b8f920a7873724a7494288b46bea3ce7ebc5a920b745bc8ae4caa5885cf5204
+  languageName: node
+  linkType: hard
+
+"d3-scale-chromatic@npm:3":
+  version: 3.1.0
+  resolution: "d3-scale-chromatic@npm:3.1.0"
+  dependencies:
+    d3-color: "npm:1 - 3"
+    d3-interpolate: "npm:1 - 3"
+  checksum: 10c0/9a3f4671ab0b971f4a411b42180d7cf92bfe8e8584e637ce7e698d705e18d6d38efbd20ec64f60cc0dfe966c20d40fc172565bc28aaa2990c0a006360eed91af
+  languageName: node
+  linkType: hard
+
+"d3-scale@npm:4":
+  version: 4.0.2
+  resolution: "d3-scale@npm:4.0.2"
+  dependencies:
+    d3-array: "npm:2.10.0 - 3"
+    d3-format: "npm:1 - 3"
+    d3-interpolate: "npm:1.2.0 - 3"
+    d3-time: "npm:2.1.1 - 3"
+    d3-time-format: "npm:2 - 4"
+  checksum: 10c0/65d9ad8c2641aec30ed5673a7410feb187a224d6ca8d1a520d68a7d6eac9d04caedbff4713d1e8545be33eb7fec5739983a7ab1d22d4e5ad35368c6729d362f1
+  languageName: node
+  linkType: hard
+
+"d3-selection@npm:2 - 3, d3-selection@npm:3":
+  version: 3.0.0
+  resolution: "d3-selection@npm:3.0.0"
+  checksum: 10c0/e59096bbe8f0cb0daa1001d9bdd6dbc93a688019abc97d1d8b37f85cd3c286a6875b22adea0931b0c88410d025563e1643019161a883c516acf50c190a11b56b
+  languageName: node
+  linkType: hard
+
+"d3-shape@npm:3":
+  version: 3.2.0
+  resolution: "d3-shape@npm:3.2.0"
+  dependencies:
+    d3-path: "npm:^3.1.0"
+  checksum: 10c0/f1c9d1f09926daaf6f6193ae3b4c4b5521e81da7d8902d24b38694517c7f527ce3c9a77a9d3a5722ad1e3ff355860b014557b450023d66a944eabf8cfde37132
+  languageName: node
+  linkType: hard
+
+"d3-shape@npm:^1.2.0":
+  version: 1.3.7
+  resolution: "d3-shape@npm:1.3.7"
+  dependencies:
+    d3-path: "npm:1"
+  checksum: 10c0/548057ce59959815decb449f15632b08e2a1bdce208f9a37b5f98ec7629dda986c2356bc7582308405ce68aedae7d47b324df41507404df42afaf352907577ae
+  languageName: node
+  linkType: hard
+
+"d3-time-format@npm:2 - 4, d3-time-format@npm:4":
+  version: 4.1.0
+  resolution: "d3-time-format@npm:4.1.0"
+  dependencies:
+    d3-time: "npm:1 - 3"
+  checksum: 10c0/735e00fb25a7fd5d418fac350018713ae394eefddb0d745fab12bbff0517f9cdb5f807c7bbe87bb6eeb06249662f8ea84fec075f7d0cd68609735b2ceb29d206
+  languageName: node
+  linkType: hard
+
+"d3-time@npm:1 - 3, d3-time@npm:2.1.1 - 3, d3-time@npm:3":
+  version: 3.1.0
+  resolution: "d3-time@npm:3.1.0"
+  dependencies:
+    d3-array: "npm:2 - 3"
+  checksum: 10c0/a984f77e1aaeaa182679b46fbf57eceb6ebdb5f67d7578d6f68ef933f8eeb63737c0949991618a8d29472dbf43736c7d7f17c452b2770f8c1271191cba724ca1
+  languageName: node
+  linkType: hard
+
+"d3-timer@npm:1 - 3, d3-timer@npm:3":
+  version: 3.0.1
+  resolution: "d3-timer@npm:3.0.1"
+  checksum: 10c0/d4c63cb4bb5461d7038aac561b097cd1c5673969b27cbdd0e87fa48d9300a538b9e6f39b4a7f0e3592ef4f963d858c8a9f0e92754db73116770856f2fc04561a
+  languageName: node
+  linkType: hard
+
+"d3-transition@npm:2 - 3, d3-transition@npm:3":
+  version: 3.0.1
+  resolution: "d3-transition@npm:3.0.1"
+  dependencies:
+    d3-color: "npm:1 - 3"
+    d3-dispatch: "npm:1 - 3"
+    d3-ease: "npm:1 - 3"
+    d3-interpolate: "npm:1 - 3"
+    d3-timer: "npm:1 - 3"
+  peerDependencies:
+    d3-selection: 2 - 3
+  checksum: 10c0/4e74535dda7024aa43e141635b7522bb70cf9d3dfefed975eb643b36b864762eca67f88fafc2ca798174f83ca7c8a65e892624f824b3f65b8145c6a1a88dbbad
+  languageName: node
+  linkType: hard
+
+"d3-zoom@npm:3":
+  version: 3.0.0
+  resolution: "d3-zoom@npm:3.0.0"
+  dependencies:
+    d3-dispatch: "npm:1 - 3"
+    d3-drag: "npm:2 - 3"
+    d3-interpolate: "npm:1 - 3"
+    d3-selection: "npm:2 - 3"
+    d3-transition: "npm:2 - 3"
+  checksum: 10c0/ee2036479049e70d8c783d594c444fe00e398246048e3f11a59755cd0e21de62ece3126181b0d7a31bf37bcf32fd726f83ae7dea4495ff86ec7736ce5ad36fd3
+  languageName: node
+  linkType: hard
+
+"d3@npm:^7.9.0":
+  version: 7.9.0
+  resolution: "d3@npm:7.9.0"
+  dependencies:
+    d3-array: "npm:3"
+    d3-axis: "npm:3"
+    d3-brush: "npm:3"
+    d3-chord: "npm:3"
+    d3-color: "npm:3"
+    d3-contour: "npm:4"
+    d3-delaunay: "npm:6"
+    d3-dispatch: "npm:3"
+    d3-drag: "npm:3"
+    d3-dsv: "npm:3"
+    d3-ease: "npm:3"
+    d3-fetch: "npm:3"
+    d3-force: "npm:3"
+    d3-format: "npm:3"
+    d3-geo: "npm:3"
+    d3-hierarchy: "npm:3"
+    d3-interpolate: "npm:3"
+    d3-path: "npm:3"
+    d3-polygon: "npm:3"
+    d3-quadtree: "npm:3"
+    d3-random: "npm:3"
+    d3-scale: "npm:4"
+    d3-scale-chromatic: "npm:3"
+    d3-selection: "npm:3"
+    d3-shape: "npm:3"
+    d3-time: "npm:3"
+    d3-time-format: "npm:4"
+    d3-timer: "npm:3"
+    d3-transition: "npm:3"
+    d3-zoom: "npm:3"
+  checksum: 10c0/3dd9c08c73cfaa69c70c49e603c85e049c3904664d9c79a1a52a0f52795828a1ff23592dc9a7b2257e711d68a615472a13103c212032f38e016d609796e087e8
+  languageName: node
+  linkType: hard
+
+"dagre-d3-es@npm:7.0.13":
+  version: 7.0.13
+  resolution: "dagre-d3-es@npm:7.0.13"
+  dependencies:
+    d3: "npm:^7.9.0"
+    lodash-es: "npm:^4.17.21"
+  checksum: 10c0/4eca80dbbad4075311e3853930f99486024785b54210541796d4216140d91744738ee51125e2692c3532af148fbc2e690171750583916ed2ad553150abb198c7
+  languageName: node
+  linkType: hard
+
+"dayjs@npm:^1.11.18":
+  version: 1.11.19
+  resolution: "dayjs@npm:1.11.19"
+  checksum: 10c0/7d8a6074a343f821f81ea284d700bd34ea6c7abbe8d93bce7aba818948957c1b7f56131702e5e890a5622cdfc05dcebe8aed0b8313bdc6838a594d7846b0b000
+  languageName: node
+  linkType: hard
+
+"debug@npm:^4.0.0":
+  version: 4.3.5
+  resolution: "debug@npm:4.3.5"
+  dependencies:
+    ms: "npm:2.1.2"
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 10c0/082c375a2bdc4f4469c99f325ff458adad62a3fc2c482d59923c260cb08152f34e2659f72b3767db8bb2f21ca81a60a42d1019605a412132d7b9f59363a005cc
+  languageName: node
+  linkType: hard
+
+"debug@npm:^4.4.3":
+  version: 4.4.3
+  resolution: "debug@npm:4.4.3"
+  dependencies:
+    ms: "npm:^2.1.3"
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 10c0/d79136ec6c83ecbefd0f6a5593da6a9c91ec4d7ddc4b54c883d6e71ec9accb5f67a1a5e96d00a328196b5b5c86d365e98d8a3a70856aaf16b4e7b1985e67f5a6
+  languageName: node
+  linkType: hard
+
+"decode-named-character-reference@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "decode-named-character-reference@npm:1.0.2"
+  dependencies:
+    character-entities: "npm:^2.0.0"
+  checksum: 10c0/66a9fc5d9b5385a2b3675c69ba0d8e893393d64057f7dbbb585265bb4fc05ec513d76943b8e5aac7d8016d20eea4499322cbf4cd6d54b466976b78f3a7587a4c
+  languageName: node
+  linkType: hard
+
+"delaunator@npm:5":
+  version: 5.0.1
+  resolution: "delaunator@npm:5.0.1"
+  dependencies:
+    robust-predicates: "npm:^3.0.2"
+  checksum: 10c0/3d7ea4d964731c5849af33fec0a271bc6753487b331fd7d43ccb17d77834706e1c383e6ab8fda0032da955e7576d1083b9603cdaf9cbdfd6b3ebd1fb8bb675a5
+  languageName: node
+  linkType: hard
+
+"dequal@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "dequal@npm:2.0.3"
+  checksum: 10c0/f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888
+  languageName: node
+  linkType: hard
+
+"detect-libc@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "detect-libc@npm:2.0.3"
+  checksum: 10c0/88095bda8f90220c95f162bf92cad70bd0e424913e655c20578600e35b91edc261af27531cf160a331e185c0ced93944bc7e09939143225f56312d7fd800fdb7
+  languageName: node
+  linkType: hard
+
+"devlop@npm:^1.0.0, devlop@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "devlop@npm:1.1.0"
+  dependencies:
+    dequal: "npm:^2.0.0"
+  checksum: 10c0/e0928ab8f94c59417a2b8389c45c55ce0a02d9ac7fd74ef62d01ba48060129e1d594501b77de01f3eeafc7cb00773819b0df74d96251cf20b31c5b3071f45c0e
+  languageName: node
+  linkType: hard
+
+"dompurify@npm:^3.2.5":
+  version: 3.3.1
+  resolution: "dompurify@npm:3.3.1"
+  dependencies:
+    "@types/trusted-types": "npm:^2.0.7"
+  dependenciesMeta:
+    "@types/trusted-types":
+      optional: true
+  checksum: 10c0/fa0a8c55a436ba0d54389195e3d2337e311f56de709a2fc9efc98dbbc7746fa53bb4b74b6ac043b77a279a8f2ebd8685f0ebaa6e58c9e32e92051d529bc0baf8
+  languageName: node
+  linkType: hard
+
+"entities@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
+  languageName: node
+  linkType: hard
+
+"esast-util-from-estree@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "esast-util-from-estree@npm:2.0.0"
+  dependencies:
+    "@types/estree-jsx": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    estree-util-visit: "npm:^2.0.0"
+    unist-util-position-from-estree: "npm:^2.0.0"
+  checksum: 10c0/6c619bc6963314f8f64b32e3b101b321bf121f659e62b11e70f425619c2db6f1d25f4c594a57fd00908da96c67d9bfbf876eb5172abf9e13f47a71796f6630ff
+  languageName: node
+  linkType: hard
+
+"esast-util-from-js@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "esast-util-from-js@npm:2.0.1"
+  dependencies:
+    "@types/estree-jsx": "npm:^1.0.0"
+    acorn: "npm:^8.0.0"
+    esast-util-from-estree: "npm:^2.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/3a446fb0b0d7bcd7e0157aa44b3b692802a08c93edbea81cc0f7fe4437bfdfb4b72e4563fe63b4e36d390086b71185dba4ac921f4180cc6349985c263cc74421
+  languageName: node
+  linkType: hard
+
+"escape-string-regexp@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "escape-string-regexp@npm:5.0.0"
+  checksum: 10c0/6366f474c6f37a802800a435232395e04e9885919873e382b157ab7e8f0feb8fed71497f84a6f6a81a49aab41815522f5839112bd38026d203aea0c91622df95
+  languageName: node
+  linkType: hard
+
+"esm@npm:^3.2.25":
+  version: 3.2.25
+  resolution: "esm@npm:3.2.25"
+  checksum: 10c0/8e60e8075506a7ce28681c30c8f54623fe18a251c364cd481d86719fc77f58aa055b293d80632d9686d5408aaf865ffa434897dc9fd9153c8b3f469fad23f094
+  languageName: node
+  linkType: hard
+
+"estree-util-attach-comments@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "estree-util-attach-comments@npm:3.0.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+  checksum: 10c0/ee69bb5c45e2ad074725b90ed181c1c934b29d81bce4b0c7761431e83c4c6ab1b223a6a3d6a4fbeb92128bc5d5ee201d5dd36cf1770aa5e16a40b0cf36e8a1f1
+  languageName: node
+  linkType: hard
+
+"estree-util-build-jsx@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "estree-util-build-jsx@npm:3.0.1"
+  dependencies:
+    "@types/estree-jsx": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    estree-util-is-identifier-name: "npm:^3.0.0"
+    estree-walker: "npm:^3.0.0"
+  checksum: 10c0/274c119817b8e7caa14a9778f1e497fea56cdd2b01df1a1ed037f843178992d3afe85e0d364d485e1e2e239255763553d1b647b15e4a7ba50851bcb43dc6bf80
+  languageName: node
+  linkType: hard
+
+"estree-util-is-identifier-name@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "estree-util-is-identifier-name@npm:2.1.0"
+  checksum: 10c0/cc241a6998d30f4e8775ec34b042ef93e0085cd1bdf692a01f22e9b748f0866c76679475ff87935be1d8d5b1a7648be8cba366dc60866b372269f35feec756fe
+  languageName: node
+  linkType: hard
+
+"estree-util-is-identifier-name@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "estree-util-is-identifier-name@npm:3.0.0"
+  checksum: 10c0/d1881c6ed14bd588ebd508fc90bf2a541811dbb9ca04dec2f39d27dcaa635f85b5ed9bbbe7fc6fb1ddfca68744a5f7c70456b4b7108b6c4c52780631cc787c5b
+  languageName: node
+  linkType: hard
+
+"estree-util-scope@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "estree-util-scope@npm:1.0.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+  checksum: 10c0/ef8a573cc899277c613623a1722f630e2163abbc6e9e2f49e758c59b81b484e248b585df6df09a38c00fbfb6390117997cc80c1347b7a86bc1525d9e462b60d5
+  languageName: node
+  linkType: hard
+
+"estree-util-to-js@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "estree-util-to-js@npm:2.0.0"
+  dependencies:
+    "@types/estree-jsx": "npm:^1.0.0"
+    astring: "npm:^1.8.0"
+    source-map: "npm:^0.7.0"
+  checksum: 10c0/ac88cb831401ef99e365f92f4af903755d56ae1ce0e0f0fb8ff66e678141f3d529194f0fb15f6c78cd7554c16fda36854df851d58f9e05cfab15bddf7a97cea0
+  languageName: node
+  linkType: hard
+
+"estree-util-value-to-estree@npm:^3.3.3":
+  version: 3.5.0
+  resolution: "estree-util-value-to-estree@npm:3.5.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+  checksum: 10c0/05c8d4b3338598929122cbfd6b127b22de4600dda8178b789b0d139e5b296e57a2343e487d6e108d8c39b18550dae2af3a110093698684db810954f353e9099b
+  languageName: node
+  linkType: hard
+
+"estree-util-visit@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "estree-util-visit@npm:2.0.0"
+  dependencies:
+    "@types/estree-jsx": "npm:^1.0.0"
+    "@types/unist": "npm:^3.0.0"
+  checksum: 10c0/acda8b03cc8f890d79c7c7361f6c95331ba84b7ccc0c32b49f447fc30206b20002b37ffdfc97b6ad16e6fe065c63ecbae1622492e2b6b4775c15966606217f39
+  languageName: node
+  linkType: hard
+
+"estree-walker@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "estree-walker@npm:3.0.3"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+  checksum: 10c0/c12e3c2b2642d2bcae7d5aa495c60fa2f299160946535763969a1c83fc74518ffa9c2cd3a8b69ac56aea547df6a8aac25f729a342992ef0bbac5f1c73e78995d
+  languageName: node
+  linkType: hard
+
+"execa@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "execa@npm:8.0.1"
+  dependencies:
+    cross-spawn: "npm:^7.0.3"
+    get-stream: "npm:^8.0.1"
+    human-signals: "npm:^5.0.0"
+    is-stream: "npm:^3.0.0"
+    merge-stream: "npm:^2.0.0"
+    npm-run-path: "npm:^5.1.0"
+    onetime: "npm:^6.0.0"
+    signal-exit: "npm:^4.1.0"
+    strip-final-newline: "npm:^3.0.0"
+  checksum: 10c0/2c52d8775f5bf103ce8eec9c7ab3059909ba350a5164744e9947ed14a53f51687c040a250bda833f906d1283aa8803975b84e6c8f7a7c42f99dc8ef80250d1af
+  languageName: node
+  linkType: hard
+
+"extend@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "extend@npm:3.0.2"
+  checksum: 10c0/73bf6e27406e80aa3e85b0d1c4fd987261e628064e170ca781125c0b635a3dabad5e05adbf07595ea0cf1e6c5396cacb214af933da7cbaf24fe75ff14818e8f9
+  languageName: node
+  linkType: hard
+
+"fast-glob@npm:^3.3.2":
+  version: 3.3.3
+  resolution: "fast-glob@npm:3.3.3"
+  dependencies:
+    "@nodelib/fs.stat": "npm:^2.0.2"
+    "@nodelib/fs.walk": "npm:^1.2.3"
+    glob-parent: "npm:^5.1.2"
+    merge2: "npm:^1.3.0"
+    micromatch: "npm:^4.0.8"
+  checksum: 10c0/f6aaa141d0d3384cf73cbcdfc52f475ed293f6d5b65bfc5def368b09163a9f7e5ec2b3014d80f733c405f58e470ee0cc451c2937685045cddcdeaa24199c43fe
+  languageName: node
+  linkType: hard
+
+"fastq@npm:^1.6.0":
+  version: 1.20.1
+  resolution: "fastq@npm:1.20.1"
+  dependencies:
+    reusify: "npm:^1.0.4"
+  checksum: 10c0/e5dd725884decb1f11e5c822221d76136f239d0236f176fab80b7b8f9e7619ae57e6b4e5b73defc21e6b9ef99437ee7b545cff8e6c2c337819633712fa9d352e
+  languageName: node
+  linkType: hard
+
+"fault@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "fault@npm:2.0.1"
+  dependencies:
+    format: "npm:^0.2.0"
+  checksum: 10c0/b80fbf1019b9ce8b08ee09ce86e02b028563e13a32ac3be34e42bfac00a97b96d8dee6d31e26578ffc16224eb6729e01ff1f97ddfeee00494f4f56c0aeed4bdd
+  languageName: node
+  linkType: hard
+
+"fdir@npm:^6.5.0":
+  version: 6.5.0
+  resolution: "fdir@npm:6.5.0"
+  peerDependencies:
+    picomatch: ^3 || ^4
+  peerDependenciesMeta:
+    picomatch:
+      optional: true
+  checksum: 10c0/e345083c4306b3aed6cb8ec551e26c36bab5c511e99ea4576a16750ddc8d3240e63826cc624f5ae17ad4dc82e68a253213b60d556c11bfad064b7607847ed07f
+  languageName: node
+  linkType: hard
+
+"fill-range@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "fill-range@npm:7.1.1"
+  dependencies:
+    to-regex-range: "npm:^5.0.1"
+  checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018
+  languageName: node
+  linkType: hard
+
+"format@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "format@npm:0.2.2"
+  checksum: 10c0/6032ba747541a43abf3e37b402b2f72ee08ebcb58bf84d816443dd228959837f1cddf1e8775b29fa27ff133f4bd146d041bfca5f9cf27f048edf3d493cf8fee6
+  languageName: node
+  linkType: hard
+
+"get-stream@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "get-stream@npm:8.0.1"
+  checksum: 10c0/5c2181e98202b9dae0bb4a849979291043e5892eb40312b47f0c22b9414fc9b28a3b6063d2375705eb24abc41ecf97894d9a51f64ff021511b504477b27b4290
+  languageName: node
+  linkType: hard
+
+"github-slugger@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "github-slugger@npm:2.0.0"
+  checksum: 10c0/21b912b6b1e48f1e5a50b2292b48df0ff6abeeb0691b161b3d93d84f4ae6b1acd6ae23702e914af7ea5d441c096453cf0f621b72d57893946618d21dd1a1c486
+  languageName: node
+  linkType: hard
+
+"glob-parent@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "glob-parent@npm:5.1.2"
+  dependencies:
+    is-glob: "npm:^4.0.1"
+  checksum: 10c0/cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee
+  languageName: node
+  linkType: hard
+
+"hachure-fill@npm:^0.5.2":
+  version: 0.5.2
+  resolution: "hachure-fill@npm:0.5.2"
+  checksum: 10c0/307e3b6f9f2d3c11a82099c3f71eecbb9c440c00c1f896ac1732c23e6dbff16a92bb893d222b8b721b89cf11e58649ca60b4c24e5663f705f877cefd40153429
+  languageName: node
+  linkType: hard
+
+"hast-util-from-dom@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "hast-util-from-dom@npm:5.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    hastscript: "npm:^8.0.0"
+    web-namespaces: "npm:^2.0.0"
+  checksum: 10c0/1b0a9d65eb8f8cd3616559190bb6db271b7b4f72a13c5dc16abac264b6f7145beb408fbaa497d1b5c725d55392b951972d8313802bfe90ccac33f888ec34c63c
+  languageName: node
+  linkType: hard
+
+"hast-util-from-html-isomorphic@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "hast-util-from-html-isomorphic@npm:2.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    hast-util-from-dom: "npm:^5.0.0"
+    hast-util-from-html: "npm:^2.0.0"
+    unist-util-remove-position: "npm:^5.0.0"
+  checksum: 10c0/fc68d9245e794483a802d5c85a9f6c25959e00db78cc796411efc965134f3206f9cc9fa38134572ea781ad74663e801f1f83202007b208e27a770855566a62b6
+  languageName: node
+  linkType: hard
+
+"hast-util-from-html@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "hast-util-from-html@npm:2.0.1"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    devlop: "npm:^1.1.0"
+    hast-util-from-parse5: "npm:^8.0.0"
+    parse5: "npm:^7.0.0"
+    vfile: "npm:^6.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/856ceec209940ac4f9db52bf6338b97fb11f27e6d5b930f89676bc16ee282c06f9ff2a17254280803aefdf740507cf3004f181d0286b04dda11907852decbe77
+  languageName: node
+  linkType: hard
+
+"hast-util-from-parse5@npm:^8.0.0":
+  version: 8.0.1
+  resolution: "hast-util-from-parse5@npm:8.0.1"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/unist": "npm:^3.0.0"
+    devlop: "npm:^1.0.0"
+    hastscript: "npm:^8.0.0"
+    property-information: "npm:^6.0.0"
+    vfile: "npm:^6.0.0"
+    vfile-location: "npm:^5.0.0"
+    web-namespaces: "npm:^2.0.0"
+  checksum: 10c0/4a30bb885cff1f0e023c429ae3ece73fe4b03386f07234bf23f5555ca087c2573ff4e551035b417ed7615bde559f394cdaf1db2b91c3b7f0575f3563cd238969
+  languageName: node
+  linkType: hard
+
+"hast-util-is-element@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hast-util-is-element@npm:3.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+  checksum: 10c0/f5361e4c9859c587ca8eb0d8343492f3077ccaa0f58a44cd09f35d5038f94d65152288dcd0c19336ef2c9491ec4d4e45fde2176b05293437021570aa0bc3613b
+  languageName: node
+  linkType: hard
+
+"hast-util-parse-selector@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "hast-util-parse-selector@npm:4.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+  checksum: 10c0/5e98168cb44470dc274aabf1a28317e4feb09b1eaf7a48bbaa8c1de1b43a89cd195cb1284e535698e658e3ec26ad91bc5e52c9563c36feb75abbc68aaf68fb9f
+  languageName: node
+  linkType: hard
+
+"hast-util-raw@npm:^9.0.0":
+  version: 9.0.4
+  resolution: "hast-util-raw@npm:9.0.4"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/unist": "npm:^3.0.0"
+    "@ungap/structured-clone": "npm:^1.0.0"
+    hast-util-from-parse5: "npm:^8.0.0"
+    hast-util-to-parse5: "npm:^8.0.0"
+    html-void-elements: "npm:^3.0.0"
+    mdast-util-to-hast: "npm:^13.0.0"
+    parse5: "npm:^7.0.0"
+    unist-util-position: "npm:^5.0.0"
+    unist-util-visit: "npm:^5.0.0"
+    vfile: "npm:^6.0.0"
+    web-namespaces: "npm:^2.0.0"
+    zwitch: "npm:^2.0.0"
+  checksum: 10c0/03d0fe7ba8bd75c9ce81f829650b19b78917bbe31db70d36bf6f136842496c3474e3bb1841f2d30dafe1f6b561a89a524185492b9a93d40b131000743c0d7998
+  languageName: node
+  linkType: hard
+
+"hast-util-to-estree@npm:^3.0.0, hast-util-to-estree@npm:^3.1.0":
+  version: 3.1.3
+  resolution: "hast-util-to-estree@npm:3.1.3"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    "@types/estree-jsx": "npm:^1.0.0"
+    "@types/hast": "npm:^3.0.0"
+    comma-separated-tokens: "npm:^2.0.0"
+    devlop: "npm:^1.0.0"
+    estree-util-attach-comments: "npm:^3.0.0"
+    estree-util-is-identifier-name: "npm:^3.0.0"
+    hast-util-whitespace: "npm:^3.0.0"
+    mdast-util-mdx-expression: "npm:^2.0.0"
+    mdast-util-mdx-jsx: "npm:^3.0.0"
+    mdast-util-mdxjs-esm: "npm:^2.0.0"
+    property-information: "npm:^7.0.0"
+    space-separated-tokens: "npm:^2.0.0"
+    style-to-js: "npm:^1.0.0"
+    unist-util-position: "npm:^5.0.0"
+    zwitch: "npm:^2.0.0"
+  checksum: 10c0/8e86c075319082c8a6304c5bcdf24ec02466074571e993f58bfa2cfd70850ef46d33b5c402208597a87fe0f02f1e620bda5958217efb1b7396c81c486373b75f
+  languageName: node
+  linkType: hard
+
+"hast-util-to-html@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "hast-util-to-html@npm:9.0.5"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/unist": "npm:^3.0.0"
+    ccount: "npm:^2.0.0"
+    comma-separated-tokens: "npm:^2.0.0"
+    hast-util-whitespace: "npm:^3.0.0"
+    html-void-elements: "npm:^3.0.0"
+    mdast-util-to-hast: "npm:^13.0.0"
+    property-information: "npm:^7.0.0"
+    space-separated-tokens: "npm:^2.0.0"
+    stringify-entities: "npm:^4.0.0"
+    zwitch: "npm:^2.0.4"
+  checksum: 10c0/b7a08c30bab4371fc9b4a620965c40b270e5ae7a8e94cf885f43b21705179e28c8e43b39c72885d1647965fb3738654e6962eb8b58b0c2a84271655b4d748836
+  languageName: node
+  linkType: hard
+
+"hast-util-to-jsx-runtime@npm:^2.0.0":
+  version: 2.3.6
+  resolution: "hast-util-to-jsx-runtime@npm:2.3.6"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    "@types/hast": "npm:^3.0.0"
+    "@types/unist": "npm:^3.0.0"
+    comma-separated-tokens: "npm:^2.0.0"
+    devlop: "npm:^1.0.0"
+    estree-util-is-identifier-name: "npm:^3.0.0"
+    hast-util-whitespace: "npm:^3.0.0"
+    mdast-util-mdx-expression: "npm:^2.0.0"
+    mdast-util-mdx-jsx: "npm:^3.0.0"
+    mdast-util-mdxjs-esm: "npm:^2.0.0"
+    property-information: "npm:^7.0.0"
+    space-separated-tokens: "npm:^2.0.0"
+    style-to-js: "npm:^1.0.0"
+    unist-util-position: "npm:^5.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/27297e02848fe37ef219be04a26ce708d17278a175a807689e94a821dcffc88aa506d62c3a85beed1f9a8544f7211bdcbcde0528b7b456a57c2e342c3fd11056
+  languageName: node
+  linkType: hard
+
+"hast-util-to-parse5@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "hast-util-to-parse5@npm:8.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    comma-separated-tokens: "npm:^2.0.0"
+    devlop: "npm:^1.0.0"
+    property-information: "npm:^6.0.0"
+    space-separated-tokens: "npm:^2.0.0"
+    web-namespaces: "npm:^2.0.0"
+    zwitch: "npm:^2.0.0"
+  checksum: 10c0/3c0c7fba026e0c4be4675daf7277f9ff22ae6da801435f1b7104f7740de5422576f1c025023c7b3df1d0a161e13a04c6ab8f98ada96eb50adb287b537849a2bd
+  languageName: node
+  linkType: hard
+
+"hast-util-to-string@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "hast-util-to-string@npm:3.0.1"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+  checksum: 10c0/b5fa1912a6ba6131affae52a0f4394406c4c0d23c2b0307f1d69988f1030c7bb830289303e67c5ad8f674f5f23a454c1dcd492c39e45a22c1f46d3c9bce5bd0c
+  languageName: node
+  linkType: hard
+
+"hast-util-to-text@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "hast-util-to-text@npm:4.0.2"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/unist": "npm:^3.0.0"
+    hast-util-is-element: "npm:^3.0.0"
+    unist-util-find-after: "npm:^5.0.0"
+  checksum: 10c0/93ecc10e68fe5391c6e634140eb330942e71dea2724c8e0c647c73ed74a8ec930a4b77043b5081284808c96f73f2bee64ee416038ece75a63a467e8d14f09946
+  languageName: node
+  linkType: hard
+
+"hast-util-whitespace@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "hast-util-whitespace@npm:3.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+  checksum: 10c0/b898bc9fe27884b272580d15260b6bbdabe239973a147e97fa98c45fa0ffec967a481aaa42291ec34fb56530dc2d484d473d7e2bae79f39c83f3762307edfea8
+  languageName: node
+  linkType: hard
+
+"hastscript@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "hastscript@npm:8.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    comma-separated-tokens: "npm:^2.0.0"
+    hast-util-parse-selector: "npm:^4.0.0"
+    property-information: "npm:^6.0.0"
+    space-separated-tokens: "npm:^2.0.0"
+  checksum: 10c0/f0b54bbdd710854b71c0f044612db0fe1b5e4d74fa2001633dc8c535c26033269f04f536f9fd5b03f234de1111808f9e230e9d19493bf919432bb24d541719e0
+  languageName: node
+  linkType: hard
+
+"html-void-elements@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "html-void-elements@npm:3.0.0"
+  checksum: 10c0/a8b9ec5db23b7c8053876dad73a0336183e6162bf6d2677376d8b38d654fdc59ba74fdd12f8812688f7db6fad451210c91b300e472afc0909224e0a44c8610d2
+  languageName: node
+  linkType: hard
+
+"human-signals@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "human-signals@npm:5.0.0"
+  checksum: 10c0/5a9359073fe17a8b58e5a085e9a39a950366d9f00217c4ff5878bd312e09d80f460536ea6a3f260b5943a01fe55c158d1cea3fc7bee3d0520aeef04f6d915c82
+  languageName: node
+  linkType: hard
+
+"iconv-lite@npm:0.6":
+  version: 0.6.3
+  resolution: "iconv-lite@npm:0.6.3"
+  dependencies:
+    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
+  checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1
+  languageName: node
+  linkType: hard
+
+"inline-style-parser@npm:0.2.7":
+  version: 0.2.7
+  resolution: "inline-style-parser@npm:0.2.7"
+  checksum: 10c0/d884d76f84959517430ae6c22f0bda59bb3f58f539f99aac75a8d786199ec594ed648c6ab4640531f9fc244b0ed5cd8c458078e592d016ef06de793beb1debff
+  languageName: node
+  linkType: hard
+
+"internmap@npm:1 - 2":
+  version: 2.0.3
+  resolution: "internmap@npm:2.0.3"
+  checksum: 10c0/8cedd57f07bbc22501516fbfc70447f0c6812871d471096fad9ea603516eacc2137b633633daf432c029712df0baefd793686388ddf5737e3ea15074b877f7ed
+  languageName: node
+  linkType: hard
+
+"internmap@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "internmap@npm:1.0.1"
+  checksum: 10c0/60942be815ca19da643b6d4f23bd0bf4e8c97abbd080fb963fe67583b60bdfb3530448ad4486bae40810e92317bded9995cc31411218acc750d72cd4e8646eee
+  languageName: node
+  linkType: hard
+
+"is-alphabetical@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-alphabetical@npm:2.0.1"
+  checksum: 10c0/932367456f17237533fd1fc9fe179df77957271020b83ea31da50e5cc472d35ef6b5fb8147453274ffd251134472ce24eb6f8d8398d96dee98237cdb81a6c9a7
+  languageName: node
+  linkType: hard
+
+"is-alphanumerical@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-alphanumerical@npm:2.0.1"
+  dependencies:
+    is-alphabetical: "npm:^2.0.0"
+    is-decimal: "npm:^2.0.0"
+  checksum: 10c0/4b35c42b18e40d41378293f82a3ecd9de77049b476f748db5697c297f686e1e05b072a6aaae2d16f54d2a57f85b00cbbe755c75f6d583d1c77d6657bd0feb5a2
+  languageName: node
+  linkType: hard
+
+"is-arrayish@npm:^0.3.1":
+  version: 0.3.2
+  resolution: "is-arrayish@npm:0.3.2"
+  checksum: 10c0/f59b43dc1d129edb6f0e282595e56477f98c40278a2acdc8b0a5c57097c9eff8fe55470493df5775478cf32a4dc8eaf6d3a749f07ceee5bc263a78b2434f6a54
+  languageName: node
+  linkType: hard
+
+"is-decimal@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-decimal@npm:2.0.1"
+  checksum: 10c0/8085dd66f7d82f9de818fba48b9e9c0429cb4291824e6c5f2622e96b9680b54a07a624cfc663b24148b8e853c62a1c987cfe8b0b5a13f5156991afaf6736e334
+  languageName: node
+  linkType: hard
+
+"is-docker@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-docker@npm:3.0.0"
+  bin:
+    is-docker: cli.js
+  checksum: 10c0/d2c4f8e6d3e34df75a5defd44991b6068afad4835bb783b902fa12d13ebdb8f41b2a199dcb0b5ed2cb78bfee9e4c0bbdb69c2d9646f4106464674d3e697a5856
+  languageName: node
+  linkType: hard
+
+"is-extglob@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "is-extglob@npm:2.1.1"
+  checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912
+  languageName: node
+  linkType: hard
+
+"is-glob@npm:^4.0.1":
+  version: 4.0.3
+  resolution: "is-glob@npm:4.0.3"
+  dependencies:
+    is-extglob: "npm:^2.1.1"
+  checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a
+  languageName: node
+  linkType: hard
+
+"is-hexadecimal@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-hexadecimal@npm:2.0.1"
+  checksum: 10c0/3eb60fe2f1e2bbc760b927dcad4d51eaa0c60138cf7fc671803f66353ad90c301605b502c7ea4c6bb0548e1c7e79dfd37b73b632652e3b76030bba603a7e9626
+  languageName: node
+  linkType: hard
+
+"is-inside-container@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-inside-container@npm:1.0.0"
+  dependencies:
+    is-docker: "npm:^3.0.0"
+  bin:
+    is-inside-container: cli.js
+  checksum: 10c0/a8efb0e84f6197e6ff5c64c52890fa9acb49b7b74fed4da7c95383965da6f0fa592b4dbd5e38a79f87fc108196937acdbcd758fcefc9b140e479b39ce1fcd1cd
+  languageName: node
+  linkType: hard
+
+"is-number@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "is-number@npm:7.0.0"
+  checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811
+  languageName: node
+  linkType: hard
+
+"is-plain-obj@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "is-plain-obj@npm:4.1.0"
+  checksum: 10c0/32130d651d71d9564dc88ba7e6fda0e91a1010a3694648e9f4f47bb6080438140696d3e3e15c741411d712e47ac9edc1a8a9de1fe76f3487b0d90be06ac9975e
+  languageName: node
+  linkType: hard
+
+"is-stream@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-stream@npm:3.0.0"
+  checksum: 10c0/eb2f7127af02ee9aa2a0237b730e47ac2de0d4e76a4a905a50a11557f2339df5765eaea4ceb8029f1efa978586abe776908720bfcb1900c20c6ec5145f6f29d8
+  languageName: node
+  linkType: hard
+
+"is-wsl@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "is-wsl@npm:3.1.1"
+  dependencies:
+    is-inside-container: "npm:^1.0.0"
+  checksum: 10c0/7e5023522bfb8f27de4de960b0d82c4a8146c0bddb186529a3616d78b5bbbfc19ef0c5fc60d0b3a3cc0bf95a415fbdedc18454310ea3049587c879b07ace5107
+  languageName: node
+  linkType: hard
+
+"is64bit@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is64bit@npm:2.0.0"
+  dependencies:
+    system-architecture: "npm:^0.1.0"
+  checksum: 10c0/9f3741d4b7560e2a30b9ce0c79bb30c7bdcc5df77c897bd59bb68f0fd882ae698015e8da81d48331def66c778d430c1ae3cb8c1fcc34e96c576b66198395faa7
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "isexe@npm:2.0.0"
+  checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d
+  languageName: node
+  linkType: hard
+
+"katex@npm:^0.16.0":
+  version: 0.16.10
+  resolution: "katex@npm:0.16.10"
+  dependencies:
+    commander: "npm:^8.3.0"
+  bin:
+    katex: cli.js
+  checksum: 10c0/b465213157e5245bbb31ff6563c33ae81807c06d6f2246325b3a2397497e8929a34eebbb262f5e0991ec00fbc0cc85f388246e6dfc38ec86c28d3e481cb70afa
+  languageName: node
+  linkType: hard
+
+"katex@npm:^0.16.21, katex@npm:^0.16.22":
+  version: 0.16.33
+  resolution: "katex@npm:0.16.33"
+  dependencies:
+    commander: "npm:^8.3.0"
+  bin:
+    katex: cli.js
+  checksum: 10c0/b2b655e4a3592ee0db45fea87856542383109ed598504a1c67b8eb957b9ba4dab752d5865f6354579d2a260d71e3e3594278a66c184b70c574a52481abee8caa
+  languageName: node
+  linkType: hard
+
+"khroma@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "khroma@npm:2.1.0"
+  checksum: 10c0/634d98753ff5d2540491cafeb708fc98de0d43f4e6795256d5c8f6e3ad77de93049ea41433928fda3697adf7bbe6fe27351858f6d23b78f8b5775ef314c59891
+  languageName: node
+  linkType: hard
+
+"langium@npm:^4.0.0":
+  version: 4.2.1
+  resolution: "langium@npm:4.2.1"
+  dependencies:
+    chevrotain: "npm:~11.1.1"
+    chevrotain-allstar: "npm:~0.3.1"
+    vscode-languageserver: "npm:~9.0.1"
+    vscode-languageserver-textdocument: "npm:~1.0.11"
+    vscode-uri: "npm:~3.1.0"
+  checksum: 10c0/19ddf79cc3c435ec70f8eb50de255571711db7cea89d171cf80bc97e7ed73d4d0bb6b4215899df8369fa6d0e17f442f30af4ec2e9657041bf2f93be1310ba50a
+  languageName: node
+  linkType: hard
+
+"layout-base@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "layout-base@npm:1.0.2"
+  checksum: 10c0/2a55d0460fd9f6ed53d7e301b9eb3dea19bda03815d616a40665ce6dc75c1f4d62e1ca19a897da1cfaf6de1b91de59cd6f2f79ba1258f3d7fccc7d46ca7f3337
+  languageName: node
+  linkType: hard
+
+"layout-base@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "layout-base@npm:2.0.1"
+  checksum: 10c0/a44df9ef3cbff9916a10f616635e22b5787c89fa62b2fec6f99e8e6ee512c7cebd22668ce32dab5a83c934ba0a309c51a678aa0b40d70853de6c357893c0a88b
+  languageName: node
+  linkType: hard
+
+"lodash-es@npm:4.17.23, lodash-es@npm:^4.17.23":
+  version: 4.17.23
+  resolution: "lodash-es@npm:4.17.23"
+  checksum: 10c0/3150fb6660c14c7a6b5f23bd11597d884b140c0e862a17fdb415aaa5ef7741523182904a6b7929f04e5f60a11edb5a79499eb448734381c99ffb3c4734beeddd
+  languageName: node
+  linkType: hard
+
+"lodash-es@npm:^4.17.21":
+  version: 4.17.21
+  resolution: "lodash-es@npm:4.17.21"
+  checksum: 10c0/fb407355f7e6cd523a9383e76e6b455321f0f153a6c9625e21a8827d10c54c2a2341bd2ae8d034358b60e07325e1330c14c224ff582d04612a46a4f0479ff2f2
+  languageName: node
+  linkType: hard
+
+"longest-streak@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "longest-streak@npm:3.1.0"
+  checksum: 10c0/7c2f02d0454b52834d1bcedef79c557bd295ee71fdabb02d041ff3aa9da48a90b5df7c0409156dedbc4df9b65da18742652aaea4759d6ece01f08971af6a7eaa
+  languageName: node
+  linkType: hard
+
+"markdown-extensions@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "markdown-extensions@npm:2.0.0"
+  checksum: 10c0/406139da2aa0d5ebad86195c8e8c02412f873c452b4c087ae7bc767af37956141be449998223bb379eea179b5fd38dfa610602b6f29c22ddab5d51e627a7e41d
+  languageName: node
+  linkType: hard
+
+"markdown-table@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "markdown-table@npm:3.0.3"
+  checksum: 10c0/47433a3f31e4637a184e38e873ab1d2fadfb0106a683d466fec329e99a2d8dfa09f091fa42202c6f13ec94aef0199f449a684b28042c636f2edbc1b7e1811dcd
+  languageName: node
+  linkType: hard
+
+"marked@npm:^16.2.1":
+  version: 16.4.2
+  resolution: "marked@npm:16.4.2"
+  bin:
+    marked: bin/marked.js
+  checksum: 10c0/fc6051142172454f2023f3d6b31cca92879ec8e1b96457086a54c70354c74b00e1b6543a76a1fad6d399366f52b90a848f6ffb8e1d65a5baff87f3ba9b8f1847
+  languageName: node
+  linkType: hard
+
+"mathjax-full@npm:^3.2.2":
+  version: 3.2.2
+  resolution: "mathjax-full@npm:3.2.2"
+  dependencies:
+    esm: "npm:^3.2.25"
+    mhchemparser: "npm:^4.1.0"
+    mj-context-menu: "npm:^0.6.1"
+    speech-rule-engine: "npm:^4.0.6"
+  checksum: 10c0/48f55747bd91aa6bba905bab8654045e4d654a0a65869b1d446e25a89284ef37dc722c6c4a585e7fc14c5f87bb6954291f066e08e5a8245bb5ff0c4f4c54c8d4
+  languageName: node
+  linkType: hard
+
+"mdast-util-find-and-replace@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "mdast-util-find-and-replace@npm:3.0.2"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    escape-string-regexp: "npm:^5.0.0"
+    unist-util-is: "npm:^6.0.0"
+    unist-util-visit-parents: "npm:^6.0.0"
+  checksum: 10c0/c8417a35605d567772ff5c1aa08363ff3010b0d60c8ea68c53cba09bf25492e3dd261560425c1756535f3b7107f62e7ff3857cdd8fb1e62d1b2cc2ea6e074ca2
+  languageName: node
+  linkType: hard
+
+"mdast-util-from-markdown@npm:^2.0.0, mdast-util-from-markdown@npm:^2.0.1":
+  version: 2.0.3
+  resolution: "mdast-util-from-markdown@npm:2.0.3"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    "@types/unist": "npm:^3.0.0"
+    decode-named-character-reference: "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    mdast-util-to-string: "npm:^4.0.0"
+    micromark: "npm:^4.0.0"
+    micromark-util-decode-numeric-character-reference: "npm:^2.0.0"
+    micromark-util-decode-string: "npm:^2.0.0"
+    micromark-util-normalize-identifier: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+    unist-util-stringify-position: "npm:^4.0.0"
+  checksum: 10c0/d3eac9ac2b88e3b41fb85aa81c7bfd1f4f8a2fde497ad805e66fea7b2abfe486ffd94d2a20f9fd2951dcdebe4916f3bdcf851319891dd62d343e26c2f02583ba
+  languageName: node
+  linkType: hard
+
+"mdast-util-frontmatter@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-frontmatter@npm:2.0.1"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    devlop: "npm:^1.0.0"
+    escape-string-regexp: "npm:^5.0.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+    micromark-extension-frontmatter: "npm:^2.0.0"
+  checksum: 10c0/d9b0b70dd9c574cc0220d4e05dd8e9d86ac972a6a5af9e0c49c839b31cb750d4313445cfbbdf9264a7fbe3f8c8d920b45358b8500f4286e6b9dc830095b25b9a
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-autolink-literal@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-gfm-autolink-literal@npm:2.0.1"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    ccount: "npm:^2.0.0"
+    devlop: "npm:^1.0.0"
+    mdast-util-find-and-replace: "npm:^3.0.0"
+    micromark-util-character: "npm:^2.0.0"
+  checksum: 10c0/963cd22bd42aebdec7bdd0a527c9494d024d1ad0739c43dc040fee35bdfb5e29c22564330a7418a72b5eab51d47a6eff32bc0255ef3ccb5cebfe8970e91b81b6
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-footnote@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "mdast-util-gfm-footnote@npm:2.1.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    devlop: "npm:^1.1.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+    micromark-util-normalize-identifier: "npm:^2.0.0"
+  checksum: 10c0/8ab965ee6be3670d76ec0e95b2ba3101fc7444eec47564943ab483d96ac17d29da2a4e6146a2a288be30c21b48c4f3938a1e54b9a46fbdd321d49a5bc0077ed0
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-strikethrough@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-strikethrough@npm:2.0.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+  checksum: 10c0/b053e93d62c7545019bd914271ea9e5667ad3b3b57d16dbf68e56fea39a7e19b4a345e781312714eb3d43fdd069ff7ee22a3ca7f6149dfa774554f19ce3ac056
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-table@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-table@npm:2.0.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    devlop: "npm:^1.0.0"
+    markdown-table: "npm:^3.0.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+  checksum: 10c0/128af47c503a53bd1c79f20642561e54a510ad5e2db1e418d28fefaf1294ab839e6c838e341aef5d7e404f9170b9ca3d1d89605f234efafde93ee51174a6e31e
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm-task-list-item@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mdast-util-gfm-task-list-item@npm:2.0.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    devlop: "npm:^1.0.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+  checksum: 10c0/258d725288482b636c0a376c296431390c14b4f29588675297cb6580a8598ed311fc73ebc312acfca12cc8546f07a3a285a53a3b082712e2cbf5c190d677d834
+  languageName: node
+  linkType: hard
+
+"mdast-util-gfm@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "mdast-util-gfm@npm:3.1.0"
+  dependencies:
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-gfm-autolink-literal: "npm:^2.0.0"
+    mdast-util-gfm-footnote: "npm:^2.0.0"
+    mdast-util-gfm-strikethrough: "npm:^2.0.0"
+    mdast-util-gfm-table: "npm:^2.0.0"
+    mdast-util-gfm-task-list-item: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+  checksum: 10c0/4bedcfb6a20e39901c8772f0d2bb2d7a64ae87a54c13cbd92eec062cf470fbb68c2ad754e149af5b30794e2de61c978ab1de1ace03c0c40f443ca9b9b8044f81
+  languageName: node
+  linkType: hard
+
+"mdast-util-math@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mdast-util-math@npm:3.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/mdast": "npm:^4.0.0"
+    devlop: "npm:^1.0.0"
+    longest-streak: "npm:^3.0.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.1.0"
+    unist-util-remove-position: "npm:^5.0.0"
+  checksum: 10c0/d4e839e38719f26872ed78aac18339805a892f1b56585a9cb8668f34e221b4f0660b9dfe49ec96dbbe79fd1b63b648608a64046d8286bcd2f9d576e80b48a0a1
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdx-expression@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-mdx-expression@npm:2.0.1"
+  dependencies:
+    "@types/estree-jsx": "npm:^1.0.0"
+    "@types/hast": "npm:^3.0.0"
+    "@types/mdast": "npm:^4.0.0"
+    devlop: "npm:^1.0.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+  checksum: 10c0/9a1e57940f66431f10312fa239096efa7627f375e7933b5d3162c0b5c1712a72ac87447aff2b6838d2bbd5c1311b188718cc90b33b67dc67a88550e0a6ef6183
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdx-jsx@npm:^3.0.0":
+  version: 3.2.0
+  resolution: "mdast-util-mdx-jsx@npm:3.2.0"
+  dependencies:
+    "@types/estree-jsx": "npm:^1.0.0"
+    "@types/hast": "npm:^3.0.0"
+    "@types/mdast": "npm:^4.0.0"
+    "@types/unist": "npm:^3.0.0"
+    ccount: "npm:^2.0.0"
+    devlop: "npm:^1.1.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+    parse-entities: "npm:^4.0.0"
+    stringify-entities: "npm:^4.0.0"
+    unist-util-stringify-position: "npm:^4.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/3acadaf3b962254f7ad2990fed4729961dc0217ca31fde9917986e880843f3ecf3392b1f22d569235cacd180d50894ad266db7af598aedca69d330d33c7ac613
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdx@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mdast-util-mdx@npm:3.0.0"
+  dependencies:
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-mdx-expression: "npm:^2.0.0"
+    mdast-util-mdx-jsx: "npm:^3.0.0"
+    mdast-util-mdxjs-esm: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+  checksum: 10c0/4faea13f77d6bc9aa64ee41a5e4779110b73444a17fda363df6ebe880ecfa58b321155b71f8801c3faa6d70d6222a32a00cbd6dbf5fad8db417f4688bc9c74e1
+  languageName: node
+  linkType: hard
+
+"mdast-util-mdxjs-esm@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "mdast-util-mdxjs-esm@npm:2.0.1"
+  dependencies:
+    "@types/estree-jsx": "npm:^1.0.0"
+    "@types/hast": "npm:^3.0.0"
+    "@types/mdast": "npm:^4.0.0"
+    devlop: "npm:^1.0.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+  checksum: 10c0/5bda92fc154141705af2b804a534d891f28dac6273186edf1a4c5e3f045d5b01dbcac7400d27aaf91b7e76e8dce007c7b2fdf136c11ea78206ad00bdf9db46bc
+  languageName: node
+  linkType: hard
+
+"mdast-util-phrasing@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "mdast-util-phrasing@npm:4.1.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    unist-util-is: "npm:^6.0.0"
+  checksum: 10c0/bf6c31d51349aa3d74603d5e5a312f59f3f65662ed16c58017169a5fb0f84ca98578f626c5ee9e4aa3e0a81c996db8717096705521bddb4a0185f98c12c9b42f
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-hast@npm:^13.0.0":
+  version: 13.2.0
+  resolution: "mdast-util-to-hast@npm:13.2.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/mdast": "npm:^4.0.0"
+    "@ungap/structured-clone": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    micromark-util-sanitize-uri: "npm:^2.0.0"
+    trim-lines: "npm:^3.0.0"
+    unist-util-position: "npm:^5.0.0"
+    unist-util-visit: "npm:^5.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/9ee58def9287df8350cbb6f83ced90f9c088d72d4153780ad37854f87144cadc6f27b20347073b285173b1649b0723ddf0b9c78158608a804dcacb6bda6e1816
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-hast@npm:^13.2.0":
+  version: 13.2.1
+  resolution: "mdast-util-to-hast@npm:13.2.1"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/mdast": "npm:^4.0.0"
+    "@ungap/structured-clone": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    micromark-util-sanitize-uri: "npm:^2.0.0"
+    trim-lines: "npm:^3.0.0"
+    unist-util-position: "npm:^5.0.0"
+    unist-util-visit: "npm:^5.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/3eeaf28a5e84e1e08e6d54a1a8a06c0fca88cb5d36f4cf8086f0177248d1ce6e4e751f4ad0da19a3dea1c6ea61bd80784acc3ae021e44ceeb21aa5413a375e43
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-markdown@npm:^2.0.0, mdast-util-to-markdown@npm:^2.1.0":
+  version: 2.1.2
+  resolution: "mdast-util-to-markdown@npm:2.1.2"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    "@types/unist": "npm:^3.0.0"
+    longest-streak: "npm:^3.0.0"
+    mdast-util-phrasing: "npm:^4.0.0"
+    mdast-util-to-string: "npm:^4.0.0"
+    micromark-util-classify-character: "npm:^2.0.0"
+    micromark-util-decode-string: "npm:^2.0.0"
+    unist-util-visit: "npm:^5.0.0"
+    zwitch: "npm:^2.0.0"
+  checksum: 10c0/4649722a6099f12e797bd8d6469b2b43b44e526b5182862d9c7766a3431caad2c0112929c538a972f214e63c015395e5d3f54bd81d9ac1b16e6d8baaf582f749
+  languageName: node
+  linkType: hard
+
+"mdast-util-to-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mdast-util-to-string@npm:4.0.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+  checksum: 10c0/2d3c1af29bf3fe9c20f552ee9685af308002488f3b04b12fa66652c9718f66f41a32f8362aa2d770c3ff464c034860b41715902ada2306bb0a055146cef064d7
+  languageName: node
+  linkType: hard
+
+"merge-stream@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "merge-stream@npm:2.0.0"
+  checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5
+  languageName: node
+  linkType: hard
+
+"merge2@npm:^1.3.0":
+  version: 1.4.1
+  resolution: "merge2@npm:1.4.1"
+  checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb
+  languageName: node
+  linkType: hard
+
+"mermaid@npm:^11.0.0":
+  version: 11.12.3
+  resolution: "mermaid@npm:11.12.3"
+  dependencies:
+    "@braintree/sanitize-url": "npm:^7.1.1"
+    "@iconify/utils": "npm:^3.0.1"
+    "@mermaid-js/parser": "npm:^1.0.0"
+    "@types/d3": "npm:^7.4.3"
+    cytoscape: "npm:^3.29.3"
+    cytoscape-cose-bilkent: "npm:^4.1.0"
+    cytoscape-fcose: "npm:^2.2.0"
+    d3: "npm:^7.9.0"
+    d3-sankey: "npm:^0.12.3"
+    dagre-d3-es: "npm:7.0.13"
+    dayjs: "npm:^1.11.18"
+    dompurify: "npm:^3.2.5"
+    katex: "npm:^0.16.22"
+    khroma: "npm:^2.1.0"
+    lodash-es: "npm:^4.17.23"
+    marked: "npm:^16.2.1"
+    roughjs: "npm:^4.6.6"
+    stylis: "npm:^4.3.6"
+    ts-dedent: "npm:^2.2.0"
+    uuid: "npm:^11.1.0"
+  checksum: 10c0/a50e0e79fa913d8d0c88a8927d14b07c8236ebb595aade815152b2668ed4e3e5204884c776739ee0b473df2277a4431cf21ed98cc2a7d81995d0f5a94af93058
+  languageName: node
+  linkType: hard
+
+"mhchemparser@npm:^4.1.0":
+  version: 4.2.1
+  resolution: "mhchemparser@npm:4.2.1"
+  checksum: 10c0/5afe8b5ed918fda71a17875227050fd7e8e706305df28bd0beb5a7cd07886a393d041317e3c4b9105fc518ab75065b65886b2574cbd8dec49520de04d119e64a
+  languageName: node
+  linkType: hard
+
+"micromark-core-commonmark@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "micromark-core-commonmark@npm:2.0.3"
+  dependencies:
+    decode-named-character-reference: "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    micromark-factory-destination: "npm:^2.0.0"
+    micromark-factory-label: "npm:^2.0.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-factory-title: "npm:^2.0.0"
+    micromark-factory-whitespace: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-chunked: "npm:^2.0.0"
+    micromark-util-classify-character: "npm:^2.0.0"
+    micromark-util-html-tag-name: "npm:^2.0.0"
+    micromark-util-normalize-identifier: "npm:^2.0.0"
+    micromark-util-resolve-all: "npm:^2.0.0"
+    micromark-util-subtokenize: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/bd4a794fdc9e88dbdf59eaf1c507ddf26e5f7ddf4e52566c72239c0f1b66adbcd219ba2cd42350debbe24471434d5f5e50099d2b3f4e5762ca222ba8e5b549ee
+  languageName: node
+  linkType: hard
+
+"micromark-extension-frontmatter@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-frontmatter@npm:2.0.0"
+  dependencies:
+    fault: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/7d0d876e598917a67146d29f536d6fbbf9d1b2401a77e2f64a3f80f934a63ff26fa94b01759c9185c24b2a91e4e6abf908fa7aa246f00a7778a6b37a17464300
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-autolink-literal@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-autolink-literal@npm:2.1.0"
+  dependencies:
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-sanitize-uri: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/84e6fbb84ea7c161dfa179665dc90d51116de4c28f3e958260c0423e5a745372b7dcbc87d3cde98213b532e6812f847eef5ae561c9397d7f7da1e59872ef3efe
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-footnote@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-footnote@npm:2.1.0"
+  dependencies:
+    devlop: "npm:^1.0.0"
+    micromark-core-commonmark: "npm:^2.0.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-normalize-identifier: "npm:^2.0.0"
+    micromark-util-sanitize-uri: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/d172e4218968b7371b9321af5cde8c77423f73b233b2b0fcf3ff6fd6f61d2e0d52c49123a9b7910612478bf1f0d5e88c75a3990dd68f70f3933fe812b9f77edc
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-strikethrough@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-strikethrough@npm:2.1.0"
+  dependencies:
+    devlop: "npm:^1.0.0"
+    micromark-util-chunked: "npm:^2.0.0"
+    micromark-util-classify-character: "npm:^2.0.0"
+    micromark-util-resolve-all: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/ef4f248b865bdda71303b494671b7487808a340b25552b11ca6814dff3fcfaab9be8d294643060bbdb50f79313e4a686ab18b99cbe4d3ee8a4170fcd134234fb
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-table@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "micromark-extension-gfm-table@npm:2.1.1"
+  dependencies:
+    devlop: "npm:^1.0.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/04bc00e19b435fa0add62cd029d8b7eb6137522f77832186b1d5ef34544a9bd030c9cf85e92ddfcc5c31f6f0a58a43d4b96dba4fc21316037c734630ee12c912
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-tagfilter@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-gfm-tagfilter@npm:2.0.0"
+  dependencies:
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/995558843fff137ae4e46aecb878d8a4691cdf23527dcf1e2f0157d66786be9f7bea0109c52a8ef70e68e3f930af811828ba912239438e31a9cfb9981f44d34d
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm-task-list-item@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-extension-gfm-task-list-item@npm:2.1.0"
+  dependencies:
+    devlop: "npm:^1.0.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/78aa537d929e9309f076ba41e5edc99f78d6decd754b6734519ccbbfca8abd52e1c62df68d41a6ae64d2a3fc1646cea955893c79680b0b4385ced4c52296181f
+  languageName: node
+  linkType: hard
+
+"micromark-extension-gfm@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-gfm@npm:3.0.0"
+  dependencies:
+    micromark-extension-gfm-autolink-literal: "npm:^2.0.0"
+    micromark-extension-gfm-footnote: "npm:^2.0.0"
+    micromark-extension-gfm-strikethrough: "npm:^2.0.0"
+    micromark-extension-gfm-table: "npm:^2.0.0"
+    micromark-extension-gfm-tagfilter: "npm:^2.0.0"
+    micromark-extension-gfm-task-list-item: "npm:^2.0.0"
+    micromark-util-combine-extensions: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/970e28df6ebdd7c7249f52a0dda56e0566fbfa9ae56c8eeeb2445d77b6b89d44096880cd57a1c01e7821b1f4e31009109fbaca4e89731bff7b83b8519690e5d9
+  languageName: node
+  linkType: hard
+
+"micromark-extension-math@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "micromark-extension-math@npm:3.1.0"
+  dependencies:
+    "@types/katex": "npm:^0.16.0"
+    devlop: "npm:^1.0.0"
+    katex: "npm:^0.16.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/56e6f2185a4613f9d47e7e98cf8605851c990957d9229c942b005e286c8087b61dc9149448d38b2f8be6d42cc6a64aad7e1f2778ddd86fbbb1a2f48a3ca1872f
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdx-expression@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "micromark-extension-mdx-expression@npm:3.0.1"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    micromark-factory-mdx-expression: "npm:^2.0.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-events-to-acorn: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/4d8cc5353b083b06bd51c98389de9c198261a5b2b440b75e85000a18d10511f21ba77538d6dfde0e0589df9de3fba9a1d14c2448d30c92d6b461c26d86e397f4
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdx-jsx@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "micromark-extension-mdx-jsx@npm:3.0.2"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    estree-util-is-identifier-name: "npm:^3.0.0"
+    micromark-factory-mdx-expression: "npm:^2.0.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-events-to-acorn: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/5693b2e51934ac29a6aab521eaa2151f891d1fe092550bbd4ce24e4dd7567c1421a54f5e585a57dfa1769a79570f6df57ddd7a98bf0889dd11d495847a266dd7
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdx-md@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-extension-mdx-md@npm:2.0.0"
+  dependencies:
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/bae91c61273de0e5ba80a980c03470e6cd9d7924aa936f46fbda15d780704d9386e945b99eda200e087b96254fbb4271a9545d5ce02676cd6ae67886a8bf82df
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdxjs-esm@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-mdxjs-esm@npm:3.0.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    micromark-core-commonmark: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-events-to-acorn: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+    unist-util-position-from-estree: "npm:^2.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/13e3f726495a960650cdedcba39198ace5bdc953ccb12c14d71fc9ed9bb88e40cc3ba9231e973f6984da3b3573e7ddb23ce409f7c16f52a8d57b608bf46c748d
+  languageName: node
+  linkType: hard
+
+"micromark-extension-mdxjs@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "micromark-extension-mdxjs@npm:3.0.0"
+  dependencies:
+    acorn: "npm:^8.0.0"
+    acorn-jsx: "npm:^5.0.0"
+    micromark-extension-mdx-expression: "npm:^3.0.0"
+    micromark-extension-mdx-jsx: "npm:^3.0.0"
+    micromark-extension-mdx-md: "npm:^2.0.0"
+    micromark-extension-mdxjs-esm: "npm:^3.0.0"
+    micromark-util-combine-extensions: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/fd84f036ddad0aabbc12e7f1b3e9dcfe31573bbc413c5ae903779ef0366d7a4c08193547e7ba75718c9f45654e45f52e575cfc2f23a5f89205a8a70d9a506aea
+  languageName: node
+  linkType: hard
+
+"micromark-factory-destination@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-factory-destination@npm:2.0.1"
+  dependencies:
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/bbafcf869cee5bf511161354cb87d61c142592fbecea051000ff116068dc85216e6d48519d147890b9ea5d7e2864a6341c0c09d9948c203bff624a80a476023c
+  languageName: node
+  linkType: hard
+
+"micromark-factory-label@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-factory-label@npm:2.0.1"
+  dependencies:
+    devlop: "npm:^1.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/0137716b4ecb428114165505e94a2f18855c8bbea21b07a8b5ce514b32a595ed789d2b967125718fc44c4197ceaa48f6609d58807a68e778138d2e6b91b824e8
+  languageName: node
+  linkType: hard
+
+"micromark-factory-mdx-expression@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "micromark-factory-mdx-expression@npm:2.0.3"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-events-to-acorn: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+    unist-util-position-from-estree: "npm:^2.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/a6004ef6272dd01a5d718f2affd7bfb5e08f0849340f5fd96ac823fbc5e9d3b3343acedda50805873ccda5e3b8af4d5fbb302abc874544044ac90c217345cf97
+  languageName: node
+  linkType: hard
+
+"micromark-factory-space@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-factory-space@npm:2.0.1"
+  dependencies:
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/f9ed43f1c0652d8d898de0ac2be3f77f776fffe7dd96bdbba1e02d7ce33d3853c6ff5daa52568fc4fa32cdf3a62d86b85ead9b9189f7211e1d69ff2163c450fb
+  languageName: node
+  linkType: hard
+
+"micromark-factory-title@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-factory-title@npm:2.0.1"
+  dependencies:
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/e72fad8d6e88823514916890099a5af20b6a9178ccf78e7e5e05f4de99bb8797acb756257d7a3a57a53854cb0086bf8aab15b1a9e9db8982500dd2c9ff5948b6
+  languageName: node
+  linkType: hard
+
+"micromark-factory-whitespace@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-factory-whitespace@npm:2.0.1"
+  dependencies:
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/20a1ec58698f24b766510a309b23a10175034fcf1551eaa9da3adcbed3e00cd53d1ebe5f030cf873f76a1cec3c34eb8c50cc227be3344caa9ed25d56cf611224
+  languageName: node
+  linkType: hard
+
+"micromark-util-character@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-util-character@npm:2.1.0"
+  dependencies:
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/fc37a76aaa5a5138191ba2bef1ac50c36b3bcb476522e98b1a42304ab4ec76f5b036a746ddf795d3de3e7004b2c09f21dd1bad42d161f39b8cfc0acd067e6373
+  languageName: node
+  linkType: hard
+
+"micromark-util-chunked@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-chunked@npm:2.0.1"
+  dependencies:
+    micromark-util-symbol: "npm:^2.0.0"
+  checksum: 10c0/b68c0c16fe8106949537bdcfe1be9cf36c0ccd3bc54c4007003cb0984c3750b6cdd0fd77d03f269a3382b85b0de58bde4f6eedbe7ecdf7244759112289b1ab56
+  languageName: node
+  linkType: hard
+
+"micromark-util-classify-character@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-classify-character@npm:2.0.1"
+  dependencies:
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/8a02e59304005c475c332f581697e92e8c585bcd45d5d225a66c1c1b14ab5a8062705188c2ccec33cc998d33502514121478b2091feddbc751887fc9c290ed08
+  languageName: node
+  linkType: hard
+
+"micromark-util-combine-extensions@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-combine-extensions@npm:2.0.1"
+  dependencies:
+    micromark-util-chunked: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/f15e282af24c8372cbb10b9b0b3e2c0aa681fea0ca323a44d6bc537dc1d9382c819c3689f14eaa000118f5a163245358ce6276b2cda9a84439cdb221f5d86ae7
+  languageName: node
+  linkType: hard
+
+"micromark-util-decode-numeric-character-reference@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "micromark-util-decode-numeric-character-reference@npm:2.0.2"
+  dependencies:
+    micromark-util-symbol: "npm:^2.0.0"
+  checksum: 10c0/9c8a9f2c790e5593ffe513901c3a110e9ec8882a08f466da014112a25e5059b51551ca0aeb7ff494657d86eceb2f02ee556c6558b8d66aadc61eae4a240da0df
+  languageName: node
+  linkType: hard
+
+"micromark-util-decode-string@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-decode-string@npm:2.0.1"
+  dependencies:
+    decode-named-character-reference: "npm:^1.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-decode-numeric-character-reference: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+  checksum: 10c0/f24d75b2e5310be6e7b6dee532e0d17d3bf46996841d6295f2a9c87a2046fff4ab603c52ab9d7a7a6430a8b787b1574ae895849c603d262d1b22eef71736b5cb
+  languageName: node
+  linkType: hard
+
+"micromark-util-encode@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-encode@npm:2.0.0"
+  checksum: 10c0/ebdaafff23100bbf4c74e63b4b1612a9ddf94cd7211d6a076bc6fb0bc32c1b48d6fb615aa0953e607c62c97d849f97f1042260d3eb135259d63d372f401bbbb2
+  languageName: node
+  linkType: hard
+
+"micromark-util-events-to-acorn@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "micromark-util-events-to-acorn@npm:2.0.3"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    "@types/unist": "npm:^3.0.0"
+    devlop: "npm:^1.0.0"
+    estree-util-visit: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/a4e0716e943ffdd16a918edf51d4f8291ec2692f5c4d04693dbef3358716fba891f288197afd102c14f4d98dac09d52351046ab7aad1d50b74677bdd5fa683c0
+  languageName: node
+  linkType: hard
+
+"micromark-util-html-tag-name@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-html-tag-name@npm:2.0.1"
+  checksum: 10c0/ae80444db786fde908e9295f19a27a4aa304171852c77414516418650097b8afb401961c9edb09d677b06e97e8370cfa65638dde8438ebd41d60c0a8678b85b9
+  languageName: node
+  linkType: hard
+
+"micromark-util-normalize-identifier@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-normalize-identifier@npm:2.0.1"
+  dependencies:
+    micromark-util-symbol: "npm:^2.0.0"
+  checksum: 10c0/5299265fa360769fc499a89f40142f10a9d4a5c3dd8e6eac8a8ef3c2e4a6570e4c009cf75ea46dce5ee31c01f25587bde2f4a5cc0a935584ae86dd857f2babbd
+  languageName: node
+  linkType: hard
+
+"micromark-util-resolve-all@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "micromark-util-resolve-all@npm:2.0.1"
+  dependencies:
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/bb6ca28764696bb479dc44a2d5b5fe003e7177aeae1d6b0d43f24cc223bab90234092d9c3ce4a4d2b8df095ccfd820537b10eb96bb7044d635f385d65a4c984a
+  languageName: node
+  linkType: hard
+
+"micromark-util-sanitize-uri@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-sanitize-uri@npm:2.0.0"
+  dependencies:
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-encode: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+  checksum: 10c0/74763ca1c927dd520d3ab8fd9856a19740acf76fc091f0a1f5d4e99c8cd5f1b81c5a0be3efb564941a071fb6d85fd951103f2760eb6cff77b5ab3abe08341309
+  languageName: node
+  linkType: hard
+
+"micromark-util-subtokenize@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "micromark-util-subtokenize@npm:2.1.0"
+  dependencies:
+    devlop: "npm:^1.0.0"
+    micromark-util-chunked: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/bee69eece4393308e657c293ba80d92ebcb637e5f55e21dcf9c3fa732b91a8eda8ac248d76ff375e675175bfadeae4712e5158ef97eef1111789da1ce7ab5067
+  languageName: node
+  linkType: hard
+
+"micromark-util-symbol@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-symbol@npm:2.0.0"
+  checksum: 10c0/4e76186c185ce4cefb9cea8584213d9ffacd77099d1da30c0beb09fa21f46f66f6de4c84c781d7e34ff763fe3a06b530e132fa9004882afab9e825238d0aa8b3
+  languageName: node
+  linkType: hard
+
+"micromark-util-types@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "micromark-util-types@npm:2.0.0"
+  checksum: 10c0/d74e913b9b61268e0d6939f4209e3abe9dada640d1ee782419b04fd153711112cfaaa3c4d5f37225c9aee1e23c3bb91a1f5223e1e33ba92d33e83956a53e61de
+  languageName: node
+  linkType: hard
+
+"micromark@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "micromark@npm:4.0.2"
+  dependencies:
+    "@types/debug": "npm:^4.0.0"
+    debug: "npm:^4.0.0"
+    decode-named-character-reference: "npm:^1.0.0"
+    devlop: "npm:^1.0.0"
+    micromark-core-commonmark: "npm:^2.0.0"
+    micromark-factory-space: "npm:^2.0.0"
+    micromark-util-character: "npm:^2.0.0"
+    micromark-util-chunked: "npm:^2.0.0"
+    micromark-util-combine-extensions: "npm:^2.0.0"
+    micromark-util-decode-numeric-character-reference: "npm:^2.0.0"
+    micromark-util-encode: "npm:^2.0.0"
+    micromark-util-normalize-identifier: "npm:^2.0.0"
+    micromark-util-resolve-all: "npm:^2.0.0"
+    micromark-util-sanitize-uri: "npm:^2.0.0"
+    micromark-util-subtokenize: "npm:^2.0.0"
+    micromark-util-symbol: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+  checksum: 10c0/07462287254219d6eda6eac8a3cebaff2994e0575499e7088027b825105e096e4f51e466b14b2a81b71933a3b6c48ee069049d87bc2c2127eee50d9cc69e8af6
+  languageName: node
+  linkType: hard
+
+"micromatch@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "micromatch@npm:4.0.8"
+  dependencies:
+    braces: "npm:^3.0.3"
+    picomatch: "npm:^2.3.1"
+  checksum: 10c0/166fa6eb926b9553f32ef81f5f531d27b4ce7da60e5baf8c021d043b27a388fb95e46a8038d5045877881e673f8134122b59624d5cecbd16eb50a42e7a6b5ca8
+  languageName: node
+  linkType: hard
+
+"mimic-fn@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "mimic-fn@npm:4.0.0"
+  checksum: 10c0/de9cc32be9996fd941e512248338e43407f63f6d497abe8441fa33447d922e927de54d4cc3c1a3c6d652857acd770389d5a3823f311a744132760ce2be15ccbf
+  languageName: node
+  linkType: hard
+
+"minimatch@npm:^10.0.1":
+  version: 10.2.4
+  resolution: "minimatch@npm:10.2.4"
+  dependencies:
+    brace-expansion: "npm:^5.0.2"
+  checksum: 10c0/35f3dfb7b99b51efd46afd378486889f590e7efb10e0f6a10ba6800428cf65c9a8dedb74427d0570b318d749b543dc4e85f06d46d2858bc8cac7e1eb49a95945
+  languageName: node
+  linkType: hard
+
+"mj-context-menu@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "mj-context-menu@npm:0.6.1"
+  checksum: 10c0/2bf3564bb5cbd3915e14417e8df4a4e3013f1e281d431ee1e88976ae6529cc88e6eea7d9b3e217d1d79666f89070c3e1a193383ba9c7bf82d63075e616664ce9
+  languageName: node
+  linkType: hard
+
+"mlly@npm:^1.7.4, mlly@npm:^1.8.0":
+  version: 1.8.0
+  resolution: "mlly@npm:1.8.0"
+  dependencies:
+    acorn: "npm:^8.15.0"
+    pathe: "npm:^2.0.3"
+    pkg-types: "npm:^1.3.1"
+    ufo: "npm:^1.6.1"
+  checksum: 10c0/f174b844ae066c71e9b128046677868e2e28694f0bbeeffbe760b2a9d8ff24de0748d0fde6fabe706700c1d2e11d3c0d7a53071b5ea99671592fac03364604ab
+  languageName: node
+  linkType: hard
+
+"ms@npm:2.1.2":
+  version: 2.1.2
+  resolution: "ms@npm:2.1.2"
+  checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
+  languageName: node
+  linkType: hard
+
+"ms@npm:^2.1.3":
+  version: 2.1.3
+  resolution: "ms@npm:2.1.3"
+  checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
+  languageName: node
+  linkType: hard
+
+"nanoid@npm:^3.3.6":
+  version: 3.3.7
+  resolution: "nanoid@npm:3.3.7"
+  bin:
+    nanoid: bin/nanoid.cjs
+  checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
+  languageName: node
+  linkType: hard
+
+"negotiator@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "negotiator@npm:1.0.0"
+  checksum: 10c0/4c559dd52669ea48e1914f9d634227c561221dd54734070791f999c52ed0ff36e437b2e07d5c1f6e32909fc625fe46491c16e4a8f0572567d4dd15c3a4fda04b
+  languageName: node
+  linkType: hard
+
+"next-themes@npm:^0.4.0":
+  version: 0.4.6
+  resolution: "next-themes@npm:0.4.6"
+  peerDependencies:
+    react: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
+  checksum: 10c0/83590c11d359ce7e4ced14f6ea9dd7a691d5ce6843fe2dc520fc27e29ae1c535118478d03e7f172609c41b1ef1b8da6b8dd2d2acd6cd79cac1abbdbd5b99f2c4
+  languageName: node
+  linkType: hard
+
+"next@npm:^15.0.3":
+  version: 15.0.3
+  resolution: "next@npm:15.0.3"
+  dependencies:
+    "@next/env": "npm:15.0.3"
+    "@next/swc-darwin-arm64": "npm:15.0.3"
+    "@next/swc-darwin-x64": "npm:15.0.3"
+    "@next/swc-linux-arm64-gnu": "npm:15.0.3"
+    "@next/swc-linux-arm64-musl": "npm:15.0.3"
+    "@next/swc-linux-x64-gnu": "npm:15.0.3"
+    "@next/swc-linux-x64-musl": "npm:15.0.3"
+    "@next/swc-win32-arm64-msvc": "npm:15.0.3"
+    "@next/swc-win32-x64-msvc": "npm:15.0.3"
+    "@swc/counter": "npm:0.1.3"
+    "@swc/helpers": "npm:0.5.13"
+    busboy: "npm:1.6.0"
+    caniuse-lite: "npm:^1.0.30001579"
+    postcss: "npm:8.4.31"
+    sharp: "npm:^0.33.5"
+    styled-jsx: "npm:5.1.6"
+  peerDependencies:
+    "@opentelemetry/api": ^1.1.0
+    "@playwright/test": ^1.41.2
+    babel-plugin-react-compiler: "*"
+    react: ^18.2.0 || 19.0.0-rc-66855b96-20241106
+    react-dom: ^18.2.0 || 19.0.0-rc-66855b96-20241106
+    sass: ^1.3.0
+  dependenciesMeta:
+    "@next/swc-darwin-arm64":
+      optional: true
+    "@next/swc-darwin-x64":
+      optional: true
+    "@next/swc-linux-arm64-gnu":
+      optional: true
+    "@next/swc-linux-arm64-musl":
+      optional: true
+    "@next/swc-linux-x64-gnu":
+      optional: true
+    "@next/swc-linux-x64-musl":
+      optional: true
+    "@next/swc-win32-arm64-msvc":
+      optional: true
+    "@next/swc-win32-x64-msvc":
+      optional: true
+    sharp:
+      optional: true
+  peerDependenciesMeta:
+    "@opentelemetry/api":
+      optional: true
+    "@playwright/test":
+      optional: true
+    babel-plugin-react-compiler:
+      optional: true
+    sass:
+      optional: true
+  bin:
+    next: dist/bin/next
+  checksum: 10c0/c5f6a57acb5f29063abc82d4d4417a048d0c2d5216d6ded6aa3fe32d60bb4835ed57dd34e2ef8fdda15579e97205820dc25bf34556b1d942a01a33d9ae7f88db
+  languageName: node
+  linkType: hard
+
+"nextra-theme-docs@npm:^4":
+  version: 4.6.1
+  resolution: "nextra-theme-docs@npm:4.6.1"
+  dependencies:
+    "@headlessui/react": "npm:^2.1.2"
+    clsx: "npm:^2.1.0"
+    next-themes: "npm:^0.4.0"
+    react-compiler-runtime: "npm:^19.1.0-rc.2"
+    scroll-into-view-if-needed: "npm:^3.1.0"
+    zod: "npm:^4.1.12"
+    zustand: "npm:^5.0.1"
+  peerDependencies:
+    next: ">=14"
+    nextra: 4.6.1
+    react: ">=18"
+    react-dom: ">=18"
+  checksum: 10c0/53b217fdf3207493461be660a4ab3c807b5149f2019abd00d1a0436d2edd06c426e6fde2bee0912b3f0c5b5f949ddbc2bc78fcf15c96e2cf53e2f0e3fba24a62
+  languageName: node
+  linkType: hard
+
+"nextra@npm:^4":
+  version: 4.6.1
+  resolution: "nextra@npm:4.6.1"
+  dependencies:
+    "@formatjs/intl-localematcher": "npm:^0.6.0"
+    "@headlessui/react": "npm:^2.1.2"
+    "@mdx-js/mdx": "npm:^3.0.0"
+    "@napi-rs/simple-git": "npm:^0.1.9"
+    "@shikijs/twoslash": "npm:^3.2.1"
+    "@theguild/remark-mermaid": "npm:^0.3.0"
+    "@theguild/remark-npm2yarn": "npm:^0.3.2"
+    better-react-mathjax: "npm:^2.3.0"
+    clsx: "npm:^2.1.0"
+    estree-util-to-js: "npm:^2.0.0"
+    estree-util-value-to-estree: "npm:^3.3.3"
+    fast-glob: "npm:^3.3.2"
+    github-slugger: "npm:^2.0.0"
+    hast-util-to-estree: "npm:^3.1.0"
+    katex: "npm:^0.16.21"
+    mdast-util-from-markdown: "npm:^2.0.1"
+    mdast-util-gfm: "npm:^3.0.0"
+    mdast-util-to-hast: "npm:^13.2.0"
+    negotiator: "npm:^1.0.0"
+    react-compiler-runtime: "npm:^19.1.0-rc.2"
+    react-medium-image-zoom: "npm:^5.2.12"
+    rehype-katex: "npm:^7.0.0"
+    rehype-pretty-code: "npm:0.14.1"
+    rehype-raw: "npm:^7.0.0"
+    remark-frontmatter: "npm:^5.0.0"
+    remark-gfm: "npm:^4.0.0"
+    remark-math: "npm:^6.0.0"
+    remark-reading-time: "npm:^2.0.2"
+    remark-smartypants: "npm:^3.0.0"
+    server-only: "npm:^0.0.1"
+    shiki: "npm:^3.2.1"
+    slash: "npm:^5.1.0"
+    title: "npm:^4.0.1"
+    ts-morph: "npm:^27.0.0"
+    unist-util-remove: "npm:^4.0.0"
+    unist-util-visit: "npm:^5.0.0"
+    unist-util-visit-children: "npm:^3.0.0"
+    yaml: "npm:^2.3.2"
+    zod: "npm:^4.1.12"
+  peerDependencies:
+    next: ">=14"
+    react: ">=18"
+    react-dom: ">=18"
+  checksum: 10c0/67b39c8c153afd83043b4edf54ef98472c37d37fcf06614b14e10e712cebdc02f4ca9d0f231b75a5ebc64db124a2794fc911068bccf591cdaf0941cd07deb5b9
+  languageName: node
+  linkType: hard
+
+"nlcst-to-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "nlcst-to-string@npm:4.0.0"
+  dependencies:
+    "@types/nlcst": "npm:^2.0.0"
+  checksum: 10c0/a192c8b3365a7c076812004e72ae5b4a1734e582be2a6f3c062f3beecf18868a9fe2d1bad870bfead320fb39830f2c4f3752e5ae6574c4e59157126fd1ddba70
+  languageName: node
+  linkType: hard
+
+"npm-run-path@npm:^5.1.0":
+  version: 5.3.0
+  resolution: "npm-run-path@npm:5.3.0"
+  dependencies:
+    path-key: "npm:^4.0.0"
+  checksum: 10c0/124df74820c40c2eb9a8612a254ea1d557ddfab1581c3e751f825e3e366d9f00b0d76a3c94ecd8398e7f3eee193018622677e95816e8491f0797b21e30b2deba
+  languageName: node
+  linkType: hard
+
+"npm-to-yarn@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "npm-to-yarn@npm:3.0.1"
+  checksum: 10c0/f0a72bfc0ed2ad50c5995511ff6442520d259aee5a58e1b0914572a33d29c07090a684a1d8ce95d2399dfe9bc51e649e8d029b0118ecf941f40212053693caca
+  languageName: node
+  linkType: hard
+
+"onetime@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "onetime@npm:6.0.0"
+  dependencies:
+    mimic-fn: "npm:^4.0.0"
+  checksum: 10c0/4eef7c6abfef697dd4479345a4100c382d73c149d2d56170a54a07418c50816937ad09500e1ed1e79d235989d073a9bade8557122aee24f0576ecde0f392bb6c
+  languageName: node
+  linkType: hard
+
+"oniguruma-parser@npm:^0.12.1":
+  version: 0.12.1
+  resolution: "oniguruma-parser@npm:0.12.1"
+  checksum: 10c0/b843ea54cda833efb19f856314afcbd43e903ece3de489ab78c527ddec84859208052557daa9fad4bdba89ebdd15b0cc250de86b3daf8c7cbe37bac5a6a185d3
+  languageName: node
+  linkType: hard
+
+"oniguruma-to-es@npm:^4.3.4":
+  version: 4.3.4
+  resolution: "oniguruma-to-es@npm:4.3.4"
+  dependencies:
+    oniguruma-parser: "npm:^0.12.1"
+    regex: "npm:^6.0.1"
+    regex-recursion: "npm:^6.0.2"
+  checksum: 10c0/fb58459f50db71c2c4785205636186bfbb125b094c4275512a8f41f123ed3fbf61f37c455f4360ef14a56c693981aecd7da3ae2c05614a222e872c4643b463fc
+  languageName: node
+  linkType: hard
+
+"package-manager-detector@npm:^1.3.0":
+  version: 1.6.0
+  resolution: "package-manager-detector@npm:1.6.0"
+  checksum: 10c0/6419d0b840be64fd45bcdcb7a19f09b81b65456d5e7f7a3daac305a4c90643052122f6ac0308afe548ffee75e36148532a2002ea9d292754f1e385aa2e1ea03b
+  languageName: node
+  linkType: hard
+
+"parse-entities@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "parse-entities@npm:4.0.1"
+  dependencies:
+    "@types/unist": "npm:^2.0.0"
+    character-entities: "npm:^2.0.0"
+    character-entities-legacy: "npm:^3.0.0"
+    character-reference-invalid: "npm:^2.0.0"
+    decode-named-character-reference: "npm:^1.0.0"
+    is-alphanumerical: "npm:^2.0.0"
+    is-decimal: "npm:^2.0.0"
+    is-hexadecimal: "npm:^2.0.0"
+  checksum: 10c0/9dfa3b0dc43a913c2558c4bd625b1abcc2d6c6b38aa5724b141ed988471977248f7ad234eed57e1bc70b694dd15b0d710a04f66c2f7c096e35abd91962b7d926
+  languageName: node
+  linkType: hard
+
+"parse-latin@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "parse-latin@npm:7.0.0"
+  dependencies:
+    "@types/nlcst": "npm:^2.0.0"
+    "@types/unist": "npm:^3.0.0"
+    nlcst-to-string: "npm:^4.0.0"
+    unist-util-modify-children: "npm:^4.0.0"
+    unist-util-visit-children: "npm:^3.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/4232a464f98c41c6680575c54bc2c9b21ac4b82a1f796a871bfef5efa6eddaab9bccf734b08cde6b0a5504ef46a0a14041ddd0bc5d9cc70f73a507f93f610596
+  languageName: node
+  linkType: hard
+
+"parse-numeric-range@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "parse-numeric-range@npm:1.3.0"
+  checksum: 10c0/53465afaa92111e86697281b684aa4574427360889cc23a1c215488c06b72441febdbf09f47ab0bef9a0c701e059629f3eebd2fe6fb241a254ad7a7a642aebe8
+  languageName: node
+  linkType: hard
+
+"parse5@npm:^7.0.0":
+  version: 7.1.2
+  resolution: "parse5@npm:7.1.2"
+  dependencies:
+    entities: "npm:^4.4.0"
+  checksum: 10c0/297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4
+  languageName: node
+  linkType: hard
+
+"path-browserify@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "path-browserify@npm:1.0.1"
+  checksum: 10c0/8b8c3fd5c66bd340272180590ae4ff139769e9ab79522e2eb82e3d571a89b8117c04147f65ad066dccfb42fcad902e5b7d794b3d35e0fd840491a8ddbedf8c66
+  languageName: node
+  linkType: hard
+
+"path-data-parser@npm:0.1.0, path-data-parser@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "path-data-parser@npm:0.1.0"
+  checksum: 10c0/ba22d54669a8bc4a3df27431fe667900685585d1196085b803d0aa4066b83e709bbf2be7c1d2b56e706b49cc698231d55947c22abbfc4843ca424bbf8c985745
+  languageName: node
+  linkType: hard
+
+"path-key@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "path-key@npm:3.1.1"
+  checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c
+  languageName: node
+  linkType: hard
+
+"path-key@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "path-key@npm:4.0.0"
+  checksum: 10c0/794efeef32863a65ac312f3c0b0a99f921f3e827ff63afa5cb09a377e202c262b671f7b3832a4e64731003fa94af0263713962d317b9887bd1e0c48a342efba3
+  languageName: node
+  linkType: hard
+
+"pathe@npm:^2.0.1, pathe@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "pathe@npm:2.0.3"
+  checksum: 10c0/c118dc5a8b5c4166011b2b70608762e260085180bb9e33e80a50dcdb1e78c010b1624f4280c492c92b05fc276715a4c357d1f9edc570f8f1b3d90b6839ebaca1
+  languageName: node
+  linkType: hard
+
+"picocolors@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "picocolors@npm:1.0.1"
+  checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400
+  languageName: node
+  linkType: hard
+
+"picomatch@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "picomatch@npm:2.3.1"
+  checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
+  languageName: node
+  linkType: hard
+
+"picomatch@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "picomatch@npm:4.0.3"
+  checksum: 10c0/9582c951e95eebee5434f59e426cddd228a7b97a0161a375aed4be244bd3fe8e3a31b846808ea14ef2c8a2527a6eeab7b3946a67d5979e81694654f939473ae2
+  languageName: node
+  linkType: hard
+
+"pkg-types@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "pkg-types@npm:1.3.1"
+  dependencies:
+    confbox: "npm:^0.1.8"
+    mlly: "npm:^1.7.4"
+    pathe: "npm:^2.0.1"
+  checksum: 10c0/19e6cb8b66dcc66c89f2344aecfa47f2431c988cfa3366bdfdcfb1dd6695f87dcce37fbd90fe9d1605e2f4440b77f391e83c23255347c35cf84e7fd774d7fcea
+  languageName: node
+  linkType: hard
+
+"points-on-curve@npm:0.2.0, points-on-curve@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "points-on-curve@npm:0.2.0"
+  checksum: 10c0/f0d92343fcc2ad1f48334633e580574c1e0e28038a756133e171e537f270d6d64203feada5ee556e36f448a1b46e0306dee07b30f589f4e3ad720f6ee38ef48c
+  languageName: node
+  linkType: hard
+
+"points-on-path@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "points-on-path@npm:0.2.1"
+  dependencies:
+    path-data-parser: "npm:0.1.0"
+    points-on-curve: "npm:0.2.0"
+  checksum: 10c0/a7010340f9f196976f61838e767bb7b0b7f6273ab4fb9eb37c61001fe26fbfc3fcd63c96d5e85b9a4ab579213ab366f2ddaaf60e2a9253e2b91a62db33f395ba
+  languageName: node
+  linkType: hard
+
+"postcss@npm:8.4.31":
+  version: 8.4.31
+  resolution: "postcss@npm:8.4.31"
+  dependencies:
+    nanoid: "npm:^3.3.6"
+    picocolors: "npm:^1.0.0"
+    source-map-js: "npm:^1.0.2"
+  checksum: 10c0/748b82e6e5fc34034dcf2ae88ea3d11fd09f69b6c50ecdd3b4a875cfc7cdca435c958b211e2cb52355422ab6fccb7d8f2f2923161d7a1b281029e4a913d59acf
+  languageName: node
+  linkType: hard
+
+"property-information@npm:^6.0.0":
+  version: 6.5.0
+  resolution: "property-information@npm:6.5.0"
+  checksum: 10c0/981e0f9cc2e5acdb414a6fd48a99dd0fd3a4079e7a91ab41cf97a8534cf43e0e0bc1ffada6602a1b3d047a33db8b5fc2ef46d863507eda712d5ceedac443f0ef
+  languageName: node
+  linkType: hard
+
+"property-information@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "property-information@npm:7.1.0"
+  checksum: 10c0/e0fe22cff26103260ad0e82959229106563fa115a54c4d6c183f49d88054e489cc9f23452d3ad584179dc13a8b7b37411a5df873746b5e4086c865874bfa968e
+  languageName: node
+  linkType: hard
+
+"queue-microtask@npm:^1.2.2":
+  version: 1.2.3
+  resolution: "queue-microtask@npm:1.2.3"
+  checksum: 10c0/900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102
+  languageName: node
+  linkType: hard
+
+"react-compiler-runtime@npm:^19.1.0-rc.2":
+  version: 19.1.0-rc.3
+  resolution: "react-compiler-runtime@npm:19.1.0-rc.3"
+  peerDependencies:
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0 || ^0.0.0-experimental
+  checksum: 10c0/a3f58880bbbda22ef47a4d0d45bd210f2e506bad5d30ca5aa0a8758b71c226d8abb89b3db9b0c1850d5d7c0891763551d2910d16a37da10a8477552b93f40019
+  languageName: node
+  linkType: hard
+
+"react-dom@npm:^19":
+  version: 19.2.4
+  resolution: "react-dom@npm:19.2.4"
+  dependencies:
+    scheduler: "npm:^0.27.0"
+  peerDependencies:
+    react: ^19.2.4
+  checksum: 10c0/f0c63f1794dedb154136d4d0f59af00b41907f4859571c155940296808f4b94bf9c0c20633db75b5b2112ec13d8d7dd4f9bf57362ed48782f317b11d05a44f35
+  languageName: node
+  linkType: hard
+
+"react-medium-image-zoom@npm:^5.2.12":
+  version: 5.4.1
+  resolution: "react-medium-image-zoom@npm:5.4.1"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  checksum: 10c0/513cd9126cd0d54500e6022847e9f8bf70140bf6983fa44fcd1608b264eb30d09d1047abce114173647ebe9a278843b2f76c1b05bf2410c0dc29919ac38c7b45
+  languageName: node
+  linkType: hard
+
+"react@npm:^19":
+  version: 19.2.4
+  resolution: "react@npm:19.2.4"
+  checksum: 10c0/cd2c9ff67a720799cc3b38a516009986f7fc4cb8d3e15716c6211cf098d1357ee3e348ab05ad0600042bbb0fd888530ba92e329198c92eafa0994f5213396596
+  languageName: node
+  linkType: hard
+
+"reading-time@npm:^1.3.0":
+  version: 1.5.0
+  resolution: "reading-time@npm:1.5.0"
+  checksum: 10c0/0f730852fd4fb99e5f78c5b0cf36ab8c3fa15db96f87d9563843f6fd07a47864273ade539ebb184b785b728cde81a70283aa2d9b80cba5ca03b81868be03cabc
+  languageName: node
+  linkType: hard
+
+"recma-build-jsx@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "recma-build-jsx@npm:1.0.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    estree-util-build-jsx: "npm:^3.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/ca30f5163887b44c74682355da2625f7b49f33267699d22247913e513e043650cbdd6a7497cf13c60f09ad9e7bc2bd35bd20853672773c19188569814b56bb04
+  languageName: node
+  linkType: hard
+
+"recma-jsx@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "recma-jsx@npm:1.0.1"
+  dependencies:
+    acorn-jsx: "npm:^5.0.0"
+    estree-util-to-js: "npm:^2.0.0"
+    recma-parse: "npm:^1.0.0"
+    recma-stringify: "npm:^1.0.0"
+    unified: "npm:^11.0.0"
+  peerDependencies:
+    acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 10c0/9921b1270581ff133b94678868e665ba0fb6285ee60a6936106bac4899196c2ffb02dde894d9bc088fbf3deacb3e2426a3452e72066bf1203cbefebd7809d93f
+  languageName: node
+  linkType: hard
+
+"recma-parse@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "recma-parse@npm:1.0.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    esast-util-from-js: "npm:^2.0.0"
+    unified: "npm:^11.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/37c0990859a562d082e02d475ca5f4c8ef0840d285270f6699fe888cbb06260f97eb098585eda4aae416182c207fd19cf05e4f0b2dcf55cbf81dde4406d95545
+  languageName: node
+  linkType: hard
+
+"recma-stringify@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "recma-stringify@npm:1.0.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    estree-util-to-js: "npm:^2.0.0"
+    unified: "npm:^11.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/c2ed4c0e8cf8a09aedcd47c5d016d47f6e1ff6c2d4b220e2abaf1b77713bf404756af2ea3ea7999aec5862e8825aff035edceb370c7fd8603a7e9da03bd6987e
+  languageName: node
+  linkType: hard
+
+"regex-recursion@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "regex-recursion@npm:6.0.2"
+  dependencies:
+    regex-utilities: "npm:^2.3.0"
+  checksum: 10c0/68e8b6889680e904b75d7f26edaf70a1a4dc1087406bff53face4c2929d918fd77c72223843fe816ac8ed9964f96b4160650e8d5909e26a998c6e9de324dadb1
+  languageName: node
+  linkType: hard
+
+"regex-utilities@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "regex-utilities@npm:2.3.0"
+  checksum: 10c0/78c550a80a0af75223244fff006743922591bd8f61d91fef7c86b9b56cf9bbf8ee5d7adb6d8991b5e304c57c90103fc4818cf1e357b11c6c669b782839bd7893
+  languageName: node
+  linkType: hard
+
+"regex@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "regex@npm:6.1.0"
+  dependencies:
+    regex-utilities: "npm:^2.3.0"
+  checksum: 10c0/6e0ee2a1c17d5a66dc1120dfc51899dedf6677857e83a0df4d5a822ebb8645a54a079772efc1ade382b67aad35e4e22b5bd2d33c05ed28b0e000f8f57eb0aec1
+  languageName: node
+  linkType: hard
+
+"rehype-katex@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "rehype-katex@npm:7.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/katex": "npm:^0.16.0"
+    hast-util-from-html-isomorphic: "npm:^2.0.0"
+    hast-util-to-text: "npm:^4.0.0"
+    katex: "npm:^0.16.0"
+    unist-util-visit-parents: "npm:^6.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/4986d5db673576df0274464eafecef7c999fb72bf16e8df92454c68bf063b005010ab5465c64dacfbc1767ed6446dd03768917df7b9983f5e60711bce78b9880
+  languageName: node
+  linkType: hard
+
+"rehype-parse@npm:^9.0.0":
+  version: 9.0.1
+  resolution: "rehype-parse@npm:9.0.1"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    hast-util-from-html: "npm:^2.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/efa9ca17673fe70e2d322a1d262796bbed5f6a89382f8f8393352bbd6f6bbf1d4d1d050984b86ff9cb6c0fa2535175ab0829e53c94b1e38fc3c158e6c0ad90bc
+  languageName: node
+  linkType: hard
+
+"rehype-pretty-code@npm:0.14.1":
+  version: 0.14.1
+  resolution: "rehype-pretty-code@npm:0.14.1"
+  dependencies:
+    "@types/hast": "npm:^3.0.4"
+    hast-util-to-string: "npm:^3.0.0"
+    parse-numeric-range: "npm:^1.3.0"
+    rehype-parse: "npm:^9.0.0"
+    unified: "npm:^11.0.5"
+    unist-util-visit: "npm:^5.0.0"
+  peerDependencies:
+    shiki: ^1.0.0 || ^2.0.0 || ^3.0.0
+  checksum: 10c0/9f51a965edfd49d086f6421d13fa4725e59c891187fcb82aba0fe471425058af3b98210cedf2a9790e85575d1bd6d817ee88bf007628123e7878636c2c00bb1a
+  languageName: node
+  linkType: hard
+
+"rehype-raw@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "rehype-raw@npm:7.0.0"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    hast-util-raw: "npm:^9.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/1435b4b6640a5bc3abe3b2133885c4dbff5ef2190ef9cfe09d6a63f74dd7d7ffd0cede70603278560ccf1acbfb9da9faae4b68065a28bc5aa88ad18e40f32d52
+  languageName: node
+  linkType: hard
+
+"rehype-recma@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "rehype-recma@npm:1.0.0"
+  dependencies:
+    "@types/estree": "npm:^1.0.0"
+    "@types/hast": "npm:^3.0.0"
+    hast-util-to-estree: "npm:^3.0.0"
+  checksum: 10c0/be60d7433a7f788a14f41da3e93ba9d9272c908ddef47757026cc4bbcc912f6301d56810349adf876d294a8d048626a0dbf6988aaa574afbfc29eac1ddc1eb74
+  languageName: node
+  linkType: hard
+
+"remark-frontmatter@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "remark-frontmatter@npm:5.0.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    mdast-util-frontmatter: "npm:^2.0.0"
+    micromark-extension-frontmatter: "npm:^2.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/102325d5edbcf30eaf74de8a0a6e03096cc2370dfef19080fd2dd208f368fbb2323388751ac9931a1aa38a4f2828fa4bad6c52dc5249dcadcd34861693b52bf9
+  languageName: node
+  linkType: hard
+
+"remark-gfm@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "remark-gfm@npm:4.0.1"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    mdast-util-gfm: "npm:^3.0.0"
+    micromark-extension-gfm: "npm:^3.0.0"
+    remark-parse: "npm:^11.0.0"
+    remark-stringify: "npm:^11.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/427ecc6af3e76222662061a5f670a3e4e33ec5fffe2cabf04034da6a3f9a1bda1fc023e838a636385ba314e66e2bebbf017ca61ebea357eb0f5200fe0625a4b7
+  languageName: node
+  linkType: hard
+
+"remark-math@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "remark-math@npm:6.0.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    mdast-util-math: "npm:^3.0.0"
+    micromark-extension-math: "npm:^3.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/859613c4db194bb6b3c9c063661dc52b8ceda9c5cf3256b42f73d93eb8f38a6d634eb5f976fe094425f6f1035aaf329eb49ada314feb3b2b1073326b6d3aaa02
+  languageName: node
+  linkType: hard
+
+"remark-mdx@npm:^3.0.0":
+  version: 3.1.1
+  resolution: "remark-mdx@npm:3.1.1"
+  dependencies:
+    mdast-util-mdx: "npm:^3.0.0"
+    micromark-extension-mdxjs: "npm:^3.0.0"
+  checksum: 10c0/3e5585d4c2448d8ac7548b1d148f04b89251ff47fbfc80be1428cecec2fc2530abe30a5da53bb031283f8a78933259df6120c1cd4cc7cc1d43978d508798ba88
+  languageName: node
+  linkType: hard
+
+"remark-parse@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "remark-parse@npm:11.0.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    mdast-util-from-markdown: "npm:^2.0.0"
+    micromark-util-types: "npm:^2.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/6eed15ddb8680eca93e04fcb2d1b8db65a743dcc0023f5007265dda558b09db595a087f622062ccad2630953cd5cddc1055ce491d25a81f3317c858348a8dd38
+  languageName: node
+  linkType: hard
+
+"remark-reading-time@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "remark-reading-time@npm:2.0.2"
+  dependencies:
+    estree-util-is-identifier-name: "npm:^2.0.0"
+    estree-util-value-to-estree: "npm:^3.3.3"
+    reading-time: "npm:^1.3.0"
+    unist-util-visit: "npm:^3.1.0"
+  checksum: 10c0/d0b1c393e70625bba407887b5df8d1b1a8147069188ffe098e19985fd02bd7422e015a3b9e3b1b5d5a1a79de6b3a68d2c90158b7568226773fea979ac96c8c9c
+  languageName: node
+  linkType: hard
+
+"remark-rehype@npm:^11.0.0":
+  version: 11.1.2
+  resolution: "remark-rehype@npm:11.1.2"
+  dependencies:
+    "@types/hast": "npm:^3.0.0"
+    "@types/mdast": "npm:^4.0.0"
+    mdast-util-to-hast: "npm:^13.0.0"
+    unified: "npm:^11.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/f9eccacfb596d9605581dc05bfad28635d6ded5dd0a18e88af5fd4df0d3fcf9612e1501d4513bc2164d833cfe9636dab20400080b09e53f155c6e1442a1231fb
+  languageName: node
+  linkType: hard
+
+"remark-smartypants@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "remark-smartypants@npm:3.0.2"
+  dependencies:
+    retext: "npm:^9.0.0"
+    retext-smartypants: "npm:^6.0.0"
+    unified: "npm:^11.0.4"
+    unist-util-visit: "npm:^5.0.0"
+  checksum: 10c0/661129f6258feb4531c896d0d7013d0cd7835599f7d9c46947ff0cda19c717e2d5a7da28fc72a9d454dd5a5b6308403f0d7a7ec58338865a28c9242a77739b40
+  languageName: node
+  linkType: hard
+
+"remark-stringify@npm:^11.0.0":
+  version: 11.0.0
+  resolution: "remark-stringify@npm:11.0.0"
+  dependencies:
+    "@types/mdast": "npm:^4.0.0"
+    mdast-util-to-markdown: "npm:^2.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/0cdb37ce1217578f6f847c7ec9f50cbab35df5b9e3903d543e74b405404e67c07defcb23cd260a567b41b769400f6de03c2c3d9cd6ae7a6707d5c8d89ead489f
+  languageName: node
+  linkType: hard
+
+"retext-latin@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "retext-latin@npm:4.0.0"
+  dependencies:
+    "@types/nlcst": "npm:^2.0.0"
+    parse-latin: "npm:^7.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/51530be66db9ef6ab8e9cda5dd0598377ff4321481d6a941bf70dac16fa6e9123ff7d8ff093a05c30a3e00e282e37094b845b6130a8005a3cb7186a961ab99cb
+  languageName: node
+  linkType: hard
+
+"retext-smartypants@npm:^6.0.0":
+  version: 6.2.0
+  resolution: "retext-smartypants@npm:6.2.0"
+  dependencies:
+    "@types/nlcst": "npm:^2.0.0"
+    nlcst-to-string: "npm:^4.0.0"
+    unist-util-visit: "npm:^5.0.0"
+  checksum: 10c0/36f925353dd7f31df642bca2493524a8daee15f9b0e0dfe7fb8982462d23ccb12a99864989db22f0bacb6d7fea1f696ba96e031d3fbac4f013e1c95ef3fed881
+  languageName: node
+  linkType: hard
+
+"retext-stringify@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "retext-stringify@npm:4.0.0"
+  dependencies:
+    "@types/nlcst": "npm:^2.0.0"
+    nlcst-to-string: "npm:^4.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/eb2930356c85999a8978092a5d6ba3695fea859c71f221dcdc485704552922641bc17e50fea2ae0599d665192eaad002e98bb4236ecac94a570b73581b99004d
+  languageName: node
+  linkType: hard
+
+"retext@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "retext@npm:9.0.0"
+  dependencies:
+    "@types/nlcst": "npm:^2.0.0"
+    retext-latin: "npm:^4.0.0"
+    retext-stringify: "npm:^4.0.0"
+    unified: "npm:^11.0.0"
+  checksum: 10c0/eee9f66ff6fae5670a5eeccc0b5e2639112f868475273ce307d3079cfe7deb9d1b0f2b8fa28b4ab30abaf8538345185a44908f461a27bbf43c4f94feda90ecac
+  languageName: node
+  linkType: hard
+
+"reusify@npm:^1.0.4":
+  version: 1.1.0
+  resolution: "reusify@npm:1.1.0"
+  checksum: 10c0/4eff0d4a5f9383566c7d7ec437b671cc51b25963bd61bf127c3f3d3f68e44a026d99b8d2f1ad344afff8d278a8fe70a8ea092650a716d22287e8bef7126bb2fa
+  languageName: node
+  linkType: hard
+
+"robust-predicates@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "robust-predicates@npm:3.0.2"
+  checksum: 10c0/4ecd53649f1c2d49529c85518f2fa69ffb2f7a4453f7fd19c042421c7b4d76c3efb48bc1c740c8f7049346d7cb58cf08ee0c9adaae595cc23564d360adb1fde4
+  languageName: node
+  linkType: hard
+
+"roughjs@npm:^4.6.6":
+  version: 4.6.6
+  resolution: "roughjs@npm:4.6.6"
+  dependencies:
+    hachure-fill: "npm:^0.5.2"
+    path-data-parser: "npm:^0.1.0"
+    points-on-curve: "npm:^0.2.0"
+    points-on-path: "npm:^0.2.1"
+  checksum: 10c0/68c11bf4516aa014cef2fe52426a9bab237c2f500d13e1a4f13b523cb5723667bf2d92b9619325efdc5bc2a193588ff5af8d51683df17cfb8720e96fe2b92b0c
+  languageName: node
+  linkType: hard
+
+"run-parallel@npm:^1.1.9":
+  version: 1.2.0
+  resolution: "run-parallel@npm:1.2.0"
+  dependencies:
+    queue-microtask: "npm:^1.2.2"
+  checksum: 10c0/200b5ab25b5b8b7113f9901bfe3afc347e19bb7475b267d55ad0eb86a62a46d77510cb0f232507c9e5d497ebda569a08a9867d0d14f57a82ad5564d991588b39
+  languageName: node
+  linkType: hard
+
+"rw@npm:1":
+  version: 1.3.3
+  resolution: "rw@npm:1.3.3"
+  checksum: 10c0/b1e1ef37d1e79d9dc7050787866e30b6ddcb2625149276045c262c6b4d53075ddc35f387a856a8e76f0d0df59f4cd58fe24707e40797ebee66e542b840ed6a53
+  languageName: node
+  linkType: hard
+
+"safer-buffer@npm:>= 2.1.2 < 3.0.0":
+  version: 2.1.2
+  resolution: "safer-buffer@npm:2.1.2"
+  checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4
+  languageName: node
+  linkType: hard
+
+"scheduler@npm:^0.27.0":
+  version: 0.27.0
+  resolution: "scheduler@npm:0.27.0"
+  checksum: 10c0/4f03048cb05a3c8fddc45813052251eca00688f413a3cee236d984a161da28db28ba71bd11e7a3dd02f7af84ab28d39fb311431d3b3772fed557945beb00c452
+  languageName: node
+  linkType: hard
+
+"scroll-into-view-if-needed@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "scroll-into-view-if-needed@npm:3.1.0"
+  dependencies:
+    compute-scroll-into-view: "npm:^3.0.2"
+  checksum: 10c0/1f46b090e1e04fcfdef1e384f6d7e615f9f84d4176faf4dbba7347cc0a6e491e5d578eaf4dbe9618dd3d8d38efafde58535b3e00f2a21ce4178c14be364850ff
+  languageName: node
+  linkType: hard
+
+"semver@npm:^7.6.3":
+  version: 7.6.3
+  resolution: "semver@npm:7.6.3"
+  bin:
+    semver: bin/semver.js
+  checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf
+  languageName: node
+  linkType: hard
+
+"server-only@npm:^0.0.1":
+  version: 0.0.1
+  resolution: "server-only@npm:0.0.1"
+  checksum: 10c0/4704f0ef85da0be981af6d4ed8e739d39bcfd265b9c246a684060acda5642d0fdc6daffc2308e71e2682c5f508090978802eae0a77623c9b90a49f9ae68048d6
+  languageName: node
+  linkType: hard
+
+"sharp@npm:^0.33.5":
+  version: 0.33.5
+  resolution: "sharp@npm:0.33.5"
+  dependencies:
+    "@img/sharp-darwin-arm64": "npm:0.33.5"
+    "@img/sharp-darwin-x64": "npm:0.33.5"
+    "@img/sharp-libvips-darwin-arm64": "npm:1.0.4"
+    "@img/sharp-libvips-darwin-x64": "npm:1.0.4"
+    "@img/sharp-libvips-linux-arm": "npm:1.0.5"
+    "@img/sharp-libvips-linux-arm64": "npm:1.0.4"
+    "@img/sharp-libvips-linux-s390x": "npm:1.0.4"
+    "@img/sharp-libvips-linux-x64": "npm:1.0.4"
+    "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.4"
+    "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.4"
+    "@img/sharp-linux-arm": "npm:0.33.5"
+    "@img/sharp-linux-arm64": "npm:0.33.5"
+    "@img/sharp-linux-s390x": "npm:0.33.5"
+    "@img/sharp-linux-x64": "npm:0.33.5"
+    "@img/sharp-linuxmusl-arm64": "npm:0.33.5"
+    "@img/sharp-linuxmusl-x64": "npm:0.33.5"
+    "@img/sharp-wasm32": "npm:0.33.5"
+    "@img/sharp-win32-ia32": "npm:0.33.5"
+    "@img/sharp-win32-x64": "npm:0.33.5"
+    color: "npm:^4.2.3"
+    detect-libc: "npm:^2.0.3"
+    semver: "npm:^7.6.3"
+  dependenciesMeta:
+    "@img/sharp-darwin-arm64":
+      optional: true
+    "@img/sharp-darwin-x64":
+      optional: true
+    "@img/sharp-libvips-darwin-arm64":
+      optional: true
+    "@img/sharp-libvips-darwin-x64":
+      optional: true
+    "@img/sharp-libvips-linux-arm":
+      optional: true
+    "@img/sharp-libvips-linux-arm64":
+      optional: true
+    "@img/sharp-libvips-linux-s390x":
+      optional: true
+    "@img/sharp-libvips-linux-x64":
+      optional: true
+    "@img/sharp-libvips-linuxmusl-arm64":
+      optional: true
+    "@img/sharp-libvips-linuxmusl-x64":
+      optional: true
+    "@img/sharp-linux-arm":
+      optional: true
+    "@img/sharp-linux-arm64":
+      optional: true
+    "@img/sharp-linux-s390x":
+      optional: true
+    "@img/sharp-linux-x64":
+      optional: true
+    "@img/sharp-linuxmusl-arm64":
+      optional: true
+    "@img/sharp-linuxmusl-x64":
+      optional: true
+    "@img/sharp-wasm32":
+      optional: true
+    "@img/sharp-win32-ia32":
+      optional: true
+    "@img/sharp-win32-x64":
+      optional: true
+  checksum: 10c0/6b81421ddfe6ee524d8d77e325c5e147fef22884e1c7b1656dfd89a88d7025894115da02d5f984261bf2e6daa16f98cadd1721c4ba408b4212b1d2a60f233484
+  languageName: node
+  linkType: hard
+
+"shebang-command@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "shebang-command@npm:2.0.0"
+  dependencies:
+    shebang-regex: "npm:^3.0.0"
+  checksum: 10c0/a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e
+  languageName: node
+  linkType: hard
+
+"shebang-regex@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "shebang-regex@npm:3.0.0"
+  checksum: 10c0/1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690
+  languageName: node
+  linkType: hard
+
+"shiki@npm:^3.2.1":
+  version: 3.23.0
+  resolution: "shiki@npm:3.23.0"
+  dependencies:
+    "@shikijs/core": "npm:3.23.0"
+    "@shikijs/engine-javascript": "npm:3.23.0"
+    "@shikijs/engine-oniguruma": "npm:3.23.0"
+    "@shikijs/langs": "npm:3.23.0"
+    "@shikijs/themes": "npm:3.23.0"
+    "@shikijs/types": "npm:3.23.0"
+    "@shikijs/vscode-textmate": "npm:^10.0.2"
+    "@types/hast": "npm:^3.0.4"
+  checksum: 10c0/b06a3eddac4bd0a838f9bd79bea70b0a01195570cb11d70fd2ff7ab0a42c33a8c4980ee52174173aae0476cc152b4c1a68c081a82d94ee340cb3ef9d772ae4ba
+  languageName: node
+  linkType: hard
+
+"signal-exit@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "signal-exit@npm:4.1.0"
+  checksum: 10c0/41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83
+  languageName: node
+  linkType: hard
+
+"simple-swizzle@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "simple-swizzle@npm:0.2.2"
+  dependencies:
+    is-arrayish: "npm:^0.3.1"
+  checksum: 10c0/df5e4662a8c750bdba69af4e8263c5d96fe4cd0f9fe4bdfa3cbdeb45d2e869dff640beaaeb1ef0e99db4d8d2ec92f85508c269f50c972174851bc1ae5bd64308
+  languageName: node
+  linkType: hard
+
+"slash@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "slash@npm:5.1.0"
+  checksum: 10c0/eb48b815caf0bdc390d0519d41b9e0556a14380f6799c72ba35caf03544d501d18befdeeef074bc9c052acf69654bc9e0d79d7f1de0866284137a40805299eb3
+  languageName: node
+  linkType: hard
+
+"source-map-js@npm:^1.0.2":
+  version: 1.2.0
+  resolution: "source-map-js@npm:1.2.0"
+  checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
+  languageName: node
+  linkType: hard
+
+"source-map@npm:^0.7.0":
+  version: 0.7.4
+  resolution: "source-map@npm:0.7.4"
+  checksum: 10c0/dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc
+  languageName: node
+  linkType: hard
+
+"space-separated-tokens@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "space-separated-tokens@npm:2.0.2"
+  checksum: 10c0/6173e1d903dca41dcab6a2deed8b4caf61bd13b6d7af8374713500570aa929ff9414ae09a0519f4f8772df993300305a395d4871f35bc4ca72b6db57e1f30af8
+  languageName: node
+  linkType: hard
+
+"speech-rule-engine@npm:^4.0.6":
+  version: 4.1.2
+  resolution: "speech-rule-engine@npm:4.1.2"
+  dependencies:
+    "@xmldom/xmldom": "npm:0.9.8"
+    commander: "npm:13.1.0"
+    wicked-good-xpath: "npm:1.3.0"
+  bin:
+    sre: bin/sre
+  checksum: 10c0/bf3de3a009751f72442bb6ba85a82ecf9f32b2764a46d9a83aa28a7da89a05ba173ee2b8018d6f556d7a8ff18358f04da8133f3aa7eaefcb66c43997ae75fa20
+  languageName: node
+  linkType: hard
+
+"streamsearch@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "streamsearch@npm:1.1.0"
+  checksum: 10c0/fbd9aecc2621364384d157f7e59426f4bfd385e8b424b5aaa79c83a6f5a1c8fd2e4e3289e95de1eb3511cb96bb333d6281a9919fafce760e4edb35b2cd2facab
+  languageName: node
+  linkType: hard
+
+"stringify-entities@npm:^4.0.0":
+  version: 4.0.4
+  resolution: "stringify-entities@npm:4.0.4"
+  dependencies:
+    character-entities-html4: "npm:^2.0.0"
+    character-entities-legacy: "npm:^3.0.0"
+  checksum: 10c0/537c7e656354192406bdd08157d759cd615724e9d0873602d2c9b2f6a5c0a8d0b1d73a0a08677848105c5eebac6db037b57c0b3a4ec86331117fa7319ed50448
+  languageName: node
+  linkType: hard
+
+"strip-final-newline@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "strip-final-newline@npm:3.0.0"
+  checksum: 10c0/a771a17901427bac6293fd416db7577e2bc1c34a19d38351e9d5478c3c415f523f391003b42ed475f27e33a78233035df183525395f731d3bfb8cdcbd4da08ce
+  languageName: node
+  linkType: hard
+
+"style-to-js@npm:^1.0.0":
+  version: 1.1.21
+  resolution: "style-to-js@npm:1.1.21"
+  dependencies:
+    style-to-object: "npm:1.0.14"
+  checksum: 10c0/94231aa80f58f442c3a5ae01a21d10701e5d62f96b4b3e52eab3499077ee52df203cc0df4a1a870707f5e99470859136ea8657b782a5f4ca7934e0ffe662a588
+  languageName: node
+  linkType: hard
+
+"style-to-object@npm:1.0.14":
+  version: 1.0.14
+  resolution: "style-to-object@npm:1.0.14"
+  dependencies:
+    inline-style-parser: "npm:0.2.7"
+  checksum: 10c0/854d9e9b77afc336e6d7b09348e7939f2617b34eb0895824b066d8cd1790284cb6d8b2ba36be88025b2595d715dba14b299ae76e4628a366541106f639e13679
+  languageName: node
+  linkType: hard
+
+"styled-jsx@npm:5.1.6":
+  version: 5.1.6
+  resolution: "styled-jsx@npm:5.1.6"
+  dependencies:
+    client-only: "npm:0.0.1"
+  peerDependencies:
+    react: ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0"
+  peerDependenciesMeta:
+    "@babel/core":
+      optional: true
+    babel-plugin-macros:
+      optional: true
+  checksum: 10c0/ace50e7ea5ae5ae6a3b65a50994c51fca6ae7df9c7ecfd0104c36be0b4b3a9c5c1a2374d16e2a11e256d0b20be6d47256d768ecb4f91ab390f60752a075780f5
+  languageName: node
+  linkType: hard
+
+"stylis@npm:^4.3.6":
+  version: 4.3.6
+  resolution: "stylis@npm:4.3.6"
+  checksum: 10c0/e736d484983a34f7c65d362c67dc79b7bce388054b261c2b7b23d02eaaf280617033f65d44b1ea341854f4331a5074b885668ac8741f98c13a6cfd6443ae85d0
+  languageName: node
+  linkType: hard
+
+"system-architecture@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "system-architecture@npm:0.1.0"
+  checksum: 10c0/1969974ea5d31a9ac7c38f2657cfe8255b36f9e1d5ba3c58cb84c24fbeedf562778b8511f18a0abe6d70ae90148cfcaf145ecf26e37c0a53a3829076f3238cbb
+  languageName: node
+  linkType: hard
+
+"tabbable@npm:^6.0.0":
+  version: 6.4.0
+  resolution: "tabbable@npm:6.4.0"
+  checksum: 10c0/d931427f4a96b801fd8801ba296a702119e06f70ad262fed8abc5271225c9f1ca51b89fdec4fb2f22e1d35acb3d2881db0a17cedc758272e9ecb540d00299d76
+  languageName: node
+  linkType: hard
+
+"tinyexec@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "tinyexec@npm:1.0.2"
+  checksum: 10c0/1261a8e34c9b539a9aae3b7f0bb5372045ff28ee1eba035a2a059e532198fe1a182ec61ac60fa0b4a4129f0c4c4b1d2d57355b5cb9aa2d17ac9454ecace502ee
+  languageName: node
+  linkType: hard
+
+"tinyglobby@npm:^0.2.14":
+  version: 0.2.15
+  resolution: "tinyglobby@npm:0.2.15"
+  dependencies:
+    fdir: "npm:^6.5.0"
+    picomatch: "npm:^4.0.3"
+  checksum: 10c0/869c31490d0d88eedb8305d178d4c75e7463e820df5a9b9d388291daf93e8b1eb5de1dad1c1e139767e4269fe75f3b10d5009b2cc14db96ff98986920a186844
+  languageName: node
+  linkType: hard
+
+"title@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "title@npm:4.0.1"
+  dependencies:
+    arg: "npm:^5.0.0"
+    chalk: "npm:^5.0.0"
+    clipboardy: "npm:^4.0.0"
+  bin:
+    title: dist/esm/bin.js
+  checksum: 10c0/992fbe55f2bbf6189e478dbca48a3d67eff1cf5cbe13228399c4ef9951f5ede752818efe1f841ab1f113d3b88106dd30a61ea616ce96b894daf048be6da24257
+  languageName: node
+  linkType: hard
+
+"to-regex-range@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "to-regex-range@npm:5.0.1"
+  dependencies:
+    is-number: "npm:^7.0.0"
+  checksum: 10c0/487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892
+  languageName: node
+  linkType: hard
+
+"trim-lines@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "trim-lines@npm:3.0.1"
+  checksum: 10c0/3a1611fa9e52aa56a94c69951a9ea15b8aaad760eaa26c56a65330dc8adf99cb282fc07cc9d94968b7d4d88003beba220a7278bbe2063328eb23fb56f9509e94
+  languageName: node
+  linkType: hard
+
+"trough@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "trough@npm:2.2.0"
+  checksum: 10c0/58b671fc970e7867a48514168894396dd94e6d9d6456aca427cc299c004fe67f35ed7172a36449086b2edde10e78a71a284ec0076809add6834fb8f857ccb9b0
+  languageName: node
+  linkType: hard
+
+"ts-dedent@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "ts-dedent@npm:2.2.0"
+  checksum: 10c0/175adea838468cc2ff7d5e97f970dcb798bbcb623f29c6088cb21aa2880d207c5784be81ab1741f56b9ac37840cbaba0c0d79f7f8b67ffe61c02634cafa5c303
+  languageName: node
+  linkType: hard
+
+"ts-morph@npm:^27.0.0":
+  version: 27.0.2
+  resolution: "ts-morph@npm:27.0.2"
+  dependencies:
+    "@ts-morph/common": "npm:~0.28.1"
+    code-block-writer: "npm:^13.0.3"
+  checksum: 10c0/224715cc6d97b8ff5afd3986f9629f912a0ebd83eaecbdca91c35cf10a98f607c663f666e7ea5e6afab00563d00dc80fa7a13552cc7f1cef735261c3217d0863
+  languageName: node
+  linkType: hard
+
+"tslib@npm:^2.4.0":
+  version: 2.6.3
+  resolution: "tslib@npm:2.6.3"
+  checksum: 10c0/2598aef53d9dbe711af75522464b2104724d6467b26a60f2bdac8297d2b5f1f6b86a71f61717384aa8fd897240467aaa7bcc36a0700a0faf751293d1331db39a
+  languageName: node
+  linkType: hard
+
+"tslib@npm:^2.8.0":
+  version: 2.8.1
+  resolution: "tslib@npm:2.8.1"
+  checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62
+  languageName: node
+  linkType: hard
+
+"twoslash-protocol@npm:0.3.6":
+  version: 0.3.6
+  resolution: "twoslash-protocol@npm:0.3.6"
+  checksum: 10c0/3316ad1eb0ccd83c8664582f9718c9fa0fb034ae44c68f374a49e91911585769b8994fda9532c16719d5a3c7407bf8e24fdab11a59d3f41ba41217ef67a1ffcf
+  languageName: node
+  linkType: hard
+
+"twoslash@npm:^0.3.6":
+  version: 0.3.6
+  resolution: "twoslash@npm:0.3.6"
+  dependencies:
+    "@typescript/vfs": "npm:^1.6.2"
+    twoslash-protocol: "npm:0.3.6"
+  peerDependencies:
+    typescript: ^5.5.0
+  checksum: 10c0/b0c95590e3e87a05f35c4d613087934e16074098fabb9c9096c01a02522ab3be29301bc04007e5803c2586ec33ed5212f955280af7cd0acafccdb7d32a2a2088
+  languageName: node
+  linkType: hard
+
+"typescript@npm:5.4.5":
+  version: 5.4.5
+  resolution: "typescript@npm:5.4.5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>":
+  version: 5.4.5
+  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9
+  languageName: node
+  linkType: hard
+
+"ufo@npm:^1.6.1":
+  version: 1.6.3
+  resolution: "ufo@npm:1.6.3"
+  checksum: 10c0/bf0e4ebff99e54da1b9c7182ac2f40475988b41faa881d579bc97bc2a0509672107b0a0e94c4b8d31a0ab8c4bf07f4aa0b469ac6da8536d56bda5b085ea2e953
+  languageName: node
+  linkType: hard
+
+"undici-types@npm:~5.26.4":
+  version: 5.26.5
+  resolution: "undici-types@npm:5.26.5"
+  checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501
+  languageName: node
+  linkType: hard
+
+"unified@npm:^11.0.0, unified@npm:^11.0.4, unified@npm:^11.0.5":
+  version: 11.0.5
+  resolution: "unified@npm:11.0.5"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    bail: "npm:^2.0.0"
+    devlop: "npm:^1.0.0"
+    extend: "npm:^3.0.0"
+    is-plain-obj: "npm:^4.0.0"
+    trough: "npm:^2.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/53c8e685f56d11d9d458a43e0e74328a4d6386af51c8ac37a3dcabec74ce5026da21250590d4aff6733ccd7dc203116aae2b0769abc18cdf9639a54ae528dfc9
+  languageName: node
+  linkType: hard
+
+"unist-util-find-after@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-find-after@npm:5.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    unist-util-is: "npm:^6.0.0"
+  checksum: 10c0/a7cea473c4384df8de867c456b797ff1221b20f822e1af673ff5812ed505358b36f47f3b084ac14c3622cb879ed833b71b288e8aa71025352a2aab4c2925a6eb
+  languageName: node
+  linkType: hard
+
+"unist-util-is@npm:^5.0.0":
+  version: 5.2.1
+  resolution: "unist-util-is@npm:5.2.1"
+  dependencies:
+    "@types/unist": "npm:^2.0.0"
+  checksum: 10c0/a2376910b832bb10653d2167c3cd85b3610a5fd53f5169834c08b3c3a720fae9043d75ad32d727eedfc611491966c26a9501d428ec62467edc17f270feb5410b
+  languageName: node
+  linkType: hard
+
+"unist-util-is@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "unist-util-is@npm:6.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+  checksum: 10c0/9419352181eaa1da35eca9490634a6df70d2217815bb5938a04af3a662c12c5607a2f1014197ec9c426fbef18834f6371bfdb6f033040fa8aa3e965300d70e7e
+  languageName: node
+  linkType: hard
+
+"unist-util-modify-children@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unist-util-modify-children@npm:4.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    array-iterate: "npm:^2.0.0"
+  checksum: 10c0/63d44b09a2e4c674c72816d4328d668972e68cc965ea719fef1c642b66a3ebe3b102e284a3213b4920ebccff05e0f689b4eaae8a0e5c3dafcad117d1577496da
+  languageName: node
+  linkType: hard
+
+"unist-util-position-from-estree@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "unist-util-position-from-estree@npm:2.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+  checksum: 10c0/39127bf5f0594e0a76d9241dec4f7aa26323517120ce1edd5ed91c8c1b9df7d6fb18af556e4b6250f1c7368825720ed892e2b6923be5cdc08a9bb16536dc37b3
+  languageName: node
+  linkType: hard
+
+"unist-util-position@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-position@npm:5.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+  checksum: 10c0/dde3b31e314c98f12b4dc6402f9722b2bf35e96a4f2d463233dd90d7cde2d4928074a7a11eff0a5eb1f4e200f27fc1557e0a64a7e8e4da6558542f251b1b7400
+  languageName: node
+  linkType: hard
+
+"unist-util-remove-position@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-remove-position@npm:5.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    unist-util-visit: "npm:^5.0.0"
+  checksum: 10c0/e8c76da4399446b3da2d1c84a97c607b37d03d1d92561e14838cbe4fdcb485bfc06c06cfadbb808ccb72105a80643976d0660d1fe222ca372203075be9d71105
+  languageName: node
+  linkType: hard
+
+"unist-util-remove@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unist-util-remove@npm:4.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    unist-util-is: "npm:^6.0.0"
+    unist-util-visit-parents: "npm:^6.0.0"
+  checksum: 10c0/30f3ed31095dd7f3109266d39c514fab5f2da3fb656d5f78a0e3e7700f219760f2f4d8286c810ae43c241fee3f0a8dd40f8d1e5ebeee3cb810581d5e7e8d4f7d
+  languageName: node
+  linkType: hard
+
+"unist-util-stringify-position@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unist-util-stringify-position@npm:4.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+  checksum: 10c0/dfe1dbe79ba31f589108cb35e523f14029b6675d741a79dea7e5f3d098785045d556d5650ec6a8338af11e9e78d2a30df12b1ee86529cded1098da3f17ee999e
+  languageName: node
+  linkType: hard
+
+"unist-util-visit-children@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unist-util-visit-children@npm:3.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+  checksum: 10c0/51e95f54fbf11d414952c011c761c3960864948ad3fd2abe3989eb18b18d96b8f48e7ea5ab6f23264d1a3f4f5a1ff76312dd8f2196c78b762098403505c3abb9
+  languageName: node
+  linkType: hard
+
+"unist-util-visit-parents@npm:^4.0.0":
+  version: 4.1.1
+  resolution: "unist-util-visit-parents@npm:4.1.1"
+  dependencies:
+    "@types/unist": "npm:^2.0.0"
+    unist-util-is: "npm:^5.0.0"
+  checksum: 10c0/f84b544a111af5a17f2b80c462da9f7fdcb46a69f85ab317d2d9ddca766c00e2ceea6c76c0960e58ef4607aad89661c99eccf290973b453e15dd1621c57079d4
+  languageName: node
+  linkType: hard
+
+"unist-util-visit-parents@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "unist-util-visit-parents@npm:6.0.1"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    unist-util-is: "npm:^6.0.0"
+  checksum: 10c0/51b1a5b0aa23c97d3e03e7288f0cdf136974df2217d0999d3de573c05001ef04cccd246f51d2ebdfb9e8b0ed2704451ad90ba85ae3f3177cf9772cef67f56206
+  languageName: node
+  linkType: hard
+
+"unist-util-visit@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "unist-util-visit@npm:3.1.0"
+  dependencies:
+    "@types/unist": "npm:^2.0.0"
+    unist-util-is: "npm:^5.0.0"
+    unist-util-visit-parents: "npm:^4.0.0"
+  checksum: 10c0/9b92ea4e6debadbb77f2c7a0ab8c8b7c63781b2f2050563c971687df368f6f6fe932d864442347a685f0dc56b570a55e5d7ffeb87a452489100640cf280dc8da
+  languageName: node
+  linkType: hard
+
+"unist-util-visit@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unist-util-visit@npm:5.0.0"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    unist-util-is: "npm:^6.0.0"
+    unist-util-visit-parents: "npm:^6.0.0"
+  checksum: 10c0/51434a1d80252c1540cce6271a90fd1a106dbe624997c09ed8879279667fb0b2d3a685e02e92bf66598dcbe6cdffa7a5f5fb363af8fdf90dda6c855449ae39a5
+  languageName: node
+  linkType: hard
+
+"unstoppableswap-docs@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "unstoppableswap-docs@workspace:."
+  dependencies:
+    "@types/node": "npm:20.14.5"
+    "@types/react": "npm:^19"
+    next: "npm:^15.0.3"
+    nextra: "npm:^4"
+    nextra-theme-docs: "npm:^4"
+    react: "npm:^19"
+    react-dom: "npm:^19"
+    typescript: "npm:5.4.5"
+  languageName: unknown
+  linkType: soft
+
+"use-sync-external-store@npm:^1.5.0":
+  version: 1.6.0
+  resolution: "use-sync-external-store@npm:1.6.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  checksum: 10c0/35e1179f872a53227bdf8a827f7911da4c37c0f4091c29b76b1e32473d1670ebe7bcd880b808b7549ba9a5605c233350f800ffab963ee4a4ee346ee983b6019b
+  languageName: node
+  linkType: hard
+
+"uuid@npm:^11.1.0":
+  version: 11.1.0
+  resolution: "uuid@npm:11.1.0"
+  bin:
+    uuid: dist/esm/bin/uuid
+  checksum: 10c0/34aa51b9874ae398c2b799c88a127701408cd581ee89ec3baa53509dd8728cbb25826f2a038f9465f8b7be446f0fbf11558862965b18d21c993684297628d4d3
+  languageName: node
+  linkType: hard
+
+"vfile-location@npm:^5.0.0":
+  version: 5.0.2
+  resolution: "vfile-location@npm:5.0.2"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    vfile: "npm:^6.0.0"
+  checksum: 10c0/cfc7e49de93ac5be6f3c9a9fe77676756e00d33a6c69d9c1ce279b06eedafa67fe5d0da2334b40e97963c43b014501bca2f829dfd6622a3290fb6f7dd2b9339e
+  languageName: node
+  linkType: hard
+
+"vfile-message@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "vfile-message@npm:4.0.2"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    unist-util-stringify-position: "npm:^4.0.0"
+  checksum: 10c0/07671d239a075f888b78f318bc1d54de02799db4e9dce322474e67c35d75ac4a5ac0aaf37b18801d91c9f8152974ea39678aa72d7198758b07f3ba04fb7d7514
+  languageName: node
+  linkType: hard
+
+"vfile@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "vfile@npm:6.0.1"
+  dependencies:
+    "@types/unist": "npm:^3.0.0"
+    unist-util-stringify-position: "npm:^4.0.0"
+    vfile-message: "npm:^4.0.0"
+  checksum: 10c0/443bda43e5ad3b73c5976e987dba2b2d761439867ba7d5d7c5f4b01d3c1cb1b976f5f0e6b2399a00dc9b4eaec611bd9984ce9ce8a75a72e60aed518b10a902d2
+  languageName: node
+  linkType: hard
+
+"vscode-jsonrpc@npm:8.2.0":
+  version: 8.2.0
+  resolution: "vscode-jsonrpc@npm:8.2.0"
+  checksum: 10c0/0789c227057a844f5ead55c84679206227a639b9fb76e881185053abc4e9848aa487245966cc2393fcb342c4541241b015a1a2559fddd20ac1e68945c95344e6
+  languageName: node
+  linkType: hard
+
+"vscode-languageserver-protocol@npm:3.17.5":
+  version: 3.17.5
+  resolution: "vscode-languageserver-protocol@npm:3.17.5"
+  dependencies:
+    vscode-jsonrpc: "npm:8.2.0"
+    vscode-languageserver-types: "npm:3.17.5"
+  checksum: 10c0/5f38fd80da9868d706eaa4a025f4aff9c3faad34646bcde1426f915cbd8d7e8b6c3755ce3fef6eebd256ba3145426af1085305f8a76e34276d2e95aaf339a90b
+  languageName: node
+  linkType: hard
+
+"vscode-languageserver-textdocument@npm:~1.0.11":
+  version: 1.0.12
+  resolution: "vscode-languageserver-textdocument@npm:1.0.12"
+  checksum: 10c0/534349894b059602c4d97615a1147b6c4c031141c2093e59657f54e38570f5989c21b376836f13b9375419869242e9efb4066643208b21ab1e1dee111a0f00fb
+  languageName: node
+  linkType: hard
+
+"vscode-languageserver-types@npm:3.17.5":
+  version: 3.17.5
+  resolution: "vscode-languageserver-types@npm:3.17.5"
+  checksum: 10c0/1e1260de79a2cc8de3e46f2e0182cdc94a7eddab487db5a3bd4ee716f67728e685852707d72c059721ce500447be9a46764a04f0611e94e4321ffa088eef36f8
+  languageName: node
+  linkType: hard
+
+"vscode-languageserver@npm:~9.0.1":
+  version: 9.0.1
+  resolution: "vscode-languageserver@npm:9.0.1"
+  dependencies:
+    vscode-languageserver-protocol: "npm:3.17.5"
+  bin:
+    installServerIntoExtension: bin/installServerIntoExtension
+  checksum: 10c0/8a0838d77c98a211c76e54bd3a6249fc877e4e1a73322673fb0e921168d8e91de4f170f1d4ff7e8b6289d0698207afc6aba6662d4c1cd8e4bd7cae96afd6b0c2
+  languageName: node
+  linkType: hard
+
+"vscode-uri@npm:~3.1.0":
+  version: 3.1.0
+  resolution: "vscode-uri@npm:3.1.0"
+  checksum: 10c0/5f6c9c10fd9b1664d71fab4e9fbbae6be93c7f75bb3a1d9d74399a88ab8649e99691223fd7cef4644376cac6e94fa2c086d802521b9a8e31c5af3e60f0f35624
+  languageName: node
+  linkType: hard
+
+"web-namespaces@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "web-namespaces@npm:2.0.1"
+  checksum: 10c0/df245f466ad83bd5cd80bfffc1674c7f64b7b84d1de0e4d2c0934fb0782e0a599164e7197a4bce310ee3342fd61817b8047ff04f076a1ce12dd470584142a4bd
+  languageName: node
+  linkType: hard
+
+"which@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "which@npm:2.0.2"
+  dependencies:
+    isexe: "npm:^2.0.0"
+  bin:
+    node-which: ./bin/node-which
+  checksum: 10c0/66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f
+  languageName: node
+  linkType: hard
+
+"wicked-good-xpath@npm:1.3.0":
+  version: 1.3.0
+  resolution: "wicked-good-xpath@npm:1.3.0"
+  checksum: 10c0/6837e1027e75e2ad7fe0620d11def4c42235cbe6c649727258973d7d77c2c5066a5376595e0283d3ba8e2fa22deb3cfe7358db5a02a938bde273b55b9ac57832
+  languageName: node
+  linkType: hard
+
+"yaml@npm:^2.3.2":
+  version: 2.8.2
+  resolution: "yaml@npm:2.8.2"
+  bin:
+    yaml: bin.mjs
+  checksum: 10c0/703e4dc1e34b324aa66876d63618dcacb9ed49f7e7fe9b70f1e703645be8d640f68ab84f12b86df8ac960bac37acf5513e115de7c970940617ce0343c8c9cd96
+  languageName: node
+  linkType: hard
+
+"zod@npm:^4.1.12":
+  version: 4.3.6
+  resolution: "zod@npm:4.3.6"
+  checksum: 10c0/860d25a81ab41d33aa25f8d0d07b091a04acb426e605f396227a796e9e800c44723ed96d0f53a512b57be3d1520f45bf69c0cb3b378a232a00787a2609625307
+  languageName: node
+  linkType: hard
+
+"zustand@npm:^5.0.1":
+  version: 5.0.11
+  resolution: "zustand@npm:5.0.11"
+  peerDependencies:
+    "@types/react": ">=18.0.0"
+    immer: ">=9.0.6"
+    react: ">=18.0.0"
+    use-sync-external-store: ">=1.2.0"
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    immer:
+      optional: true
+    react:
+      optional: true
+    use-sync-external-store:
+      optional: true
+  checksum: 10c0/61836b48dac5978c9d1b8289d5162a151bee77828371b9aba6431a079b77faca0635ba53da3f7b331295fbc4e78318a109a4527f7a051cb63abfe79b69ccbecf
+  languageName: node
+  linkType: hard
+
+"zwitch@npm:^2.0.0, zwitch@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "zwitch@npm:2.0.4"
+  checksum: 10c0/3c7830cdd3378667e058ffdb4cf2bb78ac5711214e2725900873accb23f3dfe5f9e7e5a06dcdc5f29605da976fc45c26d9a13ca334d6eea2245a15e77b8fc06e
+  languageName: node
+  linkType: hard
diff --git a/justfile b/justfile
index f77297e6c7..337875d749 100644
--- a/justfile
+++ b/justfile
@@ -30,10 +30,10 @@ test-ffi-address:
 
 # Start the Tauri app
 tauri:
-	cd src-tauri && cargo tauri dev --no-watch -- -vv -- --testnet
+	cd src-tauri && RUST_BACKTRACE=1 cargo tauri dev --no-watch -- -vv -- --testnet
 
 tauri-mainnet:
-	cd src-tauri && cargo tauri dev --no-watch -- -vv
+	cd src-tauri && RUST_BACKTRACE=1 cargo tauri dev --no-watch -- -vv
 
 # Install the GUI dependencies
 gui_install:
@@ -60,9 +60,13 @@ build-gui-windows:
 tests:
         cargo nextest run
 
+# List all available docker integration tests
+list-docker-tests:
+	@find swap/tests -maxdepth 1 -type f -name "*.rs" | xargs -n1 basename | sed 's/\.rs$//' | sort
+
 # Run docker tests (e.g., "just docker_test happy_path_alice_developer_tip")
 docker_test test_name:
-	cargo test --package swap --test {{test_name}} -- --nocapture
+	RUST_BACKTRACE=1 cargo test --package swap --test {{test_name}} -- --nocapture
 
 docker_test_happy_path:
 	just docker_test happy_path
@@ -83,7 +87,7 @@ swap:
 
 # Run the asb on testnet
 asb-testnet:
-	ASB_DEV_ADDR_OUTPUT_PATH="$PWD/src-gui/.env.development" cargo run -p swap-asb --bin asb -- --testnet --trace start --rpc-bind-port 9944 --rpc-bind-host 0.0.0.0
+	cargo run -p swap-asb --bin asb -- --testnet --trace start --rpc-bind-port 9944 --rpc-bind-host 0.0.0.0
 
 # Launch the ASB controller REPL against a local testnet ASB instance
 asb-testnet-controller:
@@ -108,10 +112,14 @@ fmt:
 generate-sqlx-cache:
 	./dev-scripts/regenerate_sqlx_cache.sh
 
+
+alias eslint := check_gui_eslint
 # Run eslint for the GUI frontend
 check_gui_eslint:
 	cd src-gui && yarn run eslint
 
+alias tsc := check_gui_tsc
+
 # Run the typescript type checker for the GUI frontend
 check_gui_tsc:
 	cd src-gui && yarn run tsc --noEmit
diff --git a/monero-harness/src/lib.rs b/monero-harness/src/lib.rs
index 0a7dee5eca..b561cee0c8 100644
--- a/monero-harness/src/lib.rs
+++ b/monero-harness/src/lib.rs
@@ -300,7 +300,8 @@ impl<'c> Monero {
         Ok(())
     }
 
-    pub async fn generate_block(&self) -> Result<()> {
+    /// Generates 15 blocks
+    pub async fn generate_blocks(&self) -> Result<()> {
         let miner_wallet = self.wallet("miner")?;
         let miner_address = miner_wallet.address().await?.to_string();
         self.monerod().generate_blocks(15, &miner_address).await?;
diff --git a/monero-harness/tests/wallet.rs b/monero-harness/tests/wallet.rs
index 3a47c0fc70..830d70467c 100644
--- a/monero-harness/tests/wallet.rs
+++ b/monero-harness/tests/wallet.rs
@@ -53,7 +53,7 @@ async fn fund_transfer_and_check_tx_key() {
         .await
         .unwrap();
 
-    monero.generate_block().await.unwrap();
+    monero.generate_blocks().await.unwrap();
 
     tracing::info!("Waiting for Bob to catch up");
 
@@ -69,7 +69,7 @@ async fn fund_transfer_and_check_tx_key() {
         .await
         .unwrap();
 
-    monero.generate_block().await.unwrap();
+    monero.generate_blocks().await.unwrap();
 
     wait_for_wallet_to_catch_up(bob_wallet, 0).await;
 
@@ -86,7 +86,7 @@ async fn fund_transfer_and_check_tx_key() {
         .await
         .unwrap();
 
-    monero.generate_block().await.unwrap();
+    monero.generate_blocks().await.unwrap();
 
     wait_for_wallet_to_catch_up(alice_wallet, 0).await;
 
diff --git a/monero-oxide-ext/src/lib.rs b/monero-oxide-ext/src/lib.rs
index 0517cafcd0..67d61344de 100644
--- a/monero-oxide-ext/src/lib.rs
+++ b/monero-oxide-ext/src/lib.rs
@@ -254,6 +254,14 @@ impl Amount {
         self.0
     }
 
+    /// Get the amount in Monero.
+    pub fn as_xmr(self) -> f64 {
+        // Inefficient, but most safe way: monero-rs does it this way, too
+        let mut buf = String::new();
+        fmt_piconero_in_xmr(self.as_pico(), &mut buf).expect("string to be writable");
+        buf.parse().expect("Monero amount is floating point number")
+    }
+
     /// Create an [`Amount`] with monero precision and the given number of monero, string in the format `"1.2"` or `"1"`.
     pub fn parse_monero(xmr: &str) -> Result<Amount, Error> {
         if xmr.is_empty() {
diff --git a/monero-sys/build.rs b/monero-sys/build.rs
index d5f60c851c..2bfc5442d9 100644
--- a/monero-sys/build.rs
+++ b/monero-sys/build.rs
@@ -144,7 +144,7 @@ fn main() {
         .display()
         .to_string();
     config.define("CMAKE_TOOLCHAIN_FILE", toolchain_file.clone());
-    println!("cargo:warning=Using toolchain file: {toolchain_file}");
+    println!("cargo:debug=Using toolchain file: {toolchain_file}");
 
     let depends_lib_dir = contrib_depends_dir.join(format!("{target}/lib"));
 
@@ -425,7 +425,9 @@ fn main() {
                 .to_string(),
         )
         .include(output_directory)
-        .flag("-fPIC"); // Position independent code
+        .flag("-fPIC") // Position independent code
+        .flag("-Wno-unused-parameter") // Suppress warnings from upstream Monero C++ headers
+        .flag("-Wno-reorder-ctor"); // Suppress harmless ctor init order warning from wallet2.h
 
     build.compile("monero-sys");
 }
@@ -443,7 +445,7 @@ fn compile_dependencies(
         "aarch64-apple-ios-sim" => "aarch64-apple-iossimulator".to_string(),
         _ => target,
     };
-    println!("cargo:warning=Building for target: {target}");
+    println!("cargo:debug=Building for target: {target}");
 
     match target.as_str() {
         "x86_64-apple-darwin"
@@ -459,7 +461,7 @@ fn compile_dependencies(
         _ => panic!("target unsupported: {target}"),
     }
 
-    println!("cargo:warning=Running make HOST={target} in contrib/depends",);
+    println!("cargo:debug=Running make HOST={target} in contrib/depends",);
 
     // Copy monero-depends to out_dir/depends in order to build the dependencies there
     match fs_extra::copy_items(
@@ -554,7 +556,7 @@ fn apply_patches() -> Result<(), Box<dyn std::error::Error>> {
 
     for embedded in EMBEDDED_PATCHES {
         println!(
-            "cargo:warning=Processing embedded patch: {} ({})",
+            "cargo:debug=Processing embedded patch: {} ({})",
             embedded.name, embedded.description
         );
 
@@ -567,14 +569,14 @@ fn apply_patches() -> Result<(), Box<dyn std::error::Error>> {
         }
 
         println!(
-            "cargo:warning=Found {} file(s) in patch {}",
+            "cargo:debug=Found {} file(s) in patch {}",
             file_patches.len(),
             embedded.name
         );
 
         // Apply each file patch individually
         for (file_path, patch_content) in file_patches {
-            println!("cargo:warning=Applying patch to file: {file_path}");
+            println!("cargo:debug=Applying patch to file: {file_path}");
 
             // Parse the individual file patch
             let patch = diffy::Patch::from_str(&patch_content)
@@ -591,7 +593,7 @@ fn apply_patches() -> Result<(), Box<dyn std::error::Error>> {
 
             // Check if patch is already applied by trying to reverse it
             if diffy::apply(&current, &patch.reverse()).is_ok() {
-                println!("cargo:warning=Patch for {file_path} already applied – skipping",);
+                println!("cargo:debug=Patch for {file_path} already applied – skipping",);
                 continue;
             }
 
@@ -601,11 +603,11 @@ fn apply_patches() -> Result<(), Box<dyn std::error::Error>> {
             fs::write(&target_path, patched)
                 .map_err(|e| format!("Failed to write {file_path}: {e}"))?;
 
-            println!("cargo:warning=Successfully applied patch to: {file_path}");
+            println!("cargo:debug=Successfully applied patch to: {file_path}");
         }
 
         println!(
-            "cargo:warning=Successfully applied all file patches for: {} ({})",
+            "cargo:debug=Successfully applied all file patches for: {} ({})",
             embedded.name, embedded.description
         );
     }
diff --git a/monero-tests/Cargo.toml b/monero-tests/Cargo.toml
index d3e25d28c5..9b83fb1e2a 100644
--- a/monero-tests/Cargo.toml
+++ b/monero-tests/Cargo.toml
@@ -3,6 +3,7 @@ name = "monero-tests"
 version = "0.1.0"
 edition = "2024"
 
+
 [dev-dependencies]
 monero-address = { workspace = true }
 monero-daemon-rpc = { workspace = true }
@@ -22,5 +23,7 @@ tracing-subscriber = { workspace = true }
 uuid = { workspace = true }
 zeroize = { workspace = true }
 
-[lints]
-workspace = true
+# Each test counts as a seperate crate, and would individually get
+# warnigns for "unused" dependencies. This silences them
+[lints.rust]
+unused_crate_dependencies = "allow"
diff --git a/monero-tests/src/lib.rs b/monero-tests/src/lib.rs
index 2235e70956..8b13789179 100644
--- a/monero-tests/src/lib.rs
+++ b/monero-tests/src/lib.rs
@@ -1 +1 @@
-// Empty but necessary for cargo
+
diff --git a/monero-tests/tests/reserve_proof.rs b/monero-tests/tests/reserve_proof.rs
index c21af2f304..20960b82d4 100644
--- a/monero-tests/tests/reserve_proof.rs
+++ b/monero-tests/tests/reserve_proof.rs
@@ -31,7 +31,7 @@ async fn setup(cli: &Cli) -> anyhow::Result<TestSetup<'_>> {
 
     // Fund alice's wallet
     miner.sweep(&alice.address().await?).await?;
-    monero.generate_block().await?;
+    monero.generate_blocks().await?;
     alice.refresh().await?;
 
     let alice_balance = alice.balance().await?;
diff --git a/monero-tests/tests/subaddresses.rs b/monero-tests/tests/subaddresses.rs
index 29e5704f10..a8a2ae4ded 100644
--- a/monero-tests/tests/subaddresses.rs
+++ b/monero-tests/tests/subaddresses.rs
@@ -53,16 +53,16 @@ async fn subaddress_methods_and_balances() -> anyhow::Result<()> {
     );
 
     // Mine a block to confirm the transaction and make funds visible
-    monero.generate_block().await?;
+    monero.generate_blocks().await?;
 
     // Import tx keys so Alice scans this transaction explicitly
     let sa1_txkey = tx_receipt
         .tx_keys
-        .get(&alice_sa1)
+        .get(&alice_sa1.to_string())
         .context("tx key not found for alice subaddress 1")?;
     let sa2_txkey = tx_receipt
         .tx_keys
-        .get(&alice_sa2)
+        .get(&alice_sa2.to_string())
         .context("tx key not found for alice subaddress 2")?;
 
     tracing::info!("Importing tx keys for Alice subaddresses");
@@ -82,7 +82,7 @@ async fn subaddress_methods_and_balances() -> anyhow::Result<()> {
     let bal_sa1 = per_sub.get(&1).copied().unwrap_or(0);
     let bal_sa2 = per_sub.get(&2).copied().unwrap_or(0);
 
-    tracing::info!(bal_sa1=%monero::Amount::from_pico(bal_sa1), bal_sa2=%monero::Amount::from_pico(bal_sa2), "Per-subaddress balances");
+    tracing::info!(bal_sa1=%monero_oxide_ext::Amount::from_pico(bal_sa1), bal_sa2=%monero_oxide_ext::Amount::from_pico(bal_sa2), "Per-subaddress balances");
 
     assert!(bal_sa1 > 0, "Subaddress 1 expected to have received funds");
     assert!(bal_sa2 > 0, "Subaddress 2 expected to have received funds");
diff --git a/monero-tests/tests/transfers.rs b/monero-tests/tests/transfers.rs
index a6c98ffd84..fde1b015a7 100644
--- a/monero-tests/tests/transfers.rs
+++ b/monero-tests/tests/transfers.rs
@@ -42,7 +42,7 @@ async fn monero_transfers() -> anyhow::Result<()> {
         "Expect one tx key for each non-change output"
     );
 
-    monero.generate_block().await?;
+    monero.generate_blocks().await?;
 
     let alice_txkey = tx_receipt
         .tx_keys
diff --git a/monero-tests/tests/transfers_wrong_key.rs b/monero-tests/tests/transfers_wrong_key.rs
index 407798c9aa..95c7ba12e7 100644
--- a/monero-tests/tests/transfers_wrong_key.rs
+++ b/monero-tests/tests/transfers_wrong_key.rs
@@ -41,7 +41,7 @@ async fn monero_transfers_wrong_key() {
         "Expect one tx key for the output"
     );
 
-    monero.generate_block().await.unwrap();
+    monero.generate_blocks().await.unwrap();
 
     // Use a wrong private key (just a simple constant key, not the real transfer key)
     let wrong_key = monero_oxide_ext::PrivateKey::from_slice(&[
diff --git a/src-gui/package.json b/src-gui/package.json
index 6efda81102..84a0ee1be7 100644
--- a/src-gui/package.json
+++ b/src-gui/package.json
@@ -28,7 +28,7 @@
     "@tauri-apps/api": "^2.8.0",
     "@tauri-apps/plugin-cli": "^2.4.0",
     "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
-    "@tauri-apps/plugin-dialog": "^2.0.0",
+    "@tauri-apps/plugin-dialog": "^2.6.0",
     "@tauri-apps/plugin-opener": "^2.5.0",
     "@tauri-apps/plugin-process": "^2.3.0",
     "@tauri-apps/plugin-store": "^2.4.0",
diff --git a/src-gui/src/dev/mockSwapEvents.ts b/src-gui/src/dev/mockSwapEvents.ts
new file mode 100644
index 0000000000..2281d933ad
--- /dev/null
+++ b/src-gui/src/dev/mockSwapEvents.ts
@@ -0,0 +1,389 @@
+import {
+  ApprovalRequest,
+  BidQuote,
+  LockBitcoinDetails,
+  MoneroAddressPool,
+  QuoteWithAddress,
+  TauriSwapProgressEvent,
+} from "models/tauriModel";
+
+// Mock transaction IDs
+const MOCK_BTC_LOCK_TXID =
+  "f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16";
+const MOCK_XMR_LOCK_TXID =
+  "a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8";
+const MOCK_XMR_REDEEM_TXID =
+  "b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9";
+const MOCK_BTC_CANCEL_TXID =
+  "c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0";
+const MOCK_BTC_REFUND_TXID =
+  "d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1";
+const MOCK_BTC_EARLY_REFUND_TXID =
+  "e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2";
+const MOCK_BTC_PARTIAL_REFUND_TXID =
+  "f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3";
+const MOCK_BTC_AMNESTY_TXID =
+  "a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b4";
+const MOCK_BTC_WITHHOLD_TXID =
+  "b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5";
+const MOCK_BTC_MERCY_TXID =
+  "c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6";
+
+// Mock timelock blocks for earnest deposit
+const EARNEST_DEPOSIT_TARGET_BLOCKS = 3;
+
+// Mock amounts for partial refund scenarios
+const MOCK_BTC_LOCK_AMOUNT = 50_000_000; // 0.5 BTC
+const MOCK_BTC_AMNESTY_AMOUNT = 1_000_000; // 0.01 BTC (2% of lock amount)
+
+// Mock addresses
+const MOCK_BTC_DEPOSIT_ADDRESS = "bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq";
+const MOCK_XMR_ADDRESS =
+  "888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H";
+
+export const MOCK_SWAP_ID = "a1b2c3d4-e5f6-7890-abcd-ef1234567890";
+
+const MOCK_QUOTE: BidQuote = {
+  price: 0.007,
+  min_quantity: 10_000_000,
+  max_quantity: 100_000_000,
+  refund_policy: { type: "FullRefund" },
+};
+
+const MOCK_QUOTE_WITH_ADDRESS: QuoteWithAddress = {
+  multiaddr: "/ip4/127.0.0.1/tcp/9939",
+  peer_id: "12D3KooWCdMKjesXMJz1SiZ7HgotrxuqhQJbP5sgBm2BwP1cqThi",
+  quote: MOCK_QUOTE,
+  version: "3.6.1",
+};
+
+const MOCK_QUOTE_PARTIAL_REFUND: BidQuote = {
+  price: 0.0068,
+  min_quantity: 5_000_000,
+  max_quantity: 200_000_000,
+  refund_policy: { type: "PartialRefund", content: { anti_spam_deposit_ratio: 0.02 } },
+};
+
+const MOCK_QUOTE_WITH_ADDRESS_PARTIAL: QuoteWithAddress = {
+  multiaddr: "/ip4/192.168.1.50/tcp/9940",
+  peer_id: "12D3KooWEyoppNCUzN3sX7atGxPHvqgZvUNQmKzz1mQvNfFhuqP9",
+  quote: MOCK_QUOTE_PARTIAL_REFUND,
+  version: "3.6.1",
+};
+
+const MOCK_RECEIVE_POOL: MoneroAddressPool = [
+  { address: MOCK_XMR_ADDRESS, percentage: 100, label: "Main" },
+];
+
+const XMR_TARGET_CONFIRMATIONS = 10;
+
+// Base scenario: swap start -> XMR locked (10 confirmations)
+const baseScenario: TauriSwapProgressEvent[] = [
+  { type: "ReceivedQuote", content: MOCK_QUOTE },
+  {
+    type: "WaitingForBtcDeposit",
+    content: {
+      deposit_address: MOCK_BTC_DEPOSIT_ADDRESS,
+      max_giveable: 0,
+      min_bitcoin_lock_tx_fee: 1000,
+      known_quotes: [MOCK_QUOTE_WITH_ADDRESS, MOCK_QUOTE_WITH_ADDRESS_PARTIAL],
+    },
+  },
+  { type: "SwapSetupInflight", content: { btc_lock_amount: 50_000_000 } },
+  { type: "RetrievingMoneroBlockheight" },
+  { type: "BtcLockPublishInflight" },
+  // BTC lock confirmations: 0, 1, 2
+  { type: "BtcLockTxInMempool", content: { btc_lock_txid: MOCK_BTC_LOCK_TXID, btc_lock_confirmations: 0 } },
+  { type: "BtcLockTxInMempool", content: { btc_lock_txid: MOCK_BTC_LOCK_TXID, btc_lock_confirmations: 1 } },
+  { type: "BtcLockTxInMempool", content: { btc_lock_txid: MOCK_BTC_LOCK_TXID, btc_lock_confirmations: 2 } },
+  { type: "VerifyingXmrLockTx", content: { xmr_lock_txid: MOCK_XMR_LOCK_TXID } },
+  // XMR lock confirmations: 0 through 10
+  ...Array.from({ length: XMR_TARGET_CONFIRMATIONS + 1 }, (_, i) => ({
+    type: "XmrLockTxInMempool" as const,
+    content: {
+      xmr_lock_txid: MOCK_XMR_LOCK_TXID,
+      xmr_lock_tx_confirmations: i,
+      xmr_lock_tx_target_confirmations: XMR_TARGET_CONFIRMATIONS,
+    },
+  })),
+];
+
+const happyPath: TauriSwapProgressEvent[] = [
+  ...baseScenario,
+  { type: "PreflightEncSig" },
+  { type: "InflightEncSig" },
+  { type: "EncryptedSignatureSent" },
+  { type: "RedeemingMonero" },
+  {
+    type: "XmrRedeemInMempool",
+    content: { xmr_redeem_txids: [MOCK_XMR_REDEEM_TXID], xmr_receive_pool: MOCK_RECEIVE_POOL },
+  },
+  { type: "Released" },
+];
+
+const cooperativeRedeem: TauriSwapProgressEvent[] = [
+  ...baseScenario,
+  { type: "AttemptingCooperativeRedeem" },
+  { type: "CooperativeRedeemAccepted" },
+  { type: "RedeemingMonero" },
+  {
+    type: "XmrRedeemInMempool",
+    content: { xmr_redeem_txids: [MOCK_XMR_REDEEM_TXID], xmr_receive_pool: MOCK_RECEIVE_POOL },
+  },
+  { type: "Released" },
+];
+
+const cooperativeRedeemRejected: TauriSwapProgressEvent[] = [
+  ...baseScenario,
+  { type: "AttemptingCooperativeRedeem" },
+  { type: "CooperativeRedeemRejected", content: { reason: "Peer offline" } },
+  { type: "WaitingForCancelTimelockExpiration" },
+  { type: "CancelTimelockExpired" },
+  { type: "BtcCancelPublished", content: { btc_cancel_txid: MOCK_BTC_CANCEL_TXID, btc_cancel_confirmations: 0, btc_cancel_target_confirmations: 1 } },
+  { type: "BtcCancelled", content: { btc_cancel_txid: MOCK_BTC_CANCEL_TXID } },
+  { type: "BtcRefundPublished", content: { btc_refund_txid: MOCK_BTC_REFUND_TXID } },
+  { type: "BtcRefunded", content: { btc_refund_txid: MOCK_BTC_REFUND_TXID } },
+  { type: "Released" },
+];
+
+const earlyRefund: TauriSwapProgressEvent[] = [
+  ...baseScenario,
+  { type: "BtcEarlyRefundPublished", content: { btc_early_refund_txid: MOCK_BTC_EARLY_REFUND_TXID } },
+  { type: "BtcEarlyRefunded", content: { btc_early_refund_txid: MOCK_BTC_EARLY_REFUND_TXID } },
+  { type: "Released" },
+];
+
+const partialRefundWithAmnesty: TauriSwapProgressEvent[] = [
+  ...baseScenario,
+  { type: "WaitingForCancelTimelockExpiration" },
+  { type: "CancelTimelockExpired" },
+  { type: "BtcCancelPublished", content: { btc_cancel_txid: MOCK_BTC_CANCEL_TXID, btc_cancel_confirmations: 0, btc_cancel_target_confirmations: 1 } },
+  { type: "BtcCancelled", content: { btc_cancel_txid: MOCK_BTC_CANCEL_TXID } },
+  {
+    type: "BtcPartialRefundPublished",
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  {
+    type: "BtcPartiallyRefunded",
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  // Waiting for earnest deposit timelock: 3/3, 2/3, 1/3, 0/3 blocks remaining
+  ...Array.from({ length: EARNEST_DEPOSIT_TARGET_BLOCKS + 1 }, (_, i) => ({
+    type: "WaitingForEarnestDepositTimelockExpiration" as const,
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+      target_blocks: EARNEST_DEPOSIT_TARGET_BLOCKS,
+      blocks_until_expiry: EARNEST_DEPOSIT_TARGET_BLOCKS - i,
+    },
+  })),
+  {
+    type: "BtcAmnestyPublished",
+    content: {
+      btc_amnesty_txid: MOCK_BTC_AMNESTY_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  {
+    type: "BtcAmnestyReceived",
+    content: {
+      btc_amnesty_txid: MOCK_BTC_AMNESTY_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  { type: "Released" },
+];
+
+const partialRefundWithBurn: TauriSwapProgressEvent[] = [
+  ...baseScenario,
+  { type: "WaitingForCancelTimelockExpiration" },
+  { type: "CancelTimelockExpired" },
+  { type: "BtcCancelPublished", content: { btc_cancel_txid: MOCK_BTC_CANCEL_TXID, btc_cancel_confirmations: 0, btc_cancel_target_confirmations: 1 } },
+  { type: "BtcCancelled", content: { btc_cancel_txid: MOCK_BTC_CANCEL_TXID } },
+  {
+    type: "BtcPartialRefundPublished",
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  {
+    type: "BtcPartiallyRefunded",
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  // Waiting for earnest deposit timelock: 3/3, 2/3, 1/3, 0/3 blocks remaining
+  ...Array.from({ length: EARNEST_DEPOSIT_TARGET_BLOCKS + 1 }, (_, i) => ({
+    type: "WaitingForEarnestDepositTimelockExpiration" as const,
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+      target_blocks: EARNEST_DEPOSIT_TARGET_BLOCKS,
+      blocks_until_expiry: EARNEST_DEPOSIT_TARGET_BLOCKS - i,
+    },
+  })),
+  {
+    type: "BtcWithholdPublished",
+    content: {
+      btc_withhold_txid: MOCK_BTC_WITHHOLD_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  {
+    type: "BtcWithheld",
+    content: {
+      btc_withhold_txid: MOCK_BTC_WITHHOLD_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  { type: "Released" },
+];
+
+const partialRefundWithWithholdAndMercy: TauriSwapProgressEvent[] = [
+  ...baseScenario,
+  { type: "WaitingForCancelTimelockExpiration" },
+  { type: "CancelTimelockExpired" },
+  { type: "BtcCancelPublished", content: { btc_cancel_txid: MOCK_BTC_CANCEL_TXID, btc_cancel_confirmations: 0, btc_cancel_target_confirmations: 1 } },
+  { type: "BtcCancelled", content: { btc_cancel_txid: MOCK_BTC_CANCEL_TXID } },
+  {
+    type: "BtcPartialRefundPublished",
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  {
+    type: "BtcPartiallyRefunded",
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  // Waiting for earnest deposit timelock: 3/3, 2/3, 1/3, 0/3 blocks remaining
+  ...Array.from({ length: EARNEST_DEPOSIT_TARGET_BLOCKS + 1 }, (_, i) => ({
+    type: "WaitingForEarnestDepositTimelockExpiration" as const,
+    content: {
+      btc_partial_refund_txid: MOCK_BTC_PARTIAL_REFUND_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+      target_blocks: EARNEST_DEPOSIT_TARGET_BLOCKS,
+      blocks_until_expiry: EARNEST_DEPOSIT_TARGET_BLOCKS - i,
+    },
+  })),
+  {
+    type: "BtcWithholdPublished",
+    content: {
+      btc_withhold_txid: MOCK_BTC_WITHHOLD_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  {
+    type: "BtcWithheld",
+    content: {
+      btc_withhold_txid: MOCK_BTC_WITHHOLD_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  {
+    type: "BtcMercyPublished",
+    content: {
+      btc_mercy_txid: MOCK_BTC_MERCY_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  {
+    type: "BtcMercyConfirmed",
+    content: {
+      btc_mercy_txid: MOCK_BTC_MERCY_TXID,
+      btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+      btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+    },
+  },
+  { type: "Released" },
+];
+
+export const scenarios: Record<string, TauriSwapProgressEvent[]> = {
+  happyPath,
+  cooperativeRedeem,
+  cooperativeRedeemRejected,
+  earlyRefund,
+  partialRefundWithAmnesty,
+  partialRefundWithBurn,
+  partialRefundWithWithholdAndMercy,
+};
+
+export type MockScenario = keyof typeof scenarios;
+
+// Mock LockBitcoin approval requests for testing confirmation screen
+
+// Partial refund version (5% amnesty)
+const MOCK_LOCK_BITCOIN_DETAILS_PARTIAL: LockBitcoinDetails = {
+  btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+  btc_network_fee: 5000,
+  xmr_receive_amount: 7_000_000_000_000, // 7 XMR in piconeros
+  monero_receive_pool: MOCK_RECEIVE_POOL,
+  swap_id: MOCK_SWAP_ID,
+  btc_amnesty_amount: MOCK_BTC_AMNESTY_AMOUNT,
+  has_full_refund_signature: false,
+};
+
+// Full refund version (no amnesty)
+const MOCK_LOCK_BITCOIN_DETAILS_FULL: LockBitcoinDetails = {
+  btc_lock_amount: MOCK_BTC_LOCK_AMOUNT,
+  btc_network_fee: 5000,
+  xmr_receive_amount: 7_000_000_000_000, // 7 XMR in piconeros
+  monero_receive_pool: MOCK_RECEIVE_POOL,
+  swap_id: MOCK_SWAP_ID,
+  btc_amnesty_amount: 0,
+  has_full_refund_signature: true,
+};
+
+const PARTIAL_REFUND_SCENARIOS: MockScenario[] = [
+  "partialRefundWithAmnesty",
+  "partialRefundWithBurn",
+  "partialRefundWithWithholdAndMercy",
+];
+
+export function isPartialRefundScenario(scenario: MockScenario): boolean {
+  return PARTIAL_REFUND_SCENARIOS.includes(scenario);
+}
+
+export function getMockLockBitcoinApproval(scenario: MockScenario | null): ApprovalRequest {
+  const isPartial = scenario !== null && isPartialRefundScenario(scenario);
+  return {
+    request_id: "00000000-0000-0000-0000-000000000001",
+    request: {
+      type: "LockBitcoin",
+      content: isPartial ? MOCK_LOCK_BITCOIN_DETAILS_PARTIAL : MOCK_LOCK_BITCOIN_DETAILS_FULL,
+    },
+    request_status: {
+      state: "Pending",
+      content: {
+        expiration_ts: Number.MAX_SAFE_INTEGER,
+      },
+    },
+  };
+}
diff --git a/src-gui/src/models/storeModel.ts b/src-gui/src/models/storeModel.ts
index 56e14588be..9065265e8d 100644
--- a/src-gui/src/models/storeModel.ts
+++ b/src-gui/src/models/storeModel.ts
@@ -11,4 +11,6 @@ export interface SwapSlice {
   state: SwapState | null;
   logs: CliLog[];
   spawnType: SwapSpawnType | null;
+  /** DEV ONLY: When true, prevents Tauri calls in the swap progress listener */
+  _mockOnlyDisableTauriCallsOnSwapProgress: boolean;
 }
diff --git a/src-gui/src/models/tauriModelExt.ts b/src-gui/src/models/tauriModelExt.ts
index a4bb74d7a0..89a6372844 100644
--- a/src-gui/src/models/tauriModelExt.ts
+++ b/src-gui/src/models/tauriModelExt.ts
@@ -49,11 +49,22 @@ export enum BobStateName {
   EncSigSent = "encrypted signature is sent",
   BtcRedeemed = "btc is redeemed",
   CancelTimelockExpired = "cancel timelock is expired",
+  BtcCancelPublished = "btc cancel is published",
   BtcCancelled = "btc is cancelled",
   BtcRefundPublished = "btc refund is published",
+  BtcPartialRefundPublished = "btc partial refund is published",
   BtcEarlyRefundPublished = "btc early refund is published",
   BtcRefunded = "btc is refunded",
   BtcEarlyRefunded = "btc is early refunded",
+  BtcPartiallyRefunded = "btc is partially refunded",
+  BtcAmnestyPublished = "btc amnesty is published",
+  BtcAmnestyReceived = "btc amnesty is confirmed",
+  BtcWithholdPublished = "btc withhold is published",
+  BtcWithheld = "btc is withheld",
+  BtcMercyPublished = "btc mercy is published",
+  BtcMercyConfirmed = "btc mercy is confirmed",
+  WaitingForReclaimTimelockExpiration = "waiting for remaining refund timelock to expire",
+  ReclaimTimelockExpired = "remaining refund timelock expired",
   XmrRedeemed = "xmr is redeemed",
   BtcPunished = "btc is punished",
   SafelyAborted = "safely aborted",
@@ -81,16 +92,38 @@ export function bobStateNameToHumanReadable(stateName: BobStateName): string {
       return "Bitcoin redeemed";
     case BobStateName.CancelTimelockExpired:
       return "Cancel timelock expired";
+    case BobStateName.BtcCancelPublished:
+      return "Bitcoin cancel published";
     case BobStateName.BtcCancelled:
       return "Bitcoin cancelled";
     case BobStateName.BtcRefundPublished:
       return "Bitcoin refund published";
     case BobStateName.BtcEarlyRefundPublished:
       return "Bitcoin early refund published";
+    case BobStateName.BtcPartialRefundPublished:
+      return "Bitcoin partial refund published";
+    case BobStateName.BtcAmnestyPublished:
+      return "Bitcoin amnesty was granted";
     case BobStateName.BtcRefunded:
       return "Bitcoin refunded";
     case BobStateName.BtcEarlyRefunded:
       return "Bitcoin early refunded";
+    case BobStateName.BtcPartiallyRefunded:
+      return "Bitcoin partially refunded";
+    case BobStateName.BtcAmnestyReceived:
+      return "Bitcoin amnesty was received";
+    case BobStateName.BtcWithholdPublished:
+      return "Bitcoin withhold published";
+    case BobStateName.BtcWithheld:
+      return "Bitcoin withheld";
+    case BobStateName.BtcMercyPublished:
+      return "Bitcoin mercy published";
+    case BobStateName.BtcMercyConfirmed:
+      return "Bitcoin mercy received";
+    case BobStateName.WaitingForReclaimTimelockExpiration:
+      return "Waiting for amnesty timelock";
+    case BobStateName.ReclaimTimelockExpired:
+      return "Amnesty timelock expired";
     case BobStateName.XmrRedeemed:
       return "Monero redeemed";
     case BobStateName.BtcPunished:
@@ -110,6 +143,14 @@ export type GetSwapInfoResponseExt = GetSwapInfoResponse & {
 export type TimelockNone = Extract<ExpiredTimelocks, { type: "None" }>;
 export type TimelockCancel = Extract<ExpiredTimelocks, { type: "Cancel" }>;
 export type TimelockPunish = Extract<ExpiredTimelocks, { type: "Punish" }>;
+export type TimelockWaitingForRemainingRefund = Extract<
+  ExpiredTimelocks,
+  { type: "WaitingForRemainingRefund" }
+>;
+export type TimelockRemainingRefund = Extract<
+  ExpiredTimelocks,
+  { type: "RemainingRefund" }
+>;
 
 // This function returns the absolute block number of the timelock relative to the block the tx_lock was included in
 export function getAbsoluteBlock(
@@ -126,6 +167,13 @@ export function getAbsoluteBlock(
   if (timelock.type === "Punish") {
     return cancelTimelock + punishTimelock;
   }
+  // These states are for the partial refund path - we're past cancel/punish timelocks
+  if (timelock.type === "WaitingForRemainingRefund") {
+    return cancelTimelock + punishTimelock;
+  }
+  if (timelock.type === "RemainingRefund") {
+    return cancelTimelock + punishTimelock;
+  }
 
   // We match all cases
   return exhaustiveGuard(timelock);
@@ -136,7 +184,11 @@ export type BobStateNameRunningSwap = Exclude<
   | BobStateName.Started
   | BobStateName.SwapSetupCompleted
   | BobStateName.BtcRefunded
+  | BobStateName.BtcAmnestyReceived
+  | BobStateName.BtcRefunded
   | BobStateName.BtcEarlyRefunded
+  | BobStateName.BtcWithheld
+  | BobStateName.BtcMercyConfirmed
   | BobStateName.BtcPunished
   | BobStateName.SafelyAborted
   | BobStateName.XmrRedeemed
@@ -154,6 +206,9 @@ export function isBobStateNameRunningSwap(
     BobStateName.SwapSetupCompleted,
     BobStateName.BtcRefunded,
     BobStateName.BtcEarlyRefunded,
+    BobStateName.BtcAmnestyReceived,
+    BobStateName.BtcWithheld,
+    BobStateName.BtcMercyConfirmed,
     BobStateName.BtcPunished,
     BobStateName.SafelyAborted,
     BobStateName.XmrRedeemed,
@@ -167,6 +222,7 @@ export type BobStateNamePossiblyCancellableSwap =
   | BobStateName.XmrLocked
   | BobStateName.EncSigSent
   | BobStateName.CancelTimelockExpired
+  | BobStateName.BtcCancelPublished
   | BobStateName.BtcRefundPublished
   | BobStateName.BtcEarlyRefundPublished;
 
@@ -193,6 +249,7 @@ export function isBobStateNamePossiblyCancellableSwap(
     BobStateName.XmrLocked,
     BobStateName.EncSigSent,
     BobStateName.CancelTimelockExpired,
+    BobStateName.BtcCancelPublished,
     BobStateName.BtcRefundPublished,
     BobStateName.BtcEarlyRefundPublished,
   ].includes(state);
@@ -205,6 +262,7 @@ export type BobStateNamePossiblyRefundableSwap =
   | BobStateName.XmrLocked
   | BobStateName.EncSigSent
   | BobStateName.CancelTimelockExpired
+  | BobStateName.BtcCancelPublished
   | BobStateName.BtcCancelled
   | BobStateName.BtcRefundPublished
   | BobStateName.BtcEarlyRefundPublished;
@@ -230,6 +288,7 @@ export function isBobStateNamePossiblyRefundableSwap(
     BobStateName.XmrLocked,
     BobStateName.EncSigSent,
     BobStateName.CancelTimelockExpired,
+    BobStateName.BtcCancelPublished,
     BobStateName.BtcCancelled,
     BobStateName.BtcRefundPublished,
     BobStateName.BtcEarlyRefundPublished,
diff --git a/src-gui/src/renderer/background.ts b/src-gui/src/renderer/background.ts
index ba98e572df..2c03d77520 100644
--- a/src-gui/src/renderer/background.ts
+++ b/src-gui/src/renderer/background.ts
@@ -135,7 +135,10 @@ listen<TauriEvent>(TAURI_UNIFIED_EVENT_CHANNEL_NAME, (event) => {
 
   switch (channelName) {
     case "SwapProgress":
-      store.dispatch(swapProgressEventReceived(eventData));
+      // Skip when mocking is enabled (DEV only) - mock dispatches bypass this listener
+      if (!store.getState().swap._mockOnlyDisableTauriCallsOnSwapProgress) {
+        store.dispatch(swapProgressEventReceived(eventData));
+      }
       break;
 
     case "CliLog":
diff --git a/src-gui/src/renderer/components/alert/SwapStatusAlert/SwapStatusAlert.tsx b/src-gui/src/renderer/components/alert/SwapStatusAlert/SwapStatusAlert.tsx
index d75d618b3d..1d559f36ea 100644
--- a/src-gui/src/renderer/components/alert/SwapStatusAlert/SwapStatusAlert.tsx
+++ b/src-gui/src/renderer/components/alert/SwapStatusAlert/SwapStatusAlert.tsx
@@ -161,6 +161,77 @@ function PunishTimelockExpiredAlert() {
   );
 }
 
+/**
+ * Sub-component for alerts when waiting for remaining refund timelock.
+ * This occurs after a partial refund was confirmed but we're waiting for the amnesty timelock.
+ */
+function WaitingForRemainingRefundTimelockAlert({
+  blocksLeft,
+}: {
+  blocksLeft: number;
+}) {
+  return (
+    <MessageList
+      messages={[
+        "Your Bitcoin was partially refunded",
+        <>
+          Waiting{" "}
+          <HumanizedBitcoinBlockDuration blocks={blocksLeft} displayBlocks />{" "}
+          for the amnesty timelock to expire
+        </>,
+        "The maker can burn the remaining Bitcoin before the timelock expires",
+        "If the maker doesn't burn it, you can claim the remaining Bitcoin once the timelock expires",
+        "Keep the app running or resume the swap once the timelock expires",
+      ]}
+    />
+  );
+}
+
+/**
+ * Sub-component for alerts when remaining refund timelock has expired.
+ * The amnesty transaction can now be published.
+ */
+function RemainingRefundTimelockExpiredAlert() {
+  return (
+    <MessageList
+      messages={[
+        "Your Bitcoin was partially refunded",
+        "The amnesty timelock has expired",
+        "Resume the swap to claim the remaining Bitcoin",
+      ]}
+    />
+  );
+}
+
+/**
+ * Sub-component for alerts when the maker has withheld the amnesty output.
+ */
+function BtcWithholdPublishedAlert() {
+  return (
+    <MessageList
+      messages={[
+        "The remaining Bitcoin was withheld by the maker",
+        "Waiting for the maker to grant mercy",
+        "Keep the app running or resume the swap to receive the mercy",
+      ]}
+    />
+  );
+}
+
+/**
+ * Sub-component for alerts when the maker has published the mercy transaction.
+ */
+function BtcMercyPublishedAlert() {
+  return (
+    <MessageList
+      messages={[
+        "The maker granted mercy",
+        "Waiting for the mercy transaction to be confirmed",
+      ]}
+    />
+  );
+}
+
 /**
  * Main component for displaying the appropriate swap alert status text.
  * @param swap - The swap information.
@@ -175,6 +246,10 @@ export function StateAlert({
   timelock: ExpiredTimelocks | null;
   isRunning: boolean;
 }) {
+  if (swap == null) {
+    return null;
+  }
+
   switch (swap.state_name) {
     // This is the state where the swap is safe because the other party has redeemed the Bitcoin
     // It cannot be punished anymore
@@ -189,9 +264,14 @@ export function StateAlert({
     case BobStateName.XmrLocked:
     case BobStateName.EncSigSent:
     case BobStateName.CancelTimelockExpired:
+    // Even if the refund transactions have been published, it cannot be
+    // guaranteed that they will be confirmed in time
+    // falls through
+    case BobStateName.BtcCancelPublished:
     case BobStateName.BtcCancelled:
-    case BobStateName.BtcRefundPublished: // Even if the transactions have been published, it cannot be
-    case BobStateName.BtcEarlyRefundPublished: // guaranteed that they will be confirmed in time
+    case BobStateName.BtcRefundPublished:
+    case BobStateName.BtcPartialRefundPublished:
+    case BobStateName.BtcEarlyRefundPublished:
       if (timelock != null) {
         switch (timelock.type) {
           case "None":
@@ -209,16 +289,54 @@ export function StateAlert({
             );
           case "Punish":
             return <PunishTimelockExpiredAlert />;
+          // These two timelock types only exist once the partial refund tx has been confirmed
+          // They shouldn't occur for these states, so return null
+          case "WaitingForRemainingRefund":
+          case "RemainingRefund":
+            return null;
           default:
             exhaustiveGuard(timelock);
         }
       }
       return <PunishTimelockExpiredAlert />;
 
+    case BobStateName.BtcPartiallyRefunded:
+      // Reuse existing timelock alerts for the amnesty waiting period
+      if (timelock != null) {
+        switch (timelock.type) {
+          case "WaitingForRemainingRefund":
+            return (
+              <WaitingForRemainingRefundTimelockAlert
+                blocksLeft={timelock.content.blocks_left}
+              />
+            );
+          case "RemainingRefund":
+            return <RemainingRefundTimelockExpiredAlert />;
+          default:
+            return null;
+        }
+      }
+      return null;
+
+    case BobStateName.BtcWithholdPublished:
+      return <BtcWithholdPublishedAlert />;
+
+    case BobStateName.BtcMercyPublished:
+      return <BtcMercyPublishedAlert />;
+
+    case BobStateName.BtcAmnestyPublished:
+      // Amnesty tx published, waiting for confirmation - no specific alert needed
+      return null;
+
+    case BobStateName.WaitingForReclaimTimelockExpiration:
+    case BobStateName.ReclaimTimelockExpired:
+      return null;
+
     // If the Bitcoin lock transaction has not been published yet
     // there is no need to display an alert
     case BobStateName.BtcLockReadyToPublish:
       return null;
+
     default:
       exhaustiveGuard(swap.state_name);
   }
@@ -270,7 +388,7 @@ export default function SwapStatusAlert({
 
   return (
     <Alert
-      key={swap.swap_id}
+      key={swapId}
       severity="warning"
       variant="filled"
       classes={{ message: "alert-message-flex-grow" }}
@@ -291,8 +409,9 @@ export default function SwapStatusAlert({
           <>
             Swap <TruncatedText>{swap.swap_id}</TruncatedText> is not running
           </>
-        )}
-      </AlertTitle>
+        )
+        }
+      </AlertTitle >
       <Box
         sx={{
           display: "flex",
@@ -303,6 +422,6 @@ export default function SwapStatusAlert({
         <StateAlert swap={swap} timelock={timelock} isRunning={isRunning} />
         {timelock && <TimelockTimeline swap={swap} timelock={timelock} />}
       </Box>
-    </Alert>
+    </Alert >
   );
 }
diff --git a/src-gui/src/renderer/components/inputs/NumberInput.tsx b/src-gui/src/renderer/components/inputs/NumberInput.tsx
index 4fa2f18158..8909417bf4 100644
--- a/src-gui/src/renderer/components/inputs/NumberInput.tsx
+++ b/src-gui/src/renderer/components/inputs/NumberInput.tsx
@@ -42,10 +42,15 @@ export default function NumberInput({
     return 0;
   };
 
-  const [userPrecision, setUserPrecision] = useState(() =>
-    getDecimalPrecision(step),
-  ); // Track user's decimal precision
-  const [minPrecision, setMinPrecision] = useState(3);
+  // minPrecision is purely derived from step - no state needed
+  const minPrecision = getDecimalPrecision(step);
+
+  // Track user's decimal precision, reset when step changes
+  const [userPrecision, setUserPrecision] = useState(() => minPrecision);
+
+  // eslint-disable-next-line react-hooks/set-state-in-effect -- reset state when prop changes
+  useEffect(() => setUserPrecision(minPrecision), [step, minPrecision]);
+
   const appliedPrecision =
     userPrecision > minPrecision ? userPrecision : minPrecision;
 
@@ -61,12 +66,6 @@ export default function NumberInput({
     }
   }, [placeholder, isFocused, value, onChange]);
 
-  // Update precision when step changes
-  useEffect(() => {
-    setUserPrecision(getDecimalPrecision(step));
-    setMinPrecision(getDecimalPrecision(step));
-  }, [step]);
-
   // Measure text width to size input dynamically
   useEffect(() => {
     if (measureRef.current) {
diff --git a/src-gui/src/renderer/components/modal/donation-tip/DonationTipDialog.tsx b/src-gui/src/renderer/components/modal/donation-tip/DonationTipDialog.tsx
index 7e089a157a..2d8bea415d 100644
--- a/src-gui/src/renderer/components/modal/donation-tip/DonationTipDialog.tsx
+++ b/src-gui/src/renderer/components/modal/donation-tip/DonationTipDialog.tsx
@@ -23,7 +23,7 @@ import {
 } from "store/hooks";
 import ExternalLink from "renderer/components/other/ExternalLink";
 import GitHubIcon from "@mui/icons-material/GitHub";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 
 const GITHUB_BOUNTIES_URL = "https://eigenwallet.org/bounties";
 
@@ -239,15 +239,14 @@ export function GlobalDonationTipDialog() {
   // "Latch" pattern: once conditions are met, we remember that the dialog should be shown.
   // This prevents the dialog from closing when the user moves their mouse (which would
   // break the idle condition). Once triggered, it stays triggered.
+  // Uses "adjust state during render" pattern instead of useEffect.
   const [hasTriggered, setHasTriggered] = useState(false);
 
   const shouldOpen = hasntSelectedTipYet && isExperiencedUser && isIdle;
 
-  useEffect(() => {
-    if (shouldOpen && !hasTriggered) {
-      setHasTriggered(true);
-    }
-  }, [shouldOpen, hasTriggered]);
+  if (shouldOpen && !hasTriggered) {
+    setHasTriggered(true);
+  }
 
   // Show dialog if we've triggered and user hasn't dismissed
   const open = hasTriggered && !dismissed;
diff --git a/src-gui/src/renderer/components/modal/feedback/useFeedback.ts b/src-gui/src/renderer/components/modal/feedback/useFeedback.ts
index deec3b9862..56fec91e0c 100644
--- a/src-gui/src/renderer/components/modal/feedback/useFeedback.ts
+++ b/src-gui/src/renderer/components/modal/feedback/useFeedback.ts
@@ -49,13 +49,12 @@ export function useFeedback() {
   });
   const [logsState, setLogsState] =
     useState<FeedbackLogsState>(initialLogsState);
-  const [isPending, setIsPending] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  const bodyTooLong = inputState.bodyText.length > MAX_FEEDBACK_LENGTH;
-
+  // Fetch swap logs when selection changes
   useEffect(() => {
     if (inputState.selectedSwap === null) {
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- clear when deselected
       setLogsState((prev) => ({ ...prev, swapLogs: [] }));
       return;
     }
@@ -76,41 +75,33 @@ export function useFeedback() {
       });
   }, [inputState.selectedSwap, inputState.isSwapLogsRedacted]);
 
+  // Fetch/process daemon logs when settings change
   useEffect(() => {
     if (!inputState.attachDaemonLogs) {
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- clear when detached
       setLogsState((prev) => ({ ...prev, daemonLogs: [] }));
       return;
     }
 
-    try {
-      const hashedLogs = store.getState().logs?.state.logs ?? [];
-
-      if (inputState.isDaemonLogsRedacted) {
-        const logs = hashedLogs.map((h) => h.log);
-        redactLogs(logs)
-          .then((redactedLogs) => {
-            setLogsState((prev) => ({
-              ...prev,
-              daemonLogs: hashLogs(redactedLogs),
-            }));
-            setError(null);
-          })
-          .catch((e) => {
-            logger.error(`Failed to redact daemon logs: ${e}`);
-            setLogsState((prev) => ({ ...prev, daemonLogs: [] }));
-            setError(`Failed to redact daemon logs: ${e}`);
-          });
-      } else {
-        setLogsState((prev) => ({
-          ...prev,
-          daemonLogs: hashedLogs,
-        }));
-        setError(null);
-      }
-    } catch (e) {
-      logger.error(`Failed to fetch daemon logs: ${e}`);
-      setLogsState((prev) => ({ ...prev, daemonLogs: [] }));
-      setError(`Failed to fetch daemon logs: ${e}`);
+    const hashedLogs = store.getState().logs?.state.logs ?? [];
+
+    if (inputState.isDaemonLogsRedacted) {
+      const logs = hashedLogs.map((h) => h.log);
+      redactLogs(logs)
+        .then((redactedLogs) => {
+          setLogsState((prev) => ({
+            ...prev,
+            daemonLogs: hashLogs(redactedLogs),
+          }));
+          setError(null);
+        })
+        .catch((e) => {
+          logger.error(`Failed to redact daemon logs: ${e}`);
+          setLogsState((prev) => ({ ...prev, daemonLogs: [] }));
+          setError(`Failed to redact daemon logs: ${e}`);
+        });
+    } else {
+      setLogsState((prev) => ({ ...prev, daemonLogs: hashedLogs }));
     }
   }, [inputState.attachDaemonLogs, inputState.isDaemonLogsRedacted]);
 
diff --git a/src-gui/src/renderer/components/modal/seed-selection/SeedSelectionDialog.tsx b/src-gui/src/renderer/components/modal/seed-selection/SeedSelectionDialog.tsx
index 9852eb5a22..a23154ef1c 100644
--- a/src-gui/src/renderer/components/modal/seed-selection/SeedSelectionDialog.tsx
+++ b/src-gui/src/renderer/components/modal/seed-selection/SeedSelectionDialog.tsx
@@ -20,7 +20,7 @@ import {
   CardContent,
 } from "@mui/material";
 import NewPasswordInput from "renderer/components/other/NewPasswordInput";
-import { useState, useEffect } from "react";
+import { useState, useEffect, useRef } from "react";
 import { usePendingSeedSelectionApproval } from "store/hooks";
 import { resolveApproval, checkSeed } from "renderer/rpc";
 import { SeedChoice } from "models/tauriModel";
@@ -74,7 +74,7 @@ export default function SeedSelectionDialog() {
   >("RandomSeed");
   const [customSeed, setCustomSeed] = useState<string>("");
   const [blockheightInput, setBlockheightInput] = useState<string>("");
-  const [isSeedValid, setIsSeedValid] = useState<boolean>(false);
+  const [asyncSeedValidation, setAsyncSeedValidation] = useState<boolean>(false);
   const [password, setPassword] = useState<string>("");
   const [isPasswordValid, setIsPasswordValid] = useState<boolean>(true);
   const [walletPath, setWalletPath] = useState<string>("");
@@ -87,26 +87,29 @@ export default function SeedSelectionDialog() {
       ? approval.request.content.recent_wallets
       : [];
 
+  // Only run async validation when in "FromSeed" mode with content
+  const needsSeedValidation = selectedOption === "FromSeed" && customSeed.trim();
+
   useEffect(() => {
-    if (selectedOption === "FromSeed" && customSeed.trim()) {
-      checkSeed(customSeed.trim())
-        .then((valid) => {
-          setIsSeedValid(valid);
-        })
-        .catch(() => {
-          setIsSeedValid(false);
-        });
-    } else {
-      setIsSeedValid(false);
-    }
-  }, [customSeed, selectedOption]);
+    if (!needsSeedValidation) return;
+
+    checkSeed(customSeed.trim())
+      .then(setAsyncSeedValidation)
+      .catch(() => setAsyncSeedValidation(false));
+  }, [customSeed, needsSeedValidation]);
+
+  // isSeedValid is derived: only true if we need validation AND async check passed
+  const isSeedValid = needsSeedValidation && asyncSeedValidation;
 
-  // Auto-select the first recent wallet if available
+  // Auto-select the first recent wallet if available (one-time initialization)
+  const hasInitializedRef = useRef(false);
   useEffect(() => {
-    if (recentWallets.length > 0) {
+    if (recentWallets.length > 0 && !hasInitializedRef.current) {
+      hasInitializedRef.current = true;
       setSelectedOption("FromWalletPath");
       setWalletPath(recentWallets[0]);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- only init once when wallets available
   }, [recentWallets.length]);
 
   const selectWalletFile = async () => {
diff --git a/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx b/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx
index f270cb0127..3ff2bf3738 100644
--- a/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx
+++ b/src-gui/src/renderer/components/modal/swap/SwapStateStepper.tsx
@@ -1,19 +1,29 @@
 import { Step, StepLabel, Stepper, Typography } from "@mui/material";
 import { SwapState } from "models/storeModel";
-import { useAppSelector } from "store/hooks";
 import logger from "utils/logger";
 
 export enum PathType {
   HAPPY_PATH = "happy path",
-  UNHAPPY_PATH = "unhappy path",
+  RECOVERY_PATH = "recovery path",
 }
 
-type PathStep = [type: PathType, step: number, isError: boolean];
+export enum RecoveryScenario {
+  GENERIC = "generic",
+  FULL_REFUND = "full_refund",
+  PARTIAL_REFUND = "partial_refund",
+  COOPERATIVE_REDEEM = "cooperative_redeem",
+}
+
+type PathStep = [
+  type: PathType,
+  step: number,
+  isError: boolean,
+  scenario?: RecoveryScenario,
+];
 
 /**
  * Determines the current step in the swap process based on the previous and latest state.
- * @param prevState - The previous state of the swap process (null if it's the initial state)
- * @param latestState - The latest state of the swap process
+ * @param state - The state of the swap process (null if it's the initial state)
  * @returns A tuple containing [PathType, activeStep, errorFlag]
  */
 function getActiveStep(state: SwapState | null): PathStep | null {
@@ -92,38 +102,62 @@ function getActiveStep(state: SwapState | null): PathStep | null {
     case "XmrRedeemInMempool":
       return [PathType.HAPPY_PATH, 4, false];
 
-    // Unhappy Path States
+    // Recovery Path States - Generic (early states before we know outcome)
 
-    // Step 1: Cancel timelock has expired. Waiting for cancel transaction to be published
+    case "WaitingForCancelTimelockExpiration":
     case "CancelTimelockExpired":
-      return [PathType.UNHAPPY_PATH, 0, isReleased];
+      return [PathType.RECOVERY_PATH, 0, isReleased, RecoveryScenario.GENERIC];
 
-    // Step 2: Swap has been cancelled. Waiting for Bitcoin to be refunded
+    case "BtcCancelPublished":
     case "BtcCancelled":
-      return [PathType.UNHAPPY_PATH, 1, isReleased];
+      return [PathType.RECOVERY_PATH, 1, isReleased, RecoveryScenario.GENERIC];
+
+    // Recovery Path States - Full Refund
 
-    // Step 2: One of the two Bitcoin refund transactions have been published
-    // but they haven't been confirmed yet
     case "BtcRefundPublished":
     case "BtcEarlyRefundPublished":
-      return [PathType.UNHAPPY_PATH, 1, isReleased];
+      return [PathType.RECOVERY_PATH, 1, isReleased, RecoveryScenario.FULL_REFUND];
 
-    // Step 2: One of the two Bitcoin refund transactions have been confirmed
     case "BtcRefunded":
     case "BtcEarlyRefunded":
-      return [PathType.UNHAPPY_PATH, 2, false];
+      return [PathType.RECOVERY_PATH, 2, false, RecoveryScenario.FULL_REFUND];
+
+    // Recovery Path States - Partial Refund
+
+    case "BtcPartialRefundPublished":
+      return [PathType.RECOVERY_PATH, 1, isReleased, RecoveryScenario.PARTIAL_REFUND];
+
+    case "BtcPartiallyRefunded":
+    case "WaitingForEarnestDepositTimelockExpiration":
+    case "BtcAmnestyPublished":
+      return [PathType.RECOVERY_PATH, 2, isReleased, RecoveryScenario.PARTIAL_REFUND];
+
+    case "BtcAmnestyReceived":
+      return [PathType.RECOVERY_PATH, 3, false, RecoveryScenario.PARTIAL_REFUND];
+
+    case "BtcWithholdPublished":
+      return [PathType.RECOVERY_PATH, 2, true, RecoveryScenario.PARTIAL_REFUND];
+
+    case "BtcWithheld":
+      return [PathType.RECOVERY_PATH, 2, true, RecoveryScenario.PARTIAL_REFUND];
+
+    case "BtcMercyPublished":
+      return [PathType.RECOVERY_PATH, 2, isReleased, RecoveryScenario.PARTIAL_REFUND];
+
+    case "BtcMercyConfirmed":
+      return [PathType.RECOVERY_PATH, 3, false, RecoveryScenario.PARTIAL_REFUND];
+
+    // Recovery Path States - Cooperative Redeem (after punishment)
 
-    // Step 2 (Failed): Failed to refund Bitcoin
-    // The timelock expired before we could refund, resulting in punishment
     case "BtcPunished":
-      return [PathType.UNHAPPY_PATH, 1, true];
+      return [PathType.RECOVERY_PATH, 1, true, RecoveryScenario.COOPERATIVE_REDEEM];
 
-    // Attempting cooperative redemption after punishment
     case "AttemptingCooperativeRedeem":
     case "CooperativeRedeemAccepted":
-      return [PathType.UNHAPPY_PATH, 1, isReleased];
+      return [PathType.RECOVERY_PATH, 2, isReleased, RecoveryScenario.COOPERATIVE_REDEEM];
+
     case "CooperativeRedeemRejected":
-      return [PathType.UNHAPPY_PATH, 1, true];
+      return [PathType.RECOVERY_PATH, 2, true, RecoveryScenario.COOPERATIVE_REDEEM];
 
     case "Resuming":
       return null;
@@ -163,15 +197,34 @@ function SwapStepper({
 
 const HAPPY_PATH_STEP_LABELS = [
   { label: "Locking your BTC", duration: "~12min" },
-  { label: "They lock their XMR", duration: "~10min" },
+  { label: "They lock their XMR", duration: "~20min" },
   { label: "They redeem the BTC", duration: "~2min" },
-  { label: "Redeeming your XMR", duration: "~10min" },
+  { label: "Redeeming your XMR", duration: "~1min" },
 ];
 
-const UNHAPPY_PATH_STEP_LABELS = [
-  { label: "Cancelling swap", duration: "~1min" },
-  { label: "Attempting recovery", duration: "~5min" },
-];
+const RECOVERY_STEP_LABELS: Record<
+  RecoveryScenario,
+  Array<{ label: string; duration: string }>
+> = {
+  [RecoveryScenario.GENERIC]: [
+    { label: "Cancelling swap", duration: "~1min" },
+    { label: "Attempting recovery", duration: "" },
+  ],
+  [RecoveryScenario.FULL_REFUND]: [
+    { label: "Cancelling swap", duration: "~1min" },
+    { label: "Bitcoin refunded", duration: "~5min" },
+  ],
+  [RecoveryScenario.PARTIAL_REFUND]: [
+    { label: "Cancelling swap", duration: "~1min" },
+    { label: "Partial refund", duration: "~2min" },
+    { label: "Reclaiming deposit", duration: "~30min" },
+  ],
+  [RecoveryScenario.COOPERATIVE_REDEEM]: [
+    { label: "Cancelling swap", duration: "~1min" },
+    { label: "We have been punished", duration: "" },
+    { label: "Attempting cooperative recovery", duration: "~2min" },
+  ],
+};
 
 export default function SwapStateStepper({
   state,
@@ -184,12 +237,14 @@ export default function SwapStateStepper({
     return null;
   }
 
-  const [pathType, activeStep, error] = result;
+  const [pathType, activeStep, error, scenario] = result;
 
-  const steps =
-    pathType === PathType.HAPPY_PATH
-      ? HAPPY_PATH_STEP_LABELS
-      : UNHAPPY_PATH_STEP_LABELS;
+  let steps: Array<{ label: string; duration: string }>;
+  if (pathType === PathType.HAPPY_PATH) {
+    steps = HAPPY_PATH_STEP_LABELS;
+  } else {
+    steps = RECOVERY_STEP_LABELS[scenario ?? RecoveryScenario.GENERIC];
+  }
 
   return <SwapStepper steps={steps} activeStep={activeStep} error={error} />;
 }
diff --git a/src-gui/src/renderer/components/modal/swap/pages/MockSwapControls.tsx b/src-gui/src/renderer/components/modal/swap/pages/MockSwapControls.tsx
new file mode 100644
index 0000000000..366388ba77
--- /dev/null
+++ b/src-gui/src/renderer/components/modal/swap/pages/MockSwapControls.tsx
@@ -0,0 +1,139 @@
+import { useState } from "react";
+import {
+  Box,
+  Button,
+  IconButton,
+  MenuItem,
+  Paper,
+  Select,
+  Switch,
+  Typography,
+} from "@mui/material";
+import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
+import ChevronRightIcon from "@mui/icons-material/ChevronRight";
+import { scenarios, MockScenario, MOCK_SWAP_ID, getMockLockBitcoinApproval } from "dev/mockSwapEvents";
+import { useAppDispatch } from "store/hooks";
+import { approvalEventReceived } from "store/features/rpcSlice";
+import {
+  swapProgressEventReceived,
+  swapReset,
+  setMockOnlyDisableTauriCallsOnSwapProgress,
+} from "store/features/swapSlice";
+
+export default function MockSwapControls() {
+  const dispatch = useAppDispatch();
+  const [scenario, setScenario] = useState<MockScenario | null>(null);
+  const [index, setIndex] = useState(0);
+
+  const enabled = scenario !== null;
+  const total = scenario ? scenarios[scenario].length : 0;
+
+  const dispatchMockState = (mockScenario: MockScenario, eventIndex: number) => {
+    const event = scenarios[mockScenario][eventIndex];
+    dispatch(
+      swapProgressEventReceived({
+        swap_id: MOCK_SWAP_ID,
+        event,
+      }),
+    );
+  };
+
+  const handleMockConfirmation = () => {
+    dispatch(approvalEventReceived(getMockLockBitcoinApproval(scenario)));
+  };
+
+  const handleToggle = (checked: boolean) => {
+    if (checked) {
+      const firstScenario = Object.keys(scenarios)[0] as MockScenario;
+      setScenario(firstScenario);
+      setIndex(0);
+      dispatch(setMockOnlyDisableTauriCallsOnSwapProgress(true));
+      dispatchMockState(firstScenario, 0);
+    } else {
+      setScenario(null);
+      setIndex(0);
+      dispatch(setMockOnlyDisableTauriCallsOnSwapProgress(false));
+      dispatch(swapReset());
+    }
+  };
+
+  const handleScenarioChange = (newScenario: MockScenario) => {
+    setScenario(newScenario);
+    setIndex(0);
+    dispatchMockState(newScenario, 0);
+  };
+
+  const prev = () => {
+    if (!scenario || index === 0) return;
+    const newIndex = index - 1;
+    setIndex(newIndex);
+    dispatchMockState(scenario, newIndex);
+  };
+
+  const next = () => {
+    if (!scenario || index >= total - 1) return;
+    const newIndex = index + 1;
+    setIndex(newIndex);
+    dispatchMockState(scenario, newIndex);
+  };
+
+  const currentStateName = scenario ? scenarios[scenario][index].type : null;
+
+  return (
+    <Paper variant="outlined" sx={{ p: 1.5, bgcolor: "action.hover" }}>
+      <Box sx={{ display: "flex", alignItems: "center", gap: 1, flexWrap: "wrap" }}>
+        <Switch
+          size="small"
+          checked={enabled}
+          onChange={(e) => handleToggle(e.target.checked)}
+        />
+        <Typography variant="caption" color="text.secondary">
+          Mock
+        </Typography>
+        <Select
+          size="small"
+          value={scenario ?? ""}
+          onChange={(e) => handleScenarioChange(e.target.value as MockScenario)}
+          disabled={!enabled}
+          sx={{ minWidth: 180 }}
+        >
+          {Object.keys(scenarios).map((key) => (
+            <MenuItem key={key} value={key}>
+              {key}
+            </MenuItem>
+          ))}
+        </Select>
+        {enabled && (
+          <>
+            <IconButton size="small" onClick={prev} disabled={index === 0}>
+              <ChevronLeftIcon fontSize="small" />
+            </IconButton>
+            <Typography variant="body2" sx={{ minWidth: 40, textAlign: "center" }}>
+              {index + 1}/{total}
+            </Typography>
+            <IconButton size="small" onClick={next} disabled={index === total - 1}>
+              <ChevronRightIcon fontSize="small" />
+            </IconButton>
+            <Typography
+              variant="body2"
+              sx={{
+                fontFamily: "monospace",
+                bgcolor: "background.paper",
+                px: 1,
+                py: 0.5,
+                borderRadius: 1,
+                border: 1,
+                borderColor: "divider",
+              }}
+            >
+              {currentStateName}
+            </Typography>
+          </>
+        )}
+        <Button size="small" variant="outlined" onClick={handleMockConfirmation}>
+          Mock Confirmation
+        </Button>
+      </Box>
+    </Paper>
+  );
+}
diff --git a/src-gui/src/renderer/components/other/MonospaceTextBox.tsx b/src-gui/src/renderer/components/other/MonospaceTextBox.tsx
index 069d2f0588..419423d914 100644
--- a/src-gui/src/renderer/components/other/MonospaceTextBox.tsx
+++ b/src-gui/src/renderer/components/other/MonospaceTextBox.tsx
@@ -19,9 +19,9 @@ export default function MonospaceTextBox({
         display: "flex",
         alignItems: "center",
         justifyContent: "space-between",
-        backgroundColor: light ? "transparent" : theme.palette.grey[900],
-        borderRadius: 2,
-        border: light ? `1px solid ${theme.palette.grey[800]}` : "none",
+        backgroundColor: theme.palette.action.hover,
+        borderRadius: theme.shape.borderRadius,
+        border: "none",
         padding: theme.spacing(1),
         gap: 1,
       })}
diff --git a/src-gui/src/renderer/components/other/ValidatedTextField.tsx b/src-gui/src/renderer/components/other/ValidatedTextField.tsx
index 37a8c9d6ec..ca3573cadd 100644
--- a/src-gui/src/renderer/components/other/ValidatedTextField.tsx
+++ b/src-gui/src/renderer/components/other/ValidatedTextField.tsx
@@ -1,5 +1,5 @@
 import { TextFieldProps, TextField } from "@mui/material";
-import { useState, useEffect, useCallback } from "react";
+import { useState, useCallback, useEffect } from "react";
 
 interface ValidatedTextFieldProps
   extends Omit<TextFieldProps, "onChange" | "value"> {
@@ -24,6 +24,10 @@ export default function ValidatedTextField({
 }: ValidatedTextFieldProps) {
   const [inputValue, setInputValue] = useState(value || "");
 
+  // Sync internal state with prop (controlled component pattern)
+  // eslint-disable-next-line react-hooks/set-state-in-effect -- sync internal state with external prop
+  useEffect(() => setInputValue(value || ""), [value]);
+
   const handleChange = useCallback(
     (newValue: string) => {
       const trimmedValue = newValue.trim();
@@ -38,10 +42,6 @@ export default function ValidatedTextField({
     [allowEmpty, isValid, onValidatedChange],
   );
 
-  useEffect(() => {
-    setInputValue(value || "");
-  }, [value]);
-
   const isError =
     (allowEmpty && inputValue === "") || (inputValue === "" && noErrorWhenEmpty)
       ? false
diff --git a/src-gui/src/renderer/components/pages/monero/SendTransactionModal.tsx b/src-gui/src/renderer/components/pages/monero/SendTransactionModal.tsx
index e25aae0110..1f9dd5422b 100644
--- a/src-gui/src/renderer/components/pages/monero/SendTransactionModal.tsx
+++ b/src-gui/src/renderer/components/pages/monero/SendTransactionModal.tsx
@@ -27,7 +27,7 @@ export default function SendTransactionModal({
 
   const showSuccess = successResponse !== null;
 
-  const handleClose = (event: unknown, reason: string) => {
+  const handleClose = (_: unknown, reason: string) => {
     // We want the user to explicitly close the dialog.
     // We do not close the dialog upon a backdrop click.
     if (reason === "backdropClick") {
@@ -60,7 +60,7 @@ export default function SendTransactionModal({
       )}
       {showSuccess && (
         <SendSuccessContent
-          onClose={handleClose}
+          onClose={onClose}
           successDetails={successResponse}
         />
       )}
diff --git a/src-gui/src/renderer/components/pages/swap/swap/SwapStatePage.tsx b/src-gui/src/renderer/components/pages/swap/swap/SwapStatePage.tsx
index c77865d9d0..89ed8f4a0c 100644
--- a/src-gui/src/renderer/components/pages/swap/swap/SwapStatePage.tsx
+++ b/src-gui/src/renderer/components/pages/swap/swap/SwapStatePage.tsx
@@ -8,6 +8,17 @@ import {
   BitcoinEarlyRefundPublishedPage,
   BitcoinRefundPublishedPage,
 } from "./done/BitcoinRefundedPage";
+import {
+  BitcoinPartialRefundPublished,
+  BitcoinPartiallyRefunded,
+  WaitingForEarnestDepositTimelockExpirationPage,
+  BitcoinAmnestyPublished,
+  BitcoinAmnestyReceived,
+  BitcoinWithholdPublished,
+  BitcoinWithheld,
+  BitcoinMercyPublished,
+  BitcoinMercyConfirmed,
+} from "./done/BitcoinPartialRefundPage";
 import XmrRedeemInMempoolPage from "./done/XmrRedeemInMempoolPage";
 import ProcessExitedPage from "./exited/ProcessExitedPage";
 import BitcoinCancelledPage from "./in_progress/BitcoinCancelledPage";
@@ -103,10 +114,12 @@ export default function SwapStatePage({ state }: { state: SwapState | null }) {
       break;
     case "CancelTimelockExpired":
       return <CancelTimelockExpiredPage />;
+    case "BtcCancelPublished":
+      return <BitcoinCancelledPage />;
     case "BtcCancelled":
       return <BitcoinCancelledPage />;
 
-    //// 4 different types of Bitcoin refund states we can be in
+    //// 8 different types of Bitcoin refund states we can be in
     case "BtcRefundPublished": // tx_refund has been published but has not been confirmed yet
       if (state.curr.type === "BtcRefundPublished") {
         return <BitcoinRefundPublishedPage {...state.curr.content} />;
@@ -127,6 +140,53 @@ export default function SwapStatePage({ state }: { state: SwapState | null }) {
         return <BitcoinEarlyRefundedPage {...state.curr.content} />;
       }
       break;
+    case "BtcPartialRefundPublished":
+      if (state.curr.type === "BtcPartialRefundPublished") {
+        return <BitcoinPartialRefundPublished {...state.curr.content} />;
+      }
+      break;
+    case "BtcPartiallyRefunded":
+      if (state.curr.type === "BtcPartiallyRefunded") {
+        return <BitcoinPartiallyRefunded {...state.curr.content} />;
+      }
+      break;
+    case "WaitingForEarnestDepositTimelockExpiration":
+      if (state.curr.type === "WaitingForEarnestDepositTimelockExpiration") {
+        return <WaitingForEarnestDepositTimelockExpirationPage {...state.curr.content} />;
+      }
+      break;
+    case "BtcAmnestyPublished":
+      if (state.curr.type === "BtcAmnestyPublished") {
+        return <BitcoinAmnestyPublished {...state.curr.content} />;
+      }
+      break;
+    case "BtcAmnestyReceived":
+      if (state.curr.type === "BtcAmnestyReceived") {
+        return <BitcoinAmnestyReceived {...state.curr.content} />;
+      }
+      break;
+
+    //// 4 different types of withhold / mercy states
+    case "BtcWithholdPublished":
+      if (state.curr.type === "BtcWithholdPublished") {
+        return <BitcoinWithholdPublished {...state.curr.content} />;
+      }
+      break;
+    case "BtcWithheld":
+      if (state.curr.type === "BtcWithheld") {
+        return <BitcoinWithheld {...state.curr.content} />;
+      }
+      break;
+    case "BtcMercyPublished":
+      if (state.curr.type === "BtcMercyPublished") {
+        return <BitcoinMercyPublished {...state.curr.content} />;
+      }
+      break;
+    case "BtcMercyConfirmed":
+      if (state.curr.type === "BtcMercyConfirmed") {
+        return <BitcoinMercyConfirmed {...state.curr.content} />;
+      }
+      break;
 
     //// 4 different types of Bitcoin punished states we can be in
     case "BtcPunished":
diff --git a/src-gui/src/renderer/components/pages/swap/swap/SwapWidget.tsx b/src-gui/src/renderer/components/pages/swap/swap/SwapWidget.tsx
index 0411806372..f166d22ded 100644
--- a/src-gui/src/renderer/components/pages/swap/swap/SwapWidget.tsx
+++ b/src-gui/src/renderer/components/pages/swap/swap/SwapWidget.tsx
@@ -1,4 +1,5 @@
 import { Box, Button, Dialog, DialogActions, Paper } from "@mui/material";
+import { useState } from "react";
 import { useActiveSwapInfo, useAppSelector } from "store/hooks";
 import SwapStatePage from "renderer/components/pages/swap/swap/SwapStatePage";
 import CancelButton from "./CancelButton";
@@ -6,12 +7,11 @@ import SwapStateStepper from "renderer/components/modal/swap/SwapStateStepper";
 import SwapStatusAlert from "renderer/components/alert/SwapStatusAlert/SwapStatusAlert";
 import DebugPageSwitchBadge from "renderer/components/modal/swap/pages/DebugPageSwitchBadge";
 import DebugPage from "renderer/components/modal/swap/pages/DebugPage";
-import { useState } from "react";
+import MockSwapControls from "renderer/components/modal/swap/pages/MockSwapControls";
 
 export default function SwapWidget() {
-  const swap = useAppSelector((state) => state.swap);
+  const swapState = useAppSelector((state) => state.swap.state);
   const swapInfo = useActiveSwapInfo();
-
   const [debug, setDebug] = useState(false);
 
   return (
@@ -24,6 +24,7 @@ export default function SwapWidget() {
           onlyShowIfUnusualAmountOfTimeHasPassed
         />
       )}
+      {import.meta.env.DEV && <MockSwapControls />}
       <Dialog
         fullWidth
         maxWidth="md"
@@ -60,11 +61,11 @@ export default function SwapWidget() {
             justifyContent: "center",
           }}
         >
-          <SwapStatePage state={swap.state} />
+          <SwapStatePage state={swapState} />
         </Box>
-        {swap.state !== null && (
+        {swapState !== null && (
           <>
-            <SwapStateStepper state={swap.state} />
+            <SwapStateStepper state={swapState} />
             <Box
               sx={{
                 display: "flex",
diff --git a/src-gui/src/renderer/components/pages/swap/swap/components/CircularProgressWithSubtitle.tsx b/src-gui/src/renderer/components/pages/swap/swap/components/CircularProgressWithSubtitle.tsx
index 6c7965089b..7bc8595939 100644
--- a/src-gui/src/renderer/components/pages/swap/swap/components/CircularProgressWithSubtitle.tsx
+++ b/src-gui/src/renderer/components/pages/swap/swap/components/CircularProgressWithSubtitle.tsx
@@ -21,7 +21,7 @@ export default function CircularProgressWithSubtitle({
       }}
     >
       <CircularProgress size={50} />
-      <Typography variant="subtitle2" sx={{ paddingTop: 1 }}>
+      <Typography variant="subtitle2" sx={{ paddingTop: 1, textAlign: "center" }}>
         {description}
       </Typography>
     </Box>
diff --git a/src-gui/src/renderer/components/pages/swap/swap/done/BitcoinPartialRefundPage.tsx b/src-gui/src/renderer/components/pages/swap/swap/done/BitcoinPartialRefundPage.tsx
new file mode 100644
index 0000000000..41c4e6186d
--- /dev/null
+++ b/src-gui/src/renderer/components/pages/swap/swap/done/BitcoinPartialRefundPage.tsx
@@ -0,0 +1,346 @@
+/**
+ * Pages for the partial refund path of the swap.
+ *
+ * This path is taken when Alice only signs the partial refund transaction
+ * (not the full refund). The flow is:
+ *
+ * 1. BtcPartialRefundPublished - TxPartialRefund is published
+ * 2. BtcPartiallyRefunded - TxPartialRefund is confirmed
+ * 3. Either:
+ *    a. BtcAmnestyPublished -> BtcAmnestyReceived (Bob claims amnesty via TxReclaim)
+ *    b. BtcWithholdPublished -> BtcWithheld (Alice withholds amnesty via TxWithhold)
+ *       -> optionally BtcMercyPublished -> BtcMercyConfirmed (Alice grants mercy)
+ */
+
+import { Alert, Box, Button, DialogContentText, Typography } from "@mui/material";
+import { TauriSwapProgressEventContent } from "models/tauriModelExt";
+import { useActiveSwapInfo } from "store/hooks";
+import FeedbackInfoBox from "renderer/components/pages/help/FeedbackInfoBox";
+import BitcoinTransactionInfoBox from "renderer/components/pages/swap/swap/components/BitcoinTransactionInfoBox";
+import DiscordIcon from "renderer/components/icons/DiscordIcon";
+import MatrixIcon from "renderer/components/icons/MatrixIcon";
+
+export function BitcoinPartialRefundPublished({
+  btc_partial_refund_txid,
+  btc_lock_amount,
+  btc_amnesty_amount,
+}: TauriSwapProgressEventContent<"BtcPartialRefundPublished">) {
+  return (
+    <PartialRefundPage
+      txid={btc_partial_refund_txid}
+      confirmed={false}
+      btcLockAmount={btc_lock_amount}
+      btcAmnestyAmount={btc_amnesty_amount}
+    />
+  );
+}
+
+export function BitcoinPartiallyRefunded({
+  btc_partial_refund_txid,
+  btc_lock_amount,
+  btc_amnesty_amount,
+}: TauriSwapProgressEventContent<"BtcPartiallyRefunded">) {
+  return (
+    <PartialRefundPage
+      txid={btc_partial_refund_txid}
+      confirmed={true}
+      btcLockAmount={btc_lock_amount}
+      btcAmnestyAmount={btc_amnesty_amount}
+    />
+  );
+}
+
+export function WaitingForEarnestDepositTimelockExpirationPage({
+  btc_partial_refund_txid,
+  btc_lock_amount,
+  btc_amnesty_amount,
+  target_blocks,
+  blocks_until_expiry,
+}: TauriSwapProgressEventContent<"WaitingForEarnestDepositTimelockExpiration">) {
+  const blocksConfirmed = target_blocks - blocks_until_expiry;
+  const atRiskPercent = Math.round((btc_amnesty_amount / btc_lock_amount) * 100);
+
+  return (
+    <>
+      <DialogContentText>
+        Waiting to claim the earnest deposit ({atRiskPercent}% of your Bitcoin).
+        The timelock of {target_blocks} Bitcoin blocks needs to expire first.
+        The maker can choose to withhold it during this time.
+      </DialogContentText>
+      <BitcoinTransactionInfoBox
+        title="Waiting for timelock to expire"
+        txId={btc_partial_refund_txid}
+        loading
+        additionalContent={`${blocksConfirmed}/${target_blocks} blocks`}
+      />
+    </>
+  );
+}
+
+function PartialRefundPage({
+  txid,
+  confirmed,
+  btcLockAmount,
+  btcAmnestyAmount,
+}: {
+  txid: string;
+  confirmed: boolean;
+  btcLockAmount: number;
+  btcAmnestyAmount: number;
+}) {
+  const swap = useActiveSwapInfo();
+
+  const guaranteedPercent = Math.round(((btcLockAmount - btcAmnestyAmount) / btcLockAmount) * 100);
+  const atRiskPercent = Math.round((btcAmnestyAmount / btcLockAmount) * 100);
+
+  const additionalContent = swap ? (
+    <>
+      {!confirmed && "Waiting for transaction to be confirmed..."}
+      {!confirmed && <br />}
+      Refund address: {swap.btc_refund_address}
+    </>
+  ) : null;
+
+  return (
+    <>
+      <Alert severity="info" sx={{ mb: 2 }}>
+        <Typography variant="body2">
+          <strong>Patience:</strong> We are first refunding the guaranteed <strong>{guaranteedPercent}%</strong> of the Bitcoin refund.
+          It is <strong>not guaranteed</strong> that we can claim the earnest deposit, which makes up the remaining <strong>{atRiskPercent}%</strong>.
+          The maker has a short timeframe to withhold the deposit, after that we can claim it.
+        </Typography>
+      </Alert>
+      <Box sx={{ display: "flex", flexDirection: "column", gap: 1 }}>
+        <BitcoinTransactionInfoBox
+          title="Partial Refund Transaction"
+          txId={txid}
+          loading={!confirmed}
+          additionalContent={additionalContent}
+        />
+      </Box>
+    </>
+  );
+}
+
+// Amnesty pages - We're claiming the remaining Bitcoin ourselves (good outcome)
+
+export function BitcoinAmnestyPublished({
+  btc_amnesty_txid,
+}: TauriSwapProgressEventContent<"BtcAmnestyPublished">) {
+  return (
+    <AmnestyPage txid={btc_amnesty_txid} confirmed={false} />
+  );
+}
+
+export function BitcoinAmnestyReceived({
+  btc_amnesty_txid,
+}: TauriSwapProgressEventContent<"BtcAmnestyReceived">) {
+  return (
+    <AmnestyPage txid={btc_amnesty_txid} confirmed={true} />
+  );
+}
+
+function AmnestyPage({
+  txid,
+  confirmed,
+}: {
+  txid: string;
+  confirmed: boolean;
+}) {
+  const swap = useActiveSwapInfo();
+
+  const mainMessage = confirmed
+    ? "All your Bitcoin have been refunded. The swap is complete."
+    : "The remaining Bitcoin (earnest deposit) are being released to you. Waiting for confirmation.";
+
+  const additionalContent = swap ? (
+    <>
+      {!confirmed && "Waiting for transaction to be confirmed..."}
+      {!confirmed && <br />}
+      Refund address: {swap.btc_refund_address}
+    </>
+  ) : null;
+
+  return (
+    <>
+      <Alert severity="success" sx={{ mb: 2 }}>
+        <Typography variant="body2">
+          <strong>{confirmed ? "Complete:" : "Almost there:"}</strong>{" "}{mainMessage}
+        </Typography>
+      </Alert>
+      <Box sx={{ display: "flex", flexDirection: "column", gap: 1 }}>
+        <BitcoinTransactionInfoBox
+          title="Remaining Refund Transaction"
+          txId={txid}
+          loading={!confirmed}
+          additionalContent={additionalContent}
+        />
+        <FeedbackInfoBox />
+      </Box>
+    </>
+  );
+}
+
+// Withhold pages - The maker actively withheld the remaining Bitcoin (bad outcome)
+// Note: By default, the user would have received the remaining Bitcoin after a timelock.
+// If we're in this state, it means the maker actively published TxWithhold to revoke it.
+
+export function BitcoinWithholdPublished({
+  btc_withhold_txid,
+  btc_lock_amount,
+  btc_amnesty_amount,
+}: TauriSwapProgressEventContent<"BtcWithholdPublished">) {
+  return (
+    <WithholdPage
+      txid={btc_withhold_txid}
+      confirmed={false}
+      btcLockAmount={btc_lock_amount}
+      btcAmnestyAmount={btc_amnesty_amount}
+    />
+  );
+}
+
+export function BitcoinWithheld({
+  btc_withhold_txid,
+  btc_lock_amount,
+  btc_amnesty_amount,
+}: TauriSwapProgressEventContent<"BtcWithheld">) {
+  return (
+    <WithholdPage
+      txid={btc_withhold_txid}
+      confirmed={true}
+      btcLockAmount={btc_lock_amount}
+      btcAmnestyAmount={btc_amnesty_amount}
+    />
+  );
+}
+
+function WithholdPage({
+  txid,
+  confirmed,
+  btcLockAmount,
+  btcAmnestyAmount,
+}: {
+  txid: string;
+  confirmed: boolean;
+  btcLockAmount: number;
+  btcAmnestyAmount: number;
+}) {
+  const atRiskPercent = Math.round((btcAmnestyAmount / btcLockAmount) * 100);
+
+  const mainMessage = "The market maker is withholding the earnest deposit."
+
+  return (
+    <Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}>
+      <DialogContentText>{mainMessage}</DialogContentText>
+      <Alert severity="error">
+        <Typography variant="body2">
+          <strong>Earnest deposit withheld:</strong> The market maker has choosen to withhold the remaining <strong>{atRiskPercent}%</strong> of your Bitcoin refund.
+
+        </Typography>
+      </Alert>
+      <Alert severity="info">
+        <Typography variant="body2" gutterBottom>
+          <strong>Why did this happen?</strong> Aborting a swap incurs significant costs on makers.
+          To prevent spam attacks, makers can choose to require an "earnest deposit",
+          which they can withhold if the swap is aborted.
+        </Typography>
+        <Typography variant="body2">
+          Makers do not have access to the withheld deposit.
+          The maker you are swapping with has exercised their option to withhold, because they think you are spamming them.
+        </Typography>
+      </Alert>
+      <Alert severity="info">
+        <Typography variant="body2">
+          <strong>You can contact the maker:</strong> If you think this was a mistake, you can contact the maker through our official
+          community channels.
+          The maker can still release the deposit.
+        </Typography>
+        <br />
+        <Box sx={{ display: "flex", justifyContent: "center", gap: 2 }}>
+          <Button
+            variant="outlined"
+            startIcon={<MatrixIcon />}
+            href="https://eigenwallet.org/matrix"
+            target="_blank"
+          >
+            Matrix
+          </Button>
+          <Button
+            variant="outlined"
+            startIcon={<DiscordIcon />}
+            href="https://eigenwallet.org/discord"
+            target="_blank"
+          >
+            Discord
+          </Button>
+        </Box>
+      </Alert>
+      <BitcoinTransactionInfoBox
+        title="Withhold Transaction"
+        txId={txid}
+        loading={!confirmed}
+        additionalContent={
+          !confirmed ? "Waiting for transaction to be confirmed..." : null
+        }
+      />
+    </Box >
+  );
+}
+
+// Mercy pages - The maker granted mercy after the user appealed
+
+export function BitcoinMercyPublished({
+  btc_mercy_txid,
+}: TauriSwapProgressEventContent<"BtcMercyPublished">) {
+  return <MercyPage txid={btc_mercy_txid} confirmed={false} />;
+}
+
+export function BitcoinMercyConfirmed({
+  btc_mercy_txid,
+}: TauriSwapProgressEventContent<"BtcMercyConfirmed">) {
+  return <MercyPage txid={btc_mercy_txid} confirmed={true} />;
+}
+
+function MercyPage({
+  txid,
+  confirmed,
+}: {
+  txid: string;
+  confirmed: boolean;
+}) {
+  const swap = useActiveSwapInfo();
+
+  const mainMessage = confirmed
+    ? "The market maker has release the earnest deposit they withheld. The refund is complete."
+    : "The market maker is releasing the earnest deposit they withheld. Waiting for transaction confirmation.";
+
+  const additionalContent = swap ? (
+    <>
+      {!confirmed && "Waiting for transaction to be confirmed..."}
+      {!confirmed && <br />}
+      Refund address: {swap.btc_refund_address}
+    </>
+  ) : null;
+
+  return (
+    <>
+      <DialogContentText sx={{ mb: 2 }}>{mainMessage}</DialogContentText>
+      <Alert severity="success" sx={{ mb: 2 }}>
+        <Typography variant="body2">
+          <strong>Mercy granted:</strong> The market maker has decided to
+          release the earnest deposit, which they previously withheld. All your Bitcoin has now been
+          fully refunded.
+        </Typography>
+      </Alert>
+      <Box sx={{ display: "flex", flexDirection: "column", gap: 1 }}>
+        <BitcoinTransactionInfoBox
+          title="Mercy Transaction"
+          txId={txid}
+          loading={!confirmed}
+          additionalContent={additionalContent}
+        />
+      </Box>
+    </>
+  );
+}
diff --git a/src-gui/src/renderer/components/pages/swap/swap/done/BitcoinRefundedPage.tsx b/src-gui/src/renderer/components/pages/swap/swap/done/BitcoinRefundedPage.tsx
index 866a6fcc41..d1496b85a1 100644
--- a/src-gui/src/renderer/components/pages/swap/swap/done/BitcoinRefundedPage.tsx
+++ b/src-gui/src/renderer/components/pages/swap/swap/done/BitcoinRefundedPage.tsx
@@ -91,3 +91,4 @@ function MultiBitcoinRefundedPage({
     </>
   );
 }
+
diff --git a/src-gui/src/renderer/components/pages/swap/swap/exited/ProcessExitedPage.tsx b/src-gui/src/renderer/components/pages/swap/swap/exited/ProcessExitedPage.tsx
index 5859c28019..acee82ea82 100644
--- a/src-gui/src/renderer/components/pages/swap/swap/exited/ProcessExitedPage.tsx
+++ b/src-gui/src/renderer/components/pages/swap/swap/exited/ProcessExitedPage.tsx
@@ -21,7 +21,10 @@ export default function ProcessExitedPage({
     (prevState.type === "XmrRedeemInMempool" ||
       prevState.type === "BtcRefunded" ||
       prevState.type === "BtcPunished" ||
-      prevState.type === "CooperativeRedeemRejected")
+      prevState.type === "CooperativeRedeemRejected" ||
+      prevState.type === "BtcWithheld" ||
+      prevState.type === "BtcMercyConfirmed" ||
+      prevState.type === "BtcAmnestyReceived")
   ) {
     return (
       <SwapStatePage
diff --git a/src-gui/src/renderer/components/pages/swap/swap/in_progress/SwapSetupInflightPage.tsx b/src-gui/src/renderer/components/pages/swap/swap/in_progress/SwapSetupInflightPage.tsx
index 01ee48ae0d..6ed84b5b3a 100644
--- a/src-gui/src/renderer/components/pages/swap/swap/in_progress/SwapSetupInflightPage.tsx
+++ b/src-gui/src/renderer/components/pages/swap/swap/in_progress/SwapSetupInflightPage.tsx
@@ -5,8 +5,9 @@ import {
   TauriSwapProgressEventContent,
 } from "models/tauriModelExt";
 import { SatsAmount, PiconeroAmount } from "renderer/components/other/Units";
-import { Box, Typography, Divider, Theme } from "@mui/material";
-import { useActiveSwapId, usePendingLockBitcoinApproval } from "store/hooks";
+import { Box, Typography, Paper, Divider, Theme } from "@mui/material";
+import { useActiveSwapId, usePendingLockBitcoinApproval, useAppSelector } from "store/hooks";
+import { getMarkup, satsToBtc, piconerosToXmr } from "utils/conversionUtils";
 import PromiseInvokeButton from "renderer/components/PromiseInvokeButton";
 import CircularProgressWithSubtitle from "../components/CircularProgressWithSubtitle";
 import CheckIcon from "@mui/icons-material/Check";
@@ -28,6 +29,8 @@ export default function SwapSetupInflightPage({
   btc_lock_amount,
 }: TauriSwapProgressEventContent<"SwapSetupInflight">) {
   const request = useActiveLockBitcoinApprovalRequest();
+  // Get market rate for markup calculation (must be called unconditionally)
+  const xmrBtcRate = useAppSelector((state) => state.rates.xmrBtcRate);
 
   const [timeLeft, setTimeLeft] = useState<number>(0);
   const expirationTs =
@@ -75,9 +78,18 @@ export default function SwapSetupInflightPage({
     );
   }
 
-  const { btc_network_fee, monero_receive_pool, xmr_receive_amount } =
+  const { btc_network_fee, monero_receive_pool, xmr_receive_amount, btc_amnesty_amount } =
     request.request.content;
 
+  // Calculate markup compared to market rate
+  const makerRate = satsToBtc(btc_lock_amount) / piconerosToXmr(Number(xmr_receive_amount));
+  const markupPercent = xmrBtcRate != null ? getMarkup(makerRate, xmrBtcRate) : null;
+
+  // Calculate refund percentages
+  const guaranteedRefundPercent = ((btc_lock_amount - btc_amnesty_amount) / btc_lock_amount) * 100;
+  const depositPercent = (btc_amnesty_amount / btc_lock_amount) * 100;
+  const hasDeposit = btc_amnesty_amount > 0;
+
   return (
     <Box
       sx={{
@@ -127,6 +139,91 @@ export default function SwapSetupInflightPage({
         </Box>
       </Box>
 
+      {/* Info section: Rate and Refund details */}
+      <Paper
+        elevation={2}
+        sx={{
+          p: 2,
+          mt: 2,
+          bgcolor: "background.paper",
+          borderRadius: 1,
+        }}
+      >
+        {markupPercent != null && (
+          <>
+            <Typography variant="body2">
+              Rate: {Math.abs(markupPercent).toFixed(1)}% {markupPercent >= 0 ? "above" : "below"} market
+            </Typography>
+            <Divider sx={{ my: 1.5 }} />
+          </>
+        )}
+        {hasDeposit ? (
+          <Box sx={{ display: "flex", flexDirection: "column", gap: 1 }}>
+            <Box
+              sx={{
+                p: 1.5,
+                bgcolor: (theme) => theme.palette.success.main + "15",
+                borderRadius: 1,
+                borderLeft: 3,
+                borderColor: "success.main",
+              }}
+            >
+              <Typography variant="body2" sx={{ fontWeight: 500, color: "success.main" }}>
+                {guaranteedRefundPercent.toFixed(0)}% guaranteed refund
+              </Typography>
+            </Box>
+            <Box
+              sx={{
+                p: 1.5,
+                bgcolor: (theme) => theme.palette.info.main + "15",
+                borderRadius: 1,
+                borderLeft: 3,
+                borderColor: "info.main",
+              }}
+            >
+              <Typography variant="body2" sx={{ fontWeight: 500, color: "info.main" }}>
+                {depositPercent.toFixed(0)}% anti-spam deposit
+              </Typography>
+              <Typography
+                variant="caption"
+                color="text.secondary"
+                sx={{ display: "block", mt: 0.5 }}
+              >
+                └ Never witheld for successful swaps
+              </Typography>
+              <Typography
+                variant="caption"
+                color="text.secondary"
+                sx={{ display: "block", mt: 0.5 }}
+              >
+                └ Almost always returned in case of a refund
+              </Typography>
+              <Typography
+                variant="caption"
+                color="text.secondary"
+                sx={{ display: "block", mt: 0.5 }}
+              >
+                └ Maker may freeze as an anti-spam measure in rare circumstances
+              </Typography>
+            </Box>
+          </Box>
+        ) : (
+          <Box
+            sx={{
+              p: 1.5,
+              bgcolor: (theme) => theme.palette.success.main + "15",
+              borderRadius: 1,
+              borderLeft: 3,
+              borderColor: "success.main",
+            }}
+          >
+            <Typography variant="body2" sx={{ fontWeight: 500, color: "success.main" }}>
+              Full refund if swap fails (guaranteed)
+            </Typography>
+          </Box>
+        )}
+      </Paper>
+
       <Box
         sx={{
           marginTop: 4,
@@ -189,76 +286,75 @@ interface BitcoinSendSectionProps {
   btc_network_fee: number;
 }
 
-const BitcoinMainBox = ({
+function BitcoinMainBox({
   btc_lock_amount,
   btc_network_fee,
-}: {
-  btc_lock_amount: number;
-  btc_network_fee: number;
-}) => (
-  <Box
-    sx={{
-      position: "relative",
-      height: "100%",
-      display: "flex",
-      flexDirection: "column",
-      gap: 1,
-    }}
-  >
+}: BitcoinSendSectionProps) {
+  return (
     <Box
       sx={{
+        position: "relative",
+        height: "100%",
         display: "flex",
-        justifyContent: "space-between",
-        alignItems: "center",
-        padding: 1.5,
-        border: 1,
-        gap: "0.5rem 1rem",
-        borderColor: "warning.main",
-        borderRadius: 1,
-        flexGrow: 1,
-        backgroundColor: (theme) => theme.palette.warning.light + "10",
-        background: (theme) =>
-          `linear-gradient(135deg, ${theme.palette.warning.light}20, ${theme.palette.warning.light}05)`,
+        flexDirection: "column",
+        gap: 1,
       }}
     >
-      <Typography
-        variant="body1"
-        sx={(theme) => ({
-          color: theme.palette.text.primary,
-        })}
-      >
-        You send
-      </Typography>
-      <Typography
-        variant="h5"
-        sx={(theme) => ({
-          fontWeight: "bold",
-          color: theme.palette.warning.dark,
-          textShadow: "0 1px 2px rgba(0,0,0,0.1)",
-        })}
+      <Box
+        sx={{
+          display: "flex",
+          justifyContent: "space-between",
+          alignItems: "center",
+          padding: 1.5,
+          border: 1,
+          gap: "0.5rem 1rem",
+          borderColor: "warning.main",
+          borderRadius: 1,
+          flexGrow: 1,
+          backgroundColor: (theme) => theme.palette.warning.light + "10",
+          background: (theme) =>
+            `linear-gradient(135deg, ${theme.palette.warning.light}20, ${theme.palette.warning.light}05)`,
+        }}
       >
-        <SatsAmount amount={btc_lock_amount} />
-      </Typography>
-    </Box>
+        <Typography
+          variant="body1"
+          sx={(theme) => ({
+            color: theme.palette.text.primary,
+          })}
+        >
+          You send
+        </Typography>
+        <Typography
+          variant="h5"
+          sx={(theme) => ({
+            fontWeight: "bold",
+            color: theme.palette.warning.dark,
+            textShadow: "0 1px 2px rgba(0,0,0,0.1)",
+          })}
+        >
+          <SatsAmount amount={btc_lock_amount} />
+        </Typography>
+      </Box>
 
-    {/* Network fee box attached to the bottom */}
-    <Box
-      sx={{
-        padding: "0.25rem 0.75rem",
-        backgroundColor: (theme) => theme.palette.warning.main,
-        color: (theme) => theme.palette.warning.contrastText,
-        borderRadius: "4px",
-        fontSize: "0.75rem",
-        fontWeight: 600,
-        boxShadow: "0 2px 4px rgba(0,0,0,0.1)",
-        whiteSpace: "nowrap",
-        zIndex: 1,
-      }}
-    >
-      Network fee: <SatsAmount amount={btc_network_fee} />
+      {/* Network fee box attached to the bottom */}
+      <Box
+        sx={{
+          padding: "0.25rem 0.75rem",
+          backgroundColor: (theme) => theme.palette.warning.main,
+          color: (theme) => theme.palette.warning.contrastText,
+          borderRadius: "4px",
+          fontSize: "0.75rem",
+          fontWeight: 600,
+          boxShadow: "0 2px 4px rgba(0,0,0,0.1)",
+          whiteSpace: "nowrap",
+          zIndex: 1,
+        }}
+      >
+        Network fee: <SatsAmount amount={btc_network_fee} />
+      </Box>
     </Box>
-  </Box>
-);
+  )
+};
 
 interface PoolBreakdownProps {
   monero_receive_pool: Array<{
diff --git a/src-gui/src/renderer/components/pages/swap/swap/init/deposit_and_choose_offer/MakerDiscoveryStatus.tsx b/src-gui/src/renderer/components/pages/swap/swap/init/deposit_and_choose_offer/MakerDiscoveryStatus.tsx
index 6256930101..828da25015 100644
--- a/src-gui/src/renderer/components/pages/swap/swap/init/deposit_and_choose_offer/MakerDiscoveryStatus.tsx
+++ b/src-gui/src/renderer/components/pages/swap/swap/init/deposit_and_choose_offer/MakerDiscoveryStatus.tsx
@@ -24,7 +24,7 @@ import {
   Close as CloseIcon,
   Refresh as RefreshIcon,
 } from "@mui/icons-material";
-import { useEffect, useState, useMemo } from "react";
+import { useState, useMemo, useEffect } from "react";
 import { useAppSelector } from "store/hooks";
 import { QuoteStatus, ConnectionStatus } from "models/tauriModel";
 import { selectPeers } from "store/selectors";
@@ -48,15 +48,17 @@ export default function MakerDiscoveryStatus() {
     .filter((p) => p.connection === ConnectionStatus.Connected)
     .map((p) => p.peer_id);
 
-  // Track peers that have ever been connected
+  // Track peers that have ever been connected (accumulating historical state)
   useEffect(() => {
-    if (connectedPeerIds.length > 0) {
-      setEverConnectedPeers((prev) => {
-        const updated = new Set(prev);
-        connectedPeerIds.forEach((id) => updated.add(id));
-        return updated;
-      });
-    }
+    if (connectedPeerIds.length === 0) return;
+    setEverConnectedPeers((prev) => {
+      const newIds = connectedPeerIds.filter((id) => !prev.has(id));
+      if (newIds.length === 0) return prev;
+      const updated = new Set(prev);
+      newIds.forEach((id) => updated.add(id));
+      return updated;
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- peers is the stable source
   }, [peers]);
 
   const quotesInflight = peers.filter(
diff --git a/src-gui/src/renderer/components/pages/swap/swap/init/deposit_and_choose_offer/MakerOfferItem.tsx b/src-gui/src/renderer/components/pages/swap/swap/init/deposit_and_choose_offer/MakerOfferItem.tsx
index a7a80ec201..545d8bedd7 100644
--- a/src-gui/src/renderer/components/pages/swap/swap/init/deposit_and_choose_offer/MakerOfferItem.tsx
+++ b/src-gui/src/renderer/components/pages/swap/swap/init/deposit_and_choose_offer/MakerOfferItem.tsx
@@ -1,6 +1,6 @@
 import { Box, Chip, Divider, Paper, Tooltip, Typography } from "@mui/material";
 import Jdenticon from "renderer/components/other/Jdenticon";
-import { QuoteWithAddress } from "models/tauriModel";
+import { BidQuote, QuoteWithAddress, RefundPolicyWire } from "models/tauriModel";
 import {
   MoneroSatsExchangeRate,
   MoneroSatsMarkup,
@@ -10,6 +10,16 @@ import PromiseInvokeButton from "renderer/components/PromiseInvokeButton";
 import { resolveApproval } from "renderer/rpc";
 import { isMakerVersionOutdated } from "utils/multiAddrUtils";
 import WarningIcon from "@mui/icons-material/Warning";
+import { RefundPolicy } from "store/features/settingsSlice";
+import { useAppSelector } from "store/hooks";
+import { BobStateName } from "models/tauriModelExt";
+
+function getRefundPercentage(policy: RefundPolicyWire): number {
+  if (policy.type === "FullRefund") {
+    return 100;
+  }
+  return policy.content.anti_spam_deposit_ratio * 100;
+}
 
 export default function MakerOfferItem({
   quoteWithAddress,
@@ -21,6 +31,7 @@ export default function MakerOfferItem({
   const { multiaddr, peer_id, quote, version } = quoteWithAddress;
   const isOutOfLiquidity = quote.max_quantity == 0;
 
+
   return (
     <Paper
       variant="outlined"
@@ -130,6 +141,8 @@ export default function MakerOfferItem({
             size="small"
           />
         </Tooltip>
+        {EarnestDepositChip(quote)}
+        {ReputationChip(peer_id)}
         {isMakerVersionOutdated(version) ? (
           <Tooltip title="Outdated software — may cause issues" arrow>
             <Chip
@@ -181,3 +194,57 @@ export default function MakerOfferItem({
     </Paper>
   );
 }
+
+function EarnestDepositChip(quote: BidQuote) {
+  const full_refund: boolean = quote.refund_policy.type === "FullRefund" ? true : quote.refund_policy.content.anti_spam_deposit_ratio === 0;
+  // Rounded to 0.001 precision
+  const earnest_deposit_ratio = Math.round(
+    (quote.refund_policy.type === "FullRefund" ? 0 : quote.refund_policy.content?.anti_spam_deposit_ratio)
+    * 1000
+  ) / 1000;
+  const guaranteed_refund_percentage = (1 - earnest_deposit_ratio) * 100;
+
+  const tooltip_text = full_refund ? "100% refund cryptographically guaranteed." : `${guaranteed_refund_percentage}% refund cryptographically guaranteed. During refunds maker may withhold the remaining ${earnest_deposit_ratio * 100}% to protect themselves against griefing. Does not apply to successful swaps`;
+  const text = `${guaranteed_refund_percentage}% refund guaranteed`;
+
+  // TODO: use colors better to distinguish between low deposits (1%) and high ones (20%)
+
+  return <Tooltip
+    title={tooltip_text}
+    arrow
+  >
+    <Chip
+      label={text}
+      size="small"
+      color={full_refund ? "success" : "warning"} />
+  </Tooltip>;
+}
+
+function ReputationChip(peer_id: string) {
+  const allSwaps = useAppSelector(state => state.rpc.state.swapInfos)
+  if (!allSwaps) { return <></> }
+  const swapsWithThisPeer = Object.values(allSwaps).filter(swap => swap.seller.peer_id == peer_id)
+
+  const successfulSwaps = swapsWithThisPeer.filter(swap => swap.state_name === BobStateName.XmrRedeemed).length
+  // TODO: don't hardcode this check (was swap refunded/punished?) here, put into tauriModelExt or other place
+  const refundedSwaps = swapsWithThisPeer.filter(swap => [BobStateName.BtcRefunded, BobStateName.BtcEarlyRefunded, BobStateName.BtcMercyConfirmed].includes(swap.state_name)).length
+  const failedSwaps = swapsWithThisPeer.filter(swap => [BobStateName.BtcPunished, BobStateName.BtcWithheld].includes(swap.state_name)).length
+
+  return <Tooltip
+    title={"How many swaps you made with this maker and how they turned out. \"Fail\" means you have been punished or you refunded and the maker withheld the anti-spam deposit."}
+    arrow
+  >
+    <Chip
+      size="small"
+      label={
+        <Box display="flex" style={{ gap: "0.5rem" }}>
+          <Box color="success.main">{successfulSwaps} success</Box>
+          <Divider orientation="vertical" flexItem />
+          <Box color="warning.main">{refundedSwaps} refund</Box>
+          <Divider orientation="vertical" flexItem />
+          <Box color="error.main">{failedSwaps} fail</Box>
+        </Box>
+      }
+    />
+  </Tooltip>
+}
diff --git a/src-gui/src/renderer/rpc.ts b/src-gui/src/renderer/rpc.ts
index d1f57ae68e..ec819a4c60 100644
--- a/src-gui/src/renderer/rpc.ts
+++ b/src-gui/src/renderer/rpc.ts
@@ -703,6 +703,11 @@ export async function rejectApproval<T>(
 }
 
 export async function refreshApprovals(): Promise<void> {
+  // Skip when mocking is enabled (DEV only)
+  if (store.getState().swap._mockOnlyDisableTauriCallsOnSwapProgress) {
+    return;
+  }
+
   const response = await invokeNoArgs<GetPendingApprovalsResponse>(
     "get_pending_approvals",
   );
diff --git a/src-gui/src/store/features/swapSlice.ts b/src-gui/src/store/features/swapSlice.ts
index d2acec5c7b..6bf863b53b 100644
--- a/src-gui/src/store/features/swapSlice.ts
+++ b/src-gui/src/store/features/swapSlice.ts
@@ -8,6 +8,8 @@ const initialState: SwapSlice = {
 
   // TODO: Remove this and replace logic entirely with Tauri events
   spawnType: null,
+
+  _mockOnlyDisableTauriCallsOnSwapProgress: false,
 };
 
 export const swapSlice = createSlice({
@@ -37,9 +39,19 @@ export const swapSlice = createSlice({
     swapReset() {
       return initialState;
     },
+    setMockOnlyDisableTauriCallsOnSwapProgress(
+      swap,
+      action: PayloadAction<boolean>,
+    ) {
+      swap._mockOnlyDisableTauriCallsOnSwapProgress = action.payload;
+    },
   },
 });
 
-export const { swapReset, swapProgressEventReceived } = swapSlice.actions;
+export const {
+  swapReset,
+  swapProgressEventReceived,
+  setMockOnlyDisableTauriCallsOnSwapProgress,
+} = swapSlice.actions;
 
 export default swapSlice.reducer;
diff --git a/src-gui/src/store/middleware/storeListener.ts b/src-gui/src/store/middleware/storeListener.ts
index aff8524507..38fb9dfefe 100644
--- a/src-gui/src/store/middleware/storeListener.ts
+++ b/src-gui/src/store/middleware/storeListener.ts
@@ -159,6 +159,11 @@ export function createMainListeners() {
   listener.startListening({
     actionCreator: swapProgressEventReceived,
     effect: async (action) => {
+      // Skip Tauri calls when mocking is enabled (DEV only)
+      if (store.getState().swap._mockOnlyDisableTauriCallsOnSwapProgress) {
+        return;
+      }
+
       if (action.payload.event.type === "Released") {
         logger.info("Swap released, updating bitcoin balance...");
         await checkBitcoinBalance();
diff --git a/src-gui/src/utils/multiAddrUtils.ts b/src-gui/src/utils/multiAddrUtils.ts
index e753392de3..d03312915d 100644
--- a/src-gui/src/utils/multiAddrUtils.ts
+++ b/src-gui/src/utils/multiAddrUtils.ts
@@ -1,12 +1,12 @@
 import { ExtendedMakerStatus, Maker } from "models/apiModel";
-import { Multiaddr } from "multiaddr";
 import semver from "semver";
 import { isTestnet } from "store/config";
 
 // const MIN_ASB_VERSION = "1.0.0-alpha.1" // First version to support new libp2p protocol
 // const MIN_ASB_VERSION = "1.1.0-rc.3" // First version with support for bdk > 1.0
 // const MIN_ASB_VERSION = "2.0.0-beta.1"; // First version with support for tx_early_refund
-const MIN_ASB_VERSION = "3.2.0-rc.1";
+// const MIN_ASB_VERSION = "3.2.0-rc.1";
+const MIN_ASB_VERSION = "4.0.0"; // First version with partial refund path
 
 export function isMakerOnCorrectNetwork(
   provider: ExtendedMakerStatus,
diff --git a/src-gui/yarn.lock b/src-gui/yarn.lock
index 8f4abf9b8e..ff653951db 100644
--- a/src-gui/yarn.lock
+++ b/src-gui/yarn.lock
@@ -1546,12 +1546,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tauri-apps/plugin-dialog@npm:^2.0.0":
-  version: 2.4.2
-  resolution: "@tauri-apps/plugin-dialog@npm:2.4.2"
+"@tauri-apps/plugin-dialog@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "@tauri-apps/plugin-dialog@npm:2.6.0"
   dependencies:
     "@tauri-apps/api": "npm:^2.8.0"
-  checksum: 10c0/2950a5aa07727710b5395491e9b80886c13cbefd05445a84412819128e90bdaec751795c47ed39dd80fb5181c4e21ee7aaaae6152551dbf1ddc02aa3eac59b37
+  checksum: 10c0/b5d4f91588d28e1790caffaba3fed0f656b3d569ea78a5cf4d6e873686fb7b423b84cfdc75777863da8d916cc0784f3c2e1806de16765d4a1f4e4e6623d2408a
   languageName: node
   linkType: hard
 
@@ -6129,7 +6129,7 @@ __metadata:
     "@tauri-apps/cli": "npm:^2.0.0"
     "@tauri-apps/plugin-cli": "npm:^2.4.0"
     "@tauri-apps/plugin-clipboard-manager": "npm:^2.3.0"
-    "@tauri-apps/plugin-dialog": "npm:^2.0.0"
+    "@tauri-apps/plugin-dialog": "npm:^2.6.0"
     "@tauri-apps/plugin-opener": "npm:^2.5.0"
     "@tauri-apps/plugin-process": "npm:^2.3.0"
     "@tauri-apps/plugin-store": "npm:^2.4.0"
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index c22cfdf026..39d5062c11 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -80,7 +80,8 @@ macro_rules! generate_command_handlers {
             get_context_status,
             get_monero_subaddresses,
             create_monero_subaddress,
-            set_monero_subaddress_label
+            set_monero_subaddress_label,
+            refresh_p2p
         ]
     };
 }
diff --git a/swap-asb/Cargo.toml b/swap-asb/Cargo.toml
index 126ce5031c..e147323d23 100644
--- a/swap-asb/Cargo.toml
+++ b/swap-asb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-asb"
-version = "3.6.7"
+version = "4.0.0"
 authors = ["The eigenwallet guys <hello@eigenwallet.org>", "The COMIT guys <hello@comit.network>"]
 edition = "2021"
 description = "ASB (Automated Swap Backend) binary for XMR/BTC atomic swaps."
diff --git a/swap-asb/src/command.rs b/swap-asb/src/command.rs
index 654af7109f..5730d097a4 100644
--- a/swap-asb/src/command.rs
+++ b/swap-asb/src/command.rs
@@ -177,6 +177,14 @@ where
             env_config: env_config(testnet),
             cmd: Command::SafelyAbort { swap_id },
         },
+        RawCommand::ManualRecovery(ManualRecovery::GrantMercy { swap_id }) => Arguments {
+            testnet,
+            json,
+            trace,
+            config_path: config_path(config, testnet)?,
+            env_config: env_config(testnet),
+            cmd: Command::GrantMercy { swap_id },
+        },
     };
 
     Ok(arguments)
@@ -249,6 +257,9 @@ pub enum Command {
     SafelyAbort {
         swap_id: Uuid,
     },
+    GrantMercy {
+        swap_id: Uuid,
+    },
     ExportBitcoinWallet,
     ExportMoneroWallet,
     ExportMoneroLockWallet {
@@ -411,6 +422,16 @@ pub enum ManualRecovery {
         )]
         swap_id: Uuid,
     },
+    #[structopt(
+        about = "Grant mercy to a swap in BtcWithholdConfirmed state, allowing the taker to claim the remaining funds."
+    )]
+    GrantMercy {
+        #[structopt(
+            long = "swap-id",
+            help = "The swap id can be retrieved using the history subcommand"
+        )]
+        swap_id: Uuid,
+    },
 }
 
 #[derive(structopt::StructOpt, Debug)]
diff --git a/swap-asb/src/main.rs b/swap-asb/src/main.rs
index 2e315cbbb6..87259daaa1 100644
--- a/swap-asb/src/main.rs
+++ b/swap-asb/src/main.rs
@@ -26,7 +26,7 @@ use structopt::clap::ErrorKind;
 mod command;
 use command::{parse_args, Arguments, Command};
 use swap::asb::rpc::RpcServer;
-use swap::asb::{cancel, punish, redeem, refund, safely_abort, EventLoop, ExchangeRate, Finality};
+use swap::asb::{cancel, grant_mercy, punish, redeem, refund, safely_abort, EventLoop, ExchangeRate, Finality};
 use swap::common::tor::{bootstrap_tor_client, create_tor_client};
 use swap::common::tracing_util::Format;
 use swap::common::{self, get_logs, warn_if_outdated};
@@ -38,7 +38,8 @@ use swap::protocol::alice::{run, AliceState, TipConfig};
 use swap::protocol::{Database, State};
 use swap::seed::Seed;
 use swap_env::config::{
-    initial_setup, query_user_for_initial_config, read_config, Config, ConfigNotInitialized,
+    initial_setup, query_user_for_initial_config, read_config, validate_config, Config,
+    ConfigNotInitialized,
 };
 use swap_feed;
 use swap_machine::alice::is_complete;
@@ -140,19 +141,7 @@ pub async fn main() -> Result<()> {
     // Initialize tracing
     initialize_tracing(json, &config, trace)?;
 
-    // Check for conflicting env / config values
-    if config.monero.network != env_config.monero_network {
-        bail!(format!(
-            "Expected monero network in config file to be {:?} but was {:?}",
-            env_config.monero_network, config.monero.network
-        ));
-    }
-    if config.bitcoin.network != env_config.bitcoin_network {
-        bail!(format!(
-            "Expected bitcoin network in config file to be {:?} but was {:?}",
-            env_config.bitcoin_network, config.bitcoin.network
-        ));
-    }
+    validate_config(&config, env_config)?;
 
     let seed = Seed::from_file_or_generate(&config.data.dir)
         .await
@@ -316,6 +305,7 @@ pub async fn main() -> Result<()> {
                 config.maker.max_buy_btc,
                 config.maker.external_bitcoin_redeem_address,
                 tip_config,
+                config.maker.refund_policy,
             )
             .unwrap();
 
@@ -483,6 +473,13 @@ pub async fn main() -> Result<()> {
 
             tracing::info!("Swap safely aborted");
         }
+        Command::GrantMercy { swap_id } => {
+            let db = open_db(db_file, AccessMode::ReadWrite, None).await?;
+
+            grant_mercy(swap_id, db).await?;
+
+            tracing::info!("Mercy granted for swap {}", swap_id);
+        }
         Command::Redeem {
             swap_id,
             do_not_await_finality,
@@ -544,7 +541,8 @@ pub async fn main() -> Result<()> {
                 .next()
                 .context("Couldn't find state Started for this swap")?;
 
-            let secret_spend_key = match state3.watch_for_btc_tx_refund(&bitcoin_wallet).await {
+            let secret_spend_key = match state3.watch_for_btc_tx_full_refund(&bitcoin_wallet).await
+            {
                 Ok(secret) => secret,
                 Err(error) => {
                     tracing::error!(
diff --git a/swap-controller-api/Cargo.toml b/swap-controller-api/Cargo.toml
index 6cc73f689b..346c17e77a 100644
--- a/swap-controller-api/Cargo.toml
+++ b/swap-controller-api/Cargo.toml
@@ -1,12 +1,13 @@
 [package]
 name = "swap-controller-api"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2021"
 
 [dependencies]
 bitcoin = { workspace = true }
 jsonrpsee = { workspace = true, features = ["macros", "server", "client-core", "http-client"] }
 serde = { workspace = true }
+uuid = { workspace = true, features = ["serde"] }
 
 [lints]
 workspace = true
diff --git a/swap-controller-api/src/lib.rs b/swap-controller-api/src/lib.rs
index 6790dec75d..339c70d6c5 100644
--- a/swap-controller-api/src/lib.rs
+++ b/swap-controller-api/src/lib.rs
@@ -1,6 +1,7 @@
 use jsonrpsee::proc_macros::rpc;
 use jsonrpsee::types::ErrorObjectOwned;
 use serde::{Deserialize, Serialize};
+use uuid::Uuid;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct BitcoinBalanceResponse {
@@ -64,10 +65,22 @@ pub struct RegistrationStatusResponse {
     pub registrations: Vec<RegistrationStatusItem>,
 }
 
+// TODO: we should not need both this and asb::SwapDetails
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Swap {
-    pub id: String,
+    pub swap_id: String,
+    pub start_date: String,
     pub state: String,
+    pub btc_lock_txid: String,
+    #[serde(with = "bitcoin::amount::serde::as_sat")]
+    pub btc_amount: bitcoin::Amount,
+    /// Monero amount in piconero
+    pub xmr_amount: u64,
+    /// Exchange rate: BTC per XMR (amount of BTC needed to buy 1 XMR)
+    #[serde(with = "bitcoin::amount::serde::as_sat")]
+    pub exchange_rate: bitcoin::Amount,
+    pub peer_id: String,
+    pub completed: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -76,6 +89,12 @@ pub struct MoneroSeedResponse {
     pub restore_height: u64,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct SetBurnOnRefundRequest {
+    pub swap_id: String,
+    pub burn: bool,
+}
+
 #[rpc(client, server)]
 pub trait AsbApi {
     #[method(name = "check_connection")]
@@ -100,4 +119,9 @@ pub trait AsbApi {
     async fn get_swaps(&self) -> Result<Vec<Swap>, ErrorObjectOwned>;
     #[method(name = "registration_status")]
     async fn registration_status(&self) -> Result<RegistrationStatusResponse, ErrorObjectOwned>;
+    #[method(name = "set_burn_on_refund")]
+    async fn set_withhold_deposit(&self, swap_id: Uuid, burn: bool)
+        -> Result<(), ErrorObjectOwned>;
+    #[method(name = "grant_mercy")]
+    async fn grant_mercy(&self, swap_id: Uuid) -> Result<(), ErrorObjectOwned>;
 }
diff --git a/swap-controller/Cargo.toml b/swap-controller/Cargo.toml
index 3a9fbb493e..cb59810b39 100644
--- a/swap-controller/Cargo.toml
+++ b/swap-controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-controller"
-version = "3.6.7"
+version = "4.0.0"
 edition = "2021"
 
 [[bin]]
@@ -10,12 +10,14 @@ path = "src/main.rs"
 [dependencies]
 anyhow = { workspace = true }
 clap = { version = "4", features = ["derive"] }
+comfy-table = "7.2.1"
 jsonrpsee = { workspace = true, features = ["client-core", "http-client"] }
 monero-oxide-ext = { path = "../monero-oxide-ext" }
 rustyline = "17.0.0"
 shell-words = "1.1"
 swap-controller-api = { path = "../swap-controller-api" }
 tokio = { workspace = true }
+uuid = { workspace = true, features = ["serde"] }
 
 [lints]
 workspace = true
diff --git a/swap-controller/src/cli.rs b/swap-controller/src/cli.rs
index f0f89f200f..1e458d7df5 100644
--- a/swap-controller/src/cli.rs
+++ b/swap-controller/src/cli.rs
@@ -1,4 +1,5 @@
 use clap::{Parser, Subcommand};
+use uuid::Uuid;
 
 #[derive(Parser)]
 #[command(name = "asb-controller")]
@@ -37,4 +38,17 @@ pub enum Cmd {
     GetSwaps,
     /// Show rendezvous registration status
     RegistrationStatus,
+    /// Set whether to burn Bitcoin on refund for a swap
+    SetWithholdDeposit {
+        /// The swap ID
+        swap_id: Uuid,
+        /// Whether to burn the Bitcoin (true or false)
+        #[arg(action = clap::ArgAction::Set)]
+        withhold: bool,
+    },
+    /// Grant mercy (release the anti-spam deposit) for a swap in BtcWithheld state
+    GrantMercy {
+        /// The swap ID
+        swap_id: Uuid,
+    },
 }
diff --git a/swap-controller/src/main.rs b/swap-controller/src/main.rs
index 8951484dd8..3aefe3e195 100644
--- a/swap-controller/src/main.rs
+++ b/swap-controller/src/main.rs
@@ -76,13 +76,41 @@ async fn dispatch(cmd: Cmd, client: impl AsbApiClient) -> anyhow::Result<()> {
         }
         Cmd::GetSwaps => {
             let swaps = client.get_swaps().await?;
+
+            let mut table = comfy_table::Table::new();
+            table.set_header([
+                "ID",
+                "Started",
+                "State",
+                "BTC Lock TxID",
+                "BTC",
+                "XMR",
+                "Rate (BTC/XMR)",
+                "Peer ID",
+                "Completed",
+            ]);
+
             if swaps.is_empty() {
-                println!("No swaps found");
+                table.add_row(["No swaps found"]);
             } else {
-                for swap in swaps {
-                    println!("{}: {}", swap.id, swap.state);
+                for swap in &swaps {
+                    let xmr = monero_oxide_ext::Amount::from_pico(swap.xmr_amount);
+                    table.add_row([
+                        &swap.swap_id,
+                        &swap.start_date,
+                        &swap.state,
+                        &swap.btc_lock_txid,
+                        &swap.btc_amount.to_string(),
+                        // Floating point may introduce very small inaccuracies here
+                        &format!("{:.12} XMR", xmr.as_xmr()),
+                        &swap.exchange_rate.to_string(),
+                        &swap.peer_id,
+                        &swap.completed.to_string(),
+                    ]);
                 }
             }
+
+            println!("{table}");
         }
         Cmd::BitcoinSeed => {
             let response = client.bitcoin_seed().await?;
@@ -95,7 +123,7 @@ async fn dispatch(cmd: Cmd, client: impl AsbApiClient) -> anyhow::Result<()> {
                 println!("No rendezvous points configured");
             } else {
                 for item in response.registrations {
-                    let address = item.address.as_deref().unwrap_or("?");
+                    let address = item.address.as_ref().map(String::as_str).unwrap_or("?");
                     println!(
                         "Connection status to rendezvous point at \"{}\" is \"{:?}\". Registration status is \"{:?}\"",
                         address, item.connection, item.registration
@@ -103,6 +131,21 @@ async fn dispatch(cmd: Cmd, client: impl AsbApiClient) -> anyhow::Result<()> {
                 }
             }
         }
+        Cmd::SetWithholdDeposit {
+            swap_id,
+            withhold: burn,
+        } => {
+            client.set_withhold_deposit(swap_id, burn).await?;
+            if burn {
+                println!("Withholding deposit should the taker refund for swap {swap_id}");
+            } else {
+                println!("Not withholding deposit should the taker refund for swap {swap_id}");
+            }
+        }
+        Cmd::GrantMercy { swap_id } => {
+            client.grant_mercy(swap_id).await?;
+            println!("Mercy granted for swap {swap_id}");
+        }
     }
     Ok(())
 }
diff --git a/swap-core/Cargo.toml b/swap-core/Cargo.toml
index 53fe14c235..13b0a94baa 100644
--- a/swap-core/Cargo.toml
+++ b/swap-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-core"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [dependencies]
diff --git a/swap-core/proptest-regressions/bitcoin.txt b/swap-core/proptest-regressions/bitcoin.txt
new file mode 100644
index 0000000000..29be8f4aca
--- /dev/null
+++ b/swap-core/proptest-regressions/bitcoin.txt
@@ -0,0 +1,7 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc dd09112d3bef8c0fb013a7fc8a1e2bb68e9a5db3041b954c7b7723e8fcace068 # shrinks to funding_amount = 3000, num_utxos = 1, sats_per_vb = 1, key = Xpriv { network: Test, depth: 0, parent_fingerprint: 00000000, child_number: Normal { index: 0 }, private_key: SecretKey(#dc659542f09c329f), chain_code: c94a49bbee951f7f7401c801db73c23cf17b0b3aa2f6246a8616fe2205a6ca51 }, alice = Point<Normal,Public,NonZero>(0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798), bob = Point<Normal,Public,NonZero>(02c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5)
diff --git a/swap-core/src/bitcoin.rs b/swap-core/src/bitcoin.rs
index 2a320673ae..4ccd6fc34d 100644
--- a/swap-core/src/bitcoin.rs
+++ b/swap-core/src/bitcoin.rs
@@ -2,38 +2,46 @@
 
 mod cancel;
 mod early_refund;
+mod full_refund;
 mod lock;
+mod mercy;
+mod partial_refund;
 mod punish;
+mod reclaim;
 mod redeem;
-mod refund;
 mod timelocks;
+mod withhold;
 
 pub use crate::bitcoin::cancel::TxCancel;
 pub use crate::bitcoin::early_refund::TxEarlyRefund;
+pub use crate::bitcoin::full_refund::TxFullRefund;
 pub use crate::bitcoin::lock::TxLock;
+pub use crate::bitcoin::mercy::TxMercy;
+pub use crate::bitcoin::partial_refund::TxPartialRefund;
 pub use crate::bitcoin::punish::TxPunish;
+pub use crate::bitcoin::reclaim::TxReclaim;
 pub use crate::bitcoin::redeem::TxRedeem;
-pub use crate::bitcoin::refund::TxRefund;
 pub use crate::bitcoin::timelocks::{BlockHeight, ExpiredTimelocks};
-pub use crate::bitcoin::timelocks::{CancelTimelock, PunishTimelock};
+pub use crate::bitcoin::timelocks::{CancelTimelock, PunishTimelock, RemainingRefundTimelock};
+pub use crate::bitcoin::withhold::TxWithhold;
 pub use ::bitcoin::amount::Amount;
 pub use ::bitcoin::psbt::Psbt as PartiallySignedTransaction;
 pub use ::bitcoin::{Address, AddressType, Network, Transaction, Txid};
+pub use bitcoin_wallet::ScriptStatus;
+pub use ecdsa_fun::Signature;
 pub use ecdsa_fun::adaptor::EncryptedSignature;
 pub use ecdsa_fun::fun::Scalar;
-pub use ecdsa_fun::Signature;
 
 use ::bitcoin::hashes::Hash;
 use ::bitcoin::secp256k1::ecdsa;
 use ::bitcoin::sighash::SegwitV0Sighash as Sighash;
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use bdk_wallet::miniscript::descriptor::Wsh;
 use bdk_wallet::miniscript::{Descriptor, Segwitv0};
-use bitcoin_wallet::primitives::ScriptStatus;
+use ecdsa_fun::ECDSA;
 use ecdsa_fun::adaptor::{Adaptor, HashTranscript};
 use ecdsa_fun::fun::Point;
 use ecdsa_fun::nonce::Deterministic;
-use ecdsa_fun::ECDSA;
 use rand::{CryptoRng, RngCore};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
@@ -242,13 +250,30 @@ pub fn recover(S: PublicKey, sig: Signature, encsig: EncryptedSignature) -> Resu
 pub fn current_epoch(
     cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     tx_lock_status: ScriptStatus,
     tx_cancel_status: ScriptStatus,
+    tx_partial_refund_status: Option<ScriptStatus>,
 ) -> ExpiredTimelocks {
     if tx_cancel_status.is_confirmed_with(punish_timelock) {
         return ExpiredTimelocks::Punish;
     }
 
+    // Check if TxPartialRefund is confirmed and handle remaining refund timelock
+    // For old swaps, these will be None and we skip the partial refund checks
+    if let (Some(remaining_refund_timelock), Some(tx_partial_refund_status)) =
+        (remaining_refund_timelock, tx_partial_refund_status)
+    {
+        if tx_partial_refund_status.is_confirmed_with(remaining_refund_timelock) {
+            return ExpiredTimelocks::RemainingRefund;
+        }
+        if tx_partial_refund_status.is_confirmed() {
+            return ExpiredTimelocks::WaitingForRemainingRefund {
+                blocks_left: tx_partial_refund_status.blocks_left_until(remaining_refund_timelock),
+            };
+        }
+    }
+
     if tx_lock_status.is_confirmed_with(cancel_timelock) {
         return ExpiredTimelocks::Cancel {
             blocks_left: tx_cancel_status.blocks_left_until(punish_timelock),
@@ -557,8 +582,8 @@ mod tests {
     /// subscriptions to the transaction are on index `0` when broadcasting the
     /// transaction.
     #[tokio::test]
-    async fn given_amounts_with_change_outputs_when_signing_tx_then_output_index_0_is_ensured_for_script(
-    ) {
+    async fn given_amounts_with_change_outputs_when_signing_tx_then_output_index_0_is_ensured_for_script()
+     {
         // This value is somewhat arbitrary but the indexation problem usually occurred
         // on the first or second value (i.e. 547, 548) We keep the test
         // iterations relatively low because these tests are expensive.
@@ -700,9 +725,9 @@ TRACE bitcoin_wallet::wallet: Bitcoin transaction status changed txid=0000000000
 
     mod cached_fee_estimator_tests {
         use super::*;
-        use std::sync::atomic::{AtomicU32, Ordering};
         use std::sync::Arc;
-        use tokio::time::{sleep, Duration};
+        use std::sync::atomic::{AtomicU32, Ordering};
+        use tokio::time::{Duration, sleep};
 
         /// Mock fee estimator that tracks how many times methods are called
         #[derive(Clone)]
diff --git a/swap-core/src/bitcoin/cancel.rs b/swap-core/src/bitcoin/cancel.rs
index a04d3898be..a84d8e65e7 100644
--- a/swap-core/src/bitcoin/cancel.rs
+++ b/swap-core/src/bitcoin/cancel.rs
@@ -2,14 +2,14 @@
 
 use crate::bitcoin::{self, CancelTimelock, PunishTimelock};
 use crate::bitcoin::{
-    build_shared_output_descriptor, Address, Amount, PublicKey, Transaction, TxLock,
+    Address, Amount, PublicKey, Transaction, TxLock, build_shared_output_descriptor,
 };
+use ::bitcoin::Weight;
 use ::bitcoin::sighash::SighashCache;
 use ::bitcoin::transaction::Version;
-use ::bitcoin::Weight;
 use ::bitcoin::{
-    locktime::absolute::LockTime as PackedLockTime, secp256k1, sighash::SegwitV0Sighash as Sighash,
     EcdsaSighashType, OutPoint, ScriptBuf, Sequence, TxIn, TxOut, Txid,
+    locktime::absolute::LockTime as PackedLockTime, secp256k1, sighash::SegwitV0Sighash as Sighash,
 };
 use anyhow::Result;
 use bdk_wallet::miniscript::Descriptor;
@@ -193,6 +193,43 @@ impl TxCancel {
         }
     }
 
+    pub fn build_refund_with_amnesty_transaction(
+        &self,
+        refund_address: &Address,
+        amnesty_descriptor: &Descriptor<::bitcoin::PublicKey>,
+        amnesty_amount: Amount,
+        spending_fee: Amount,
+    ) -> Transaction {
+        let previous_output = self.as_outpoint();
+
+        let tx_in = TxIn {
+            previous_output,
+            script_sig: Default::default(),
+            sequence: Sequence(0xFFFF_FFFF),
+            witness: Default::default(),
+        };
+
+        assert!(self.amount() > (amnesty_amount + spending_fee));
+        let refund_amount = self.amount() - amnesty_amount - spending_fee;
+
+        let tx_out_refund = TxOut {
+            value: refund_amount,
+            script_pubkey: refund_address.script_pubkey(),
+        };
+
+        let tx_out_amnesty = TxOut {
+            value: amnesty_amount,
+            script_pubkey: amnesty_descriptor.script_pubkey(),
+        };
+
+        Transaction {
+            version: Version(2),
+            lock_time: PackedLockTime::from_height(0).expect("0 to be below lock time threshold"),
+            input: vec![tx_in],
+            output: vec![tx_out_refund, tx_out_amnesty],
+        }
+    }
+
     pub fn weight() -> Weight {
         Weight::from_wu(596)
     }
diff --git a/swap-core/src/bitcoin/refund.rs b/swap-core/src/bitcoin/full_refund.rs
similarity index 88%
rename from swap-core/src/bitcoin/refund.rs
rename to swap-core/src/bitcoin/full_refund.rs
index 77fe2080ab..5e36ce875a 100644
--- a/swap-core/src/bitcoin/refund.rs
+++ b/swap-core/src/bitcoin/full_refund.rs
@@ -18,15 +18,23 @@ use std::sync::Arc;
 
 use super::extract_ecdsa_sig;
 
+/// A transaction that refunds 100% of the locked Bitcoin.
+/// Previously to the partial refund protocol change, this was the only type of refund transaction.
+/// 
+/// Now there also is the partial refund transaction, which refunds only a portion of the locked Bitcoin.
+/// For more information, see [#675](https://github.com/eigenwallet/core/pull/675).
+/// 
+/// The main reason this struct is still here is to 1) keep backwards compatibility in the database
+/// and 2) avoid having to pay fees for 2 Bitcoin transactions when we want to get a full refund anyway.
 #[derive(Debug, Clone)]
-pub struct TxRefund {
+pub struct TxFullRefund {
     inner: Transaction,
     digest: Sighash,
     cancel_output_descriptor: Descriptor<::bitcoin::PublicKey>,
     watch_script: ScriptBuf,
 }
 
-impl TxRefund {
+impl TxFullRefund {
     pub fn new(tx_cancel: &TxCancel, refund_address: &Address, spending_fee: Amount) -> Self {
         let tx_refund = tx_cancel.build_spend_transaction(refund_address, None, spending_fee);
 
@@ -158,7 +166,7 @@ impl TxRefund {
     }
 }
 
-impl Watchable for TxRefund {
+impl Watchable for TxFullRefund {
     fn id(&self) -> Txid {
         self.txid()
     }
diff --git a/swap-core/src/bitcoin/lock.rs b/swap-core/src/bitcoin/lock.rs
index 35329431ee..b47bc9ddce 100644
--- a/swap-core/src/bitcoin/lock.rs
+++ b/swap-core/src/bitcoin/lock.rs
@@ -1,12 +1,12 @@
 #![allow(non_snake_case)]
 
-use crate::bitcoin::{build_shared_output_descriptor, Address, Amount, PublicKey, Transaction};
+use crate::bitcoin::{Address, Amount, PublicKey, Transaction, build_shared_output_descriptor};
 use ::bitcoin::psbt::Psbt as PartiallySignedTransaction;
 use ::bitcoin::{OutPoint, TxIn, TxOut, Txid};
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use bdk_wallet::miniscript::Descriptor;
 use bdk_wallet::psbt::PsbtUtils;
-use bitcoin::{locktime::absolute::LockTime as PackedLockTime, ScriptBuf, Sequence};
+use bitcoin::{ScriptBuf, Sequence, locktime::absolute::LockTime as PackedLockTime};
 use bitcoin_wallet::primitives::Watchable;
 use serde::{Deserialize, Serialize};
 
diff --git a/swap-core/src/bitcoin/mercy.rs b/swap-core/src/bitcoin/mercy.rs
new file mode 100644
index 0000000000..75a3f1942e
--- /dev/null
+++ b/swap-core/src/bitcoin/mercy.rs
@@ -0,0 +1,145 @@
+#![allow(non_snake_case)]
+
+use crate::bitcoin::withhold::TxWithhold;
+use crate::bitcoin::{self, Address, Amount, PublicKey, Transaction};
+use ::bitcoin::sighash::SighashCache;
+use ::bitcoin::{EcdsaSighashType, Txid, sighash::SegwitV0Sighash as Sighash};
+use ::bitcoin::{ScriptBuf, Weight, secp256k1};
+use anyhow::{Context, Result};
+use bdk_wallet::miniscript::Descriptor;
+use bitcoin_wallet::primitives::Watchable;
+use ecdsa_fun::Signature;
+use std::collections::HashMap;
+
+/// TxMercy spends the burn output of TxWithhold and sends it to
+/// Bob's refund address. This allows Alice to voluntarily refund Bob even
+/// after she has "burnt" the amnesty output.
+///
+/// This transaction is presigned by Bob during swap setup, but Alice keeps
+/// her signature private until she decides to cooperate (e.g., if Bob contacts
+/// her to request the refund).
+#[derive(Debug, Clone)]
+pub struct TxMercy {
+    inner: Transaction,
+    digest: Sighash,
+    burn_output_descriptor: Descriptor<::bitcoin::PublicKey>,
+    watch_script: ScriptBuf,
+}
+
+impl TxMercy {
+    pub fn new(
+        tx_withhold: &TxWithhold,
+        refund_address: &Address,
+        spending_fee: Amount,
+    ) -> Self {
+        // TODO: Handle case where fee >= burn amount more gracefully
+        assert!(
+            tx_withhold.amount() > spending_fee,
+            "TxMercy fee ({}) must be less than burn amount ({})",
+            spending_fee,
+            tx_withhold.amount()
+        );
+
+        let tx_mercy = tx_withhold.build_spend_transaction(refund_address, spending_fee);
+
+        let digest = SighashCache::new(&tx_mercy)
+            .p2wsh_signature_hash(
+                0, // Only one input: burn output from tx_withhold
+                &tx_withhold
+                    .burn_output_descriptor
+                    .script_code()
+                    .expect("scriptcode"),
+                tx_withhold.amount(),
+                EcdsaSighashType::All,
+            )
+            .expect("sighash");
+
+        Self {
+            inner: tx_mercy,
+            digest,
+            burn_output_descriptor: tx_withhold.burn_output_descriptor.clone(),
+            watch_script: refund_address.script_pubkey(),
+        }
+    }
+
+    pub fn txid(&self) -> Txid {
+        self.inner.compute_txid()
+    }
+
+    pub fn digest(&self) -> Sighash {
+        self.digest
+    }
+
+    pub fn complete_as_alice(
+        &self,
+        a: bitcoin::SecretKey,
+        B: bitcoin::PublicKey,
+        sig_b: Signature,
+    ) -> Result<Transaction> {
+        let sig_a = a.sign(self.digest());
+
+        self.clone()
+            .add_signatures((a.public(), sig_a), (B, sig_b))
+            .context("Couldn't add signatures to transaction")
+    }
+
+    pub fn add_signatures(
+        self,
+        (A, sig_a): (PublicKey, Signature),
+        (B, sig_b): (PublicKey, Signature),
+    ) -> Result<Transaction> {
+        let satisfier = {
+            let mut satisfier = HashMap::with_capacity(2);
+
+            let A = ::bitcoin::PublicKey {
+                compressed: true,
+                inner: secp256k1::PublicKey::from_slice(&A.0.to_bytes())?,
+            };
+            let B = ::bitcoin::PublicKey {
+                compressed: true,
+                inner: secp256k1::PublicKey::from_slice(&B.0.to_bytes())?,
+            };
+
+            let sig_a = secp256k1::ecdsa::Signature::from_compact(&sig_a.to_bytes())?;
+            let sig_b = secp256k1::ecdsa::Signature::from_compact(&sig_b.to_bytes())?;
+
+            // The order in which these are inserted doesn't matter
+            satisfier.insert(
+                A,
+                ::bitcoin::ecdsa::Signature {
+                    signature: sig_a,
+                    sighash_type: EcdsaSighashType::All,
+                },
+            );
+            satisfier.insert(
+                B,
+                ::bitcoin::ecdsa::Signature {
+                    signature: sig_b,
+                    sighash_type: EcdsaSighashType::All,
+                },
+            );
+
+            satisfier
+        };
+
+        let mut tx = self.inner;
+        self.burn_output_descriptor
+            .satisfy(&mut tx.input[0], satisfier)?;
+
+        Ok(tx)
+    }
+
+    pub fn weight() -> Weight {
+        Weight::from_wu(548)
+    }
+}
+
+impl Watchable for TxMercy {
+    fn id(&self) -> Txid {
+        self.txid()
+    }
+
+    fn script(&self) -> ScriptBuf {
+        self.watch_script.clone()
+    }
+}
diff --git a/swap-core/src/bitcoin/partial_refund.rs b/swap-core/src/bitcoin/partial_refund.rs
new file mode 100644
index 0000000000..9ec2817ca7
--- /dev/null
+++ b/swap-core/src/bitcoin/partial_refund.rs
@@ -0,0 +1,271 @@
+#![allow(non_snake_case)]
+
+use crate::bitcoin;
+use crate::bitcoin::{
+    Address, Amount, EmptyWitnessStack, NoInputs, NotThreeWitnesses, PublicKey, TooManyInputs,
+    Transaction, TxCancel, build_shared_output_descriptor, verify_sig,
+};
+use ::bitcoin::sighash::SighashCache;
+use ::bitcoin::{EcdsaSighashType, Txid, sighash::SegwitV0Sighash as Sighash};
+use ::bitcoin::{ScriptBuf, Weight, secp256k1};
+use anyhow::{Context, Result, bail};
+use bdk_wallet::miniscript::Descriptor;
+use bitcoin_wallet::primitives::Watchable;
+use curve25519_dalek::scalar::Scalar;
+use ecdsa_fun::Signature;
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use super::extract_ecdsa_sig;
+use super::timelocks::RemainingRefundTimelock;
+
+#[derive(Debug, Clone)]
+pub struct TxPartialRefund {
+    inner: Transaction,
+    digest: Sighash,
+    cancel_output_descriptor: Descriptor<::bitcoin::PublicKey>,
+    pub(in crate::bitcoin) amnesty_output_descriptor: Descriptor<::bitcoin::PublicKey>,
+    watch_script: ScriptBuf,
+}
+
+impl TxPartialRefund {
+    pub fn new(
+        tx_cancel: &TxCancel,
+        refund_address: &Address,
+        A: PublicKey,
+        B: PublicKey,
+        amnesty_amount: Amount,
+        spending_fee: Amount,
+    ) -> Result<Self> {
+        let amnesty_output_descriptor = build_shared_output_descriptor(A.0, B.0)?;
+
+        let tx_refund = tx_cancel.build_refund_with_amnesty_transaction(
+            refund_address,
+            &amnesty_output_descriptor,
+            amnesty_amount,
+            spending_fee,
+        );
+
+        let digest = SighashCache::new(&tx_refund)
+            .p2wsh_signature_hash(
+                // Only one input: cancel transaction
+                0,
+                &tx_cancel
+                    .output_descriptor
+                    .script_code()
+                    .expect("scriptcode"),
+                tx_cancel.amount(),
+                EcdsaSighashType::All,
+            )
+            .expect("sighash");
+
+        Ok(Self {
+            inner: tx_refund,
+            digest,
+            cancel_output_descriptor: tx_cancel.output_descriptor.clone(),
+            amnesty_output_descriptor,
+            watch_script: refund_address.script_pubkey(),
+        })
+    }
+
+    pub fn txid(&self) -> Txid {
+        self.inner.compute_txid()
+    }
+
+    pub fn digest(&self) -> Sighash {
+        self.digest
+    }
+
+    pub fn anti_spam_deposit(&self) -> Amount {
+        self.inner.output[1].value
+    }
+
+    pub fn ani_spam_deposit_outpoint(&self) -> ::bitcoin::OutPoint {
+        ::bitcoin::OutPoint::new(self.txid(), 1)
+    }
+
+    pub fn build_reclaim_transaction(
+        &self,
+        refund_address: &Address,
+        spending_fee: Amount,
+        remaining_refund_timelock: RemainingRefundTimelock,
+    ) -> Result<Transaction> {
+        use ::bitcoin::{
+            Sequence, TxIn, TxOut, locktime::absolute::LockTime as PackedLockTime,
+            transaction::Version,
+        };
+
+        let tx_in = TxIn {
+            previous_output: self.ani_spam_deposit_outpoint(),
+            script_sig: Default::default(),
+            sequence: Sequence(remaining_refund_timelock.0),
+            witness: Default::default(),
+        };
+
+        let tx_out = TxOut {
+            value: self
+                .anti_spam_deposit()
+                .checked_sub(spending_fee)
+                .context("btc amnesty amount is less than spending fee")?,
+            script_pubkey: refund_address.script_pubkey(),
+        };
+
+        Ok(Transaction {
+            version: Version(2),
+            lock_time: PackedLockTime::from_height(0).expect("0 to be below lock time threshold"),
+            input: vec![tx_in],
+            output: vec![tx_out],
+        })
+    }
+
+    /// Build a transaction that spends the amnesty output to a new 2-of-2 multisig (burn output).
+    /// This is used by TxWithhold to "burn" the amnesty by moving it to another multisig.
+    /// Unlike `build_amnesty_spend_transaction`, this has no timelock.
+    pub fn build_withhold_transaction(
+        &self,
+        burn_output_descriptor: &Descriptor<::bitcoin::PublicKey>,
+        spending_fee: Amount,
+    ) -> Transaction {
+        use ::bitcoin::{
+            Sequence, TxIn, TxOut, locktime::absolute::LockTime as PackedLockTime,
+            transaction::Version,
+        };
+
+        // TODO: Handle case where fee >= amnesty_amount more gracefully
+        assert!(
+            self.anti_spam_deposit() > spending_fee,
+            "Burn spend fee ({}) must be less than amnesty amount ({})",
+            spending_fee,
+            self.anti_spam_deposit()
+        );
+
+        let tx_in = TxIn {
+            previous_output: self.ani_spam_deposit_outpoint(),
+            script_sig: Default::default(),
+            sequence: Sequence(0xFFFF_FFFF), // No timelock
+            witness: Default::default(),
+        };
+
+        let tx_out = TxOut {
+            value: self.anti_spam_deposit() - spending_fee,
+            script_pubkey: burn_output_descriptor.script_pubkey(),
+        };
+
+        Transaction {
+            version: Version(2),
+            lock_time: PackedLockTime::from_height(0).expect("0 to be below lock time threshold"),
+            input: vec![tx_in],
+            output: vec![tx_out],
+        }
+    }
+
+    pub fn add_signatures(
+        self,
+        (A, sig_a): (PublicKey, Signature),
+        (B, sig_b): (PublicKey, Signature),
+    ) -> Result<Transaction> {
+        let satisfier = {
+            let mut satisfier = HashMap::with_capacity(2);
+
+            let A = ::bitcoin::PublicKey {
+                compressed: true,
+                inner: secp256k1::PublicKey::from_slice(&A.0.to_bytes())?,
+            };
+            let B = ::bitcoin::PublicKey {
+                compressed: true,
+                inner: secp256k1::PublicKey::from_slice(&B.0.to_bytes())?,
+            };
+
+            let sig_a = secp256k1::ecdsa::Signature::from_compact(&sig_a.to_bytes())?;
+            let sig_b = secp256k1::ecdsa::Signature::from_compact(&sig_b.to_bytes())?;
+
+            // The order in which these are inserted doesn't matter
+            satisfier.insert(
+                A,
+                ::bitcoin::ecdsa::Signature {
+                    signature: sig_a,
+                    sighash_type: EcdsaSighashType::All,
+                },
+            );
+            satisfier.insert(
+                B,
+                ::bitcoin::ecdsa::Signature {
+                    signature: sig_b,
+                    sighash_type: EcdsaSighashType::All,
+                },
+            );
+
+            satisfier
+        };
+
+        let mut tx_refund = self.inner;
+        self.cancel_output_descriptor
+            .satisfy(&mut tx_refund.input[0], satisfier)?;
+
+        Ok(tx_refund)
+    }
+
+    pub fn extract_monero_private_key(
+        &self,
+        signed_refund_tx: Arc<bitcoin::Transaction>,
+        s_a: Scalar,
+        a: bitcoin::SecretKey,
+        S_b_bitcoin: bitcoin::PublicKey,
+    ) -> Result<Scalar> {
+        let tx_refund_sig = self
+            .extract_signature_by_key(signed_refund_tx, a.public())
+            .context("Failed to extract signature from Bitcoin partial refund tx")?;
+        let tx_refund_encsig = a.encsign(S_b_bitcoin, self.digest());
+
+        let s_b = bitcoin::recover(S_b_bitcoin, tx_refund_sig, tx_refund_encsig)
+            .context("Failed to recover Monero secret key from Bitcoin signature")?;
+
+        let s_b = crate::monero::primitives::private_key_from_secp256k1_scalar(s_b.into());
+
+        let spend_key = s_a + s_b;
+
+        Ok(spend_key)
+    }
+
+    fn extract_signature_by_key(
+        &self,
+        candidate_transaction: Arc<Transaction>,
+        B: PublicKey,
+    ) -> Result<Signature> {
+        let input = match candidate_transaction.input.as_slice() {
+            [input] => input,
+            [] => bail!(NoInputs),
+            inputs => bail!(TooManyInputs(inputs.len())),
+        };
+
+        let sigs = match input.witness.to_vec().as_slice() {
+            [sig_1, sig_2, _script] => [sig_1, sig_2]
+                .into_iter()
+                .map(|sig| extract_ecdsa_sig(sig))
+                .collect::<Result<Vec<_>, _>>(),
+            [] => bail!(EmptyWitnessStack),
+            witnesses => bail!(NotThreeWitnesses(witnesses.len())),
+        }?;
+
+        let sig = sigs
+            .into_iter()
+            .find(|sig| verify_sig(&B, &self.digest(), sig).is_ok())
+            .context("Neither signature on witness stack verifies against B")?;
+
+        Ok(sig)
+    }
+
+    pub fn weight() -> Weight {
+        Weight::from_wu(720)
+    }
+}
+
+impl Watchable for TxPartialRefund {
+    fn id(&self) -> Txid {
+        self.txid()
+    }
+
+    fn script(&self) -> ScriptBuf {
+        self.watch_script.clone()
+    }
+}
diff --git a/swap-core/src/bitcoin/reclaim.rs b/swap-core/src/bitcoin/reclaim.rs
new file mode 100644
index 0000000000..0e9ba83ac1
--- /dev/null
+++ b/swap-core/src/bitcoin/reclaim.rs
@@ -0,0 +1,134 @@
+use crate::bitcoin::partial_refund::TxPartialRefund;
+use crate::bitcoin::{self, Address, Amount, PublicKey, Transaction};
+use ::bitcoin::sighash::SighashCache;
+use ::bitcoin::{EcdsaSighashType, Txid, sighash::SegwitV0Sighash as Sighash};
+use ::bitcoin::{ScriptBuf, Weight, secp256k1};
+use anyhow::{Context, Result};
+use bdk_wallet::miniscript::Descriptor;
+use bitcoin_wallet::primitives::Watchable;
+use ecdsa_fun::Signature;
+use std::collections::HashMap;
+
+use super::timelocks::RemainingRefundTimelock;
+
+#[derive(Debug, Clone)]
+pub struct TxReclaim {
+    inner: Transaction,
+    digest: Sighash,
+    amensty_output_descriptor: Descriptor<::bitcoin::PublicKey>,
+    watch_script: ScriptBuf,
+}
+
+impl TxReclaim {
+    pub fn new(
+        tx_refund: &TxPartialRefund,
+        refund_address: &Address,
+        spending_fee: Amount,
+        remaining_refund_timelock: RemainingRefundTimelock,
+    ) -> Result<Self> {
+        let tx_reclaim = tx_refund
+            .build_reclaim_transaction(refund_address, spending_fee, remaining_refund_timelock)
+            .context("Couldn't build tx reclaim")?;
+
+        let digest = SighashCache::new(&tx_reclaim)
+            .p2wsh_signature_hash(
+                0, // Only one input: amnesty box from tx_refund
+                &tx_refund
+                    .amnesty_output_descriptor
+                    .script_code()
+                    .expect("scriptcode"),
+                tx_refund.anti_spam_deposit(),
+                EcdsaSighashType::All,
+            )
+            .expect("sighash");
+
+        Ok(Self {
+            inner: tx_reclaim,
+            digest,
+            amensty_output_descriptor: tx_refund.amnesty_output_descriptor.clone(),
+            watch_script: refund_address.script_pubkey(),
+        })
+    }
+
+    pub fn txid(&self) -> Txid {
+        self.inner.compute_txid()
+    }
+
+    pub fn digest(&self) -> Sighash {
+        self.digest
+    }
+
+    pub fn complete_as_alice(
+        &self,
+        s_a: bitcoin::SecretKey,
+        B: bitcoin::PublicKey,
+        sig_b: Signature,
+    ) -> Result<Transaction> {
+        let digest = self.digest();
+        let sig_a = s_a.sign(digest);
+
+        self.clone()
+            .add_signatures((s_a.public(), sig_a), (B, sig_b))
+            .context("Couldn't add signatures to transaction")
+    }
+
+    pub fn add_signatures(
+        self,
+        (A, sig_a): (PublicKey, Signature),
+        (B, sig_b): (PublicKey, Signature),
+    ) -> Result<Transaction> {
+        let satisfier = {
+            let mut satisfier = HashMap::with_capacity(2);
+
+            let A = ::bitcoin::PublicKey {
+                compressed: true,
+                inner: secp256k1::PublicKey::from_slice(&A.0.to_bytes())?,
+            };
+            let B = ::bitcoin::PublicKey {
+                compressed: true,
+                inner: secp256k1::PublicKey::from_slice(&B.0.to_bytes())?,
+            };
+
+            let sig_a = secp256k1::ecdsa::Signature::from_compact(&sig_a.to_bytes())?;
+            let sig_b = secp256k1::ecdsa::Signature::from_compact(&sig_b.to_bytes())?;
+
+            // The order in which these are inserted doesn't matter
+            satisfier.insert(
+                A,
+                ::bitcoin::ecdsa::Signature {
+                    signature: sig_a,
+                    sighash_type: EcdsaSighashType::All,
+                },
+            );
+            satisfier.insert(
+                B,
+                ::bitcoin::ecdsa::Signature {
+                    signature: sig_b,
+                    sighash_type: EcdsaSighashType::All,
+                },
+            );
+
+            satisfier
+        };
+
+        let mut tx_refund = self.inner;
+        self.amensty_output_descriptor
+            .satisfy(&mut tx_refund.input[0], satisfier)?;
+
+        Ok(tx_refund)
+    }
+
+    pub fn weight() -> Weight {
+        Weight::from_wu(548)
+    }
+}
+
+impl Watchable for TxReclaim {
+    fn id(&self) -> Txid {
+        self.txid()
+    }
+
+    fn script(&self) -> ScriptBuf {
+        self.watch_script.clone()
+    }
+}
diff --git a/swap-core/src/bitcoin/timelocks.rs b/swap-core/src/bitcoin/timelocks.rs
index 3034758650..2b8d777916 100644
--- a/swap-core/src/bitcoin/timelocks.rs
+++ b/swap-core/src/bitcoin/timelocks.rs
@@ -106,12 +106,59 @@ impl PartialEq<PunishTimelock> for u32 {
     }
 }
 
+/// How long a taker has to wait to refund the remaining Bitcoin after publishing
+/// TxPartialRefund.
+#[derive(Debug, Copy, Clone, Serialize, Deserialize, Eq, PartialEq)]
+#[serde(transparent)]
+#[typeshare]
+pub struct RemainingRefundTimelock(pub u32);
+
+impl From<RemainingRefundTimelock> for u32 {
+    fn from(remainin_refund_timelock: RemainingRefundTimelock) -> Self {
+        remainin_refund_timelock.0
+    }
+}
+
+impl From<u32> for RemainingRefundTimelock {
+    fn from(number_of_blocks: u32) -> Self {
+        Self(number_of_blocks)
+    }
+}
+
+impl RemainingRefundTimelock {
+    pub const fn new(number_of_blocks: u32) -> Self {
+        Self(number_of_blocks)
+    }
+}
+
+impl Add<RemainingRefundTimelock> for BlockHeight {
+    type Output = BlockHeight;
+
+    fn add(self, rhs: RemainingRefundTimelock) -> Self::Output {
+        self + rhs.0
+    }
+}
+
+impl PartialOrd<RemainingRefundTimelock> for u32 {
+    fn partial_cmp(&self, other: &RemainingRefundTimelock) -> Option<Ordering> {
+        self.partial_cmp(&other.0)
+    }
+}
+
+impl PartialEq<RemainingRefundTimelock> for u32 {
+    fn eq(&self, other: &RemainingRefundTimelock) -> bool {
+        self.eq(&other.0)
+    }
+}
+
 #[typeshare]
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
 #[serde(tag = "type", content = "content")]
 pub enum ExpiredTimelocks {
     None { blocks_left: u32 },
     Cancel { blocks_left: u32 },
+    WaitingForRemainingRefund { blocks_left: u32 },
+    RemainingRefund,
     Punish,
 }
 
@@ -130,8 +177,8 @@ mod tests {
     use crate::bitcoin::*;
     use bitcoin::secp256k1;
     use bitcoin_wallet::*;
-    use ecdsa_fun::fun::marker::{NonZero, Public};
     use ecdsa_fun::fun::Point;
+    use ecdsa_fun::fun::marker::{NonZero, Public};
     use rand::rngs::OsRng;
 
     #[test]
@@ -142,8 +189,10 @@ mod tests {
         let expired_timelock = current_epoch(
             CancelTimelock::new(5),
             PunishTimelock::new(5),
+            None,
             tx_lock_status,
             tx_cancel_status,
+            None,
         );
 
         assert!(matches!(expired_timelock, ExpiredTimelocks::None { .. }));
@@ -157,8 +206,10 @@ mod tests {
         let expired_timelock = current_epoch(
             CancelTimelock::new(5),
             PunishTimelock::new(5),
+            None,
             tx_lock_status,
             tx_cancel_status,
+            None,
         );
 
         assert!(matches!(expired_timelock, ExpiredTimelocks::Cancel { .. }));
@@ -172,13 +223,54 @@ mod tests {
         let expired_timelock = current_epoch(
             CancelTimelock::new(5),
             PunishTimelock::new(5),
+            None,
             tx_lock_status,
             tx_cancel_status,
+            None,
         );
 
         assert_eq!(expired_timelock, ExpiredTimelocks::Punish)
     }
 
+    #[test]
+    fn partial_refund_confirmed_waiting_for_remaining_refund_timelock() {
+        let tx_lock_status = ScriptStatus::from_confirmations(10);
+        let tx_cancel_status = ScriptStatus::from_confirmations(5);
+        let tx_partial_refund_status = ScriptStatus::from_confirmations(2);
+
+        let expired_timelock = current_epoch(
+            CancelTimelock::new(5),
+            PunishTimelock::new(10),
+            Some(RemainingRefundTimelock::new(5)),
+            tx_lock_status,
+            tx_cancel_status,
+            Some(tx_partial_refund_status),
+        );
+
+        assert!(matches!(
+            expired_timelock,
+            ExpiredTimelocks::WaitingForRemainingRefund { .. }
+        ));
+    }
+
+    #[test]
+    fn partial_refund_remaining_timelock_expired() {
+        let tx_lock_status = ScriptStatus::from_confirmations(10);
+        let tx_cancel_status = ScriptStatus::from_confirmations(5);
+        let tx_partial_refund_status = ScriptStatus::from_confirmations(5);
+
+        let expired_timelock = current_epoch(
+            CancelTimelock::new(5),
+            PunishTimelock::new(10),
+            Some(RemainingRefundTimelock::new(5)),
+            tx_lock_status,
+            tx_cancel_status,
+            Some(tx_partial_refund_status),
+        );
+
+        assert_eq!(expired_timelock, ExpiredTimelocks::RemainingRefund);
+    }
+
     #[test]
     fn tx_early_refund_has_correct_weight() {
         // TxEarlyRefund should have the same weight as other similar transactions
@@ -186,7 +278,10 @@ mod tests {
 
         // It should be the same as TxRedeem and TxRefund weights since they have similar structure
         assert_eq!(TxEarlyRefund::weight() as u64, TxRedeem::weight().to_wu());
-        assert_eq!(TxEarlyRefund::weight() as u64, TxRefund::weight().to_wu());
+        assert_eq!(
+            TxEarlyRefund::weight() as u64,
+            TxFullRefund::weight().to_wu()
+        );
     }
 
     #[test]
diff --git a/swap-core/src/bitcoin/withhold.rs b/swap-core/src/bitcoin/withhold.rs
new file mode 100644
index 0000000000..638ff2ed5a
--- /dev/null
+++ b/swap-core/src/bitcoin/withhold.rs
@@ -0,0 +1,205 @@
+#![allow(non_snake_case)]
+
+use crate::bitcoin::partial_refund::TxPartialRefund;
+use crate::bitcoin::{
+    self, Address, Amount, PublicKey, Transaction, build_shared_output_descriptor,
+};
+use ::bitcoin::sighash::SighashCache;
+use ::bitcoin::{EcdsaSighashType, Txid, sighash::SegwitV0Sighash as Sighash};
+use ::bitcoin::{OutPoint, ScriptBuf, Weight, secp256k1};
+use anyhow::{Context, Result};
+use bdk_wallet::miniscript::Descriptor;
+use bitcoin_wallet::primitives::Watchable;
+use ecdsa_fun::Signature;
+use std::collections::HashMap;
+
+/// TxWithhold spends the amnesty output of TxPartialRefund and sends it to
+/// a new 2-of-2 multisig. This allows Alice to "burn" the amnesty (prevent Bob
+/// from claiming it via TxReclaim) while still allowing a later refund
+/// via TxMercy if Alice cooperates.
+///
+/// Unlike TxReclaim, this transaction has no timelock - Alice can publish
+/// it immediately after TxPartialRefund is confirmed.
+#[derive(Debug, Clone)]
+pub struct TxWithhold {
+    inner: Transaction,
+    digest: Sighash,
+    amnesty_output_descriptor: Descriptor<::bitcoin::PublicKey>,
+    pub(in crate::bitcoin) burn_output_descriptor: Descriptor<::bitcoin::PublicKey>,
+    watch_script: ScriptBuf,
+}
+
+impl TxWithhold {
+    pub fn new(
+        tx_partial_refund: &TxPartialRefund,
+        A: PublicKey,
+        B: PublicKey,
+        spending_fee: Amount,
+    ) -> Result<Self> {
+        // TODO: Handle case where fee >= amnesty_amount more gracefully
+        // For now, assert to catch this during development
+        assert!(
+            tx_partial_refund.anti_spam_deposit() > spending_fee,
+            "TxWithhold fee ({}) must be less than amnesty amount ({})",
+            spending_fee,
+            tx_partial_refund.anti_spam_deposit()
+        );
+
+        let burn_output_descriptor = build_shared_output_descriptor(A.0, B.0)?;
+
+        let tx_withhold =
+            tx_partial_refund.build_withhold_transaction(&burn_output_descriptor, spending_fee);
+
+        let digest = SighashCache::new(&tx_withhold)
+            .p2wsh_signature_hash(
+                0, // Only one input: amnesty output from tx_partial_refund
+                &tx_partial_refund
+                    .amnesty_output_descriptor
+                    .script_code()
+                    .expect("scriptcode"),
+                tx_partial_refund.anti_spam_deposit(),
+                EcdsaSighashType::All,
+            )
+            .expect("sighash");
+
+        let watch_script = burn_output_descriptor.script_pubkey();
+
+        Ok(Self {
+            inner: tx_withhold,
+            digest,
+            amnesty_output_descriptor: tx_partial_refund.amnesty_output_descriptor.clone(),
+            burn_output_descriptor,
+            watch_script,
+        })
+    }
+
+    pub fn txid(&self) -> Txid {
+        self.inner.compute_txid()
+    }
+
+    pub fn digest(&self) -> Sighash {
+        self.digest
+    }
+
+    pub fn amount(&self) -> Amount {
+        self.inner.output[0].value
+    }
+
+    pub fn as_outpoint(&self) -> OutPoint {
+        OutPoint::new(self.txid(), 0)
+    }
+
+    pub fn complete_as_alice(
+        &self,
+        a: bitcoin::SecretKey,
+        B: bitcoin::PublicKey,
+        sig_b: Signature,
+    ) -> Result<Transaction> {
+        let sig_a = a.sign(self.digest());
+
+        self.clone()
+            .add_signatures((a.public(), sig_a), (B, sig_b))
+            .context("Couldn't add signatures to transaction")
+    }
+
+    pub fn add_signatures(
+        self,
+        (A, sig_a): (PublicKey, Signature),
+        (B, sig_b): (PublicKey, Signature),
+    ) -> Result<Transaction> {
+        let satisfier = {
+            let mut satisfier = HashMap::with_capacity(2);
+
+            let A = ::bitcoin::PublicKey {
+                compressed: true,
+                inner: secp256k1::PublicKey::from_slice(&A.0.to_bytes())?,
+            };
+            let B = ::bitcoin::PublicKey {
+                compressed: true,
+                inner: secp256k1::PublicKey::from_slice(&B.0.to_bytes())?,
+            };
+
+            let sig_a = secp256k1::ecdsa::Signature::from_compact(&sig_a.to_bytes())?;
+            let sig_b = secp256k1::ecdsa::Signature::from_compact(&sig_b.to_bytes())?;
+
+            // The order in which these are inserted doesn't matter
+            satisfier.insert(
+                A,
+                ::bitcoin::ecdsa::Signature {
+                    signature: sig_a,
+                    sighash_type: EcdsaSighashType::All,
+                },
+            );
+            satisfier.insert(
+                B,
+                ::bitcoin::ecdsa::Signature {
+                    signature: sig_b,
+                    sighash_type: EcdsaSighashType::All,
+                },
+            );
+
+            satisfier
+        };
+
+        let mut tx = self.inner;
+        self.amnesty_output_descriptor
+            .satisfy(&mut tx.input[0], satisfier)?;
+
+        Ok(tx)
+    }
+
+    /// Build a transaction that spends the burn output to a destination address.
+    /// Used by TxMercy to send the funds back to Bob's refund address.
+    pub fn build_spend_transaction(
+        &self,
+        destination: &Address,
+        spending_fee: Amount,
+    ) -> Transaction {
+        use ::bitcoin::{
+            Sequence, TxIn, TxOut, locktime::absolute::LockTime as PackedLockTime,
+            transaction::Version,
+        };
+
+        // TODO: Handle case where fee >= burn amount more gracefully
+        // For now, assert to catch this during development
+        assert!(
+            self.amount() > spending_fee,
+            "TxMercy fee ({}) must be less than burn amount ({})",
+            spending_fee,
+            self.amount()
+        );
+
+        let tx_in = TxIn {
+            previous_output: self.as_outpoint(),
+            script_sig: Default::default(),
+            sequence: Sequence(0xFFFF_FFFF), // No timelock
+            witness: Default::default(),
+        };
+
+        let tx_out = TxOut {
+            value: self.amount() - spending_fee,
+            script_pubkey: destination.script_pubkey(),
+        };
+
+        Transaction {
+            version: Version(2),
+            lock_time: PackedLockTime::from_height(0).expect("0 to be below lock time threshold"),
+            input: vec![tx_in],
+            output: vec![tx_out],
+        }
+    }
+
+    pub fn weight() -> Weight {
+        Weight::from_wu(596)
+    }
+}
+
+impl Watchable for TxWithhold {
+    fn id(&self) -> Txid {
+        self.txid()
+    }
+
+    fn script(&self) -> ScriptBuf {
+        self.watch_script.clone()
+    }
+}
diff --git a/swap-core/src/monero/primitives.rs b/swap-core/src/monero/primitives.rs
index 061ba0f876..beac72791c 100644
--- a/swap-core/src/monero/primitives.rs
+++ b/swap-core/src/monero/primitives.rs
@@ -1,10 +1,10 @@
 use crate::bitcoin;
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use monero_address::{MoneroAddress, Network};
 pub use monero_oxide_wallet::ed25519::Scalar;
 use rand::{CryptoRng, RngCore};
-use rust_decimal::prelude::*;
 use rust_decimal::Decimal;
+use rust_decimal::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::ops::Add;
@@ -326,12 +326,10 @@ impl MoneroAddressPool {
 
 impl From<::monero_address::MoneroAddress> for MoneroAddressPool {
     fn from(address: ::monero_address::MoneroAddress) -> Self {
-        Self(vec![LabeledMoneroAddress::new(
-            address,
-            Decimal::from(1),
-            "user address".to_string(),
-        )
-        .expect("Percentage 1 is always valid")])
+        Self(vec![
+            LabeledMoneroAddress::new(address, Decimal::from(1), "user address".to_string())
+                .expect("Percentage 1 is always valid"),
+        ])
     }
 }
 
diff --git a/swap-db/Cargo.toml b/swap-db/Cargo.toml
index 2a65aea576..64ffe841e1 100644
--- a/swap-db/Cargo.toml
+++ b/swap-db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-db"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [dependencies]
diff --git a/swap-db/src/alice.rs b/swap-db/src/alice.rs
index 187a1b7a29..8d4183ba71 100644
--- a/swap-db/src/alice.rs
+++ b/swap-db/src/alice.rs
@@ -75,6 +75,29 @@ pub enum Alice {
         #[serde(with = "swap_serde::monero::private_key")]
         spend_key: monero::PrivateKey,
     },
+    BtcPartiallyRefunded {
+        monero_wallet_restore_blockheight: BlockHeight,
+        transfer_proof: TransferProof,
+        state3: alice::State3,
+        #[serde(with = "swap_serde::monero::private_key")]
+        spend_key: monero::PrivateKey,
+    },
+    XmrRefundable {
+        monero_wallet_restore_blockheight: BlockHeight,
+        transfer_proof: TransferProof,
+        state3: alice::State3,
+        #[serde(with = "swap_serde::monero::private_key")]
+        spend_key: monero::PrivateKey,
+    },
+    BtcWithholdPublished {
+        state3: alice::State3,
+    },
+    BtcMercyGranted {
+        state3: alice::State3,
+    },
+    BtcMercyPublished {
+        state3: alice::State3,
+    },
     Done(AliceEndState),
 }
 
@@ -82,7 +105,10 @@ pub enum Alice {
 pub enum AliceEndState {
     SafelyAborted,
     BtcRedeemed,
-    XmrRefunded,
+    XmrRefunded {
+        #[serde(default)]
+        state3: Option<alice::State3>,
+    },
     BtcEarlyRefunded {
         state3: alice::State3,
     },
@@ -90,20 +116,22 @@ pub enum AliceEndState {
         state3: alice::State3,
         transfer_proof: TransferProof,
     },
+    BtcWithheld {
+        state3: alice::State3,
+    },
+    BtcMercyConfirmed {
+        state3: alice::State3,
+    },
 }
 
 impl From<AliceState> for Alice {
     fn from(alice_state: AliceState) -> Self {
         match alice_state {
-            AliceState::Started { state3 } => Alice::Started {
-                state3: state3.as_ref().clone(),
-            },
-            AliceState::BtcLockTransactionSeen { state3 } => Alice::BtcLockTransactionSeen {
-                state3: state3.as_ref().clone(),
-            },
-            AliceState::BtcLocked { state3 } => Alice::BtcLocked {
-                state3: state3.as_ref().clone(),
-            },
+            AliceState::Started { state3 } => Alice::Started { state3: *state3 },
+            AliceState::BtcLockTransactionSeen { state3 } => {
+                Alice::BtcLockTransactionSeen { state3: *state3 }
+            }
+            AliceState::BtcLocked { state3 } => Alice::BtcLocked { state3: *state3 },
             AliceState::XmrLockTransactionSent {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
@@ -111,7 +139,7 @@ impl From<AliceState> for Alice {
             } => Alice::XmrLockTransactionSent {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
             },
             AliceState::XmrLocked {
                 monero_wallet_restore_blockheight,
@@ -120,7 +148,7 @@ impl From<AliceState> for Alice {
             } => Alice::XmrLocked {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
             },
             AliceState::XmrLockTransferProofSent {
                 monero_wallet_restore_blockheight,
@@ -129,7 +157,7 @@ impl From<AliceState> for Alice {
             } => Alice::XmrLockTransferProofSent {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
             },
             AliceState::EncSigLearned {
                 monero_wallet_restore_blockheight,
@@ -139,14 +167,14 @@ impl From<AliceState> for Alice {
             } => Alice::EncSigLearned {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
                 encrypted_signature: encrypted_signature.as_ref().clone(),
             },
             AliceState::BtcRedeemTransactionPublished {
                 state3,
                 transfer_proof,
             } => Alice::BtcRedeemTransactionPublished {
-                state3: state3.as_ref().clone(),
+                state3: *state3,
                 transfer_proof,
             },
             AliceState::BtcRedeemed => Alice::Done(AliceEndState::BtcRedeemed),
@@ -157,7 +185,7 @@ impl From<AliceState> for Alice {
             } => Alice::BtcCancelled {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
             },
             AliceState::BtcRefunded {
                 monero_wallet_restore_blockheight,
@@ -168,14 +196,36 @@ impl From<AliceState> for Alice {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
                 spend_key,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
             },
-            AliceState::BtcEarlyRefundable { state3 } => Alice::BtcEarlyRefundable {
-                state3: state3.as_ref().clone(),
+            AliceState::BtcPartiallyRefunded {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                spend_key,
+                state3,
+            } => Alice::BtcPartiallyRefunded {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                state3: *state3,
+                spend_key,
             },
-            AliceState::BtcEarlyRefunded(state3) => Alice::Done(AliceEndState::BtcEarlyRefunded {
-                state3: state3.as_ref().clone(),
-            }),
+            AliceState::XmrRefundable {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                state3,
+                spend_key,
+            } => Alice::XmrRefundable {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                state3: *state3,
+                spend_key,
+            },
+            AliceState::BtcEarlyRefundable { state3 } => {
+                Alice::BtcEarlyRefundable { state3: *state3 }
+            }
+            AliceState::BtcEarlyRefunded(state3) => {
+                Alice::Done(AliceEndState::BtcEarlyRefunded { state3: *state3 })
+            }
             AliceState::BtcPunishable {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
@@ -183,9 +233,24 @@ impl From<AliceState> for Alice {
             } => Alice::BtcPunishable {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
             },
-            AliceState::XmrRefunded => Alice::Done(AliceEndState::XmrRefunded),
+            AliceState::XmrRefunded { state3 } => Alice::Done(AliceEndState::XmrRefunded {
+                state3: state3.map(|s| s.as_ref().clone()),
+            }),
+            AliceState::BtcWithholdPublished { state3 } => {
+                Alice::BtcWithholdPublished { state3: *state3 }
+            }
+            AliceState::BtcWithholdConfirmed { state3 } => {
+                Alice::Done(AliceEndState::BtcWithheld { state3: *state3 })
+            }
+            AliceState::BtcMercyGranted { state3 } => Alice::BtcMercyGranted { state3: *state3 },
+            AliceState::BtcMercyPublished { state3 } => {
+                Alice::BtcMercyPublished { state3: *state3 }
+            }
+            AliceState::BtcMercyConfirmed { state3 } => {
+                Alice::Done(AliceEndState::BtcMercyConfirmed { state3: *state3 })
+            }
             AliceState::WaitingForCancelTimelockExpiration {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
@@ -193,7 +258,7 @@ impl From<AliceState> for Alice {
             } => Alice::WaitingForCancelTimelockExpiration {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
             },
             AliceState::CancelTimelockExpired {
                 monero_wallet_restore_blockheight,
@@ -202,13 +267,13 @@ impl From<AliceState> for Alice {
             } => Alice::CancelTimelockExpired {
                 monero_wallet_restore_blockheight,
                 transfer_proof,
-                state3: state3.as_ref().clone(),
+                state3: *state3,
             },
             AliceState::BtcPunished {
                 state3,
                 transfer_proof,
             } => Alice::Done(AliceEndState::BtcPunished {
-                state3: state3.as_ref().clone(),
+                state3: *state3,
                 transfer_proof,
             }),
             AliceState::SafelyAborted => Alice::Done(AliceEndState::SafelyAborted),
@@ -320,13 +385,46 @@ impl From<Alice> for AliceState {
                 spend_key,
                 state3: Box::new(state3),
             },
+            Alice::BtcPartiallyRefunded {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                state3,
+                spend_key,
+            } => AliceState::BtcPartiallyRefunded {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                spend_key,
+                state3: Box::new(state3),
+            },
             Alice::BtcEarlyRefundable { state3 } => AliceState::BtcEarlyRefundable {
                 state3: Box::new(state3),
             },
+            Alice::XmrRefundable {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                state3,
+                spend_key,
+            } => AliceState::XmrRefundable {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                spend_key,
+                state3: Box::new(state3),
+            },
+            Alice::BtcWithholdPublished { state3 } => AliceState::BtcWithholdPublished {
+                state3: Box::new(state3),
+            },
+            Alice::BtcMercyGranted { state3 } => AliceState::BtcMercyGranted {
+                state3: Box::new(state3),
+            },
+            Alice::BtcMercyPublished { state3 } => AliceState::BtcMercyPublished {
+                state3: Box::new(state3),
+            },
             Alice::Done(end_state) => match end_state {
                 AliceEndState::SafelyAborted => AliceState::SafelyAborted,
                 AliceEndState::BtcRedeemed => AliceState::BtcRedeemed,
-                AliceEndState::XmrRefunded => AliceState::XmrRefunded,
+                AliceEndState::XmrRefunded { state3 } => AliceState::XmrRefunded {
+                    state3: state3.map(Box::new),
+                },
                 AliceEndState::BtcPunished {
                     state3,
                     transfer_proof,
@@ -337,6 +435,12 @@ impl From<Alice> for AliceState {
                 AliceEndState::BtcEarlyRefunded { state3 } => {
                     AliceState::BtcEarlyRefunded(Box::new(state3))
                 }
+                AliceEndState::BtcWithheld { state3 } => AliceState::BtcWithholdConfirmed {
+                    state3: Box::new(state3),
+                },
+                AliceEndState::BtcMercyConfirmed { state3 } => AliceState::BtcMercyConfirmed {
+                    state3: Box::new(state3),
+                },
             },
         }
     }
@@ -366,7 +470,14 @@ impl fmt::Display for Alice {
             Alice::BtcCancelled { .. } => f.write_str("Bitcoin cancel transaction published"),
             Alice::BtcPunishable { .. } => f.write_str("Bitcoin punishable"),
             Alice::BtcRefunded { .. } => f.write_str("Monero refundable"),
+            Alice::BtcPartiallyRefunded { .. } => f.write_str("Monero refundable"),
             Alice::BtcEarlyRefundable { .. } => f.write_str("Bitcoin early refundable"),
+            Alice::XmrRefundable { .. } => f.write_str("Bitcoin early refundable"),
+            Alice::BtcWithholdPublished { .. } => {
+                f.write_str("Bitcoin withhold transaction published")
+            }
+            Alice::BtcMercyGranted { .. } => f.write_str("Bitcoin mercy initiated"),
+            Alice::BtcMercyPublished { .. } => f.write_str("Bitcoin mercy published"),
             Alice::Done(end_state) => write!(f, "Done: {}", end_state),
         }
     }
diff --git a/swap-db/src/bob.rs b/swap-db/src/bob.rs
index 09b9b867c3..0966891af7 100644
--- a/swap-db/src/bob.rs
+++ b/swap-db/src/bob.rs
@@ -7,7 +7,6 @@ use swap_machine::bob::BobState;
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub enum Bob {
     Started {
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         btc_amount: bitcoin::Amount,
         #[serde(with = "swap_serde::bitcoin::address_serde")]
         change_address: bitcoin::Address,
@@ -51,9 +50,18 @@ pub enum Bob {
         monero_wallet_restore_blockheight: BlockHeight,
     },
     CancelTimelockExpired(bob::State6),
+    BtcCancelPublished(bob::State6),
     BtcCancelled(bob::State6),
     BtcRefundPublished(bob::State6),
     BtcEarlyRefundPublished(bob::State6),
+    BtcPartialRefundPublished(bob::State6),
+    BtcPartiallyRefunded(bob::State6),
+    WaitingForReclaimTimelockExpiration(bob::State6),
+    ReclaimTimelockExpired(bob::State6),
+    BtcReclaimPublished(bob::State6),
+    BtcWithholdPublished(bob::State6),
+    BtcWithheld(bob::State6),
+    BtcMercyPublished(bob::State6),
     Done(BobEndState),
 }
 
@@ -63,6 +71,8 @@ pub enum BobEndState {
     XmrRedeemed { tx_lock_id: bitcoin::Txid },
     BtcRefunded(Box<bob::State6>),
     BtcEarlyRefunded(Box<bob::State6>),
+    BtcReclaimConfirmed(Box<bob::State6>),
+    BtcMercyConfirmed(Box<bob::State6>),
 }
 
 impl From<BobState> for Bob {
@@ -123,9 +133,11 @@ impl From<BobState> for Bob {
                 monero_wallet_restore_blockheight,
             },
             BobState::CancelTimelockExpired(state6) => Bob::CancelTimelockExpired(state6),
+            BobState::BtcCancelPublished(state6) => Bob::BtcCancelPublished(state6),
             BobState::BtcCancelled(state6) => Bob::BtcCancelled(state6),
             BobState::BtcRefundPublished(state6) => Bob::BtcRefundPublished(state6),
             BobState::BtcEarlyRefundPublished(state6) => Bob::BtcEarlyRefundPublished(state6),
+            BobState::BtcPartialRefundPublished(state6) => Bob::BtcPartialRefundPublished(state6),
             BobState::BtcPunished { state, tx_lock_id } => Bob::BtcPunished { state, tx_lock_id },
             BobState::BtcRefunded(state6) => Bob::Done(BobEndState::BtcRefunded(Box::new(state6))),
             BobState::XmrRedeemed { tx_lock_id } => {
@@ -134,6 +146,21 @@ impl From<BobState> for Bob {
             BobState::BtcEarlyRefunded(state6) => {
                 Bob::Done(BobEndState::BtcEarlyRefunded(Box::new(state6)))
             }
+            BobState::BtcPartiallyRefunded(state6) => Bob::BtcPartiallyRefunded(state6),
+            BobState::BtcReclaimPublished(state6) => Bob::BtcReclaimPublished(state6),
+            BobState::BtcReclaimConfirmed(state6) => {
+                Bob::Done(BobEndState::BtcReclaimConfirmed(Box::new(state6)))
+            }
+            BobState::WaitingForReclaimTimelockExpiration(state6) => {
+                Bob::WaitingForReclaimTimelockExpiration(state6)
+            }
+            BobState::ReclaimTimelockExpired(state6) => Bob::ReclaimTimelockExpired(state6),
+            BobState::BtcWithholdPublished(state6) => Bob::BtcWithholdPublished(state6),
+            BobState::BtcWithheld(state6) => Bob::BtcWithheld(state6),
+            BobState::BtcMercyPublished(state6) => Bob::BtcMercyPublished(state6),
+            BobState::BtcMercyConfirmed(state6) => {
+                Bob::Done(BobEndState::BtcMercyConfirmed(Box::new(state6)))
+            }
             BobState::SafelyAborted => Bob::Done(BobEndState::SafelyAborted),
         }
     }
@@ -197,15 +224,28 @@ impl From<Bob> for BobState {
                 monero_wallet_restore_blockheight,
             },
             Bob::CancelTimelockExpired(state6) => BobState::CancelTimelockExpired(state6),
+            Bob::BtcCancelPublished(state6) => BobState::BtcCancelPublished(state6),
             Bob::BtcCancelled(state6) => BobState::BtcCancelled(state6),
             Bob::BtcRefundPublished(state6) => BobState::BtcRefundPublished(state6),
+            Bob::BtcPartialRefundPublished(state6) => BobState::BtcPartialRefundPublished(state6),
+            Bob::BtcPartiallyRefunded(state6) => BobState::BtcPartiallyRefunded(state6),
+            Bob::BtcReclaimPublished(state6) => BobState::BtcReclaimPublished(state6),
             Bob::BtcEarlyRefundPublished(state6) => BobState::BtcEarlyRefundPublished(state6),
             Bob::BtcPunished { state, tx_lock_id } => BobState::BtcPunished { state, tx_lock_id },
+            Bob::WaitingForReclaimTimelockExpiration(state6) => {
+                BobState::WaitingForReclaimTimelockExpiration(state6)
+            }
+            Bob::ReclaimTimelockExpired(state6) => BobState::ReclaimTimelockExpired(state6),
+            Bob::BtcWithholdPublished(state6) => BobState::BtcWithholdPublished(state6),
+            Bob::BtcWithheld(state6) => BobState::BtcWithheld(state6),
+            Bob::BtcMercyPublished(state6) => BobState::BtcMercyPublished(state6),
             Bob::Done(end_state) => match end_state {
                 BobEndState::SafelyAborted => BobState::SafelyAborted,
                 BobEndState::XmrRedeemed { tx_lock_id } => BobState::XmrRedeemed { tx_lock_id },
                 BobEndState::BtcRefunded(state6) => BobState::BtcRefunded(*state6),
                 BobEndState::BtcEarlyRefunded(state6) => BobState::BtcEarlyRefunded(*state6),
+                BobEndState::BtcReclaimConfirmed(state6) => BobState::BtcReclaimConfirmed(*state6),
+                BobEndState::BtcMercyConfirmed(state6) => BobState::BtcMercyConfirmed(*state6),
             },
         }
     }
@@ -227,13 +267,26 @@ impl fmt::Display for Bob {
                 f.write_str("Waiting for cancel timelock expiration")
             }
             Bob::CancelTimelockExpired(_) => f.write_str("Cancel timelock is expired"),
+            Bob::BtcCancelPublished(_) => f.write_str("Bitcoin cancel published"),
             Bob::BtcCancelled(_) => f.write_str("Bitcoin refundable"),
             Bob::BtcRefundPublished { .. } => f.write_str("Bitcoin refund published"),
             Bob::BtcEarlyRefundPublished { .. } => f.write_str("Bitcoin early refund published"),
+            Bob::BtcPartialRefundPublished { .. } => {
+                f.write_str("Bitcoin partially refund published")
+            }
             Bob::BtcRedeemed(_) => f.write_str("Monero redeemable"),
             Bob::Done(end_state) => write!(f, "Done: {}", end_state),
             Bob::EncSigSent { .. } => f.write_str("Encrypted signature sent"),
             Bob::BtcPunished { .. } => f.write_str("Bitcoin punished"),
+            Bob::BtcPartiallyRefunded { .. } => f.write_str("Bitcoin partially refunded"),
+            Bob::BtcReclaimPublished { .. } => f.write_str("Bitcoin reclaim transaction published"),
+            Bob::WaitingForReclaimTimelockExpiration { .. } => {
+                f.write_str("Waiting for reclaim timelock to expire")
+            }
+            Bob::ReclaimTimelockExpired { .. } => f.write_str("Reclaim timelock expired"),
+            Bob::BtcWithholdPublished { .. } => f.write_str("Bitcoin withhold published"),
+            Bob::BtcWithheld { .. } => f.write_str("Bitcoin withheld"),
+            Bob::BtcMercyPublished { .. } => f.write_str("Bitcoin mercy published"),
         }
     }
 }
diff --git a/swap-env/Cargo.toml b/swap-env/Cargo.toml
index d5c3d95147..cbaa67850d 100644
--- a/swap-env/Cargo.toml
+++ b/swap-env/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-env"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [dependencies]
diff --git a/swap-env/src/config.rs b/swap-env/src/config.rs
index f976dd40d6..a558aad09d 100644
--- a/swap-env/src/config.rs
+++ b/swap-env/src/config.rs
@@ -1,10 +1,10 @@
 use crate::defaults::{
-    GetDefaults, BITFINEX_PRICE_TICKER_WS_URL, KRAKEN_PRICE_TICKER_WS_URL,
+    BITFINEX_PRICE_TICKER_WS_URL, GetDefaults, KRAKEN_PRICE_TICKER_WS_URL,
     KUCOIN_PRICE_TICKER_REST_URL,
 };
 use crate::env::{Mainnet, Testnet};
 use crate::prompt;
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use config::ConfigError;
 use libp2p::core::Multiaddr;
 use rust_decimal::Decimal;
@@ -101,23 +101,45 @@ pub struct Maker {
     #[serde(with = "::bitcoin::amount::serde::as_btc")]
     pub max_buy_btc: bitcoin::Amount,
     pub ask_spread: Decimal,
+    /// What refund conditions to give to takers.
+    #[serde(default)]
+    pub refund_policy: RefundPolicy,
     #[serde(default = "default_price_ticker_ws_url_kraken")]
     pub price_ticker_ws_url_kraken: Url,
     #[serde(default = "default_price_ticker_ws_url_bitfinex")]
     pub price_ticker_ws_url_bitfinex: Url,
     #[serde(default = "default_price_ticker_rest_url_kucoin")]
     pub price_ticker_rest_url_kucoin: Url,
+    /// If specified, Bitcoin received from successful swaps will be sent to this address.
     #[serde(default, with = "swap_serde::bitcoin::address_serde::option")]
     pub external_bitcoin_redeem_address: Option<bitcoin::Address>,
     /// Percentage (between 0.0 and 1.0) of the swap amount
-    // that will be donated to the project as part of the Monero lock transaction
+    /// that will be donated to the devepment fund as part of the Monero lock transaction.
     #[serde(default = "default_developer_tip")]
     pub developer_tip: Decimal,
 }
 
-fn default_developer_tip() -> Decimal {
-    // By default, we do not tip
-    Decimal::ZERO
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
+pub struct RefundPolicy {
+    /// Takers will only receive this percentage of their Bitcoin back by default.
+    /// Maker can still issue "amnesty" to refund the rest.
+    /// This protects the maker against griefing attacks.
+    #[serde(default = "default_anti_spam_deposit_ratio")]
+    pub anti_spam_deposit_ratio: Decimal,
+    /// If true, Alice will publish TxWithhold after refunding her XMR,
+    /// denying Bob access to the amnesty output. Alice can later grant
+    /// final amnesty to return the funds to Bob.
+    #[serde(default = "default_always_withhold_deposit")]
+    pub always_withhold_deposit: bool,
+}
+
+impl Default for RefundPolicy {
+    fn default() -> Self {
+        Self {
+            anti_spam_deposit_ratio: default_anti_spam_deposit_ratio(),
+            always_withhold_deposit: false,
+        }
+    }
 }
 
 fn default_price_ticker_ws_url_kraken() -> Url {
@@ -132,6 +154,18 @@ fn default_price_ticker_rest_url_kucoin() -> Url {
     Url::parse(KUCOIN_PRICE_TICKER_REST_URL).expect("default kucoin rest url to be valid")
 }
 
+fn default_developer_tip() -> Decimal {
+    Decimal::ZERO
+}
+
+fn default_anti_spam_deposit_ratio() -> Decimal {
+    Decimal::ZERO
+}
+
+fn default_always_withhold_deposit() -> bool {
+    false
+}
+
 impl Config {
     pub fn read<D>(config_file: D) -> Result<Self, ConfigError>
     where
@@ -180,6 +214,40 @@ pub fn read_config(config_path: PathBuf) -> Result<Result<Config, ConfigNotIniti
     Ok(Ok(file))
 }
 
+/// Maximum allowed anti-spam deposit ratio. Values above this are implausible
+/// and likely indicate a misconfiguration (e.g. deposit exceeding fees).
+pub const MAX_ANTI_SPAM_DEPOSIT_RATIO: Decimal = Decimal::from_parts(2, 0, 0, false, 1); // 0.2
+
+pub fn validate_config(config: &Config, env_config: crate::env::Config) -> Result<()> {
+    if config.monero.network != env_config.monero_network {
+        bail!(
+            "Expected monero network in config file to be {:?} but was {:?}",
+            env_config.monero_network,
+            config.monero.network
+        );
+    }
+    if config.bitcoin.network != env_config.bitcoin_network {
+        bail!(
+            "Expected bitcoin network in config file to be {:?} but was {:?}",
+            env_config.bitcoin_network,
+            config.bitcoin.network
+        );
+    }
+
+    let ratio = config.maker.refund_policy.anti_spam_deposit_ratio;
+    if ratio < Decimal::ZERO || ratio > Decimal::ONE {
+        bail!("anti_spam_deposit_ratio must be between 0 and 1, got {ratio}");
+    }
+    if ratio > MAX_ANTI_SPAM_DEPOSIT_RATIO {
+        bail!(
+            "anti_spam_deposit_ratio of {ratio} exceeds maximum of {MAX_ANTI_SPAM_DEPOSIT_RATIO}. \
+             Such a high deposit ratio is implausible and likely a misconfiguration."
+        );
+    }
+
+    Ok(())
+}
+
 pub fn initial_setup(config_path: PathBuf, config: Config) -> Result<()> {
     let toml = toml::to_string(&config)?;
 
@@ -249,6 +317,7 @@ pub fn query_user_for_initial_config_with_network(
             price_ticker_rest_url_kucoin: defaults.price_ticker_rest_url_kucoin,
             external_bitcoin_redeem_address: None,
             developer_tip,
+            refund_policy: defaults.refund_policy,
         },
     })
 }
diff --git a/swap-env/src/defaults.rs b/swap-env/src/defaults.rs
index 7c68b83479..2e41716799 100644
--- a/swap-env/src/defaults.rs
+++ b/swap-env/src/defaults.rs
@@ -1,3 +1,4 @@
+use crate::config::RefundPolicy;
 use crate::env::{Mainnet, Testnet};
 use anyhow::{Context, Result};
 use libp2p::Multiaddr;
@@ -118,6 +119,7 @@ pub struct Defaults {
     pub bitcoin_confirmation_target: u16,
     pub use_mempool_space_fee_estimation: bool,
     pub developer_tip: Decimal,
+    pub refund_policy: RefundPolicy,
 }
 
 impl GetDefaults for Mainnet {
@@ -135,6 +137,7 @@ impl GetDefaults for Mainnet {
             bitcoin_confirmation_target: 1,
             use_mempool_space_fee_estimation: true,
             developer_tip: Decimal::ZERO,
+            refund_policy: RefundPolicy::default(),
         };
 
         Ok(defaults)
@@ -156,6 +159,7 @@ impl GetDefaults for Testnet {
             bitcoin_confirmation_target: 1,
             use_mempool_space_fee_estimation: true,
             developer_tip: Decimal::ZERO,
+            refund_policy: RefundPolicy::default(),
         };
 
         Ok(defaults)
diff --git a/swap-env/src/env.rs b/swap-env/src/env.rs
index 4e2a0618f3..dc984fbcaf 100644
--- a/swap-env/src/env.rs
+++ b/swap-env/src/env.rs
@@ -15,6 +15,7 @@ pub struct Config {
     pub bitcoin_avg_block_time: Duration,
     pub bitcoin_cancel_timelock: u32,
     pub bitcoin_punish_timelock: u32,
+    pub bitcoin_remaining_refund_timelock: u32,
     pub bitcoin_network: bitcoin::Network,
     pub monero_avg_block_time: Duration,
     pub monero_finality_confirmations: u64,
@@ -61,6 +62,7 @@ impl GetConfig for Mainnet {
             bitcoin_avg_block_time: 10.std_minutes(),
             bitcoin_cancel_timelock: 72,
             bitcoin_punish_timelock: 144,
+            bitcoin_remaining_refund_timelock: 2,
             bitcoin_network: bitcoin::Network::Bitcoin,
             monero_avg_block_time: 2.std_minutes(),
             // If Alice cannot lock her Monero within this timeout,
@@ -83,6 +85,7 @@ impl GetConfig for Testnet {
             bitcoin_avg_block_time: 10.std_minutes(),
             bitcoin_cancel_timelock: 12 * 3,
             bitcoin_punish_timelock: 24 * 3,
+            bitcoin_remaining_refund_timelock: 2,
             bitcoin_network: bitcoin::Network::Testnet,
             monero_avg_block_time: 2.std_minutes(),
             monero_lock_retry_timeout: 10.std_minutes(),
@@ -103,6 +106,7 @@ impl GetConfig for Regtest {
             bitcoin_avg_block_time: 5.std_seconds(),
             bitcoin_cancel_timelock: 100,
             bitcoin_punish_timelock: 50,
+            bitcoin_remaining_refund_timelock: 5,
             bitcoin_network: bitcoin::Network::Regtest,
             monero_avg_block_time: 1.std_seconds(),
             monero_lock_retry_timeout: 1.std_minutes(),
diff --git a/swap-feed/Cargo.toml b/swap-feed/Cargo.toml
index d413c87027..7a187cbc7a 100644
--- a/swap-feed/Cargo.toml
+++ b/swap-feed/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-feed"
-version = "0.1.0"
+version = "4.0.0"
 authors = ["The COMIT guys <hello@comit.network>"]
 edition = "2021"
 description = "Price feed functionality for XMR/BTC atomic swaps"
diff --git a/swap-fs/Cargo.toml b/swap-fs/Cargo.toml
index 4f92c417ec..cc23fc7064 100644
--- a/swap-fs/Cargo.toml
+++ b/swap-fs/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-fs"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [dependencies]
diff --git a/swap-machine/Cargo.toml b/swap-machine/Cargo.toml
index e15b435a1a..28fe50239e 100644
--- a/swap-machine/Cargo.toml
+++ b/swap-machine/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-machine"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [dependencies]
@@ -14,14 +14,21 @@ libp2p = { workspace = true }
 monero-address = { workspace = true }
 monero-oxide-ext = { path = "../monero-oxide-ext" }
 rand = { workspace = true }
+rust_decimal = { workspace = true }
 rand_chacha = { workspace = true }
 serde = { workspace = true }
 sha2 = { workspace = true }
-sigma_fun = { workspace = true, default-features = false, features = ["ed25519", "serde", "secp256k1", "alloc"] }
+sigma_fun = { workspace = true, default-features = false, features = [
+    "ed25519",
+    "serde",
+    "secp256k1",
+    "alloc",
+] }
 swap-core = { path = "../swap-core" }
 swap-env = { path = "../swap-env" }
 swap-serde = { path = "../swap-serde" }
 thiserror = { workspace = true }
+tracing = { workspace = true }
 uuid = { workspace = true, features = ["serde"] }
 
 [dev-dependencies]
diff --git a/swap-machine/src/alice/mod.rs b/swap-machine/src/alice/mod.rs
index 604af7cf9e..2cb7d0133f 100644
--- a/swap-machine/src/alice/mod.rs
+++ b/swap-machine/src/alice/mod.rs
@@ -1,20 +1,21 @@
 #![allow(non_snake_case)]
 
-use crate::common::{Message0, Message1, Message2, Message3, Message4, CROSS_CURVE_PROOF_SYSTEM};
-use anyhow::{bail, Context, Result};
+use crate::common::{CROSS_CURVE_PROOF_SYSTEM, Message0, Message1, Message2, Message3, Message4};
+use anyhow::{Context, Result, bail};
 use rand::{CryptoRng, RngCore};
 use serde::{Deserialize, Serialize};
 use sigma_fun::ext::dl_secp256k1_ed25519_eq::CrossCurveDLEQProof;
-use std::fmt;
+use std::fmt::{self, Debug};
 use std::sync::Arc;
 use swap_core::bitcoin::{
-    current_epoch, CancelTimelock, ExpiredTimelocks, PunishTimelock, Transaction, TxCancel,
-    TxEarlyRefund, TxPunish, TxRedeem, TxRefund, Txid,
+    CancelTimelock, ExpiredTimelocks, PunishTimelock, RemainingRefundTimelock, Transaction,
+    TxCancel, TxEarlyRefund, TxFullRefund, TxMercy, TxPartialRefund, TxPunish, TxReclaim, TxRedeem,
+    TxWithhold, Txid, current_epoch,
 };
 use swap_core::compat::{IntoDalek, IntoDalekNg, IntoMoneroOxide};
-use swap_core::monero;
-use swap_core::monero::primitives::{AmountExt, BlockHeight, TransferProof, TransferRequest};
 use swap_core::monero::ScalarExt;
+use swap_core::monero::primitives::{AmountExt, BlockHeight, TransferProof, TransferRequest};
+use swap_core::monero::{self, Scalar};
 use swap_env::env::Config;
 use uuid::Uuid;
 
@@ -64,18 +65,48 @@ pub enum AliceState {
         state3: Box<State3>,
     },
     BtcEarlyRefunded(Box<State3>),
+    // We enter the refund states regardless of whether or not the refund
+    // transaction was confirmed because we do not care. We can extract the key
+    // we need to refund ourself regardless.
     BtcRefunded {
         monero_wallet_restore_blockheight: BlockHeight,
         transfer_proof: TransferProof,
         spend_key: monero_oxide_ext::PrivateKey,
         state3: Box<State3>,
     },
-    BtcPunishable {
+    BtcPartiallyRefunded {
+        monero_wallet_restore_blockheight: BlockHeight,
+        transfer_proof: TransferProof,
+        spend_key: monero::PrivateKey,
+        state3: Box<State3>,
+    },
+    XmrRefundable {
         monero_wallet_restore_blockheight: BlockHeight,
         transfer_proof: TransferProof,
+        spend_key: monero::PrivateKey,
+        state3: Box<State3>,
+    },
+    // TODO: save redeem transaction id
+    XmrRefunded {
+        state3: Option<Box<State3>>,
+    },
+    BtcWithholdPublished {
+        state3: Box<State3>,
+    },
+    BtcWithholdConfirmed {
+        state3: Box<State3>,
+    },
+    /// Operator has decided to grant final amnesty to Bob.
+    /// This state will publish TxMercy and transition to BtcMercyPublished.
+    BtcMercyGranted {
+        state3: Box<State3>,
+    },
+    BtcMercyPublished {
+        state3: Box<State3>,
+    },
+    BtcMercyConfirmed {
         state3: Box<State3>,
     },
-    XmrRefunded,
     WaitingForCancelTimelockExpiration {
         monero_wallet_restore_blockheight: BlockHeight,
         transfer_proof: TransferProof,
@@ -86,6 +117,11 @@ pub enum AliceState {
         transfer_proof: TransferProof,
         state3: Box<State3>,
     },
+    BtcPunishable {
+        monero_wallet_restore_blockheight: BlockHeight,
+        transfer_proof: TransferProof,
+        state3: Box<State3>,
+    },
     BtcPunished {
         state3: Box<State3>,
         transfer_proof: TransferProof,
@@ -94,14 +130,20 @@ pub enum AliceState {
 }
 
 pub fn is_complete(state: &AliceState) -> bool {
-    matches!(
-        state,
-        AliceState::XmrRefunded
-            | AliceState::BtcRedeemed
-            | AliceState::BtcPunished { .. }
-            | AliceState::SafelyAborted
-            | AliceState::BtcEarlyRefunded(_)
-    )
+    match state {
+        // XmrRefunded is only complete if we don't need to publish TxWithhold
+        AliceState::XmrRefunded { state3 } => match state3 {
+            Some(s3) if s3.should_publish_tx_withhold == Some(true) => false,
+            _ => true,
+        },
+        AliceState::BtcRedeemed
+        | AliceState::BtcPunished { .. }
+        | AliceState::SafelyAborted
+        | AliceState::BtcEarlyRefunded(_)
+        | AliceState::BtcWithholdConfirmed { .. }
+        | AliceState::BtcMercyConfirmed { .. } => true,
+        _ => false,
+    }
 }
 
 impl fmt::Display for AliceState {
@@ -127,13 +169,24 @@ impl fmt::Display for AliceState {
             AliceState::BtcPunished { .. } => write!(f, "btc is punished"),
             AliceState::SafelyAborted => write!(f, "safely aborted"),
             AliceState::BtcPunishable { .. } => write!(f, "btc is punishable"),
-            AliceState::XmrRefunded => write!(f, "xmr is refunded"),
+            AliceState::XmrRefunded { .. } => write!(f, "xmr is refunded"),
+            AliceState::BtcWithholdPublished { .. } => write!(f, "btc withhold published"),
+            AliceState::BtcWithholdConfirmed { .. } => write!(f, "btc withheld"),
+            AliceState::BtcMercyGranted { .. } => write!(f, "btc mercy granted"),
+            AliceState::BtcMercyPublished { .. } => {
+                write!(f, "btc mercy published")
+            }
+            AliceState::BtcMercyConfirmed { .. } => {
+                write!(f, "btc mercy confirmed")
+            }
             AliceState::WaitingForCancelTimelockExpiration { .. } => {
                 write!(f, "waiting for cancel timelock expiration")
             }
             AliceState::CancelTimelockExpired { .. } => write!(f, "cancel timelock is expired"),
             AliceState::BtcEarlyRefundable { .. } => write!(f, "btc is early refundable"),
             AliceState::BtcEarlyRefunded(_) => write!(f, "btc is early refunded"),
+            AliceState::BtcPartiallyRefunded { .. } => write!(f, "btc is partially refunded"),
+            AliceState::XmrRefundable { .. } => write!(f, "xmr is refundable"),
         }
     }
 }
@@ -149,12 +202,16 @@ pub struct State0 {
     dleq_proof_s_a: CrossCurveDLEQProof,
     btc: bitcoin::Amount,
     xmr: monero::Amount,
+    btc_amnesty_amount: Option<bitcoin::Amount>,
     cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     redeem_address: bitcoin::Address,
     punish_address: bitcoin::Address,
     tx_redeem_fee: bitcoin::Amount,
     tx_punish_fee: bitcoin::Amount,
+    tx_withhold_fee: Option<bitcoin::Amount>,
+    should_publish_tx_withhold: Option<bool>,
 }
 
 impl State0 {
@@ -162,11 +219,14 @@ impl State0 {
     pub fn new<R>(
         btc: bitcoin::Amount,
         xmr: monero::Amount,
+        btc_amnesty_amount: bitcoin::Amount,
         env_config: Config,
         redeem_address: bitcoin::Address,
         punish_address: bitcoin::Address,
         tx_redeem_fee: bitcoin::Amount,
         tx_punish_fee: bitcoin::Amount,
+        tx_withhold_fee: bitcoin::Amount,
+        should_publish_tx_withhold: bool,
         rng: &mut R,
     ) -> Self
     where
@@ -186,14 +246,18 @@ impl State0 {
             S_a_bitcoin: S_a_bitcoin.into(),
             S_a_monero: S_a_monero.compress().into(),
             dleq_proof_s_a,
+            btc_amnesty_amount: Some(btc_amnesty_amount),
             redeem_address,
             punish_address,
             btc,
             xmr,
             cancel_timelock: env_config.bitcoin_cancel_timelock.into(),
             punish_timelock: env_config.bitcoin_punish_timelock.into(),
+            remaining_refund_timelock: Some(env_config.bitcoin_remaining_refund_timelock.into()),
             tx_redeem_fee,
             tx_punish_fee,
+            tx_withhold_fee: Some(tx_withhold_fee),
+            should_publish_tx_withhold: Some(should_publish_tx_withhold),
         }
     }
 
@@ -224,15 +288,22 @@ impl State0 {
                 dleq_proof_s_a: self.dleq_proof_s_a,
                 btc: self.btc,
                 xmr: self.xmr,
+                btc_amnesty_amount: self.btc_amnesty_amount,
                 cancel_timelock: self.cancel_timelock,
                 punish_timelock: self.punish_timelock,
+                remaining_refund_timelock: self.remaining_refund_timelock,
                 refund_address: msg.refund_address,
                 redeem_address: self.redeem_address,
                 punish_address: self.punish_address,
                 tx_redeem_fee: self.tx_redeem_fee,
                 tx_punish_fee: self.tx_punish_fee,
                 tx_refund_fee: msg.tx_refund_fee,
+                tx_partial_refund_fee: Some(msg.tx_partial_refund_fee),
+                tx_reclaim_fee: Some(msg.tx_reclaim_fee),
+                tx_withhold_fee: self.tx_withhold_fee,
+                tx_mercy_fee: Some(msg.tx_mercy_fee),
                 tx_cancel_fee: msg.tx_cancel_fee,
+                should_publish_tx_withhold: self.should_publish_tx_withhold,
             },
         ))
     }
@@ -253,20 +324,27 @@ pub struct State1 {
     dleq_proof_s_a: CrossCurveDLEQProof,
     btc: bitcoin::Amount,
     xmr: monero::Amount,
+    btc_amnesty_amount: Option<bitcoin::Amount>,
     cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     refund_address: bitcoin::Address,
     redeem_address: bitcoin::Address,
     punish_address: bitcoin::Address,
     tx_redeem_fee: bitcoin::Amount,
     tx_punish_fee: bitcoin::Amount,
     tx_refund_fee: bitcoin::Amount,
+    tx_partial_refund_fee: Option<bitcoin::Amount>,
+    tx_reclaim_fee: Option<bitcoin::Amount>,
+    tx_withhold_fee: Option<bitcoin::Amount>,
+    tx_mercy_fee: Option<bitcoin::Amount>,
     tx_cancel_fee: bitcoin::Amount,
+    should_publish_tx_withhold: Option<bool>,
 }
 
 impl State1 {
-    pub fn next_message(&self) -> Message1 {
-        Message1 {
+    pub fn next_message(&self) -> Result<Message1> {
+        Ok(Message1 {
             A: self.a.public(),
             S_a_monero: self.S_a_monero,
             S_a_bitcoin: self.S_a_bitcoin,
@@ -276,13 +354,23 @@ impl State1 {
             punish_address: self.punish_address.clone(),
             tx_redeem_fee: self.tx_redeem_fee,
             tx_punish_fee: self.tx_punish_fee,
-        }
+            amnesty_amount: self
+                .btc_amnesty_amount
+                .context("Missing btc_amesty_amount for new swap that should have it")?,
+            tx_withhold_fee: self
+                .tx_withhold_fee
+                .context("Missing tx_withhold_fee for new swap that should have it")?,
+        })
     }
 
     pub fn receive(self, msg: Message2) -> Result<State2> {
-        let tx_lock =
-            swap_core::bitcoin::TxLock::from_psbt(msg.psbt, self.a.public(), self.B, self.btc)
-                .context("Failed to re-construct TxLock from received PSBT")?;
+        let tx_lock = swap_core::bitcoin::TxLock::from_psbt(
+            msg.tx_lock_psbt,
+            self.a.public(),
+            self.B,
+            self.btc,
+        )
+        .context("Failed to re-construct TxLock from received PSBT")?;
 
         Ok(State2 {
             a: self.a,
@@ -293,8 +381,10 @@ impl State1 {
             v: self.v,
             btc: self.btc,
             xmr: self.xmr,
+            btc_amnesty_amount: self.btc_amnesty_amount,
             cancel_timelock: self.cancel_timelock,
             punish_timelock: self.punish_timelock,
+            remaining_refund_timelock: self.remaining_refund_timelock,
             refund_address: self.refund_address,
             redeem_address: self.redeem_address,
             punish_address: self.punish_address,
@@ -302,7 +392,12 @@ impl State1 {
             tx_redeem_fee: self.tx_redeem_fee,
             tx_punish_fee: self.tx_punish_fee,
             tx_refund_fee: self.tx_refund_fee,
+            tx_partial_refund_fee: self.tx_partial_refund_fee,
+            tx_reclaim_fee: self.tx_reclaim_fee,
+            tx_withhold_fee: self.tx_withhold_fee,
+            tx_mercy_fee: self.tx_mercy_fee,
             tx_cancel_fee: self.tx_cancel_fee,
+            should_publish_tx_withhold: self.should_publish_tx_withhold,
         })
     }
 }
@@ -318,8 +413,10 @@ pub struct State2 {
     v: monero::PrivateViewKey,
     btc: bitcoin::Amount,
     xmr: monero::Amount,
+    btc_amnesty_amount: Option<bitcoin::Amount>,
     cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     refund_address: bitcoin::Address,
     redeem_address: bitcoin::Address,
     punish_address: bitcoin::Address,
@@ -327,11 +424,16 @@ pub struct State2 {
     tx_redeem_fee: bitcoin::Amount,
     tx_punish_fee: bitcoin::Amount,
     tx_refund_fee: bitcoin::Amount,
+    tx_partial_refund_fee: Option<bitcoin::Amount>,
+    tx_reclaim_fee: Option<bitcoin::Amount>,
+    tx_withhold_fee: Option<bitcoin::Amount>,
+    tx_mercy_fee: Option<bitcoin::Amount>,
     tx_cancel_fee: bitcoin::Amount,
+    should_publish_tx_withhold: Option<bool>,
 }
 
 impl State2 {
-    pub fn next_message(&self) -> Message3 {
+    pub fn next_message(&self) -> Result<Message3> {
         let tx_cancel = swap_core::bitcoin::TxCancel::new(
             &self.tx_lock,
             self.cancel_timelock,
@@ -341,20 +443,58 @@ impl State2 {
         )
         .expect("valid cancel tx");
 
-        let tx_refund =
-            swap_core::bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);
-        // Alice encsigns the refund transaction(bitcoin) digest with Bob's monero
-        // pubkey(S_b). The refund transaction spends the output of
-        // tx_lock_bitcoin to Bob's refund address.
+        let tx_cancel_sig = self.a.sign(tx_cancel.digest());
+
+        // When the amnesty output is zero, we can't construct the tx partial refund transaction
+        // due to an integer underflow.
+        // We only send the cancel and full refund signatures.
+        if self.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO) == bitcoin::Amount::ZERO {
+            let tx_full_refund =
+                TxFullRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);
+            let tx_refund_encsig = self.a.encsign(self.S_b_bitcoin, tx_full_refund.digest());
+
+            return Ok(Message3 {
+                tx_cancel_sig,
+                tx_partial_refund_encsig: None,
+                tx_full_refund_encsig: Some(tx_refund_encsig),
+                tx_reclaim_sig: None,
+            });
+        }
+
+        let tx_partial_refund = swap_core::bitcoin::TxPartialRefund::new(
+            &tx_cancel,
+            &self.refund_address,
+            self.a.public(),
+            self.B,
+            self.btc_amnesty_amount
+                .context("Missing btc_amnesty_amount for new swap that should have it")?,
+            self.tx_partial_refund_fee
+                .context("Missing tx_partial_refund_fee for new swap")?,
+        )?;
+        // Alice encsigns the partial refund transaction(bitcoin) digest with Bob's monero
+        // pubkey(S_b). The partial refund transaction spends the output of
+        // tx_lock_bitcoin to Bob's refund address (except for the amnesty output).
         // recover(encsign(a, S_b, d), sign(a, d), S_b) = s_b where d is a digest, (a,
         // A) is alice's keypair and (s_b, S_b) is bob's keypair.
-        let tx_refund_encsig = self.a.encsign(self.S_b_bitcoin, tx_refund.digest());
+        let tx_partial_refund_encsig = self.a.encsign(self.S_b_bitcoin, tx_partial_refund.digest());
 
-        let tx_cancel_sig = self.a.sign(tx_cancel.digest());
-        Message3 {
+        // Construct and sign TxReclaim
+        let tx_reclaim = swap_core::bitcoin::TxReclaim::new(
+            &tx_partial_refund,
+            &self.refund_address,
+            self.tx_reclaim_fee
+                .context("Missing tx_reclaim_fee for new swap")?,
+            self.remaining_refund_timelock
+                .context("Missing remaining_refund_timelock for new swap")?,
+        )?;
+        let tx_reclaim_sig = self.a.sign(tx_reclaim.digest());
+
+        Ok(Message3 {
             tx_cancel_sig,
-            tx_refund_encsig,
-        }
+            tx_partial_refund_encsig: Some(tx_partial_refund_encsig),
+            tx_reclaim_sig: Some(tx_reclaim_sig),
+            tx_full_refund_encsig: None,
+        })
     }
 
     pub fn receive(self, msg: Message4) -> Result<State3> {
@@ -398,6 +538,108 @@ impl State2 {
         )
         .context("Failed to verify early refund transaction")?;
 
+        // When the bitcoin amnesty amount is zero, we can't construct the transactions for the partial refund path.
+        // We sent Bob the encsig for the full refund path already, so we don't
+        // care about the partial refund path signatures of Bob anyway.
+        // We just save `None`.
+        if self.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO) == bitcoin::Amount::ZERO {
+            return Ok(State3 {
+                a: self.a,
+                B: self.B,
+                s_a: self.s_a,
+                S_b_monero: self.S_b_monero,
+                S_b_bitcoin: self.S_b_bitcoin,
+                v: self.v,
+                btc: self.btc,
+                xmr: self.xmr,
+                btc_amnesty_amount: self.btc_amnesty_amount,
+                cancel_timelock: self.cancel_timelock,
+                punish_timelock: self.punish_timelock,
+                remaining_refund_timelock: self.remaining_refund_timelock,
+                refund_address: self.refund_address,
+                redeem_address: self.redeem_address,
+                punish_address: self.punish_address,
+                tx_lock: self.tx_lock,
+                tx_punish_sig_bob: msg.tx_punish_sig,
+                tx_cancel_sig_bob: msg.tx_cancel_sig,
+                tx_early_refund_sig_bob: msg.tx_early_refund_sig.into(),
+                tx_reclaim_sig_bob: None,
+                tx_redeem_fee: self.tx_redeem_fee,
+                tx_punish_fee: self.tx_punish_fee,
+                tx_refund_fee: self.tx_refund_fee,
+                tx_partial_refund_fee: self.tx_partial_refund_fee,
+                tx_reclaim_fee: self.tx_reclaim_fee,
+                tx_withhold_fee: self.tx_withhold_fee,
+                tx_mercy_fee: self.tx_mercy_fee,
+                tx_cancel_fee: self.tx_cancel_fee,
+                tx_withhold_sig_bob: None,
+                tx_mercy_sig_bob: None,
+                should_publish_tx_withhold: self.should_publish_tx_withhold,
+            });
+        }
+
+        // Create TxReclaim ourself
+        let tx_partial_refund = TxPartialRefund::new(
+            &tx_cancel,
+            &self.refund_address,
+            self.a.public(),
+            self.B,
+            self.btc_amnesty_amount
+                .context("missing btc_amnesty_amount")?,
+            self.tx_partial_refund_fee
+                .context("missing tx_partial_refund_fee")?,
+        )
+        .context("Couldn't construct TxPartialRefund")?;
+        let tx_reclaim = TxReclaim::new(
+            &tx_partial_refund,
+            &self.refund_address,
+            self.tx_reclaim_fee
+                .context("missing tx_reclaim_fee")?,
+            self.remaining_refund_timelock
+                .context("missing remaining_refund_timelock")?,
+        )?;
+
+        // Check if the provided signature by Bob is valid for the transaction
+        let tx_reclaim_sig = msg
+            .tx_reclaim_sig
+            .as_ref()
+            .context("Missing tx_reclaim_sig from Bob")?;
+        swap_core::bitcoin::verify_sig(&self.B, &tx_reclaim.digest(), tx_reclaim_sig)
+            .context("Failed to verify reclaim transaction")?;
+
+        // Create TxWithhold ourself
+        let tx_withhold = TxWithhold::new(
+            &tx_partial_refund,
+            self.a.public(),
+            self.B,
+            self.tx_withhold_fee
+                .context("missing tx_withhold_fee")?,
+        )?;
+
+        // Check if the provided signature by Bob is valid for the transaction
+        let tx_withhold_sig = msg
+            .tx_withhold_sig
+            .as_ref()
+            .context("Missing tx_withhold_sig from Bob")?;
+        swap_core::bitcoin::verify_sig(&self.B, &tx_withhold.digest(), tx_withhold_sig)
+            .context("Failed to verify withhold transaction")?;
+
+        // Create TxMercy ourself
+        let tx_mercy = TxMercy::new(
+            &tx_withhold,
+            &self.refund_address,
+            self.tx_mercy_fee
+                .context("missing tx_mercy_fee")?,
+        );
+
+        // Check if the provided signature by Bob is valid for the transaction
+        let tx_mercy_sig = msg
+            .tx_mercy_sig
+            .as_ref()
+            .context("Missing tx_mercy_sig from Bob")?;
+        swap_core::bitcoin::verify_sig(&self.B, &tx_mercy.digest(), tx_mercy_sig)
+            .context("Failed to verify mercy transaction")?;
+
         Ok(State3 {
             a: self.a,
             B: self.B,
@@ -407,8 +649,10 @@ impl State2 {
             v: self.v,
             btc: self.btc,
             xmr: self.xmr,
+            btc_amnesty_amount: self.btc_amnesty_amount,
             cancel_timelock: self.cancel_timelock,
             punish_timelock: self.punish_timelock,
+            remaining_refund_timelock: self.remaining_refund_timelock,
             refund_address: self.refund_address,
             redeem_address: self.redeem_address,
             punish_address: self.punish_address,
@@ -416,10 +660,18 @@ impl State2 {
             tx_punish_sig_bob: msg.tx_punish_sig,
             tx_cancel_sig_bob: msg.tx_cancel_sig,
             tx_early_refund_sig_bob: msg.tx_early_refund_sig.into(),
+            tx_reclaim_sig_bob: msg.tx_reclaim_sig.into(),
             tx_redeem_fee: self.tx_redeem_fee,
             tx_punish_fee: self.tx_punish_fee,
             tx_refund_fee: self.tx_refund_fee,
+            tx_partial_refund_fee: self.tx_partial_refund_fee,
+            tx_reclaim_fee: self.tx_reclaim_fee,
+            tx_withhold_fee: self.tx_withhold_fee,
+            tx_mercy_fee: self.tx_mercy_fee,
             tx_cancel_fee: self.tx_cancel_fee,
+            tx_withhold_sig_bob: msg.tx_withhold_sig,
+            tx_mercy_sig_bob: msg.tx_mercy_sig,
+            should_publish_tx_withhold: self.should_publish_tx_withhold,
         })
     }
 }
@@ -434,11 +686,13 @@ pub struct State3 {
     S_b_monero: monero_oxide_ext::PublicKey,
     S_b_bitcoin: swap_core::bitcoin::PublicKey,
     pub v: monero::PrivateViewKey,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub btc: bitcoin::Amount,
     pub xmr: monero::Amount,
+    pub btc_amnesty_amount: Option<bitcoin::Amount>,
     pub cancel_timelock: CancelTimelock,
     pub punish_timelock: PunishTimelock,
+    #[serde(default)]
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     #[serde(with = "swap_serde::bitcoin::address_serde")]
     refund_address: bitcoin::Address,
     #[serde(with = "swap_serde::bitcoin::address_serde")]
@@ -459,14 +713,34 @@ pub struct State3 {
     /// to wait for the timelock to expire.
     #[serde(default)]
     tx_early_refund_sig_bob: Option<swap_core::bitcoin::Signature>,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
+    /// This field was added in PR [#675](https://github.com/eigenwallet/core/pull/344).
+    /// It is optional to maintain backwards compatibility with old swaps in the database.
+    /// Bob must send this to us during swap setup, in order for us to publish TxReclaim
+    /// in case of a refund. Otherwise Bob will only be partially refunded.
+    #[serde(default)]
+    tx_reclaim_sig_bob: Option<swap_core::bitcoin::Signature>,
     tx_redeem_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_punish_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_refund_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
+    #[serde(default)]
+    pub tx_partial_refund_fee: Option<bitcoin::Amount>,
+    #[serde(default)]
+    pub tx_reclaim_fee: Option<bitcoin::Amount>,
+    #[serde(default)]
+    pub tx_withhold_fee: Option<bitcoin::Amount>,
+    #[serde(default)]
+    pub tx_mercy_fee: Option<bitcoin::Amount>,
     pub tx_cancel_fee: bitcoin::Amount,
+    #[serde(default)]
+    tx_withhold_sig_bob: Option<swap_core::bitcoin::Signature>,
+    #[serde(default)]
+    tx_mercy_sig_bob: Option<swap_core::bitcoin::Signature>,
+    /// Whether Alice should publish TxWithhold to deny Bob's amnesty.
+    /// None = no decision yet (legacy swaps or awaiting controller input)
+    /// Some(false) = don't burn (default for new swaps)
+    /// Some(true) = withhold the amnesty output
+    #[serde(default)]
+    pub should_publish_tx_withhold: Option<bool>,
 }
 
 impl State3 {
@@ -478,12 +752,23 @@ impl State3 {
 
         let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?;
         let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?;
+        // Only check partial refund status if we have the data to construct it
+        // (old swaps won't have these fields)
+        let tx_partial_refund_status =
+            if let (Some(_), Some(_)) = (self.btc_amnesty_amount, self.tx_partial_refund_fee) {
+                let tx = self.tx_partial_refund()?;
+                Some(bitcoin_wallet.status_of_script(&tx).await?)
+            } else {
+                None
+            };
 
         Ok(current_epoch(
             self.cancel_timelock,
             self.punish_timelock,
+            self.remaining_refund_timelock,
             tx_lock_status,
             tx_cancel_status,
+            tx_partial_refund_status,
         ))
     }
 
@@ -513,14 +798,27 @@ impl State3 {
         .expect("valid cancel tx")
     }
 
-    pub fn tx_refund(&self) -> TxRefund {
-        swap_core::bitcoin::TxRefund::new(
+    pub fn tx_refund(&self) -> TxFullRefund {
+        swap_core::bitcoin::TxFullRefund::new(
             &self.tx_cancel(),
             &self.refund_address,
             self.tx_refund_fee,
         )
     }
 
+    pub fn tx_partial_refund(&self) -> Result<TxPartialRefund> {
+        swap_core::bitcoin::TxPartialRefund::new(
+            &self.tx_cancel(),
+            &self.refund_address,
+            self.a.public(),
+            self.B,
+            self.btc_amnesty_amount
+                .context("Missing btc_amnesty_amount")?,
+            self.tx_partial_refund_fee
+                .context("Missing tx_partial_refund_fee")?,
+        )
+    }
+
     pub fn tx_redeem(&self) -> TxRedeem {
         TxRedeem::new(&self.tx_lock, &self.redeem_address, self.tx_redeem_fee)
     }
@@ -533,7 +831,7 @@ impl State3 {
         )
     }
 
-    pub fn extract_monero_private_key(
+    pub fn extract_monero_private_key_from_refund(
         &self,
         signed_refund_tx: Arc<bitcoin::Transaction>,
     ) -> Result<monero_oxide_ext::PrivateKey> {
@@ -549,6 +847,20 @@ impl State3 {
         ))
     }
 
+    pub fn extract_monero_private_key_from_partial_refund(
+        &self,
+        signed_partial_refund_tx: Arc<bitcoin::Transaction>,
+    ) -> Result<monero::PrivateKey> {
+        Ok(monero::PrivateKey::from_scalar(Scalar::from(
+            self.tx_partial_refund()?.extract_monero_private_key(
+                signed_partial_refund_tx,
+                self.s_a.into(),
+                self.a.clone(),
+                self.S_b_bitcoin,
+            )?,
+        )))
+    }
+
     pub async fn check_for_tx_cancel(
         &self,
         bitcoin_wallet: &dyn bitcoin_wallet::BitcoinWallet,
@@ -580,17 +892,93 @@ impl State3 {
         bitcoin_wallet: &dyn bitcoin_wallet::BitcoinWallet,
     ) -> Result<Txid> {
         let transaction = self.signed_cancel_transaction()?;
-        let (tx_id, _) = bitcoin_wallet.broadcast(transaction, "cancel").await?;
+        let (tx_id, _) = bitcoin_wallet
+            .ensure_broadcasted(transaction, "cancel")
+            .await?;
         Ok(tx_id)
     }
 
+    pub fn signed_bitcoin_amnesty_transaction(&self) -> Result<Transaction> {
+        let tx_partial_refund = self.tx_partial_refund()?;
+        let tx_amnesty = TxReclaim::new(
+            &tx_partial_refund,
+            &self.refund_address,
+            self.tx_reclaim_fee
+                .context("Missing tx_reclaim_fee")?,
+            self.remaining_refund_timelock
+                .context("Missing remaining_refund_timelock")?,
+        )?;
+
+        tx_amnesty.complete_as_alice(
+            self.a.clone(),
+            self.B,
+            self.tx_reclaim_sig_bob
+                .clone()
+                .context("missing Bob's signature for TxReclaim")?,
+        )
+    }
+
+    /// Check if we have Bob's signature for TxWithhold.
+    pub fn has_tx_withhold_sig(&self) -> bool {
+        self.tx_withhold_sig_bob.is_some()
+    }
+
+    /// Construct TxWithhold from tx_partial_refund output.
+    pub fn tx_withhold(&self) -> Result<TxWithhold> {
+        TxWithhold::new(
+            &self.tx_partial_refund()?,
+            self.a.public(),
+            self.B,
+            self.tx_withhold_fee
+                .context("Missing tx_withhold_fee")?,
+        )
+    }
+
+    /// Construct signed TxWithhold using Alice's key and Bob's presigned signature.
+    pub fn signed_withhold_transaction(&self) -> Result<Transaction> {
+        let tx_withhold = self.tx_withhold()?;
+
+        tx_withhold.complete_as_alice(
+            self.a.clone(),
+            self.B,
+            self.tx_withhold_sig_bob
+                .clone()
+                .context("missing Bob's signature for TxWithhold")?,
+        )
+    }
+
+    /// Construct TxMercy from tx_withhold output.
+    pub fn tx_mercy(&self) -> Result<TxMercy> {
+        Ok(TxMercy::new(
+            &self.tx_withhold()?,
+            &self.refund_address,
+            self.tx_mercy_fee
+                .context("Missing tx_mercy_fee")?,
+        ))
+    }
+
+    /// Construct signed TxMercy using Alice's key and Bob's presigned signature.
+    pub fn signed_mercy_transaction(&self) -> Result<Transaction> {
+        let tx_mercy = self.tx_mercy()?;
+
+        tx_mercy.complete_as_alice(
+            self.a.clone(),
+            self.B,
+            self.tx_mercy_sig_bob
+                .clone()
+                .context("missing Bob's signature for TxMercy")?,
+        )
+    }
+
     pub async fn punish_btc(
         &self,
         bitcoin_wallet: &dyn bitcoin_wallet::BitcoinWallet,
     ) -> Result<Txid> {
         let signed_tx_punish = self.signed_punish_transaction()?;
 
-        let (txid, subscription) = bitcoin_wallet.broadcast(signed_tx_punish, "punish").await?;
+        let (txid, subscription) = bitcoin_wallet
+            .ensure_broadcasted(signed_tx_punish, "punish")
+            .await?;
         subscription.wait_until_final().await?;
 
         Ok(txid)
@@ -649,17 +1037,25 @@ impl State3 {
         let refund_tx = bitcoin_wallet
             .get_raw_transaction(self.tx_refund().txid())
             .await?;
+        let partial_refund_tx = bitcoin_wallet
+            .get_raw_transaction(self.tx_partial_refund()?.txid())
+            .await?;
 
-        match refund_tx {
-            Some(refund_tx) => {
-                let spend_key = self.extract_monero_private_key(refund_tx)?;
+        match (refund_tx, partial_refund_tx) {
+            (Some(refund_tx), _) => {
+                let spend_key = self.extract_monero_private_key_from_refund(refund_tx)?;
+                Ok(Some(spend_key))
+            }
+            (_, Some(partial_refund_tx)) => {
+                let spend_key =
+                    self.extract_monero_private_key_from_partial_refund(partial_refund_tx)?;
                 Ok(Some(spend_key))
             }
-            None => Ok(None),
+            (None, None) => Ok(None),
         }
     }
 
-    pub async fn watch_for_btc_tx_refund(
+    pub async fn watch_for_btc_tx_full_refund(
         &self,
         bitcoin_wallet: &dyn bitcoin_wallet::BitcoinWallet,
     ) -> Result<monero_oxide_ext::PrivateKey> {
@@ -676,6 +1072,24 @@ impl State3 {
             "Bitcoin refund transaction not found even though we saw it in the mempool previously",
         )
     }
+
+    pub async fn watch_for_btc_tx_partial_refund(
+        &self,
+        bitcoin_wallet: &dyn bitcoin_wallet::BitcoinWallet,
+    ) -> Result<monero::PrivateKey> {
+        let tx_refund_status = bitcoin_wallet
+            .subscribe_to(Box::new(self.tx_partial_refund()?))
+            .await;
+
+        tx_refund_status
+            .wait_until_seen()
+            .await
+            .context("Failed to monitor refund transaction")?;
+
+        self.refund_btc(bitcoin_wallet).await?.context(
+            "Bitcoin refund transaction not found even though we saw it in the mempool previously",
+        )
+    }
 }
 
 pub trait ReservesMonero {
diff --git a/swap-machine/src/bob/mod.rs b/swap-machine/src/bob/mod.rs
index b1c1bc1b4f..b8a41221ab 100644
--- a/swap-machine/src/bob/mod.rs
+++ b/swap-machine/src/bob/mod.rs
@@ -1,11 +1,11 @@
 #![allow(non_snake_case)]
 
-use crate::common::{Message0, Message1, Message2, Message3, Message4, CROSS_CURVE_PROOF_SYSTEM};
-use anyhow::{anyhow, bail, Context, Result};
+use crate::common::{CROSS_CURVE_PROOF_SYSTEM, Message0, Message1, Message2, Message3, Message4};
+use anyhow::{Context, Result, anyhow, bail};
 use bitcoin_wallet::primitives::Subscription;
+use ecdsa_fun::Signature;
 use ecdsa_fun::adaptor::{Adaptor, HashTranscript};
 use ecdsa_fun::nonce::Deterministic;
-use ecdsa_fun::Signature;
 use monero::BlockHeight;
 use rand::{CryptoRng, RngCore};
 use serde::{Deserialize, Serialize};
@@ -14,8 +14,9 @@ use sigma_fun::ext::dl_secp256k1_ed25519_eq::CrossCurveDLEQProof;
 use std::fmt;
 use std::sync::Arc;
 use swap_core::bitcoin::{
-    self, current_epoch, CancelTimelock, ExpiredTimelocks, PunishTimelock, Transaction, TxCancel,
-    TxLock, Txid,
+    self, CancelTimelock, ExpiredTimelocks, PunishTimelock, RemainingRefundTimelock, Transaction,
+    TxCancel, TxFullRefund, TxLock, TxMercy, TxPartialRefund, TxReclaim, TxWithhold, Txid,
+    current_epoch,
 };
 use swap_core::compat::{IntoDalekNg, IntoMoneroOxide};
 use swap_core::monero;
@@ -26,7 +27,6 @@ use uuid::Uuid;
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub enum BobState {
     Started {
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         btc_amount: bitcoin::Amount,
         tx_lock_fee: bitcoin::Amount,
         #[serde(with = "address_serde")]
@@ -71,14 +71,34 @@ pub enum BobState {
         monero_wallet_restore_blockheight: BlockHeight,
     },
     CancelTimelockExpired(State6),
+    BtcCancelPublished(State6),
     BtcCancelled(State6),
     BtcRefundPublished(State6),
     BtcEarlyRefundPublished(State6),
+    BtcPartialRefundPublished(State6),
     BtcRefunded(State6),
     BtcEarlyRefunded(State6),
+    BtcPartiallyRefunded(State6),
+    /// Waiting for RemainingRefundTimelock to expire after partial refund confirmed.
+    /// During this time, Alice may publish TxWithhold.
+    WaitingForReclaimTimelockExpiration(State6),
+    /// RemainingRefundTimelock has expired, we can now publish TxReclaim.
+    ReclaimTimelockExpired(State6),
+    /// Alice published TxWithhold before we could publish TxReclaim.
+    BtcWithholdPublished(State6),
+    /// TxWithhold has been confirmed. The amnesty output is now burnt.
+    BtcWithheld(State6),
+    BtcReclaimPublished(State6),
+    BtcReclaimConfirmed(State6),
+    /// Alice published TxMercy (using our presigned signature) to refund us.
+    BtcMercyPublished(State6),
+    /// TxMercy has been confirmed. We received the burnt funds back.
+    BtcMercyConfirmed(State6),
     XmrRedeemed {
         tx_lock_id: bitcoin::Txid,
     },
+    /// If we do not refund within `PUNISH_TIMELOCK` blocks of either us or alice publishing
+    /// [TxCancel], then alice may punish us by forcibly redeeming the BTC.
     BtcPunished {
         state: State6,
         // TODO: This attribute is redundant and unused
@@ -87,6 +107,52 @@ pub enum BobState {
     SafelyAborted,
 }
 
+/// An enum abstracting over the different combination of
+/// refund signatures Alice could have sent us.
+/// Maintains backward compatibility with old swaps (which only had the full refund signature).
+///
+/// # IMPORTANT
+/// This enum must be `#[untagged]` and maintain the field names in order to be backwards compatible
+/// with the database.
+/// Changing any of that is a breaking change.
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
+#[serde(untagged)]
+pub enum RefundSignatures {
+    /// Alice has only signed the partial refund transaction (most cases).
+    /// Includes the amnesty signature which is always provided in new swaps.
+    Partial {
+        tx_partial_refund_encsig: bitcoin::EncryptedSignature,
+        tx_reclaim_sig: bitcoin::Signature,
+    },
+    /// Alice has signed both the partial and full refund transactions.
+    /// Includes the amnesty signature which is always provided in new swaps.
+    Full {
+        tx_partial_refund_encsig: bitcoin::EncryptedSignature,
+        // Serde rename keeps + untagged + flatten keeps this backwards compatible with old swaps in the database.
+        #[serde(rename = "tx_refund_encsig")]
+        tx_full_refund_encsig: bitcoin::EncryptedSignature,
+        tx_reclaim_sig: bitcoin::Signature,
+    },
+    /// Alice has only signed the full refund transaction.
+    /// This is only used to maintain backwards compatibility for older swaps
+    /// from before the partial refund protocol change.
+    /// See [#675](https://github.com/eigenwallet/core/pull/675).
+    Legacy {
+        // Serde rename keeps + untagged + flatten keeps this backwards compatible with old swaps in the database.
+        #[serde(rename = "tx_refund_encsig")]
+        tx_full_refund_encsig: bitcoin::EncryptedSignature,
+    },
+}
+
+/// Either a full refund or a partial refund
+pub enum RefundType {
+    Full,
+    Partial {
+        total_swap_amount: bitcoin::Amount,
+        btc_amnesty_amount: bitcoin::Amount,
+    },
+}
+
 impl fmt::Display for BobState {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
@@ -107,18 +173,48 @@ impl fmt::Display for BobState {
                 write!(f, "waiting for cancel timelock expiration")
             }
             BobState::CancelTimelockExpired(..) => write!(f, "cancel timelock is expired"),
+            BobState::BtcCancelPublished(..) => write!(f, "btc cancel is published"),
             BobState::BtcCancelled(..) => write!(f, "btc is cancelled"),
             BobState::BtcRefundPublished { .. } => write!(f, "btc refund is published"),
             BobState::BtcEarlyRefundPublished { .. } => write!(f, "btc early refund is published"),
+            BobState::BtcPartialRefundPublished { .. } => {
+                write!(f, "btc partial refund is published")
+            }
             BobState::BtcRefunded(..) => write!(f, "btc is refunded"),
             BobState::XmrRedeemed { .. } => write!(f, "xmr is redeemed"),
             BobState::BtcPunished { .. } => write!(f, "btc is punished"),
             BobState::BtcEarlyRefunded { .. } => write!(f, "btc is early refunded"),
+            BobState::BtcPartiallyRefunded { .. } => write!(f, "btc is partially refunded"),
+            BobState::BtcReclaimPublished { .. } => write!(f, "btc amnesty is published"),
+            BobState::BtcReclaimConfirmed { .. } => write!(f, "btc amnesty is confirmed"),
+            BobState::WaitingForReclaimTimelockExpiration { .. } => {
+                write!(f, "waiting for remaining refund timelock to expire")
+            }
+            BobState::ReclaimTimelockExpired { .. } => {
+                write!(f, "remaining refund timelock expired")
+            }
+            BobState::BtcWithholdPublished { .. } => write!(f, "btc withhold is published"),
+            BobState::BtcWithheld { .. } => write!(f, "btc is withheld"),
+            BobState::BtcMercyPublished { .. } => {
+                write!(f, "btc mercy is published")
+            }
+            BobState::BtcMercyConfirmed { .. } => {
+                write!(f, "btc mercy is confirmed")
+            }
             BobState::SafelyAborted => write!(f, "safely aborted"),
         }
     }
 }
 
+impl fmt::Display for RefundType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            RefundType::Full => write!(f, "full btc refund"),
+            RefundType::Partial { .. } => write!(f, "partial btc refund"),
+        }
+    }
+}
+
 impl BobState {
     /// Fetch the expired timelocks for the swap.
     /// Depending on the State, there are no locks to expire.
@@ -143,12 +239,23 @@ impl BobState {
                 Some(state.expired_timelock(bitcoin_wallet.as_ref()).await?)
             }
             BobState::CancelTimelockExpired(state)
+            | BobState::BtcCancelPublished(state)
             | BobState::BtcCancelled(state)
             | BobState::BtcRefundPublished(state)
-            | BobState::BtcEarlyRefundPublished(state) => {
+            | BobState::BtcEarlyRefundPublished(state)
+            | BobState::BtcPartialRefundPublished(state)
+            | BobState::BtcPartiallyRefunded(state)
+            | BobState::BtcReclaimPublished(state)
+            | BobState::BtcReclaimConfirmed(state)
+            | BobState::WaitingForReclaimTimelockExpiration(state)
+            | BobState::ReclaimTimelockExpired(state)
+            | BobState::BtcWithholdPublished(state)
+            | BobState::BtcWithheld(state)
+            | BobState::BtcMercyPublished(state) => {
                 Some(state.expired_timelock(bitcoin_wallet.as_ref()).await?)
             }
             BobState::BtcPunished { .. } => Some(ExpiredTimelocks::Punish),
+            BobState::BtcMercyConfirmed(_) => Some(ExpiredTimelocks::RemainingRefund),
             BobState::BtcRefunded(_)
             | BobState::BtcEarlyRefunded { .. }
             | BobState::BtcRedeemed(_)
@@ -162,6 +269,8 @@ pub fn is_complete(state: &BobState) -> bool {
         state,
         BobState::BtcRefunded(..)
             | BobState::BtcEarlyRefunded { .. }
+            | BobState::BtcReclaimConfirmed { .. }
+            | BobState::BtcMercyConfirmed { .. }
             | BobState::XmrRedeemed { .. }
             | BobState::SafelyAborted
     )
@@ -181,8 +290,12 @@ pub struct State0 {
     xmr: monero::Amount,
     cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     refund_address: bitcoin::Address,
     min_monero_confirmations: u64,
+    tx_partial_refund_fee: Option<bitcoin::Amount>,
+    tx_reclaim_fee: Option<bitcoin::Amount>,
+    tx_mercy_fee: Option<bitcoin::Amount>,
     tx_refund_fee: bitcoin::Amount,
     tx_cancel_fee: bitcoin::Amount,
     tx_lock_fee: bitcoin::Amount,
@@ -197,8 +310,12 @@ impl State0 {
         xmr: monero::Amount,
         cancel_timelock: CancelTimelock,
         punish_timelock: PunishTimelock,
+        remaining_refund_timelock: RemainingRefundTimelock,
         refund_address: bitcoin::Address,
         min_monero_confirmations: u64,
+        tx_partial_refund_fee: bitcoin::Amount,
+        tx_reclaim_fee: bitcoin::Amount,
+        tx_mercy_fee: bitcoin::Amount,
         tx_refund_fee: bitcoin::Amount,
         tx_cancel_fee: bitcoin::Amount,
         tx_lock_fee: bitcoin::Amount,
@@ -223,16 +340,20 @@ impl State0 {
             dleq_proof_s_b,
             cancel_timelock,
             punish_timelock,
+            remaining_refund_timelock: Some(remaining_refund_timelock),
             refund_address,
             min_monero_confirmations,
+            tx_partial_refund_fee: Some(tx_partial_refund_fee),
+            tx_reclaim_fee: Some(tx_reclaim_fee),
+            tx_mercy_fee: Some(tx_mercy_fee),
             tx_refund_fee,
             tx_cancel_fee,
             tx_lock_fee,
         }
     }
 
-    pub fn next_message(&self) -> Message0 {
-        Message0 {
+    pub fn next_message(&self) -> Result<Message0> {
+        Ok(Message0 {
             swap_id: self.swap_id,
             B: self.b.public(),
             S_b_monero: self.S_b_monero,
@@ -241,8 +362,17 @@ impl State0 {
             v_b: self.v_b,
             refund_address: self.refund_address.clone(),
             tx_refund_fee: self.tx_refund_fee,
+            tx_partial_refund_fee: self
+                .tx_partial_refund_fee
+                .context("tx_partial_refund_fee missing but required to setup swap")?,
+            tx_reclaim_fee: self
+                .tx_reclaim_fee
+                .context("tx_reclaim_fee missing but required to setup swap")?,
+            tx_mercy_fee: self
+                .tx_mercy_fee
+                .context("tx_mercy_fee missing but required to setup swap")?,
             tx_cancel_fee: self.tx_cancel_fee,
-        }
+        })
     }
 
     pub async fn receive(
@@ -278,8 +408,10 @@ impl State0 {
             S_a_bitcoin: msg.S_a_bitcoin,
             v,
             xmr: self.xmr,
+            btc_amnesty_amount: Some(msg.amnesty_amount),
             cancel_timelock: self.cancel_timelock,
             punish_timelock: self.punish_timelock,
+            remaining_refund_timelock: self.remaining_refund_timelock,
             refund_address: self.refund_address,
             redeem_address: msg.redeem_address,
             punish_address: msg.punish_address,
@@ -287,6 +419,10 @@ impl State0 {
             min_monero_confirmations: self.min_monero_confirmations,
             tx_redeem_fee: msg.tx_redeem_fee,
             tx_refund_fee: self.tx_refund_fee,
+            tx_partial_refund_fee: self.tx_partial_refund_fee,
+            tx_reclaim_fee: self.tx_reclaim_fee,
+            tx_withhold_fee: Some(msg.tx_withhold_fee),
+            tx_mercy_fee: self.tx_mercy_fee,
             tx_punish_fee: msg.tx_punish_fee,
             tx_cancel_fee: self.tx_cancel_fee,
         })
@@ -303,13 +439,19 @@ pub struct State1 {
     S_a_bitcoin: bitcoin::PublicKey,
     v: monero::PrivateViewKey,
     xmr: monero::Amount,
+    btc_amnesty_amount: Option<bitcoin::Amount>,
     cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     refund_address: bitcoin::Address,
     redeem_address: bitcoin::Address,
     punish_address: bitcoin::Address,
     tx_lock: bitcoin::TxLock,
     min_monero_confirmations: u64,
+    tx_partial_refund_fee: Option<bitcoin::Amount>,
+    tx_reclaim_fee: Option<bitcoin::Amount>,
+    tx_withhold_fee: Option<bitcoin::Amount>,
+    tx_mercy_fee: Option<bitcoin::Amount>,
     tx_redeem_fee: bitcoin::Amount,
     tx_refund_fee: bitcoin::Amount,
     tx_punish_fee: bitcoin::Amount,
@@ -319,7 +461,7 @@ pub struct State1 {
 impl State1 {
     pub fn next_message(&self) -> Message2 {
         Message2 {
-            psbt: self.tx_lock.clone().into(),
+            tx_lock_psbt: self.tx_lock.clone().into(),
         }
     }
 
@@ -332,16 +474,66 @@ impl State1 {
             self.tx_cancel_fee,
         )?;
 
-        let tx_refund =
-            bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);
-
-        bitcoin::verify_sig(&self.A, &tx_cancel.digest(), &msg.tx_cancel_sig)?;
-        bitcoin::verify_encsig(
-            self.A,
-            bitcoin::PublicKey::from(self.s_b.to_secpfun_scalar()),
-            &tx_refund.digest(),
-            &msg.tx_refund_encsig,
-        )?;
+        // Depending on which signatures we get, verify and store them
+        let refund_signatures = match (
+            msg.tx_full_refund_encsig,
+            msg.tx_partial_refund_encsig,
+            msg.tx_reclaim_sig,
+        ) {
+            // We got the encrypted signature for the full refund - awesome
+            (Some(tx_full_refund_encsig), _, _) => {
+                let tx_full_refund =
+                    TxFullRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);
+                bitcoin::verify_encsig(
+                    self.A,
+                    bitcoin::PublicKey::from(self.s_b.to_secpfun_scalar()),
+                    &tx_full_refund.digest(),
+                    &tx_full_refund_encsig,
+                )
+                .context("Couldn't verify Alice's signature on TxFullRefund")?;
+
+                RefundSignatures::Legacy {
+                    tx_full_refund_encsig,
+                }
+            }
+            // We got the encrypted signatures for the partial refund path.
+            (None, Some(tx_partial_refund_encsig), Some(tx_reclaim_sig)) => {
+                let tx_partial_refund = TxPartialRefund::new(
+                    &tx_cancel,
+                    &self.refund_address,
+                    self.A,
+                    self.b.public(),
+                    self.btc_amnesty_amount
+                        .context("Missing btc_amnesty_amount")?,
+                    self.tx_partial_refund_fee
+                        .context("Missing tx_partial_refund_fee")?,
+                )?;
+                bitcoin::verify_encsig(
+                    self.A,
+                    bitcoin::PublicKey::from(self.s_b.to_secpfun_scalar()),
+                    &tx_partial_refund.digest(),
+                    &tx_partial_refund_encsig,
+                )?;
+
+                let tx_reclaim = TxReclaim::new(
+                    &tx_partial_refund,
+                    &self.refund_address,
+                    self.tx_reclaim_fee
+                        .context("missing tx_reclaim_fee")?,
+                    self.remaining_refund_timelock
+                        .context("missing remaining_refund_timelock")?,
+                )?;
+                bitcoin::verify_sig(&self.A, &tx_reclaim.digest(), &tx_reclaim_sig)?;
+
+                RefundSignatures::Partial {
+                    tx_partial_refund_encsig,
+                    tx_reclaim_sig,
+                }
+            }
+            (_, _, _) => anyhow::bail!(
+                "Alice sent us neither TxFullRefund encsig nor signatures for the partial refund path"
+            ),
+        };
 
         Ok(State2 {
             A: self.A,
@@ -351,17 +543,23 @@ impl State1 {
             S_a_bitcoin: self.S_a_bitcoin,
             v: self.v,
             xmr: self.xmr,
+            btc_amnesty_amount: self.btc_amnesty_amount,
             cancel_timelock: self.cancel_timelock,
             punish_timelock: self.punish_timelock,
+            remaining_refund_timelock: self.remaining_refund_timelock,
             refund_address: self.refund_address,
             redeem_address: self.redeem_address,
             punish_address: self.punish_address,
             tx_lock: self.tx_lock,
             tx_cancel_sig_a: msg.tx_cancel_sig,
-            tx_refund_encsig: msg.tx_refund_encsig,
+            refund_signatures,
             min_monero_confirmations: self.min_monero_confirmations,
             tx_redeem_fee: self.tx_redeem_fee,
             tx_refund_fee: self.tx_refund_fee,
+            tx_partial_refund_fee: self.tx_partial_refund_fee,
+            tx_reclaim_fee: self.tx_reclaim_fee,
+            tx_withhold_fee: self.tx_withhold_fee,
+            tx_mercy_fee: self.tx_mercy_fee,
             tx_punish_fee: self.tx_punish_fee,
             tx_cancel_fee: self.tx_cancel_fee,
         })
@@ -379,8 +577,10 @@ pub struct State2 {
     S_a_bitcoin: bitcoin::PublicKey,
     v: monero::PrivateViewKey,
     pub xmr: monero::Amount,
+    pub btc_amnesty_amount: Option<bitcoin::Amount>,
     pub cancel_timelock: CancelTimelock,
     pub punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     #[serde(with = "address_serde")]
     pub refund_address: bitcoin::Address,
     #[serde(with = "address_serde")]
@@ -389,20 +589,23 @@ pub struct State2 {
     punish_address: bitcoin::Address,
     pub tx_lock: bitcoin::TxLock,
     tx_cancel_sig_a: Signature,
-    tx_refund_encsig: bitcoin::EncryptedSignature,
+    /// This field was changed in [#675](https://github.com/eigenwallet/core/pull/675).
+    /// It boils down to the same json except that it now may also contain a partial refund signature.
+    #[serde(flatten)]
+    pub refund_signatures: RefundSignatures,
     min_monero_confirmations: u64,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     tx_redeem_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     tx_punish_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_refund_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_cancel_fee: bitcoin::Amount,
+    tx_partial_refund_fee: Option<bitcoin::Amount>,
+    tx_reclaim_fee: Option<bitcoin::Amount>,
+    tx_withhold_fee: Option<bitcoin::Amount>,
+    tx_mercy_fee: Option<bitcoin::Amount>,
 }
 
 impl State2 {
-    pub fn next_message(&self) -> Message4 {
+    pub fn next_message(&self) -> Result<Message4> {
         let tx_cancel = TxCancel::new(
             &self.tx_lock,
             self.cancel_timelock,
@@ -427,11 +630,66 @@ impl State2 {
 
         let tx_early_refund_sig = self.b.sign(tx_early_refund.digest());
 
-        Message4 {
+        // We can only construct a valid TxReclaim/TxWithhold/TxMercy when the amnesty amount
+        // is greater than zero. Thus we only send our signatures for them if that is the case.
+        // Alice accepts this because she sent us her signature for TxFullRefund already anyway.
+        let (tx_reclaim_sig, tx_withhold_sig, tx_mercy_sig) =
+            if self.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO) == bitcoin::Amount::ZERO {
+                (None, None, None)
+            } else {
+                let tx_partial_refund = TxPartialRefund::new(
+                    &tx_cancel,
+                    &self.refund_address,
+                    self.A,
+                    self.b.public(),
+                    self.btc_amnesty_amount
+                        .context("missing btc_amnesty_amount")?,
+                    self.tx_partial_refund_fee
+                        .context("missing tx_partial_refund_fee")?,
+                )
+                .context("Couldn't construct TxPartialRefund")?;
+                let tx_reclaim = TxReclaim::new(
+                    &tx_partial_refund,
+                    &self.refund_address,
+                    self.tx_reclaim_fee
+                        .context("Missing tx_reclaim_fee")?,
+                    self.remaining_refund_timelock
+                        .context("missing remaining_refund_timelock")?,
+                )?;
+                let tx_reclaim_sig = self.b.sign(tx_reclaim.digest());
+
+                let tx_withhold = TxWithhold::new(
+                    &tx_partial_refund,
+                    self.A,
+                    self.b.public(),
+                    self.tx_withhold_fee
+                        .context("Missing tx_withhold_fee")?,
+                )?;
+                let tx_withhold_sig = self.b.sign(tx_withhold.digest());
+
+                let tx_mercy = TxMercy::new(
+                    &tx_withhold,
+                    &self.refund_address,
+                    self.tx_mercy_fee
+                        .context("Missing tx_mercy_fee")?,
+                );
+                let tx_mercy_sig = self.b.sign(tx_mercy.digest());
+
+                (
+                    Some(tx_reclaim_sig),
+                    Some(tx_withhold_sig),
+                    Some(tx_mercy_sig),
+                )
+            };
+
+        Ok(Message4 {
             tx_punish_sig,
             tx_cancel_sig,
             tx_early_refund_sig,
-        }
+            tx_reclaim_sig,
+            tx_withhold_sig,
+            tx_mercy_sig,
+        })
     }
 
     pub async fn lock_btc(self) -> Result<(State3, TxLock)> {
@@ -444,16 +702,22 @@ impl State2 {
                 S_a_bitcoin: self.S_a_bitcoin,
                 v: self.v,
                 xmr: self.xmr,
+                btc_amnesty_amount: self.btc_amnesty_amount,
                 cancel_timelock: self.cancel_timelock,
                 punish_timelock: self.punish_timelock,
+                remaining_refund_timelock: self.remaining_refund_timelock,
                 refund_address: self.refund_address,
                 redeem_address: self.redeem_address,
                 tx_lock: self.tx_lock.clone(),
                 tx_cancel_sig_a: self.tx_cancel_sig_a,
-                tx_refund_encsig: self.tx_refund_encsig,
+                refund_signatures: self.refund_signatures,
                 min_monero_confirmations: self.min_monero_confirmations,
                 tx_redeem_fee: self.tx_redeem_fee,
                 tx_refund_fee: self.tx_refund_fee,
+                tx_partial_refund_fee: self.tx_partial_refund_fee,
+                tx_reclaim_fee: self.tx_reclaim_fee,
+                tx_withhold_fee: self.tx_withhold_fee,
+                tx_mercy_fee: self.tx_mercy_fee,
                 tx_cancel_fee: self.tx_cancel_fee,
             },
             self.tx_lock,
@@ -472,21 +736,29 @@ pub struct State3 {
     S_a_bitcoin: bitcoin::PublicKey,
     v: monero::PrivateViewKey,
     xmr: monero::Amount,
+    btc_amnesty_amount: Option<bitcoin::Amount>,
     pub cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     #[serde(with = "address_serde")]
     refund_address: bitcoin::Address,
     #[serde(with = "address_serde")]
     redeem_address: bitcoin::Address,
     pub tx_lock: bitcoin::TxLock,
     tx_cancel_sig_a: Signature,
-    tx_refund_encsig: bitcoin::EncryptedSignature,
+    /// The (encrypted) signatures Alice sent us for the Bitcoin refund transaction(s).
+    ///
+    /// This field was changed in [#675](https://github.com/eigenwallet/core/pull/675).
+    /// It boils down to the same json except that it now may also contain a partial refund signature.
+    #[serde(flatten)]
+    pub refund_signatures: RefundSignatures,
     min_monero_confirmations: u64,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     tx_redeem_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     tx_refund_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
+    tx_partial_refund_fee: Option<bitcoin::Amount>,
+    tx_reclaim_fee: Option<bitcoin::Amount>,
+    tx_withhold_fee: Option<bitcoin::Amount>,
+    tx_mercy_fee: Option<bitcoin::Amount>,
     tx_cancel_fee: bitcoin::Amount,
 }
 
@@ -516,18 +788,24 @@ impl State3 {
             S_a_bitcoin: self.S_a_bitcoin,
             v: self.v,
             xmr: self.xmr,
+            btc_amnesty_amount: self.btc_amnesty_amount,
             cancel_timelock: self.cancel_timelock,
             punish_timelock: self.punish_timelock,
+            remaining_refund_timelock: self.remaining_refund_timelock,
             refund_address: self.refund_address,
             redeem_address: self.redeem_address,
             tx_lock: self.tx_lock,
             tx_cancel_sig_a: self.tx_cancel_sig_a,
-            tx_refund_encsig: self.tx_refund_encsig,
+            refund_signatures: self.refund_signatures,
             monero_wallet_restore_blockheight,
             lock_transfer_proof,
             tx_redeem_fee: self.tx_redeem_fee,
             tx_refund_fee: self.tx_refund_fee,
             tx_cancel_fee: self.tx_cancel_fee,
+            tx_partial_refund_fee: self.tx_partial_refund_fee,
+            tx_reclaim_fee: self.tx_reclaim_fee,
+            tx_withhold_fee: self.tx_withhold_fee,
+            tx_mercy_fee: self.tx_mercy_fee,
         }
     }
 
@@ -540,13 +818,19 @@ impl State3 {
             monero_wallet_restore_blockheight,
             cancel_timelock: self.cancel_timelock,
             punish_timelock: self.punish_timelock,
+            remaining_refund_timelock: self.remaining_refund_timelock,
             refund_address: self.refund_address.clone(),
             tx_lock: self.tx_lock.clone(),
             tx_cancel_sig_a: self.tx_cancel_sig_a.clone(),
-            tx_refund_encsig: self.tx_refund_encsig.clone(),
+            refund_signatures: self.refund_signatures.clone(),
             tx_refund_fee: self.tx_refund_fee,
             tx_cancel_fee: self.tx_cancel_fee,
+            tx_partial_refund_fee: self.tx_partial_refund_fee,
+            tx_reclaim_fee: self.tx_reclaim_fee,
+            tx_withhold_fee: self.tx_withhold_fee,
+            tx_mercy_fee: self.tx_mercy_fee,
             xmr: self.xmr,
+            btc_amnesty_amount: self.btc_amnesty_amount,
         }
     }
 
@@ -568,12 +852,30 @@ impl State3 {
 
         let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?;
         let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?;
+        let tx_partial_refund_status =
+            if let (Some(btc_amnesty_amount), Some(tx_partial_refund_fee)) =
+                (self.btc_amnesty_amount, self.tx_partial_refund_fee)
+            {
+                let tx = TxPartialRefund::new(
+                    &tx_cancel,
+                    &self.refund_address,
+                    self.A,
+                    self.b.public(),
+                    btc_amnesty_amount,
+                    tx_partial_refund_fee,
+                )?;
+                Some(bitcoin_wallet.status_of_script(&tx).await?)
+            } else {
+                None
+            };
 
         Ok(current_epoch(
             self.cancel_timelock,
             self.punish_timelock,
+            self.remaining_refund_timelock,
             tx_lock_status,
             tx_cancel_status,
+            tx_partial_refund_status,
         ))
     }
 
@@ -615,22 +917,29 @@ pub struct State4 {
     S_a_bitcoin: bitcoin::PublicKey,
     v: monero::PrivateViewKey,
     xmr: monero::Amount,
+    btc_amnesty_amount: Option<bitcoin::Amount>,
     pub cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    remaining_refund_timelock: Option<RemainingRefundTimelock>,
     #[serde(with = "address_serde")]
     refund_address: bitcoin::Address,
     #[serde(with = "address_serde")]
     redeem_address: bitcoin::Address,
     pub tx_lock: bitcoin::TxLock,
     tx_cancel_sig_a: Signature,
-    tx_refund_encsig: bitcoin::EncryptedSignature,
+    /// This field was changed in [#675](https://github.com/eigenwallet/core/pull/675).
+    /// It boils down to the same json except that it now may also contain a partial refund signature.
+    #[serde(flatten)]
+    refund_signatures: RefundSignatures,
     monero_wallet_restore_blockheight: BlockHeight,
     lock_transfer_proof: TransferProofMaybeWithTxKey,
     #[serde(with = "::bitcoin::amount::serde::as_sat")]
     tx_redeem_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     tx_refund_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
+    tx_partial_refund_fee: Option<bitcoin::Amount>,
+    tx_reclaim_fee: Option<bitcoin::Amount>,
+    tx_withhold_fee: Option<bitcoin::Amount>,
+    tx_mercy_fee: Option<bitcoin::Amount>,
     tx_cancel_fee: bitcoin::Amount,
 }
 
@@ -658,6 +967,7 @@ impl State4 {
                 s_b: self.s_b,
                 v: self.v,
                 xmr: self.xmr,
+                btc_amnesty_amount: self.btc_amnesty_amount,
                 tx_lock: self.tx_lock.clone(),
                 monero_wallet_restore_blockheight: self.monero_wallet_restore_blockheight,
                 lock_transfer_proof: self.lock_transfer_proof.clone(),
@@ -707,12 +1017,30 @@ impl State4 {
 
         let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?;
         let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?;
+        let tx_partial_refund_status =
+            if let (Some(btc_amnesty_amount), Some(tx_partial_refund_fee)) =
+                (self.btc_amnesty_amount, self.tx_partial_refund_fee)
+            {
+                let tx = TxPartialRefund::new(
+                    &tx_cancel,
+                    &self.refund_address,
+                    self.A,
+                    self.b.public(),
+                    btc_amnesty_amount,
+                    tx_partial_refund_fee,
+                )?;
+                Some(bitcoin_wallet.status_of_script(&tx).await?)
+            } else {
+                None
+            };
 
         Ok(current_epoch(
             self.cancel_timelock,
             self.punish_timelock,
+            self.remaining_refund_timelock,
             tx_lock_status,
             tx_cancel_status,
+            tx_partial_refund_status,
         ))
     }
 
@@ -725,13 +1053,19 @@ impl State4 {
             monero_wallet_restore_blockheight: self.monero_wallet_restore_blockheight,
             cancel_timelock: self.cancel_timelock,
             punish_timelock: self.punish_timelock,
+            remaining_refund_timelock: self.remaining_refund_timelock,
             refund_address: self.refund_address,
             tx_lock: self.tx_lock,
             tx_cancel_sig_a: self.tx_cancel_sig_a,
-            tx_refund_encsig: self.tx_refund_encsig,
+            refund_signatures: self.refund_signatures,
             tx_refund_fee: self.tx_refund_fee,
             tx_cancel_fee: self.tx_cancel_fee,
             xmr: self.xmr,
+            btc_amnesty_amount: self.btc_amnesty_amount,
+            tx_partial_refund_fee: self.tx_partial_refund_fee,
+            tx_reclaim_fee: self.tx_reclaim_fee,
+            tx_withhold_fee: self.tx_withhold_fee,
+            tx_mercy_fee: self.tx_mercy_fee,
         }
     }
 
@@ -748,6 +1082,7 @@ pub struct State5 {
     s_b: monero::Scalar,
     v: monero::PrivateViewKey,
     xmr: monero::Amount,
+    btc_amnesty_amount: Option<bitcoin::Amount>,
     tx_lock: bitcoin::TxLock,
     pub monero_wallet_restore_blockheight: BlockHeight,
     pub lock_transfer_proof: TransferProofMaybeWithTxKey,
@@ -775,18 +1110,27 @@ pub struct State6 {
     s_b: monero::Scalar,
     v: monero::PrivateViewKey,
     pub xmr: monero::Amount,
+    /// How much of the locked Bitcoin will stay locked in case of a partial refund.
+    /// May still be retrieve by publishing the `TxAmnesty` transaction.
+    pub btc_amnesty_amount: Option<bitcoin::Amount>,
     pub monero_wallet_restore_blockheight: BlockHeight,
     pub cancel_timelock: CancelTimelock,
     punish_timelock: PunishTimelock,
+    pub remaining_refund_timelock: Option<RemainingRefundTimelock>,
     #[serde(with = "address_serde")]
     refund_address: bitcoin::Address,
     pub tx_lock: bitcoin::TxLock,
     tx_cancel_sig_a: Signature,
-    tx_refund_encsig: bitcoin::EncryptedSignature,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
+    /// This field was changed in [#675](https://github.com/eigenwallet/core/pull/675).
+    /// It boils down to the same json except that it now may also contain a partial refund signature.
+    #[serde(flatten)]
+    pub refund_signatures: RefundSignatures,
     pub tx_refund_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_cancel_fee: bitcoin::Amount,
+    pub tx_partial_refund_fee: Option<bitcoin::Amount>,
+    pub tx_reclaim_fee: Option<bitcoin::Amount>,
+    pub tx_withhold_fee: Option<bitcoin::Amount>,
+    pub tx_mercy_fee: Option<bitcoin::Amount>,
 }
 
 impl State6 {
@@ -804,12 +1148,23 @@ impl State6 {
 
         let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?;
         let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?;
+        // Only check partial refund status if we have the data to construct it
+        // (old swaps won't have these fields)
+        let tx_partial_refund_status =
+            if let (Some(_), Some(_)) = (self.btc_amnesty_amount, self.tx_partial_refund_fee) {
+                let tx = self.construct_tx_partial_refund()?;
+                Some(bitcoin_wallet.status_of_script(&tx).await?)
+            } else {
+                None
+            };
 
         Ok(current_epoch(
             self.cancel_timelock,
             self.punish_timelock,
+            self.remaining_refund_timelock,
             tx_lock_status,
             tx_cancel_status,
+            tx_partial_refund_status,
         ))
     }
 
@@ -846,39 +1201,69 @@ impl State6 {
             .complete_as_bob(self.A, self.b.clone(), self.tx_cancel_sig_a.clone())
             .context("Failed to complete Bitcoin cancel transaction")?;
 
-        let (tx_id, subscription) = bitcoin_wallet.broadcast(transaction, "cancel").await?;
+        let (tx_id, subscription) = bitcoin_wallet
+            .ensure_broadcasted(transaction, "cancel")
+            .await?;
 
         Ok((tx_id, subscription))
     }
 
-    pub async fn publish_refund_btc(
-        &self,
-        bitcoin_wallet: &dyn bitcoin_wallet::BitcoinWallet,
-    ) -> Result<bitcoin::Txid> {
-        let signed_tx_refund = self.signed_refund_transaction()?;
-        let signed_tx_refund_txid = signed_tx_refund.compute_txid();
-        bitcoin_wallet.broadcast(signed_tx_refund, "refund").await?;
+    /// Construct the best refund transaction based on the refund signatures Alice has sent us.
+    /// This is either `TxFullRefund` or `TxPartialRefund`.
+    /// Returns the fully constructed and signed transaction along with the refund type.
+    pub async fn construct_best_bitcoin_refund_tx(&self) -> Result<(Transaction, RefundType)> {
+        if self.refund_signatures.tx_full_refund_encsig().is_some() {
+            tracing::debug!("Have the full refund signature, constructing full Bitcoin refund");
+            let tx_full_refund = self
+                .signed_full_refund_transaction()
+                .context("Couldn't construct TxFullRefund")?;
+
+            return Ok((tx_full_refund, RefundType::Full));
+        }
+
+        if self.refund_signatures.tx_partial_refund_encsig().is_some() {
+            tracing::debug!(
+                "Don't have the full refund signature, constructing partial Bitcoin refund"
+            );
+
+            let tx_partial_refund = self
+                .signed_partial_refund_transaction()
+                .context("Couldn't construct TxPartialRefund")?;
+            let total_swap_amount = self.tx_lock.lock_amount();
+            let btc_amnesty_amount = self.btc_amnesty_amount.context("Missing Bitcoin amnesty amount even though we don't have the full refund signature")?;
+
+            return Ok((
+                tx_partial_refund,
+                RefundType::Partial {
+                    total_swap_amount,
+                    btc_amnesty_amount,
+                },
+            ));
+        }
 
-        Ok(signed_tx_refund_txid)
+        unreachable!("We always have either the partial or full refund encsig");
     }
 
-    pub fn construct_tx_refund(&self) -> Result<bitcoin::TxRefund> {
+    pub fn construct_tx_refund(&self) -> Result<bitcoin::TxFullRefund> {
         let tx_cancel = self.construct_tx_cancel()?;
 
         let tx_refund =
-            bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);
+            bitcoin::TxFullRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);
 
         Ok(tx_refund)
     }
 
-    pub fn signed_refund_transaction(&self) -> Result<Transaction> {
+    pub fn signed_full_refund_transaction(&self) -> Result<Transaction> {
+        let tx_full_refund_encsig = self.refund_signatures.tx_full_refund_encsig().context(
+            "Can't sign full refund transaction because we don't have the necessary signature",
+        )?;
+
         let tx_refund = self.construct_tx_refund()?;
 
         let adaptor = Adaptor::<HashTranscript<Sha256>, Deterministic<Sha256>>::default();
 
         let sig_b = self.b.sign(tx_refund.digest());
-        let sig_a =
-            adaptor.decrypt_signature(&self.s_b.to_secpfun_scalar(), self.tx_refund_encsig.clone());
+        let sig_a = adaptor.decrypt_signature(&self.s_b.to_secpfun_scalar(), tx_full_refund_encsig);
 
         let signed_tx_refund =
             tx_refund.add_signatures((self.A, sig_a), (self.b.public(), sig_b))?;
@@ -886,6 +1271,92 @@ impl State6 {
         Ok(signed_tx_refund)
     }
 
+    pub fn construct_tx_partial_refund(&self) -> Result<bitcoin::TxPartialRefund> {
+        let tx_cancel = self.construct_tx_cancel()?;
+        bitcoin::TxPartialRefund::new(
+            &tx_cancel,
+            &self.refund_address,
+            self.A,
+            self.b.public(),
+            self.btc_amnesty_amount
+                .context("Can't construct TxPartialRefund because btc_amnesty_amount is missing")?,
+            self.tx_partial_refund_fee.context(
+                "Can't construct TxPartialRefund because tx_partial_refund_fee is missing",
+            )?,
+        )
+    }
+
+    pub fn signed_partial_refund_transaction(&self) -> Result<Transaction> {
+        let tx_partial_refund_encsig = self
+            .refund_signatures
+            .tx_partial_refund_encsig()
+            .context("Can't finalize TxPartialRefund because Alice's encsig is missing")?;
+
+        let tx_partial_refund = self.construct_tx_partial_refund()?;
+
+        let adaptor = Adaptor::<HashTranscript<Sha256>, Deterministic<Sha256>>::default();
+
+        let sig_b = self.b.sign(tx_partial_refund.digest());
+        let sig_a =
+            adaptor.decrypt_signature(&self.s_b.to_secpfun_scalar(), tx_partial_refund_encsig);
+
+        let signed_tx_partial_refund =
+            tx_partial_refund.add_signatures((self.A, sig_a), (self.b.public(), sig_b))?;
+
+        Ok(signed_tx_partial_refund)
+    }
+
+    pub fn signed_amnesty_transaction(&self) -> Result<Transaction> {
+        let tx_amnesty = self.construct_tx_amnesty()?;
+
+        let sig_a = self.refund_signatures.tx_reclaim_sig().context(
+            "Can't sign amnesty transaction because Alice's amnesty signature is missing",
+        )?;
+        let sig_b = self.b.sign(tx_amnesty.digest());
+
+        let signed_tx_amnesty =
+            tx_amnesty.add_signatures((self.A, sig_a), (self.b.public(), sig_b))?;
+
+        Ok(signed_tx_amnesty)
+    }
+
+    pub fn construct_tx_amnesty(&self) -> Result<bitcoin::TxReclaim> {
+        let tx_partial_refund = self.construct_tx_partial_refund()?;
+
+        bitcoin::TxReclaim::new(
+            &tx_partial_refund,
+            &self.refund_address,
+            self.tx_reclaim_fee.context(
+                "Can't construct TxReclaim because tx_reclaim_fee is missing",
+            )?,
+            self.remaining_refund_timelock.context(
+                "Can't construct TxReclaim because remaining_refund_timelock is missing",
+            )?,
+        )
+    }
+
+    pub fn construct_tx_withhold(&self) -> Result<bitcoin::TxWithhold> {
+        let tx_partial_refund = self.construct_tx_partial_refund()?;
+        bitcoin::TxWithhold::new(
+            &tx_partial_refund,
+            self.A,
+            self.b.public(),
+            self.tx_withhold_fee
+                .context("Can't construct TxWithhold because tx_withhold_fee is missing")?,
+        )
+    }
+
+    pub fn construct_tx_mercy(&self) -> Result<bitcoin::TxMercy> {
+        let tx_withhold = self.construct_tx_withhold()?;
+        Ok(bitcoin::TxMercy::new(
+            &tx_withhold,
+            &self.refund_address,
+            self.tx_mercy_fee.context(
+                "Can't construct TxMercy because tx_mercy_fee is missing",
+            )?,
+        ))
+    }
+
     pub fn construct_tx_early_refund(&self) -> bitcoin::TxEarlyRefund {
         bitcoin::TxEarlyRefund::new(&self.tx_lock, &self.refund_address, self.tx_refund_fee)
     }
@@ -907,6 +1378,7 @@ impl State6 {
             s_b: self.s_b,
             v: self.v,
             xmr: self.xmr,
+            btc_amnesty_amount: self.btc_amnesty_amount,
             tx_lock: self.tx_lock.clone(),
             monero_wallet_restore_blockheight: self.monero_wallet_restore_blockheight,
             lock_transfer_proof,
@@ -927,3 +1399,75 @@ impl State6 {
         Ok(tx)
     }
 }
+
+impl RefundSignatures {
+    pub fn from_possibly_full_refund_sig(
+        partial_refund_encsig: bitcoin::EncryptedSignature,
+        full_refund_encsig: Option<bitcoin::EncryptedSignature>,
+        reclaim_sig: bitcoin::Signature,
+    ) -> Self {
+        if let Some(full_refund_encsig) = full_refund_encsig {
+            Self::Full {
+                tx_partial_refund_encsig: partial_refund_encsig,
+                tx_full_refund_encsig: full_refund_encsig,
+                tx_reclaim_sig: reclaim_sig,
+            }
+        } else {
+            Self::Partial {
+                tx_partial_refund_encsig: partial_refund_encsig,
+                tx_reclaim_sig: reclaim_sig,
+            }
+        }
+    }
+
+    pub fn tx_full_refund_encsig(&self) -> Option<bitcoin::EncryptedSignature> {
+        match self {
+            RefundSignatures::Partial { .. } => None,
+            RefundSignatures::Full {
+                tx_full_refund_encsig,
+                ..
+            } => Some(tx_full_refund_encsig.clone()),
+            RefundSignatures::Legacy {
+                tx_full_refund_encsig,
+            } => Some(tx_full_refund_encsig.clone()),
+        }
+    }
+
+    pub fn tx_partial_refund_encsig(&self) -> Option<bitcoin::EncryptedSignature> {
+        match self {
+            RefundSignatures::Partial {
+                tx_partial_refund_encsig,
+                ..
+            } => Some(tx_partial_refund_encsig.clone()),
+            RefundSignatures::Full {
+                tx_partial_refund_encsig,
+                ..
+            } => Some(tx_partial_refund_encsig.clone()),
+            RefundSignatures::Legacy { .. } => None,
+        }
+    }
+
+    /// Returns Alice's signature for the amnesty transaction.
+    /// Only available for new swaps (Partial/Full variants), not Legacy swaps.
+    pub fn tx_reclaim_sig(&self) -> Option<bitcoin::Signature> {
+        match self {
+            RefundSignatures::Partial {
+                tx_reclaim_sig,
+                ..
+            } => Some(tx_reclaim_sig.clone()),
+            RefundSignatures::Full {
+                tx_reclaim_sig,
+                ..
+            } => Some(tx_reclaim_sig.clone()),
+            RefundSignatures::Legacy { .. } => None,
+        }
+    }
+
+    pub fn has_full_refund_encsig(&self) -> bool {
+        self.tx_full_refund_encsig().is_some()
+    }
+
+    pub fn has_partial_refund_encsig(&self) -> bool {
+        self.tx_partial_refund_encsig().is_some()
+    }
+}
diff --git a/swap-machine/src/common/mod.rs b/swap-machine/src/common/mod.rs
index 4cfc614495..f55b0c66a0 100644
--- a/swap-machine/src/common/mod.rs
+++ b/swap-machine/src/common/mod.rs
@@ -1,14 +1,15 @@
-use crate::alice::is_complete as alice_is_complete;
 use crate::alice::AliceState;
-use crate::bob::is_complete as bob_is_complete;
+use crate::alice::is_complete as alice_is_complete;
 use crate::bob::BobState;
-use anyhow::Result;
+use crate::bob::is_complete as bob_is_complete;
+use anyhow::{Result, bail};
 use async_trait::async_trait;
 use libp2p::{Multiaddr, PeerId};
+use rust_decimal::prelude::FromPrimitive;
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
-use sigma_fun::ext::dl_secp256k1_ed25519_eq::{CrossCurveDLEQ, CrossCurveDLEQProof};
 use sigma_fun::HashTranscript;
+use sigma_fun::ext::dl_secp256k1_ed25519_eq::{CrossCurveDLEQ, CrossCurveDLEQProof};
 use std::convert::TryInto;
 use std::sync::LazyLock;
 use swap_core::bitcoin;
@@ -35,10 +36,11 @@ pub struct Message0 {
     pub v_b: monero::PrivateViewKey,
     #[serde(with = "swap_serde::bitcoin::address_serde")]
     pub refund_address: bitcoin::Address,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_refund_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
+    pub tx_partial_refund_fee: bitcoin::Amount,
+    pub tx_reclaim_fee: bitcoin::Amount,
     pub tx_cancel_fee: bitcoin::Amount,
+    pub tx_mercy_fee: bitcoin::Amount,
 }
 
 #[allow(non_snake_case)]
@@ -53,23 +55,30 @@ pub struct Message1 {
     pub redeem_address: bitcoin::Address,
     #[serde(with = "swap_serde::bitcoin::address_serde")]
     pub punish_address: bitcoin::Address,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_redeem_fee: bitcoin::Amount,
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_punish_fee: bitcoin::Amount,
+    /// The amount of Bitcoin that Bob not get refunded unless Alice decides so.
+    /// Introduced in [#675](https://github.com/eigenwallet/core/pull/675) to combat spam.
+    pub amnesty_amount: bitcoin::Amount,
+    pub tx_withhold_fee: bitcoin::Amount,
 }
 
 #[allow(non_snake_case)]
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Message2 {
-    pub psbt: bitcoin::PartiallySignedTransaction,
+    pub tx_lock_psbt: bitcoin::PartiallySignedTransaction,
 }
 
 #[allow(non_snake_case)]
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Message3 {
     pub tx_cancel_sig: bitcoin::Signature,
-    pub tx_refund_encsig: bitcoin::EncryptedSignature,
+    // The following fields were reworked in [#675](https://github.com/eigenwallet/core/pull/675).
+    // Alice will send either the full refund encsig or signatures for both partial refund
+    // and tx refund amnesty.
+    pub tx_full_refund_encsig: Option<bitcoin::EncryptedSignature>,
+    pub tx_partial_refund_encsig: Option<bitcoin::EncryptedSignature>,
+    pub tx_reclaim_sig: Option<bitcoin::Signature>,
 }
 
 #[allow(non_snake_case)]
@@ -78,6 +87,98 @@ pub struct Message4 {
     pub tx_punish_sig: bitcoin::Signature,
     pub tx_cancel_sig: bitcoin::Signature,
     pub tx_early_refund_sig: bitcoin::Signature,
+    pub tx_reclaim_sig: Option<bitcoin::Signature>,
+    pub tx_withhold_sig: Option<bitcoin::Signature>,
+    pub tx_mercy_sig: Option<bitcoin::Signature>,
+}
+
+/// Validates that a proposed transaction fee is between
+/// [`bitcoin_wallet::MIN_ABSOLUTE_TX_FEE`] and 3× the `conservative_estimated_fee`.
+pub fn sanity_check_transaction_fee(
+    fee: bitcoin::Amount,
+    conservative_estimated_fee: bitcoin::Amount,
+) -> Result<()> {
+    if fee < bitcoin_wallet::MIN_ABSOLUTE_TX_FEE {
+        bail!(
+            "Fee ({fee}) is below the minimum relay fee ({})",
+            bitcoin_wallet::MIN_ABSOLUTE_TX_FEE,
+        );
+    }
+
+    let ceiling = conservative_estimated_fee.to_sat().saturating_mul(3);
+    if fee.to_sat() > ceiling {
+        bail!("Fee ({fee}) exceeds 3x the conservative estimate ({conservative_estimated_fee})",);
+    }
+
+    Ok(())
+}
+
+/// Number of transactions in the withhold path (TxPartialRefund + TxWithhold + TxMercy).
+pub const NUM_WITHHOLD_PATH_TXS: u64 = 3;
+
+#[derive(Clone, Debug, thiserror::Error)]
+pub enum SanityCheckError {
+    #[error("Anti-spam deposit ({amount}) doesn't cover fees (minimum: {minimum_to_cover_fees})")]
+    AntiSpamDepositTooSmall {
+        amount: bitcoin::Amount,
+        minimum_to_cover_fees: bitcoin::Amount,
+    },
+    #[error("Anti-spam deposit ratio ({ratio}) exceeds maximum accepted ({max_accepted_ratio})")]
+    AntiSpamDepositRatioTooHigh {
+        ratio: rust_decimal::Decimal,
+        max_accepted_ratio: rust_decimal::Decimal,
+    },
+}
+
+/// Validates that the amnesty amount is within sane bounds.
+///
+/// - If amnesty is zero, this is a full-refund swap and no checks are needed.
+/// - Otherwise, the amnesty must cover all transaction fees that could be spent
+///   from it (TxPartialRefund + TxReclaim, or TxPartialRefund + TxWithhold + TxMercy).
+/// - The amnesty ratio (amnesty / lock amount) must not exceed
+///   [`swap_env::config::MAX_ANTI_SPAM_DEPOSIT_RATIO`].
+pub fn sanity_check_amnesty_amount(
+    lock_amount: bitcoin::Amount,
+    amnesty_amount: bitcoin::Amount,
+    tx_partial_refund_fee: bitcoin::Amount,
+    tx_reclaim_fee: bitcoin::Amount,
+    tx_withhold_fee: bitcoin::Amount,
+    tx_mercy_fee: bitcoin::Amount,
+) -> std::result::Result<(), SanityCheckError> {
+    if amnesty_amount == bitcoin::Amount::ZERO {
+        return Ok(());
+    }
+
+    let reclaim_path = tx_partial_refund_fee + tx_reclaim_fee;
+    if amnesty_amount <= reclaim_path {
+        return Err(SanityCheckError::AntiSpamDepositTooSmall {
+            amount: amnesty_amount,
+            minimum_to_cover_fees: reclaim_path,
+        });
+    }
+
+    let withhold_path = tx_partial_refund_fee + tx_withhold_fee + tx_mercy_fee;
+    if amnesty_amount <= withhold_path {
+        return Err(SanityCheckError::AntiSpamDepositTooSmall {
+            amount: amnesty_amount,
+            minimum_to_cover_fees: withhold_path,
+        });
+    }
+
+    let amnesty_sats = rust_decimal::Decimal::from_u64(amnesty_amount.to_sat())
+        .expect("amnesty sats to fit in Decimal");
+    let lock_sats =
+        rust_decimal::Decimal::from_u64(lock_amount.to_sat()).expect("lock sats to fit in Decimal");
+    let ratio = amnesty_sats / lock_sats;
+
+    if ratio > swap_env::config::MAX_ANTI_SPAM_DEPOSIT_RATIO {
+        return Err(SanityCheckError::AntiSpamDepositRatioTooHigh {
+            ratio,
+            max_accepted_ratio: swap_env::config::MAX_ANTI_SPAM_DEPOSIT_RATIO,
+        });
+    }
+
+    Ok(())
 }
 
 #[allow(clippy::large_enum_variant)]
@@ -157,6 +258,26 @@ pub trait Database {
     async fn get_state(&self, swap_id: Uuid) -> Result<State>;
     async fn get_states(&self, swap_id: Uuid) -> Result<Vec<State>>;
     async fn all(&self) -> Result<Vec<(Uuid, State)>>;
+
+    /// Returns the current (latest) state and the starting state for a swap.
+    async fn get_current_and_starting_state(&self, swap_id: Uuid) -> Result<(State, State)> {
+        use anyhow::Context;
+
+        let states = self
+            .get_states(swap_id)
+            .await
+            .context("Error fetching all states of swap from database")?;
+        let starting = states.first().cloned().context("No states found")?;
+        let current = states.last().cloned().context("No states found")?;
+
+        // Sanity check: both states must be from the same role
+        match (&current, &starting) {
+            (State::Alice(_), State::Alice(_)) | (State::Bob(_), State::Bob(_)) => {}
+            _ => anyhow::bail!("Current and starting states have mismatched roles"),
+        }
+
+        Ok((current, starting))
+    }
     async fn insert_buffered_transfer_proof(
         &self,
         swap_id: Uuid,
@@ -168,3 +289,65 @@ pub trait Database {
     ) -> Result<Option<monero::TransferProof>>;
     async fn has_swap(&self, swap_id: Uuid) -> Result<bool>;
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use bitcoin_wallet::{MIN_ABSOLUTE_TX_FEE, MIN_ABSOLUTE_TX_FEE_SATS};
+
+    /// 1 BTC lock amount.
+    const LOCK: bitcoin::Amount = bitcoin::Amount::from_sat(100_000_000);
+    const FEE: bitcoin::Amount = MIN_ABSOLUTE_TX_FEE;
+    /// Withhold path: TxPartialRefund + TxWithhold + TxMercy (the binding constraint when all fees are equal).
+    const WITHHOLD_PATH: u64 = MIN_ABSOLUTE_TX_FEE_SATS * NUM_WITHHOLD_PATH_TXS;
+    /// 20% of LOCK (the upper bound).
+    const RATIO_CEILING: u64 = 20_000_000;
+
+    #[test]
+    fn zero_amnesty_always_passes() {
+        sanity_check_amnesty_amount(LOCK, bitcoin::Amount::ZERO, FEE, FEE, FEE, FEE)
+            .expect("zero amnesty should always pass");
+    }
+
+    #[test]
+    fn reject_amnesty_below_withhold_path() {
+        let amnesty = bitcoin::Amount::from_sat(WITHHOLD_PATH - 1);
+        sanity_check_amnesty_amount(LOCK, amnesty, FEE, FEE, FEE, FEE)
+            .expect_err("amnesty below withhold path fees should be rejected");
+    }
+
+    #[test]
+    fn reject_amnesty_equal_to_withhold_path() {
+        let amnesty = bitcoin::Amount::from_sat(WITHHOLD_PATH);
+        sanity_check_amnesty_amount(LOCK, amnesty, FEE, FEE, FEE, FEE)
+            .expect_err("amnesty equal to withhold path fees should be rejected");
+    }
+
+    #[test]
+    fn pass_amnesty_above_withhold_path() {
+        let amnesty = bitcoin::Amount::from_sat(WITHHOLD_PATH + 1);
+        sanity_check_amnesty_amount(LOCK, amnesty, FEE, FEE, FEE, FEE)
+            .expect("amnesty above withhold path fees should pass");
+    }
+
+    #[test]
+    fn pass_medium_amnesty() {
+        let amnesty = bitcoin::Amount::from_sat(10_000_000);
+        sanity_check_amnesty_amount(LOCK, amnesty, FEE, FEE, FEE, FEE)
+            .expect("10% amnesty should pass");
+    }
+
+    #[test]
+    fn pass_amnesty_at_ratio_ceiling() {
+        let amnesty = bitcoin::Amount::from_sat(RATIO_CEILING);
+        sanity_check_amnesty_amount(LOCK, amnesty, FEE, FEE, FEE, FEE)
+            .expect("amnesty exactly at 20% ratio should pass");
+    }
+
+    #[test]
+    fn reject_amnesty_above_ratio_ceiling() {
+        let amnesty = bitcoin::Amount::from_sat(RATIO_CEILING + 1);
+        sanity_check_amnesty_amount(LOCK, amnesty, FEE, FEE, FEE, FEE)
+            .expect_err("amnesty above 20% ratio should be rejected");
+    }
+}
diff --git a/swap-machine/src/lib.rs b/swap-machine/src/lib.rs
index c7c738fd39..27c9130b1a 100644
--- a/swap-machine/src/lib.rs
+++ b/swap-machine/src/lib.rs
@@ -25,6 +25,8 @@ mod tests {
             .await;
         let spending_fee = Amount::from_sat(1_000);
         let btc_amount = Amount::from_sat(500_000);
+        let btc_amnesty_amount = Amount::from_sat(100_000);
+        let should_publish_tx_refund = false;
         let xmr_amount = swap_core::monero::primitives::Amount::from_pico(10000);
 
         let tx_redeem_fee = alice_wallet
@@ -47,11 +49,14 @@ mod tests {
         let alice_state0 = alice::State0::new(
             btc_amount,
             xmr_amount,
+            btc_amnesty_amount,
             config,
             redeem_address,
             punish_address,
             tx_redeem_fee,
             tx_punish_fee,
+            spending_fee,
+            should_publish_tx_refund,
             &mut OsRng,
         );
 
@@ -62,17 +67,21 @@ mod tests {
             xmr_amount,
             CancelTimelock::new(config.bitcoin_cancel_timelock),
             PunishTimelock::new(config.bitcoin_punish_timelock),
+            RemainingRefundTimelock::new(config.bitcoin_remaining_refund_timelock),
             bob_wallet.new_address().await.unwrap(),
             config.monero_finality_confirmations,
             spending_fee,
             spending_fee,
+            spending_fee,
+            spending_fee,
+            spending_fee,
             tx_lock_fee,
         );
 
-        let message0 = bob_state0.next_message();
+        let message0 = bob_state0.next_message().unwrap();
 
         let (_, alice_state1) = alice_state0.receive(message0).unwrap();
-        let alice_message1 = alice_state1.next_message();
+        let alice_message1 = alice_state1.next_message().unwrap();
 
         let bob_state1 = bob_state0
             .receive(&bob_wallet, alice_message1)
@@ -81,10 +90,10 @@ mod tests {
         let bob_message2 = bob_state1.next_message();
 
         let alice_state2 = alice_state1.receive(bob_message2).unwrap();
-        let alice_message3 = alice_state2.next_message();
+        let alice_message3 = alice_state2.next_message().unwrap();
 
         let bob_state2 = bob_state1.receive(alice_message3).unwrap();
-        let bob_message4 = bob_state2.next_message();
+        let bob_message4 = bob_state2.next_message().unwrap();
 
         let alice_state3 = alice_state2.receive(bob_message4).unwrap();
 
@@ -106,12 +115,16 @@ mod tests {
         let redeem_transaction = alice_state3
             .signed_redeem_transaction(encrypted_signature)
             .unwrap();
-        let refund_transaction = bob_state6.signed_refund_transaction().unwrap();
+        let refund_transaction = bob_state6.signed_full_refund_transaction().unwrap();
 
         assert_weight(redeem_transaction, TxRedeem::weight().to_wu(), "TxRedeem");
         assert_weight(cancel_transaction, TxCancel::weight().to_wu(), "TxCancel");
         assert_weight(punish_transaction, TxPunish::weight().to_wu(), "TxPunish");
-        assert_weight(refund_transaction, TxRefund::weight().to_wu(), "TxRefund");
+        assert_weight(
+            refund_transaction,
+            TxFullRefund::weight().to_wu(),
+            "TxRefund",
+        );
 
         // Test TxEarlyRefund transaction
         let early_refund_transaction = alice_state3
@@ -135,6 +148,8 @@ mod tests {
             .await;
         let spending_fee = Amount::from_sat(1_000);
         let btc_amount = Amount::from_sat(500_000);
+        let btc_amnesty_amount = Amount::from_sat(100_000);
+        let should_publish_tx_refund = false;
         let xmr_amount = swap_core::monero::primitives::Amount::from_pico(10000);
 
         let tx_redeem_fee = alice_wallet
@@ -153,11 +168,14 @@ mod tests {
         let alice_state0 = alice::State0::new(
             btc_amount,
             xmr_amount,
+            btc_amnesty_amount,
             config,
             refund_address.clone(),
             punish_address,
             tx_redeem_fee,
             tx_punish_fee,
+            spending_fee,
+            should_publish_tx_refund,
             &mut OsRng,
         );
 
@@ -168,17 +186,21 @@ mod tests {
             xmr_amount,
             CancelTimelock::new(config.bitcoin_cancel_timelock),
             PunishTimelock::new(config.bitcoin_punish_timelock),
+            RemainingRefundTimelock::new(config.bitcoin_remaining_refund_timelock),
             bob_wallet.new_address().await.unwrap(),
             config.monero_finality_confirmations,
             spending_fee,
             spending_fee,
             spending_fee,
+            spending_fee,
+            spending_fee,
+            spending_fee,
         );
 
         // Complete the state machine up to State3
-        let message0 = bob_state0.next_message();
+        let message0 = bob_state0.next_message().unwrap();
         let (_, alice_state1) = alice_state0.receive(message0).unwrap();
-        let alice_message1 = alice_state1.next_message();
+        let alice_message1 = alice_state1.next_message().unwrap();
 
         let bob_state1 = bob_state0
             .receive(&bob_wallet, alice_message1)
@@ -187,10 +209,10 @@ mod tests {
         let bob_message2 = bob_state1.next_message();
 
         let alice_state2 = alice_state1.receive(bob_message2).unwrap();
-        let alice_message3 = alice_state2.next_message();
+        let alice_message3 = alice_state2.next_message().unwrap();
 
         let bob_state2 = bob_state1.receive(alice_message3).unwrap();
-        let bob_message4 = bob_state2.next_message();
+        let bob_message4 = bob_state2.next_message().unwrap();
 
         let alice_state3 = alice_state2.receive(bob_message4).unwrap();
 
diff --git a/swap-orchestrator/Cargo.toml b/swap-orchestrator/Cargo.toml
index d62ade629f..651de7f106 100644
--- a/swap-orchestrator/Cargo.toml
+++ b/swap-orchestrator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-orchestrator"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [[bin]]
diff --git a/swap-orchestrator/src/lib.rs b/swap-orchestrator/src/lib.rs
index 8b20132996..719099c42a 100644
--- a/swap-orchestrator/src/lib.rs
+++ b/swap-orchestrator/src/lib.rs
@@ -1,3 +1,9 @@
 pub mod compose;
 pub mod containers;
 pub mod images;
+
+use anyhow as _;
+use dialoguer as _;
+use swap_env as _;
+use toml as _;
+use url as _;
diff --git a/swap-orchestrator/src/main.rs b/swap-orchestrator/src/main.rs
index cc4746dc2a..b992962220 100644
--- a/swap-orchestrator/src/main.rs
+++ b/swap-orchestrator/src/main.rs
@@ -3,9 +3,11 @@ mod containers;
 mod images;
 mod prompt;
 
+use swap_orchestrator as _;
+
 use crate::compose::{
-    IntoSpec, OrchestratorDirectories, OrchestratorImage, OrchestratorImages, OrchestratorInput,
-    OrchestratorNetworks, ASB_DATA_DIR, DOCKER_COMPOSE_FILE,
+    ASB_DATA_DIR, DOCKER_COMPOSE_FILE, IntoSpec, OrchestratorDirectories, OrchestratorImage,
+    OrchestratorImages, OrchestratorInput, OrchestratorNetworks,
 };
 use std::path::PathBuf;
 use swap_env::config::{
@@ -193,6 +195,7 @@ fn main() {
                 price_ticker_ws_url_bitfinex: defaults.price_ticker_ws_url_bitfinex,
                 price_ticker_rest_url_kucoin: defaults.price_ticker_rest_url_kucoin,
                 external_bitcoin_redeem_address: None,
+                refund_policy: defaults.refund_policy,
                 developer_tip,
             },
         };
diff --git a/swap-orchestrator/tests/spec.rs b/swap-orchestrator/tests/spec.rs
index 94a874945e..a24a882031 100644
--- a/swap-orchestrator/tests/spec.rs
+++ b/swap-orchestrator/tests/spec.rs
@@ -1,3 +1,5 @@
+#![allow(unused_crate_dependencies)]
+
 use swap_orchestrator::compose::{
     IntoSpec, OrchestratorDirectories, OrchestratorImage, OrchestratorImages, OrchestratorInput,
     OrchestratorNetworks, OrchestratorPorts,
diff --git a/swap-p2p/Cargo.toml b/swap-p2p/Cargo.toml
index 30c7ff0274..adf0ee152a 100644
--- a/swap-p2p/Cargo.toml
+++ b/swap-p2p/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-p2p"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [dependencies]
@@ -16,6 +16,7 @@ swap-serde = { path = "../swap-serde" }
 async-trait = { workspace = true, optional = true }
 libp2p = { workspace = true, features = ["serde", "request-response", "rendezvous", "cbor", "json", "ping", "identify"] }
 
+
 # Serialization
 asynchronous-codec = "0.7.0"
 serde = { workspace = true }
@@ -27,6 +28,7 @@ unsigned-varint = { version = "0.8.0", features = ["codec", "asynchronous_codec"
 bitcoin = { workspace = true }
 monero-address = { workspace = true }
 rand = { workspace = true }
+rust_decimal = { workspace = true }
 
 # Utils
 anyhow = { workspace = true }
@@ -56,5 +58,11 @@ test-support = ["libp2p/noise", "libp2p/tcp", "libp2p/yamux", "libp2p/tokio", "l
 async-trait = { workspace = true }
 libp2p = { workspace = true, features = ["serde", "request-response", "rendezvous", "cbor", "json", "ping", "identify", "noise", "tcp", "yamux", "tokio", "dns"] }
 
+# Networking (for the example)
+libp2p-tor = { workspace = true  }
+tor-rtcompat = { workspace = true  }
+arti-client = {workspace = true  }
+tracing-subscriber = { workspace = true  }
+
 [lints]
 workspace = true
diff --git a/swap-p2p/examples/fetch_quotes.rs b/swap-p2p/examples/fetch_quotes.rs
index 23a0a5ba58..5ebdf7d283 100644
--- a/swap-p2p/examples/fetch_quotes.rs
+++ b/swap-p2p/examples/fetch_quotes.rs
@@ -1,22 +1,20 @@
+#![allow(unused_crate_dependencies)]
+
 use anyhow::Result;
-use arti_client::{config::TorClientConfigBuilder, TorClient};
+use arti_client::{TorClient, config::TorClientConfigBuilder};
 use futures::StreamExt;
 use libp2p::core::muxing::StreamMuxerBox;
 use libp2p::core::transport::Boxed;
 use libp2p::core::upgrade::Version;
-use libp2p::multiaddr::Protocol;
-use libp2p::swarm::dial_opts::DialOpts;
 use libp2p::swarm::NetworkBehaviour;
+use libp2p::{PeerId, SwarmBuilder, Transport, identity, yamux};
 use libp2p::{dns, tcp};
-use libp2p::{identify, noise, ping, request_response};
-use libp2p::{identity, yamux, Multiaddr, PeerId, SwarmBuilder, Transport};
+use libp2p::{identify, noise, ping};
 use libp2p_tor::{AddressConversion, TorTransport};
-use std::collections::{HashMap, VecDeque};
 use std::sync::Arc;
 use std::time::Duration;
 use swap_p2p::libp2p_ext::MultiAddrExt;
-use swap_p2p::protocols::quote::BidQuote;
-use swap_p2p::protocols::{quote, quotes_cached, rendezvous};
+use swap_p2p::protocols::{quotes_cached, rendezvous};
 use tor_rtcompat::tokio::TokioRustlsRuntime;
 
 const USE_TOR: bool = true;
@@ -130,7 +128,7 @@ async fn main() -> Result<()> {
         match event {
             libp2p::swarm::SwarmEvent::Behaviour(event) => match event {
                 BehaviourEvent::Rendezvous(event) => match event {
-                    rendezvous::discovery::Event::DiscoveredPeer { peer_id } => {}
+                    rendezvous::discovery::Event::DiscoveredPeer { .. } => {}
                 },
                 BehaviourEvent::Quote(quotes_cached::Event::CachedQuotes { quotes }) => {
                     println!("================");
@@ -150,7 +148,7 @@ async fn main() -> Result<()> {
                 }
                 _ => {}
             },
-            libp2p::swarm::SwarmEvent::ConnectionEstablished { peer_id, .. } => {}
+            libp2p::swarm::SwarmEvent::ConnectionEstablished { .. } => {}
             _ => {}
         }
     }
diff --git a/swap-p2p/src/out_event/alice.rs b/swap-p2p/src/out_event/alice.rs
index ada6c61189..51642300a9 100644
--- a/swap-p2p/src/out_event/alice.rs
+++ b/swap-p2p/src/out_event/alice.rs
@@ -1,10 +1,10 @@
-use libp2p::{identify, ping};
 use libp2p::{
+    PeerId,
     request_response::{
         InboundFailure, InboundRequestId, OutboundFailure, OutboundRequestId, ResponseChannel,
     },
-    PeerId,
 };
+use libp2p::{identify, ping};
 use uuid::Uuid;
 
 use crate::protocols::rendezvous;
@@ -16,8 +16,14 @@ use crate::protocols::{
 #[derive(Debug)]
 pub enum OutEvent {
     SwapSetupInitiated {
-        send_wallet_snapshot:
-            bmrng::RequestReceiver<bitcoin::Amount, swap_setup::alice::WalletSnapshot>,
+        // run_swap_setup in connection handler sends us the amount of
+        // Bitcoin Bob wants to send.
+        // We respond with a snapshot of our wallets and how much of that
+        // should go into the amnesty output
+        send_wallet_snapshot: bmrng::RequestReceiver<
+            bitcoin::Amount,
+            (swap_setup::alice::WalletSnapshot, bitcoin::Amount, bool),
+        >,
     },
     SwapSetupCompleted {
         peer_id: PeerId,
diff --git a/swap-p2p/src/protocols/quote.rs b/swap-p2p/src/protocols/quote.rs
index bdb06613f0..430a6652d7 100644
--- a/swap-p2p/src/protocols/quote.rs
+++ b/swap-p2p/src/protocols/quote.rs
@@ -1,16 +1,48 @@
 use crate::out_event;
 use libp2p::request_response::{self, ProtocolSupport};
 use libp2p::{PeerId, StreamProtocol};
+use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 use swap_core::bitcoin;
+use swap_env::config::RefundPolicy;
 use typeshare::typeshare;
 
-pub(crate) const PROTOCOL: &str = "/comit/xmr/btc/bid-quote/1.0.0";
+pub(crate) const PROTOCOL: &str = "/comit/xmr/btc/bid-quote/2.0.0";
 pub type OutEvent = request_response::Event<(), BidQuote>;
 pub type Message = request_response::Message<(), BidQuote>;
 
 pub type Behaviour = request_response::json::Behaviour<(), BidQuote>;
 
+/// The refund policy that will apply if the swap is cancelled.
+/// Communicated in quotes so takers know the terms upfront.
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash)]
+#[serde(tag = "type", content = "content")]
+#[typeshare]
+pub enum RefundPolicyWire {
+    /// Taker receives 100% of their Bitcoin back on refund.
+    FullRefund,
+    /// Taker receives a partial refund; the remainder goes to an amnesty output
+    /// that the maker may or may not release later.
+    PartialRefund {
+        /// Ratio (0.0-1.0) of Bitcoin that goes into the anti-spam deposit
+        /// and may be withheld by the maker.
+        #[typeshare(serialized_as = "number")]
+        anti_spam_deposit_ratio: Decimal,
+    },
+}
+
+impl From<RefundPolicy> for RefundPolicyWire {
+    fn from(policy: RefundPolicy) -> Self {
+        if policy.anti_spam_deposit_ratio == Decimal::ONE {
+            RefundPolicyWire::FullRefund
+        } else {
+            RefundPolicyWire::PartialRefund {
+                anti_spam_deposit_ratio: policy.anti_spam_deposit_ratio,
+            }
+        }
+    }
+}
+
 #[derive(Debug, Clone, Copy, Default)]
 pub struct BidQuoteProtocol;
 
@@ -25,17 +57,16 @@ impl AsRef<str> for BidQuoteProtocol {
 #[typeshare]
 pub struct BidQuote {
     /// The price at which the maker is willing to buy at.
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     #[typeshare(serialized_as = "number")]
     pub price: bitcoin::Amount,
     /// The minimum quantity the maker is willing to buy.
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     #[typeshare(serialized_as = "number")]
     pub min_quantity: bitcoin::Amount,
     /// The maximum quantity the maker is willing to buy.
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     #[typeshare(serialized_as = "number")]
     pub max_quantity: bitcoin::Amount,
+    /// The refund policy that will apply if the swap is cancelled.
+    pub refund_policy: RefundPolicyWire,
     /// Monero "ReserveProofV2" which proves that Alice has the funds to fulfill the quote.
     /// See "Zero to Monero" section 8.1.6 for more details.
     ///
@@ -50,6 +81,7 @@ impl BidQuote {
         price: bitcoin::Amount::ZERO,
         min_quantity: bitcoin::Amount::ZERO,
         max_quantity: bitcoin::Amount::ZERO,
+        refund_policy: RefundPolicyWire::FullRefund,
         reserve_proof: None,
     };
 }
diff --git a/swap-p2p/src/protocols/swap_setup.rs b/swap-p2p/src/protocols/swap_setup.rs
index 1d50b4a16b..2feb567eb5 100644
--- a/swap-p2p/src/protocols/swap_setup.rs
+++ b/swap-p2p/src/protocols/swap_setup.rs
@@ -18,7 +18,7 @@ pub mod protocol {
     use libp2p::swarm::Stream;
     use void::Void;
 
-    use super::vendor_from_fn::{from_fn, FromFnUpgrade};
+    use super::vendor_from_fn::{FromFnUpgrade, from_fn};
 
     pub fn new() -> SwapSetup {
         from_fn(
@@ -43,7 +43,6 @@ pub struct BlockchainNetwork {
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct SpotPriceRequest {
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub btc: bitcoin::Amount,
     pub blockchain_network: BlockchainNetwork,
 }
@@ -54,23 +53,53 @@ pub enum SpotPriceResponse {
     Error(SpotPriceError),
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, thiserror::Error)]
+pub enum SwapSetupError {
+    #[error("Anti-spam deposit ({amount}) doesn't cover fees (minimum: {minimum_to_cover_fees})")]
+    AntiSpamDepositTooSmall {
+        amount: bitcoin::Amount,
+        minimum_to_cover_fees: bitcoin::Amount,
+    },
+    #[error("Anti-spam deposit ratio ({ratio}) exceeds maximum accepted ({max_accepted_ratio})")]
+    AntiSpamDepositRatioTooHigh {
+        ratio: rust_decimal::Decimal,
+        max_accepted_ratio: rust_decimal::Decimal,
+    },
+}
+
+impl From<swap_machine::common::SanityCheckError> for SwapSetupError {
+    fn from(err: swap_machine::common::SanityCheckError) -> Self {
+        match err {
+            swap_machine::common::SanityCheckError::AntiSpamDepositTooSmall {
+                amount,
+                minimum_to_cover_fees,
+            } => SwapSetupError::AntiSpamDepositTooSmall {
+                amount,
+                minimum_to_cover_fees,
+            },
+            swap_machine::common::SanityCheckError::AntiSpamDepositRatioTooHigh {
+                ratio,
+                max_accepted_ratio,
+            } => SwapSetupError::AntiSpamDepositRatioTooHigh {
+                ratio,
+                max_accepted_ratio,
+            },
+        }
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum SpotPriceError {
     NoSwapsAccepted,
     AmountBelowMinimum {
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         min: bitcoin::Amount,
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         buy: bitcoin::Amount,
     },
     AmountAboveMaximum {
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         max: bitcoin::Amount,
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         buy: bitcoin::Amount,
     },
     BalanceTooLow {
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         buy: bitcoin::Amount,
     },
     BlockchainNetworkMismatch {
@@ -88,7 +117,7 @@ fn codec() -> unsigned_varint::codec::UviBytes<Bytes> {
     codec
 }
 
-pub async fn read_cbor_message<T>(stream: &mut Stream) -> Result<T>
+pub async fn read_cbor_message<T>(stream: &mut Stream) -> Result<Result<T, SwapSetupError>>
 where
     T: DeserializeOwned,
 {
@@ -100,8 +129,8 @@ where
         .context("Failed to read length-prefixed message from stream")??;
 
     let mut de = serde_cbor::Deserializer::from_slice(&bytes);
-    let message =
-        T::deserialize(&mut de).context("Failed to deserialize bytes into message using CBOR")?;
+    let message = Result::<T, SwapSetupError>::deserialize(&mut de)
+        .context("Failed to deserialize bytes into message using CBOR")?;
 
     Ok(message)
 }
@@ -110,8 +139,24 @@ pub async fn write_cbor_message<T>(stream: &mut Stream, message: T) -> Result<()
 where
     T: Serialize,
 {
-    let bytes =
-        serde_cbor::to_vec(&message).context("Failed to serialize message as bytes using CBOR")?;
+    let wrapped = Ok::<_, SwapSetupError>(message);
+    let bytes = serde_cbor::to_vec(&wrapped)
+        .context("Failed to serialize message as bytes using CBOR")?;
+
+    let mut frame = Framed::new(stream, codec());
+
+    frame
+        .send(Bytes::from(bytes))
+        .await
+        .context("Failed to write bytes as length-prefixed message")?;
+
+    Ok(())
+}
+
+pub async fn write_cbor_error(stream: &mut Stream, error: SwapSetupError) -> Result<()> {
+    let wrapped = Err::<(), _>(error);
+    let bytes = serde_cbor::to_vec(&wrapped)
+        .context("Failed to serialize error as bytes using CBOR")?;
 
     let mut frame = Framed::new(stream, codec());
 
diff --git a/swap-p2p/src/protocols/swap_setup/alice.rs b/swap-p2p/src/protocols/swap_setup/alice.rs
index a84a825d67..9bfb7f22c1 100644
--- a/swap-p2p/src/protocols/swap_setup/alice.rs
+++ b/swap-p2p/src/protocols/swap_setup/alice.rs
@@ -1,14 +1,14 @@
 use crate::out_event;
 use crate::protocols::swap_setup;
 use crate::protocols::swap_setup::{
-    protocol, BlockchainNetwork, SpotPriceError, SpotPriceRequest, SpotPriceResponse,
+    BlockchainNetwork, SpotPriceError, SpotPriceRequest, SpotPriceResponse, protocol,
 };
-use anyhow::{anyhow, Context, Result};
-use futures::future::BoxFuture;
-use futures::stream::FuturesUnordered;
+use anyhow::{Context, Result, anyhow};
 use futures::AsyncWriteExt;
 use futures::FutureExt;
 use futures::StreamExt;
+use futures::future::BoxFuture;
+use futures::stream::FuturesUnordered;
 use libp2p::core::upgrade;
 use libp2p::swarm::handler::ConnectionEvent;
 use libp2p::swarm::{ConnectionHandler, ConnectionId};
@@ -29,7 +29,8 @@ use uuid::Uuid;
 #[allow(clippy::large_enum_variant)]
 pub enum OutEvent {
     Initiated {
-        send_wallet_snapshot: bmrng::RequestReceiver<bitcoin::Amount, WalletSnapshot>,
+        send_wallet_snapshot:
+            bmrng::RequestReceiver<bitcoin::Amount, (WalletSnapshot, bitcoin::Amount, bool)>,
     },
     Completed {
         peer_id: PeerId,
@@ -54,6 +55,7 @@ pub struct WalletSnapshot {
 
     redeem_fee: bitcoin::Amount,
     punish_fee: bitcoin::Amount,
+    withhold_fee: bitcoin::Amount,
 }
 
 impl WalletSnapshot {
@@ -63,6 +65,7 @@ impl WalletSnapshot {
         punish_address: bitcoin::Address,
         redeem_fee: bitcoin::Amount,
         punish_fee: bitcoin::Amount,
+        withhold_fee: bitcoin::Amount,
     ) -> Self {
         Self {
             unlocked_balance,
@@ -71,6 +74,7 @@ impl WalletSnapshot {
             punish_address,
             redeem_fee,
             punish_fee,
+            withhold_fee,
         }
     }
 }
@@ -259,7 +263,7 @@ impl<LR> Handler<LR> {
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub enum HandlerOutEvent {
-    Initiated(bmrng::RequestReceiver<bitcoin::Amount, WalletSnapshot>),
+    Initiated(bmrng::RequestReceiver<bitcoin::Amount, (WalletSnapshot, bitcoin::Amount, bool)>),
     Completed(Result<(Uuid, State3)>),
 }
 
@@ -290,13 +294,13 @@ where
     ) {
         match event {
             ConnectionEvent::FullyNegotiatedInbound(substream) => {
-                let mut substream = substream.protocol;
+                let substream = substream.protocol;
 
                 let (sender, receiver) =
-                    bmrng::channel_with_timeout::<bitcoin::Amount, WalletSnapshot>(
-                        1,
-                        crate::defaults::SWAP_SETUP_CHANNEL_TIMEOUT,
-                    );
+                    bmrng::channel_with_timeout::<
+                        bitcoin::Amount,
+                        (WalletSnapshot, bitcoin::Amount, bool),
+                    >(1, crate::defaults::SWAP_SETUP_CHANNEL_TIMEOUT);
 
                 let resume_only = self.resume_only;
                 let min_buy = self.min_buy;
@@ -305,141 +309,20 @@ where
                 let env_config = self.env_config;
 
                 // We wrap the entire handshake in a timeout future
-                let protocol = tokio::time::timeout(self.negotiation_timeout, async move {
-                    let request = swap_setup::read_cbor_message::<SpotPriceRequest>(&mut substream)
-                        .await
-                        .context("Failed to read spot price request")?;
-
-                    let wallet_snapshot = sender
-                        .send_receive(request.btc)
-                        .await
-                        .context("Failed to receive wallet snapshot")?;
-
-                    // wrap all of these into another future so we can `return` from all the
-                    // different blocks
-                    let validate = async {
-                        if resume_only {
-                            return Err(Error::ResumeOnlyMode);
-                        };
-
-                        let blockchain_network = BlockchainNetwork {
-                            bitcoin: env_config.bitcoin_network,
-                            monero: env_config.monero_network,
-                        };
-
-                        if request.blockchain_network != blockchain_network {
-                            return Err(Error::BlockchainNetworkMismatch {
-                                cli: request.blockchain_network,
-                                asb: blockchain_network,
-                            });
-                        }
-
-                        let btc = request.btc;
-
-                        if btc < min_buy {
-                            return Err(Error::AmountBelowMinimum {
-                                min: min_buy,
-                                buy: btc,
-                            });
-                        }
-
-                        if btc > max_buy {
-                            return Err(Error::AmountAboveMaximum {
-                                max: max_buy,
-                                buy: btc,
-                            });
-                        }
-
-                        let rate =
-                            latest_rate.map_err(|e| Error::LatestRateFetchFailed(Box::new(e)))?;
-                        let xmr = rate
-                            .sell_quote(btc)
-                            .map_err(Error::SellQuoteCalculationFailed)?;
-
-                        let unlocked = wallet_snapshot.unlocked_balance;
-
-                        let needed_balance = xmr + wallet_snapshot.lock_fee.into();
-                        if unlocked.as_pico() < needed_balance.as_pico() {
-                            tracing::warn!(
-                                unlocked_balance = %unlocked,
-                                needed_balance = %needed_balance,
-                                "Rejecting swap, unlocked balance too low"
-                            );
-                            return Err(Error::BalanceTooLow {
-                                balance: wallet_snapshot.unlocked_balance,
-                                buy: btc,
-                            });
-                        }
-
-                        Ok(xmr)
-                    };
-
-                    let result = validate.await;
-
-                    let converted_result = match result {
-                        Ok(xmr) => Ok(xmr.into()),
-                        Err(e) => Err(e),
-                    };
-                    swap_setup::write_cbor_message(
-                        &mut substream,
-                        SpotPriceResponse::from_result_ref(&converted_result),
-                    )
-                    .await
-                    .context("Failed to write spot price response")?;
-
-                    let xmr = converted_result?;
-
-                    let state0 = State0::new(
-                        request.btc,
-                        xmr,
+                let protocol = tokio::time::timeout(
+                    self.negotiation_timeout,
+                    run_swap_setup(
+                        substream,
+                        sender,
+                        resume_only,
                         env_config,
-                        wallet_snapshot.redeem_address,
-                        wallet_snapshot.punish_address,
-                        wallet_snapshot.redeem_fee,
-                        wallet_snapshot.punish_fee,
-                        &mut rand::thread_rng(),
-                    );
-
-                    let message0 = swap_setup::read_cbor_message::<Message0>(&mut substream)
-                        .await
-                        .context("Failed to read message0")?;
-                    let (swap_id, state1) = state0
-                        .receive(message0)
-                        .context("Failed to transition state0 -> state1 using message0")?;
-
-                    swap_setup::write_cbor_message(&mut substream, state1.next_message())
-                        .await
-                        .context("Failed to send message1")?;
-
-                    let message2 = swap_setup::read_cbor_message::<Message2>(&mut substream)
-                        .await
-                        .context("Failed to read message2")?;
-                    let state2 = state1
-                        .receive(message2)
-                        .context("Failed to transition state1 -> state2 using message2")?;
-
-                    swap_setup::write_cbor_message(&mut substream, state2.next_message())
-                        .await
-                        .context("Failed to send message3")?;
-
-                    let message4 = swap_setup::read_cbor_message::<Message4>(&mut substream)
-                        .await
-                        .context("Failed to read message4")?;
-                    let state3 = state2
-                        .receive(message4)
-                        .context("Failed to transition state2 -> state3 using message4")?;
-
-                    substream
-                        .flush()
-                        .await
-                        .context("Failed to flush substream after all messages were sent")?;
-                    substream
-                        .close()
-                        .await
-                        .context("Failed to close substream after all messages were sent")?;
-
-                    Ok((swap_id, state3))
-                });
+                        min_buy,
+                        max_buy,
+                        latest_rate.map_err(|error| {
+                            Box::new(error) as Box<dyn std::error::Error + Send + Sync + 'static>
+                        }),
+                    ),
+                );
 
                 let max_seconds = self.negotiation_timeout.as_secs();
                 self.inbound_streams.push(
@@ -560,3 +443,178 @@ impl Error {
         }
     }
 }
+
+async fn run_swap_setup(
+    mut substream: libp2p::swarm::Stream,
+    sender: bmrng::RequestSender<bitcoin::Amount, (WalletSnapshot, bitcoin::Amount, bool)>,
+    resume_only: bool,
+    env_config: env::Config,
+    min_buy: bitcoin::Amount,
+    max_buy: bitcoin::Amount,
+    latest_rate: Result<swap_feed::Rate, Box<dyn std::error::Error + Send + Sync + 'static>>,
+) -> Result<(Uuid, State3)> {
+    let request = swap_setup::read_cbor_message::<SpotPriceRequest>(&mut substream)
+        .await
+        .context("Failed to read spot price request")?
+        .context("Peer sent an error instead of spot price request")?;
+
+    let (wallet_snapshot, btc_amnesty_amount, should_burn_on_refund) = sender
+        .send_receive(request.btc)
+        .await
+        .context("Failed to receive wallet snapshot")?;
+
+    // wrap all of these into another future so we can `return` from all the
+    // different blocks
+    let validate = async {
+        if resume_only {
+            return Err(Error::ResumeOnlyMode);
+        };
+
+        let blockchain_network = BlockchainNetwork {
+            bitcoin: env_config.bitcoin_network,
+            monero: env_config.monero_network,
+        };
+
+        if request.blockchain_network != blockchain_network {
+            return Err(Error::BlockchainNetworkMismatch {
+                cli: request.blockchain_network,
+                asb: blockchain_network,
+            });
+        }
+
+        let btc = request.btc;
+
+        if btc < min_buy {
+            return Err(Error::AmountBelowMinimum {
+                min: min_buy,
+                buy: btc,
+            });
+        }
+
+        if btc > max_buy {
+            return Err(Error::AmountAboveMaximum {
+                max: max_buy,
+                buy: btc,
+            });
+        }
+
+        let rate = latest_rate.map_err(Error::LatestRateFetchFailed)?;
+        let xmr = rate
+            .sell_quote(btc)
+            .map_err(Error::SellQuoteCalculationFailed)?;
+
+        let unlocked = wallet_snapshot.unlocked_balance;
+
+        let needed_balance = xmr + wallet_snapshot.lock_fee.into();
+        if unlocked.as_pico() < needed_balance.as_pico() {
+            tracing::warn!(
+                unlocked_balance = %unlocked,
+                needed_balance = %needed_balance,
+                "Rejecting swap, unlocked balance too low"
+            );
+            return Err(Error::BalanceTooLow {
+                balance: wallet_snapshot.unlocked_balance,
+                buy: btc,
+            });
+        }
+
+        Ok(xmr)
+    };
+
+    let result = validate.await;
+
+    let converted_result = match result {
+        Ok(xmr) => Ok(xmr.into()),
+        Err(e) => Err(e),
+    };
+    swap_setup::write_cbor_message(
+        &mut substream,
+        SpotPriceResponse::from_result_ref(&converted_result),
+    )
+    .await
+    .context("Failed to write spot price response")?;
+
+    let xmr = converted_result?;
+
+    let state0 = State0::new(
+        request.btc,
+        xmr,
+        btc_amnesty_amount,
+        env_config,
+        wallet_snapshot.redeem_address,
+        wallet_snapshot.punish_address,
+        wallet_snapshot.redeem_fee,
+        wallet_snapshot.punish_fee,
+        wallet_snapshot.withhold_fee,
+        should_burn_on_refund,
+        &mut rand::thread_rng(),
+    );
+
+    let message0 = swap_setup::read_cbor_message::<Message0>(&mut substream)
+        .await
+        .context("Failed to read message0")?
+        .context("Peer sent an error instead of message0")?;
+
+    if let Err(sanity_err) = swap_machine::common::sanity_check_amnesty_amount(
+        request.btc,
+        btc_amnesty_amount,
+        message0.tx_partial_refund_fee,
+        message0.tx_reclaim_fee,
+        wallet_snapshot.withhold_fee,
+        message0.tx_mercy_fee,
+    ) {
+        if let Err(err) =
+            swap_setup::write_cbor_error(&mut substream, sanity_err.clone().into()).await
+        {
+            tracing::error!(error=%err, "Couldn't send error message to Bob after encountering it, closing connection");
+        };
+        return Err(sanity_err).context("Amnesty sanity check failed");
+    }
+
+    let (swap_id, state1) = state0
+        .receive(message0)
+        .context("Failed to transition state0 -> state1 using message0")?;
+
+    swap_setup::write_cbor_message(
+        &mut substream,
+        state1
+            .next_message()
+            .context("Couldn't construct Mesage1")?,
+    )
+    .await
+    .context("Failed to send message1")?;
+
+    let message2 = swap_setup::read_cbor_message::<Message2>(&mut substream)
+        .await
+        .context("Failed to read message2")?
+        .context("Peer sent an error instead of message2")?;
+    let state2 = state1
+        .receive(message2)
+        .context("Failed to transition state1 -> state2 using message2")?;
+
+    swap_setup::write_cbor_message(
+        &mut substream,
+        state2.next_message().context("Couldn't produce Message3")?,
+    )
+    .await
+    .context("Failed to send message3")?;
+
+    let message4 = swap_setup::read_cbor_message::<Message4>(&mut substream)
+        .await
+        .context("Failed to read message4")?
+        .context("Peer sent an error instead of message4")?;
+    let state3 = state2
+        .receive(message4)
+        .context("Failed to transition state2 -> state3 using message4")?;
+
+    substream
+        .flush()
+        .await
+        .context("Failed to flush substream after all messages were sent")?;
+    substream
+        .close()
+        .await
+        .context("Failed to close substream after all messages were sent")?;
+
+    Ok((swap_id, state3))
+}
diff --git a/swap-p2p/src/protocols/swap_setup/bob.rs b/swap-p2p/src/protocols/swap_setup/bob.rs
index 3e9284ada1..78220cf1c5 100644
--- a/swap-p2p/src/protocols/swap_setup/bob.rs
+++ b/swap-p2p/src/protocols/swap_setup/bob.rs
@@ -1,7 +1,7 @@
 use crate::futures_util::FuturesHashSet;
 use crate::out_event;
 use crate::protocols::swap_setup::{
-    protocol, BlockchainNetwork, SpotPriceError, SpotPriceResponse,
+    BlockchainNetwork, SpotPriceError, SpotPriceResponse, protocol,
 };
 use anyhow::{Context, Result};
 use bitcoin_wallet::BitcoinWallet;
@@ -25,7 +25,7 @@ use swap_machine::bob::{State0, State2};
 use swap_machine::common::{Message1, Message3};
 use uuid::Uuid;
 
-use super::{read_cbor_message, write_cbor_message, SpotPriceRequest};
+use super::{SpotPriceRequest, read_cbor_message, write_cbor_error, write_cbor_message};
 
 // TODO: This should use redial::Behaviour to keep connections alive for peers with queued requests
 // TODO: Do not use swap_id as key inside the ConnectionHandler, use another key
@@ -174,7 +174,10 @@ impl NetworkBehaviour for Behaviour {
                 result,
             });
         } else {
-            debug_assert!(false, "Received a swap setup result from a connection handler for which we have no inflight request stored");
+            debug_assert!(
+                false,
+                "Received a swap setup result from a connection handler for which we have no inflight request stored"
+            );
         }
     }
 
@@ -326,6 +329,9 @@ pub struct NewSwap {
     pub btc: bitcoin::Amount,
     pub tx_lock_fee: bitcoin::Amount,
     pub tx_refund_fee: bitcoin::Amount,
+    pub tx_partial_refund_fee: bitcoin::Amount,
+    pub tx_reclaim_fee: bitcoin::Amount,
+    pub tx_mercy_fee: bitcoin::Amount,
     pub tx_cancel_fee: bitcoin::Amount,
     pub bitcoin_refund_address: bitcoin::Address,
 }
@@ -381,9 +387,12 @@ impl ConnectionHandler for Handler {
                     let result =
                         run_swap_setup(&mut substream, info, env_config, bitcoin_wallet).await;
 
-                    result.map_err(|err: anyhow::Error| {
-                        tracing::error!(?err, "Error occurred during swap setup protocol");
-                        Error::Protocol(format!("{:?}", err))
+                    result.map_err(|err| match err {
+                        SetupError::Rejected(reason) => Error::SwapRejected(reason),
+                        SetupError::Transient(e) => {
+                            tracing::error!(?e, "Error occurred during swap setup protocol");
+                            Error::Protocol(format!("{:?}", e))
+                        }
                     })
                 });
 
@@ -401,7 +410,10 @@ impl ConnectionHandler for Handler {
                 // In poll(..), we ensure that we never dispatch multiple concurrent swap setup requests for the same swap on the same ConnectionHandler
                 // This invariant should therefore never be violated
                 // TODO: Is this truly true?
-                assert!(!did_replace_existing_future, "Replacing an existing inflight swap setup request is not allowed. We should have checked for this invariant before instructing the Behaviour to start a substream.");
+                assert!(
+                    !did_replace_existing_future,
+                    "Replacing an existing inflight swap setup request is not allowed. We should have checked for this invariant before instructing the Behaviour to start a substream."
+                );
             }
             libp2p::swarm::handler::ConnectionEvent::DialUpgradeError(
                 libp2p::swarm::handler::DialUpgradeError { info, error },
@@ -462,7 +474,10 @@ impl ConnectionHandler for Handler {
                 );
 
                 // TODO: Potentially make this a production assert
-                debug_assert!(false, "Multiple concurrent swap setup requests with the same swap id are not allowed.");
+                debug_assert!(
+                    false,
+                    "Multiple concurrent swap setup requests with the same swap id are not allowed."
+                );
 
                 continue;
             }
@@ -478,7 +493,10 @@ impl ConnectionHandler for Handler {
                 );
 
                 // TODO: Potentially make this a production assert
-                debug_assert!(false, "Multiple concurrent substream negotiations for the same swap id are not allowed.");
+                debug_assert!(
+                    false,
+                    "Multiple concurrent substream negotiations for the same swap id are not allowed."
+                );
 
                 continue;
             }
@@ -512,13 +530,33 @@ impl ConnectionHandler for Handler {
     }
 }
 
+/// Distinguishes permanent rejections from transient errors during swap setup.
+enum SetupError {
+    /// The peer (or our own sanity check) explicitly rejected the swap.
+    Rejected(String),
+    /// A transient error (network, serialization, etc.) that may succeed on retry.
+    Transient(anyhow::Error),
+}
+
+impl From<anyhow::Error> for SetupError {
+    fn from(err: anyhow::Error) -> Self {
+        SetupError::Transient(err)
+    }
+}
+
+impl From<Error> for SetupError {
+    fn from(err: Error) -> Self {
+        SetupError::Transient(err.into())
+    }
+}
+
 // TODO: This is protocol and should be moved to another crate (probably swap-machine, swap-core or swap)
 async fn run_swap_setup(
     mut substream: &mut libp2p::swarm::Stream,
     new_swap_request: NewSwap,
     env_config: env::Config,
     bitcoin_wallet: Arc<dyn BitcoinWallet>,
-) -> Result<State2> {
+) -> Result<State2, SetupError> {
     // Here we request the spot price from Alice
     write_cbor_message(
         &mut substream,
@@ -533,14 +571,11 @@ async fn run_swap_setup(
     .await
     .context("Failed to send spot price request to Alice")?;
 
-    // Here we read the spot price response from Alice
-    // The outer ? checks if Alice responded with an error (SpotPriceError)
     let xmr = Result::from(
-        // The inner ? is for the read_cbor_message function
-        // It will return an error if the deserialization fails
         read_cbor_message::<SpotPriceResponse>(&mut substream)
             .await
-            .context("Failed to read spot price response from Alice")?,
+            .context("Failed to read spot price response from Alice")?
+            .context("Peer sent an error instead of spot price response")?,
     )?;
 
     tracing::trace!(
@@ -557,8 +592,12 @@ async fn run_swap_setup(
         xmr,
         env_config.bitcoin_cancel_timelock.into(),
         env_config.bitcoin_punish_timelock.into(),
+        env_config.bitcoin_remaining_refund_timelock.into(),
         new_swap_request.bitcoin_refund_address.clone(),
         env_config.monero_finality_confirmations,
+        new_swap_request.tx_partial_refund_fee,
+        new_swap_request.tx_reclaim_fee,
+        new_swap_request.tx_mercy_fee,
         new_swap_request.tx_refund_fee,
         new_swap_request.tx_cancel_fee,
         new_swap_request.tx_lock_fee,
@@ -569,12 +608,34 @@ async fn run_swap_setup(
         "Transitioned into state0 during swap setup",
     );
 
-    write_cbor_message(&mut substream, state0.next_message())
-        .await
-        .context("Failed to send state0 message to Alice")?;
-    let message1 = read_cbor_message::<Message1>(&mut substream)
+    write_cbor_message(
+        &mut substream,
+        state0
+            .next_message()
+            .context("Couldn't generate Message0")?,
+    )
+    .await
+    .context("Failed to send state0 message to Alice")?;
+    let message1 = match read_cbor_message::<Message1>(&mut substream)
         .await
-        .context("Failed to read message1 from Alice")?;
+        .context("Failed to read message1 from Alice")?
+    {
+        Ok(msg) => msg,
+        Err(setup_err) => return Err(SetupError::Rejected(setup_err.to_string())),
+    };
+
+    if let Err(sanity_err) = swap_machine::common::sanity_check_amnesty_amount(
+        new_swap_request.btc,
+        message1.amnesty_amount,
+        new_swap_request.tx_partial_refund_fee,
+        new_swap_request.tx_reclaim_fee,
+        message1.tx_withhold_fee,
+        new_swap_request.tx_mercy_fee,
+    ) {
+        let _ = write_cbor_error(&mut substream, sanity_err.clone().into()).await;
+        return Err(SetupError::Rejected(sanity_err.to_string()));
+    }
+
     let state1 = state0
         .receive(bitcoin_wallet.as_ref(), message1)
         .await
@@ -588,9 +649,13 @@ async fn run_swap_setup(
     write_cbor_message(&mut substream, state1.next_message())
         .await
         .context("Failed to send state1 message")?;
-    let message3 = read_cbor_message::<Message3>(&mut substream)
+    let message3 = match read_cbor_message::<Message3>(&mut substream)
         .await
-        .context("Failed to read message3 from Alice")?;
+        .context("Failed to read message3 from Alice")?
+    {
+        Ok(msg) => msg,
+        Err(setup_err) => return Err(SetupError::Rejected(setup_err.to_string())),
+    };
     let state2 = state1
         .receive(message3)
         .context("Failed to receive state2")?;
@@ -600,9 +665,14 @@ async fn run_swap_setup(
         "Transitioned into state2 during swap setup",
     );
 
-    write_cbor_message(&mut substream, state2.next_message())
-        .await
-        .context("Failed to send state2 message")?;
+    write_cbor_message(
+        &mut substream,
+        state2
+            .next_message()
+            .context("Couldn't construct Message4")?,
+    )
+    .await
+    .context("Failed to send state2 message")?;
 
     substream
         .flush()
@@ -644,10 +714,14 @@ pub enum Error {
         max: bitcoin::Amount,
         buy: bitcoin::Amount,
     },
-    #[error("Seller's XMR balance is currently too low to fulfill the swap request to buy {buy}, please try again later")]
+    #[error(
+        "Seller's XMR balance is currently too low to fulfill the swap request to buy {buy}, please try again later"
+    )]
     BalanceTooLow { buy: bitcoin::Amount },
 
-    #[error("Seller blockchain network {asb:?} setup did not match your blockchain network setup {cli:?}")]
+    #[error(
+        "Seller blockchain network {asb:?} setup did not match your blockchain network setup {cli:?}"
+    )]
     BlockchainNetworkMismatch {
         cli: BlockchainNetwork,
         asb: BlockchainNetwork,
@@ -661,6 +735,11 @@ pub enum Error {
     #[error("Something went wrong during the swap setup protocol: {0}")]
     Protocol(String),
 
+    /// The peer explicitly rejected the swap setup (e.g. anti-spam deposit too small).
+    /// This is a permanent error that should not be retried.
+    #[error("Swap rejected: {0}")]
+    SwapRejected(String),
+
     /// To be used for errors that cannot be explained on the CLI side (e.g.
     /// rate update problems on the seller side)
     #[error("Seller encountered a problem, please try again later.")]
diff --git a/swap-proptest/Cargo.toml b/swap-proptest/Cargo.toml
index 3094ee5f58..7509e855ea 100644
--- a/swap-proptest/Cargo.toml
+++ b/swap-proptest/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-proptest"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [dependencies]
diff --git a/swap-serde/Cargo.toml b/swap-serde/Cargo.toml
index 0b3960ac4b..4bc282b3c5 100644
--- a/swap-serde/Cargo.toml
+++ b/swap-serde/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap-serde"
-version = "0.1.0"
+version = "4.0.0"
 edition = "2024"
 
 [dependencies]
diff --git a/swap/Cargo.toml b/swap/Cargo.toml
index 42805db17c..a81e610965 100644
--- a/swap/Cargo.toml
+++ b/swap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap"
-version = "3.6.7"
+version = "4.0.0"
 authors = ["The COMIT guys <hello@comit.network>"]
 edition = "2021"
 description = "XMR/BTC trustless atomic swaps."
diff --git a/swap/src/asb.rs b/swap/src/asb.rs
index de055d02a0..12f958b1ff 100644
--- a/swap/src/asb.rs
+++ b/swap/src/asb.rs
@@ -11,6 +11,7 @@ pub use recovery::cancel::cancel;
 pub use recovery::punish::punish;
 pub use recovery::redeem::{redeem, Finality};
 pub use recovery::refund::refund;
+pub use recovery::grant_mercy::grant_mercy;
 pub use recovery::safely_abort::safely_abort;
 pub use recovery::{cancel, refund};
 pub use swap_feed::{ExchangeRate, FixedRate, LatestRate, Rate};
diff --git a/swap/src/asb/event_loop.rs b/swap/src/asb/event_loop.rs
index c40d49ade9..5c65319df6 100644
--- a/swap/src/asb/event_loop.rs
+++ b/swap/src/asb/event_loop.rs
@@ -6,13 +6,13 @@ use crate::asb::{Behaviour, OutEvent};
 use crate::monero;
 use crate::network::cooperative_xmr_redeem_after_punish::CooperativeXmrRedeemRejectReason;
 use crate::network::cooperative_xmr_redeem_after_punish::Response::{Fullfilled, Rejected};
-use crate::network::quote::BidQuote;
+use crate::network::quote::{BidQuote, RefundPolicyWire};
 use crate::network::swap_setup::alice::WalletSnapshot;
 use crate::network::transfer_proof;
 use crate::protocol::alice::swap::has_already_processed_enc_sig;
 use crate::protocol::alice::{AliceState, State3, Swap, TipConfig};
 use crate::protocol::{Database, State};
-use anyhow::{anyhow, Context, Result};
+use anyhow::{anyhow, bail, Context, Result};
 use bitcoin_wallet::BitcoinWallet;
 use futures::future;
 use futures::future::{BoxFuture, FutureExt};
@@ -21,6 +21,7 @@ use libp2p::request_response::{OutboundFailure, OutboundRequestId, ResponseChann
 use libp2p::swarm::SwarmEvent;
 use libp2p::{PeerId, Swarm};
 use moka::future::Cache;
+use rust_decimal::prelude::FromPrimitive;
 use rust_decimal::Decimal;
 use std::collections::HashMap;
 use std::convert::TryInto;
@@ -29,6 +30,7 @@ use std::io::Write;
 use std::sync::Arc;
 use std::time::Duration;
 use swap_core::bitcoin;
+use swap_env::config::RefundPolicy;
 use swap_env::env;
 use swap_feed::LatestRate;
 use tokio::sync::{mpsc, oneshot};
@@ -51,6 +53,7 @@ where
     max_buy: bitcoin::Amount,
     external_redeem_address: Option<bitcoin::Address>,
     developer_tip: TipConfig,
+    refund_policy: RefundPolicy,
 
     /// Cache for quotes
     quote_cache: Cache<QuoteCacheKey, Result<Arc<BidQuote>, Arc<anyhow::Error>>>,
@@ -65,6 +68,11 @@ where
     /// the sender is removed from this map.
     recv_encrypted_signature: HashMap<Uuid, bmrng::RequestSender<bitcoin::EncryptedSignature, ()>>,
 
+    /// Stores where to send burn-on-refund instructions to
+    /// The corresponding receiver is stored in the EventLoopHandle
+    /// Uses watch channel to allow multiple updates before consumption
+    recv_burn_on_refund_instruction: HashMap<Uuid, tokio::sync::watch::Sender<Option<bool>>>,
+
     /// Once we receive an [`EncryptedSignature`] from Bob, we forward it to the EventLoopHandle.
     /// Once the EventLoopHandle acknowledges the receipt of the [`EncryptedSignature`], we need to confirm this to Bob.
     /// When the EventLoopHandle acknowledges the receipt, a future in this collection resolves and returns the libp2p channel
@@ -142,6 +150,7 @@ where
         max_buy: bitcoin::Amount,
         external_redeem_address: Option<bitcoin::Address>,
         developer_tip: TipConfig,
+        refund_policy: RefundPolicy,
     ) -> Result<(Self, mpsc::Receiver<Swap>, EventLoopService)> {
         let swap_channel = MpscChannels::default();
         let (outgoing_transfer_proofs_sender, outgoing_transfer_proofs_requests) =
@@ -162,8 +171,10 @@ where
             max_buy,
             external_redeem_address,
             developer_tip,
+            refund_policy,
             quote_cache,
             recv_encrypted_signature: Default::default(),
+            recv_burn_on_refund_instruction: Default::default(),
             inflight_encrypted_signatures: Default::default(),
             outgoing_transfer_proofs_requests,
             outgoing_transfer_proofs_sender,
@@ -247,6 +258,15 @@ where
                                 }
                             };
 
+                            // TODO: propagate error to the swap_setup routine instead of swallowing it
+                            let (btc_amnesty_amount, should_publish_tx_withhold )= match apply_anti_spam_policy(btc, &self.refund_policy) {
+                                Ok(amount) => amount,
+                                Err(error) => {
+                                    tracing::error!("Swap request will be ignored because we were unable to create wallet snapshot for swap: {:#}", error);
+                                    continue;
+                                }
+                            };
+
                             let wallet_snapshot = match capture_wallet_snapshot(self.bitcoin_wallet.clone(), &self.monero_wallet, &self.external_redeem_address, btc).await {
                                 Ok(wallet_snapshot) => wallet_snapshot,
                                 Err(error) => {
@@ -256,7 +276,7 @@ where
                             };
 
                             // Ignore result, we should never hit this because the receiver will alive as long as the connection is.
-                            let _ = responder.respond(wallet_snapshot);
+                            let _ = responder.respond((wallet_snapshot, btc_amnesty_amount, should_publish_tx_withhold));
                         }
                         SwarmEvent::Behaviour(OutEvent::SwapSetupCompleted{peer_id, swap_id, state3}) => {
                             if let Err(error) = self.handle_execution_setup_done(peer_id, swap_id, state3).await {
@@ -267,7 +287,7 @@ where
                             tracing::warn!(%peer, "Ignoring spot price request: {}", error);
                         }
                         SwarmEvent::Behaviour(OutEvent::QuoteRequested { channel, peer }) => {
-                            match self.make_quote_or_use_cached(self.min_buy, self.max_buy, self.developer_tip.ratio).await {
+                            match self.make_quote_or_use_cached(self.min_buy, self.max_buy, self.developer_tip.ratio, self.refund_policy.clone().into()).await {
                                 Ok(quote_arc) => {
                                     if self.swarm.behaviour_mut().quote.send_response(channel, (*quote_arc).clone()).is_err() {
                                         tracing::debug!(%peer, "Failed to respond with quote");
@@ -540,6 +560,19 @@ where
 
                             let _ = respond_to.send(registrations);
                         }
+                        EventLoopRequest::SetBurnOnRefund { swap_id, burn, respond_to } => {
+                            let result = if let Some(sender) = self.recv_burn_on_refund_instruction.get(&swap_id) {
+                                sender.send(Some(burn))
+                                    .map_err(|_| anyhow!("Failed to send burn instruction - receiver dropped"))
+                            } else {
+                                Err(anyhow!("No active swap found with id {}", swap_id))
+                            };
+                            let _ = respond_to.send(result);
+                        }
+                        EventLoopRequest::GrantMercy { swap_id, respond_to } => {
+                            let result = self.handle_grant_mercy(swap_id).await;
+                            let _ = respond_to.send(result);
+                        }
                     }
                 }
             }
@@ -553,6 +586,7 @@ where
         min_buy: bitcoin::Amount,
         max_buy: bitcoin::Amount,
         developer_tip: Decimal,
+        refund_policy: RefundPolicyWire,
     ) -> Result<Arc<BidQuote>, Arc<anyhow::Error>> {
         // We use the min and max buy amounts to create a unique key for the cache
         // Although these values stay constant over the lifetime of an instance of the asb, this might change in the future
@@ -603,6 +637,7 @@ where
             get_reserved_items,
             get_reserve_proof,
             developer_tip,
+            refund_policy,
         )
         .await;
 
@@ -677,15 +712,70 @@ where
         self.recv_encrypted_signature
             .insert(swap_id, encrypted_signature_sender);
 
+        // Create a watch channel for burn-on-refund instructions
+        // Uses watch instead of bmrng to allow multiple updates before consumption
+        let (burn_instruction_sender, burn_instruction_receiver) =
+            tokio::sync::watch::channel(None);
+        self.recv_burn_on_refund_instruction
+            .insert(swap_id, burn_instruction_sender);
+
         let transfer_proof_sender = self.outgoing_transfer_proofs_sender.clone();
 
         EventLoopHandle {
             swap_id,
             peer,
             recv_encrypted_signature: tokio::sync::Mutex::new(Some(encrypted_signature_receiver)),
+            recv_burn_on_refund_instruction: tokio::sync::Mutex::new(burn_instruction_receiver),
             transfer_proof_sender: tokio::sync::Mutex::new(Some(transfer_proof_sender)),
         }
     }
+
+    /// Handle a request to grant mercy for a swap.
+    ///
+    /// This checks that the swap is not currently running, transitions the
+    /// state to BtcMercyGranted, and resumes the swap.
+    async fn handle_grant_mercy(&mut self, swap_id: Uuid) -> Result<()> {
+        use crate::asb::grant_mercy;
+
+        // Check if swap is currently running
+        if self.recv_encrypted_signature.contains_key(&swap_id)
+            || self.recv_burn_on_refund_instruction.contains_key(&swap_id)
+        {
+            return Err(anyhow!(
+                "Cannot grant mercy while swap {} is still running",
+                swap_id
+            ));
+        }
+
+        // Use the grant_mercy function to transition the state
+        let new_state = grant_mercy(swap_id, self.db.clone()).await?;
+
+        // Get peer ID for this swap
+        let peer_id = self.db.get_peer_id(swap_id).await?;
+
+        // Create handle and swap to resume
+        let handle = self.new_handle(peer_id, swap_id);
+        let swap = Swap {
+            event_loop_handle: handle,
+            bitcoin_wallet: self.bitcoin_wallet.clone(),
+            monero_wallet: self.monero_wallet.clone(),
+            env_config: self.env_config,
+            db: self.db.clone(),
+            state: new_state,
+            swap_id,
+            developer_tip: self.developer_tip.clone(),
+        };
+
+        // Send swap to be resumed
+        self.swap_sender
+            .send(swap)
+            .await
+            .context("Failed to send swap to be resumed")?;
+
+        tracing::info!(%swap_id, "Granted mercy and resumed swap");
+
+        Ok(())
+    }
 }
 
 // We use a Mutex here to allow recv_encrypted_signature and transfer_proof_sender to be accessed concurrently
@@ -695,6 +785,7 @@ pub struct EventLoopHandle {
     peer: PeerId,
     recv_encrypted_signature:
         tokio::sync::Mutex<Option<bmrng::RequestReceiver<bitcoin::EncryptedSignature, ()>>>,
+    recv_burn_on_refund_instruction: tokio::sync::Mutex<tokio::sync::watch::Receiver<Option<bool>>>,
     #[allow(clippy::type_complexity)]
     transfer_proof_sender: tokio::sync::Mutex<
         Option<
@@ -815,6 +906,75 @@ impl EventLoopHandle {
 
         Ok(())
     }
+
+    /// Wait for a NEW burn-on-refund instruction from the operator
+    ///
+    /// This method waits until the operator sends a new decision via the EventLoopService.
+    /// Use this in select! arms to react to operator commands.
+    ///
+    /// Returns the new burn decision when one is received.
+    pub async fn wait_for_burn_on_refund_instruction(&self) -> Result<bool> {
+        let mut guard = self.recv_burn_on_refund_instruction.lock().await;
+
+        guard
+            .changed()
+            .await
+            .map_err(|_| anyhow!("Burn instruction sender was dropped"))?;
+
+        let value = *guard.borrow();
+        Ok(value.expect("changed() returned Ok, so value should be set"))
+    }
+
+    /// Get the current burn-on-refund instruction value
+    ///
+    /// Returns Some(bool) if an instruction has been set, None otherwise.
+    /// Use this to check the current decision before taking action.
+    pub async fn get_burn_on_refund_instruction(&self) -> Option<bool> {
+        let guard = self.recv_burn_on_refund_instruction.lock().await;
+        let value = *guard.borrow();
+        value
+    }
+}
+
+/// For a new swap of `swap_amount`, this function calculates how much
+/// Bitcoin should go into the anti spam deposit incase of a refund.
+/// Returns ZERO when anti_spam_deposit_ratio is 0, indicating immediate and full refund.
+/// Also returns whether or not to always withhold the the anti spam deposit output if the taker refunds.
+fn apply_anti_spam_policy(
+    swap_amount: bitcoin::Amount,
+    refund_policy: &RefundPolicy,
+) -> Result<(bitcoin::Amount, bool)> {
+    let should_always_withhold = refund_policy.always_withhold_deposit;
+
+    // When ratio is 0.0, no amnesty - use full refund path for fewer fees
+    if refund_policy.anti_spam_deposit_ratio == Decimal::ZERO {
+        return Ok((bitcoin::Amount::ZERO, should_always_withhold));
+    }
+
+    let btc_anti_spam_deposit_ratio = refund_policy.anti_spam_deposit_ratio;
+
+    let amount_sats = swap_amount.to_sat();
+    let amount_decimal =
+        Decimal::from_u64(amount_sats).context("Decimal overflowed by Bitcoin sats")?;
+
+    let btc_amnesty_decimal = amount_decimal
+        .checked_mul(btc_anti_spam_deposit_ratio)
+        .context("Decimal overflow when computing amnesty amount in sats")?
+        .floor();
+    let btc_amnesty_sats: u64 = btc_amnesty_decimal
+        .try_into()
+        .context("Couldn't convert Decimal to u64")?;
+
+    let btc_amnesty_amount = bitcoin::Amount::from_sat(btc_amnesty_sats);
+
+    let minimum_to_cover_fees = bitcoin::Amount::from_sat(
+        bitcoin_wallet::MIN_ABSOLUTE_TX_FEE_SATS * swap_machine::common::NUM_WITHHOLD_PATH_TXS + 1,
+    );
+
+    Ok((
+        btc_amnesty_amount.max(minimum_to_cover_fees),
+        should_always_withhold,
+    ))
 }
 
 async fn capture_wallet_snapshot(
@@ -841,6 +1001,9 @@ async fn capture_wallet_snapshot(
     let punish_fee = bitcoin_wallet
         .estimate_fee(bitcoin::TxPunish::weight(), Some(transfer_amount))
         .await?;
+    let withhold_fee = bitcoin_wallet
+        .estimate_fee(bitcoin::TxWithhold::weight(), Some(transfer_amount))
+        .await?;
 
     Ok(WalletSnapshot::new(
         unlocked_balance.into(),
@@ -848,6 +1011,7 @@ async fn capture_wallet_snapshot(
         punish_address,
         redeem_fee,
         punish_fee,
+        withhold_fee,
     ))
 }
 
@@ -868,6 +1032,15 @@ mod service {
                 Vec<swap_p2p::protocols::rendezvous::register::public::RendezvousNodeStatus>,
             >,
         },
+        SetBurnOnRefund {
+            swap_id: Uuid,
+            burn: bool,
+            respond_to: oneshot::Sender<Result<(), anyhow::Error>>,
+        },
+        GrantMercy {
+            swap_id: Uuid,
+            respond_to: oneshot::Sender<Result<(), anyhow::Error>>,
+        },
     }
 
     /// Tower service for communicating with the EventLoop
@@ -913,6 +1086,39 @@ mod service {
             rx.await
                 .map_err(|_| anyhow::anyhow!("EventLoop service did not respond"))
         }
+
+        /// Set the burn-on-refund decision for a specific swap
+        ///
+        /// This can be called multiple times to update the decision before
+        /// the swap state machine polls for it.
+        pub async fn set_withhold_deposit(&self, swap_id: Uuid, burn: bool) -> anyhow::Result<()> {
+            let (tx, rx) = oneshot::channel();
+            self.sender
+                .send(EventLoopRequest::SetBurnOnRefund {
+                    swap_id,
+                    burn,
+                    respond_to: tx,
+                })
+                .map_err(|_| anyhow::anyhow!("EventLoop service is down"))?;
+            rx.await
+                .map_err(|_| anyhow::anyhow!("EventLoop service did not respond"))?
+        }
+
+        /// Grant mercy for a swap in BtcWithholdConfirmed state
+        ///
+        /// This transitions the swap to BtcMercyGranted and resumes
+        /// the swap state machine to publish the mercy transaction.
+        pub async fn grant_mercy(&self, swap_id: Uuid) -> anyhow::Result<()> {
+            let (tx, rx) = oneshot::channel();
+            self.sender
+                .send(EventLoopRequest::GrantMercy {
+                    swap_id,
+                    respond_to: tx,
+                })
+                .map_err(|_| anyhow::anyhow!("EventLoop service is down"))?;
+            rx.await
+                .map_err(|_| anyhow::anyhow!("EventLoop service did not respond"))?
+        }
     }
 }
 
@@ -925,7 +1131,7 @@ mod quote {
     use tokio::time::timeout;
 
     use crate::{
-        network::quote::{BidQuote, ReserveProofWithAddress},
+        network::quote::{BidQuote, RefundPolicyWire, ReserveProofWithAddress},
         protocol::alice::ReservesMonero,
     };
 
@@ -949,6 +1155,7 @@ mod quote {
         get_reserved_items: I,
         get_reserve_proof: P,
         developer_tip: Decimal,
+        refund_policy: RefundPolicyWire,
     ) -> Result<Arc<BidQuote>, Arc<anyhow::Error>>
     where
         LR: LatestRate,
@@ -1018,6 +1225,7 @@ mod quote {
                 price: ask_price,
                 min_quantity: bitcoin::Amount::ZERO,
                 max_quantity: bitcoin::Amount::ZERO,
+                refund_policy: refund_policy.clone(),
                 reserve_proof,
             }));
         }
@@ -1032,6 +1240,7 @@ mod quote {
                 price: ask_price,
                 min_quantity: min_buy,
                 max_quantity: max_bitcoin_for_monero,
+                refund_policy: refund_policy.clone(),
                 reserve_proof,
             }));
         }
@@ -1040,6 +1249,7 @@ mod quote {
             price: ask_price,
             min_quantity: min_buy,
             max_quantity: max_buy,
+            refund_policy,
             reserve_proof,
         }))
     }
@@ -1284,6 +1494,7 @@ mod tests {
             || async { Ok(reserved_items) },
             || async { Err(anyhow::anyhow!("no reserve proof")) },
             Decimal::ZERO,
+            RefundPolicyWire::FullRefund,
         )
         .await
         .unwrap();
@@ -1316,6 +1527,7 @@ mod tests {
             || async { Ok(reserved_items) },
             || async { Err(anyhow::anyhow!("no reserve proof")) },
             Decimal::ZERO,
+            RefundPolicyWire::FullRefund,
         )
         .await
         .unwrap();
@@ -1343,6 +1555,7 @@ mod tests {
             || async { Ok(reserved_items) },
             || async { Err(anyhow::anyhow!("no reserve proof")) },
             Decimal::ZERO,
+            RefundPolicyWire::FullRefund,
         )
         .await
         .unwrap();
@@ -1368,6 +1581,7 @@ mod tests {
             || async { Ok(reserved_items) },
             || async { Err(anyhow::anyhow!("no reserve proof")) },
             Decimal::ZERO,
+            RefundPolicyWire::FullRefund,
         )
         .await
         .unwrap();
@@ -1398,6 +1612,7 @@ mod tests {
             || async { Ok(reserved_items) },
             || async { Err(anyhow::anyhow!("no reserve proof")) },
             Decimal::ZERO,
+            RefundPolicyWire::FullRefund,
         )
         .await
         .unwrap();
@@ -1422,6 +1637,7 @@ mod tests {
             || async { Ok(reserved_items) },
             || async { Err(anyhow::anyhow!("no reserve proof")) },
             Decimal::ZERO,
+            RefundPolicyWire::FullRefund,
         )
         .await;
 
@@ -1448,6 +1664,7 @@ mod tests {
             || async { Ok(reserved_items) },
             || async { Err(anyhow::anyhow!("no reserve proof")) },
             Decimal::ZERO,
+            RefundPolicyWire::FullRefund,
         )
         .await
         .unwrap();
@@ -1460,7 +1677,36 @@ mod tests {
 
     #[tokio::test]
     async fn test_make_quote_with_developer_tip() {
-        todo!("implement once unit tests compile again")
+        let min_buy = bitcoin::Amount::from_sat(100_000);
+        let max_buy = bitcoin::Amount::from_sat(5_000_000); // High enough to be balance-limited
+        let rate = FixedRate::default();
+        let balance = monero::Amount::parse_monero("1.0").unwrap();
+        let reserved_items: Vec<MockReservedItem> = vec![];
+        let developer_tip = Decimal::new(5, 2); // 0.05 = 5%
+
+        let result = make_quote(
+            min_buy,
+            max_buy,
+            rate.clone(),
+            || async { Ok(balance) },
+            || async { Ok(reserved_items) },
+            || async { Err(anyhow::anyhow!("no reserve proof")) },
+            developer_tip,
+            RefundPolicyWire::FullRefund,
+        )
+        .await
+        .unwrap();
+
+        // Compute expected max: effective balance is reduced by the tip multiplier
+        let unreserved = unreserved_monero_balance(balance, std::iter::empty(), developer_tip);
+        let expected_max = unreserved
+            .max_bitcoin_for_price(rate.value().ask().unwrap())
+            .unwrap();
+
+        assert_eq!(result.min_quantity, min_buy);
+        assert_eq!(result.max_quantity, expected_max);
+        // The tip should have reduced max_quantity below max_buy
+        assert!(result.max_quantity < max_buy);
     }
 
     // Mock struct for testing
diff --git a/swap/src/asb/recovery.rs b/swap/src/asb/recovery.rs
index dd4a7b86a7..858c09704b 100644
--- a/swap/src/asb/recovery.rs
+++ b/swap/src/asb/recovery.rs
@@ -1,4 +1,5 @@
 pub mod cancel;
+pub mod grant_mercy;
 pub mod punish;
 pub mod redeem;
 pub mod refund;
diff --git a/swap/src/asb/recovery/cancel.rs b/swap/src/asb/recovery/cancel.rs
index 6f8dc51000..f99118ad5b 100644
--- a/swap/src/asb/recovery/cancel.rs
+++ b/swap/src/asb/recovery/cancel.rs
@@ -30,6 +30,8 @@ pub async fn cancel(
         | AliceState::CancelTimelockExpired { monero_wallet_restore_blockheight, transfer_proof, state3}
         | AliceState::BtcCancelled { monero_wallet_restore_blockheight, transfer_proof, state3 }
         | AliceState::BtcRefunded { monero_wallet_restore_blockheight, transfer_proof,  state3 ,.. }
+        | AliceState::BtcPartiallyRefunded { monero_wallet_restore_blockheight, transfer_proof,  state3 ,.. }
+        | AliceState::XmrRefundable { monero_wallet_restore_blockheight, transfer_proof,  state3 ,.. }
         | AliceState::BtcPunishable { monero_wallet_restore_blockheight, transfer_proof, state3 }  => {
             (monero_wallet_restore_blockheight, transfer_proof, state3)
         }
@@ -39,7 +41,12 @@ pub async fn cancel(
 
         // Alice already in final state
         | AliceState::BtcRedeemed
-        | AliceState::XmrRefunded
+        | AliceState::XmrRefunded { .. }
+        | AliceState::BtcWithholdPublished { .. }
+        | AliceState::BtcWithholdConfirmed { .. }
+        | AliceState::BtcMercyGranted { .. }
+        | AliceState::BtcMercyPublished { .. }
+        | AliceState::BtcMercyConfirmed { .. }
         | AliceState::BtcEarlyRefundable { .. }
         | AliceState::BtcEarlyRefunded(_)
         | AliceState::BtcPunished { .. }
diff --git a/swap/src/asb/recovery/grant_mercy.rs b/swap/src/asb/recovery/grant_mercy.rs
new file mode 100644
index 0000000000..c9d7585a74
--- /dev/null
+++ b/swap/src/asb/recovery/grant_mercy.rs
@@ -0,0 +1,29 @@
+use crate::protocol::alice::AliceState;
+use crate::protocol::Database;
+use anyhow::{bail, Result};
+use std::convert::TryInto;
+use std::sync::Arc;
+use uuid::Uuid;
+
+pub async fn grant_mercy(
+    swap_id: Uuid,
+    db: Arc<dyn Database + Send + Sync>,
+) -> Result<AliceState> {
+    let state = db.get_state(swap_id).await?.try_into()?;
+
+    match state {
+        AliceState::BtcWithholdConfirmed { state3 } => {
+            let new_state = AliceState::BtcMercyGranted { state3 };
+
+            db.insert_latest_state(swap_id, new_state.clone().into())
+                .await?;
+
+            Ok(new_state)
+        }
+        _ => bail!(
+            "Cannot grant mercy for swap {} because it is in state {} which is not BtcWithholdConfirmed",
+            swap_id,
+            state
+        ),
+    }
+}
diff --git a/swap/src/asb/recovery/punish.rs b/swap/src/asb/recovery/punish.rs
index a71a1b58a3..07657ce96a 100644
--- a/swap/src/asb/recovery/punish.rs
+++ b/swap/src/asb/recovery/punish.rs
@@ -34,13 +34,20 @@ pub async fn punish(
         // The state machine is in a state where punish is theoretically impossible but we try and punish anyway as this is what the user wants
         | AliceState::BtcRedeemTransactionPublished { state3, transfer_proof, .. }
         | AliceState::BtcRefunded { state3, transfer_proof,.. } => { (state3, transfer_proof) }
+        | AliceState::BtcPartiallyRefunded { state3, transfer_proof,.. } => { (state3, transfer_proof) }
+        | AliceState::XmrRefundable { state3, transfer_proof,.. } => { (state3, transfer_proof) }
 
         // Alice already in final state or at the start of the swap so we can't punish
         | AliceState::Started { .. }
         | AliceState::BtcLockTransactionSeen { .. }
         | AliceState::BtcLocked { .. }
         | AliceState::BtcRedeemed { .. }
-        | AliceState::XmrRefunded
+        | AliceState::XmrRefunded { .. }
+        | AliceState::BtcWithholdPublished { .. }
+        | AliceState::BtcWithholdConfirmed { .. }
+        | AliceState::BtcMercyGranted { .. }
+        | AliceState::BtcMercyPublished { .. }
+        | AliceState::BtcMercyConfirmed { .. }
         | AliceState::BtcPunished { .. }
         | AliceState::BtcEarlyRefundable { .. }
         | AliceState::BtcEarlyRefunded(_)
diff --git a/swap/src/asb/recovery/redeem.rs b/swap/src/asb/recovery/redeem.rs
index 586463bbee..406bb6eb91 100644
--- a/swap/src/asb/recovery/redeem.rs
+++ b/swap/src/asb/recovery/redeem.rs
@@ -40,7 +40,9 @@ pub async fn redeem(
             tracing::info!(%swap_id, "Trying to redeem swap");
 
             let redeem_tx = state3.signed_redeem_transaction(*encrypted_signature)?;
-            let (txid, subscription) = bitcoin_wallet.broadcast(redeem_tx, "redeem").await?;
+            let (txid, subscription) = bitcoin_wallet
+                .ensure_broadcasted(redeem_tx, "redeem")
+                .await?;
 
             subscription.wait_until_seen().await?;
 
@@ -87,9 +89,16 @@ pub async fn redeem(
         | AliceState::CancelTimelockExpired { .. }
         | AliceState::BtcCancelled { .. }
         | AliceState::BtcRefunded { .. }
+        | AliceState::BtcPartiallyRefunded { .. }
         | AliceState::BtcPunishable { .. }
         | AliceState::BtcRedeemed
-        | AliceState::XmrRefunded
+        | AliceState::XmrRefunded { .. }
+        | AliceState::BtcWithholdPublished { .. }
+        | AliceState::BtcWithholdConfirmed { .. }
+        | AliceState::BtcMercyGranted { .. }
+        | AliceState::BtcMercyPublished { .. }
+        | AliceState::BtcMercyConfirmed { .. }
+        | AliceState::XmrRefundable { .. }
         | AliceState::BtcEarlyRefundable { .. }
         | AliceState::BtcEarlyRefunded(_)
         | AliceState::BtcPunished { .. }
diff --git a/swap/src/asb/recovery/refund.rs b/swap/src/asb/recovery/refund.rs
index b747af5bc7..0214d57e34 100644
--- a/swap/src/asb/recovery/refund.rs
+++ b/swap/src/asb/recovery/refund.rs
@@ -3,7 +3,7 @@ use crate::monero;
 use crate::protocol::alice::swap::XmrRefundable;
 use crate::protocol::alice::AliceState;
 use crate::protocol::Database;
-use anyhow::{bail, Result};
+use anyhow::{bail, Context, Result};
 use bitcoin_wallet::BitcoinWallet;
 use libp2p::PeerId;
 use std::convert::TryInto;
@@ -30,7 +30,7 @@ pub async fn refund(
     swap_id: Uuid,
     bitcoin_wallet: Arc<dyn BitcoinWallet>,
     monero_wallet: Arc<monero::Wallets>,
-    db: Arc<dyn Database>,
+    db: Arc<dyn Database + Send + Sync>,
 ) -> Result<AliceState> {
     let state = db.get_state(swap_id).await?.try_into()?;
 
@@ -51,6 +51,8 @@ pub async fn refund(
         // Refund possible due to cancel transaction already being published
         | AliceState::BtcCancelled { transfer_proof, state3, .. }
         | AliceState::BtcRefunded { transfer_proof, state3, .. }
+        | AliceState::BtcPartiallyRefunded { transfer_proof, state3, .. }
+        | AliceState::XmrRefundable { transfer_proof, state3, .. }
         | AliceState::BtcPunishable { transfer_proof, state3, .. } => {
             (transfer_proof, state3)
         }
@@ -58,7 +60,12 @@ pub async fn refund(
         // Alice already in final state
         AliceState::BtcRedeemTransactionPublished { .. }
         | AliceState::BtcRedeemed
-        | AliceState::XmrRefunded
+        | AliceState::XmrRefunded { .. }
+        | AliceState::BtcWithholdPublished { .. }
+        | AliceState::BtcWithholdConfirmed { .. }
+        | AliceState::BtcMercyGranted { .. }
+        | AliceState::BtcMercyPublished { .. }
+        | AliceState::BtcMercyConfirmed { .. }
         | AliceState::BtcEarlyRefundable { .. }
         | AliceState::BtcEarlyRefunded(_)
         | AliceState::BtcPunished { .. }
@@ -67,11 +74,9 @@ pub async fn refund(
 
     tracing::info!(%swap_id, "Trying to manually refund swap");
 
-    let spend_key = if let Some(published_refund_tx) =
-        state3.fetch_tx_refund(bitcoin_wallet.as_ref()).await?
-    {
+    let spend_key = if let Some(spend_key) = state3.refund_btc(bitcoin_wallet.as_ref()).await? {
         tracing::debug!(%swap_id, "Bitcoin refund transaction found, extracting key to refund Monero");
-        state3.extract_monero_private_key(published_refund_tx)?
+        spend_key
     } else {
         let bob_peer_id = db.get_peer_id(swap_id).await?;
         bail!(Error::RefundTransactionNotPublishedYet(bob_peer_id),);
@@ -95,9 +100,46 @@ pub async fn refund(
     )
     .await?;
 
-    let state = AliceState::XmrRefunded;
+    let mut state = AliceState::XmrRefunded {
+        state3: Some(state3.clone()),
+    };
+
     db.insert_latest_state(swap_id, state.clone().into())
         .await?;
 
+    if state3.should_publish_tx_withhold.unwrap_or(false) {
+        let timelocks = state3.expired_timelocks(bitcoin_wallet.as_ref()).await?;
+
+        if matches!(timelocks, swap_core::bitcoin::ExpiredTimelocks::RemainingRefund) {
+            tracing::warn!(%swap_id, "Remaining refund timelock already expired, Bob may have already reclaimed. Attempting TxWithhold anyway");
+        }
+
+        tracing::info!(%swap_id, "Publishing TxWithhold to withhold anti-spam deposit");
+
+        let signed_tx = state3
+            .signed_withhold_transaction()
+            .context("Failed to construct signed TxWithhold")?;
+
+        let (_txid, subscription) = bitcoin_wallet
+            .ensure_broadcasted(signed_tx, "withhold")
+            .await
+            .context("Failed to broadcast TxWithhold")?;
+
+        state = AliceState::BtcWithholdPublished {
+            state3: state3.clone(),
+        };
+        db.insert_latest_state(swap_id, state.clone().into())
+            .await?;
+
+        subscription
+            .wait_until_final()
+            .await
+            .context("Failed to wait for TxWithhold confirmation")?;
+
+        state = AliceState::BtcWithholdConfirmed { state3 };
+        db.insert_latest_state(swap_id, state.clone().into())
+            .await?;
+    }
+
     Ok(state)
 }
diff --git a/swap/src/asb/recovery/safely_abort.rs b/swap/src/asb/recovery/safely_abort.rs
index f9e5812a34..779bf65033 100644
--- a/swap/src/asb/recovery/safely_abort.rs
+++ b/swap/src/asb/recovery/safely_abort.rs
@@ -29,9 +29,16 @@ pub async fn safely_abort(swap_id: Uuid, db: Arc<dyn Database>) -> Result<AliceS
         | AliceState::CancelTimelockExpired { .. }
         | AliceState::BtcCancelled { .. }
         | AliceState::BtcRefunded { .. }
+        | AliceState::BtcPartiallyRefunded { .. }
+        | AliceState::XmrRefundable { .. }
         | AliceState::BtcPunishable { .. }
         | AliceState::BtcRedeemed
-        | AliceState::XmrRefunded
+        | AliceState::XmrRefunded { .. }
+        | AliceState::BtcWithholdPublished { .. }
+        | AliceState::BtcWithholdConfirmed { .. }
+        | AliceState::BtcMercyGranted { .. }
+        | AliceState::BtcMercyPublished { .. }
+        | AliceState::BtcMercyConfirmed { .. }
         | AliceState::BtcEarlyRefundable { .. }
         | AliceState::BtcEarlyRefunded(_)
         | AliceState::BtcPunished { .. }
diff --git a/swap/src/asb/rpc/server.rs b/swap/src/asb/rpc/server.rs
index 31cf5b5a45..0fb7355827 100644
--- a/swap/src/asb/rpc/server.rs
+++ b/swap/src/asb/rpc/server.rs
@@ -14,6 +14,7 @@ use swap_controller_api::{
     RendezvousRegistrationStatus, Swap,
 };
 use tokio_util::task::AbortOnDropHandle;
+use uuid::Uuid;
 
 pub struct RpcServer {
     handle: ServerHandle,
@@ -154,24 +155,58 @@ impl AsbApiServer for RpcImpl {
     }
 
     async fn get_swaps(&self) -> Result<Vec<Swap>, ErrorObjectOwned> {
-        let swaps = self.db.all().await.into_json_rpc_result()?;
+        use crate::protocol::alice::{is_complete, AliceState};
+        use crate::protocol::State;
 
-        let swaps = swaps
-            .into_iter()
-            .map(|(swap_id, state)| {
-                let state_str = match state {
-                    crate::protocol::State::Alice(state) => format!("{state}"),
-                    crate::protocol::State::Bob(state) => format!("{state}"),
-                };
-
-                Swap {
-                    id: swap_id.to_string(),
-                    state: state_str,
-                }
-            })
-            .collect();
-
-        Ok(swaps)
+        let swaps = self
+            .db
+            .all()
+            .await
+            .context("Error fetching all swap's from database")
+            .into_json_rpc_result()?;
+        let mut results = Vec::with_capacity(swaps.len());
+
+        for (swap_id, _) in swaps {
+            let (current, starting) = self
+                .db
+                .get_current_and_starting_state(swap_id)
+                .await
+                .context("Error fetching current and first state from database")
+                .into_json_rpc_result()?;
+
+            let (State::Alice(current_alice), State::Alice(AliceState::Started { state3 })) =
+                (current, starting)
+            else {
+                continue; // Skip non-Alice swaps
+            };
+
+            let start_date = self
+                .db
+                .get_swap_start_date(swap_id)
+                .await
+                .into_json_rpc_result()?;
+            let peer_id = self.db.get_peer_id(swap_id).await.into_json_rpc_result()?;
+
+            // Exchange rate: BTC per XMR (amount of BTC needed to buy 1 XMR)
+            let rate_btc_per_xmr = state3.btc.to_btc() / state3.xmr.as_xmr();
+            let exchange_rate = bitcoin::Amount::from_btc(rate_btc_per_xmr)
+                .context("exchange rate should be valid")
+                .into_json_rpc_result()?;
+
+            results.push(Swap {
+                swap_id: swap_id.to_string(),
+                start_date,
+                state: current_alice.to_string(),
+                btc_lock_txid: state3.tx_lock.txid().to_string(),
+                btc_amount: state3.btc,
+                xmr_amount: state3.xmr.as_pico(),
+                exchange_rate,
+                peer_id: peer_id.to_string(),
+                completed: is_complete(&current_alice),
+            });
+        }
+
+        Ok(results)
     }
 
     async fn registration_status(&self) -> Result<RegistrationStatusResponse, ErrorObjectOwned> {
@@ -209,6 +244,28 @@ impl AsbApiServer for RpcImpl {
 
         Ok(RegistrationStatusResponse { registrations })
     }
+
+    async fn set_withhold_deposit(
+        &self,
+        swap_id: Uuid,
+        burn: bool,
+    ) -> Result<(), ErrorObjectOwned> {
+        self.event_loop_service
+            .set_withhold_deposit(swap_id, burn)
+            .await
+            .into_json_rpc_result()?;
+
+        Ok(())
+    }
+
+    async fn grant_mercy(&self, swap_id: Uuid) -> Result<(), ErrorObjectOwned> {
+        self.event_loop_service
+            .grant_mercy(swap_id)
+            .await
+            .into_json_rpc_result()?;
+
+        Ok(())
+    }
 }
 
 trait IntoJsonRpcResult<T> {
diff --git a/swap/src/bin/swap.rs b/swap/src/bin/swap.rs
index b0f5b875b6..f32999099a 100644
--- a/swap/src/bin/swap.rs
+++ b/swap/src/bin/swap.rs
@@ -46,7 +46,7 @@ mod tests {
     use std::time::Duration;
     use swap::cli::api::request::determine_btc_to_swap;
     use swap::cli::QuoteWithAddress;
-    use swap::network::quote::BidQuote;
+    use swap::network::quote::{BidQuote, RefundPolicyWire};
     use tracing::level_filters::LevelFilter;
     use tracing_ext::capture_logs;
 
@@ -424,6 +424,7 @@ mod tests {
                 price: Amount::from_btc(0.001).unwrap(),
                 max_quantity,
                 min_quantity,
+                refund_policy: RefundPolicyWire::FullRefund,
                 reserve_proof: None,
             },
             version: Some("1.0.0".parse().unwrap()),
diff --git a/swap/src/cli/api/request.rs b/swap/src/cli/api/request.rs
index 8f0928d100..a9fca0aba7 100644
--- a/swap/src/cli/api/request.rs
+++ b/swap/src/cli/api/request.rs
@@ -139,7 +139,7 @@ impl Request for MoneroRecoveryArgs {
 #[derive(Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct WithdrawBtcArgs {
     #[typeshare(serialized_as = "number")]
-    #[serde(default, with = "::bitcoin::amount::serde::as_sat::opt")]
+    #[serde(default)]
     pub amount: Option<bitcoin::Amount>,
     #[typeshare(serialized_as = "string")]
     #[serde(with = "swap_serde::bitcoin::address_serde")]
@@ -150,7 +150,6 @@ pub struct WithdrawBtcArgs {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct WithdrawBtcResponse {
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub amount: bitcoin::Amount,
     pub txid: String,
 }
@@ -184,18 +183,14 @@ pub struct GetSwapInfoResponse {
     #[typeshare(serialized_as = "number")]
     pub xmr_amount: monero::Amount,
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub btc_amount: bitcoin::Amount,
     #[typeshare(serialized_as = "string")]
     pub tx_lock_id: Txid,
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_cancel_fee: bitcoin::Amount,
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_refund_fee: bitcoin::Amount,
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub tx_lock_fee: bitcoin::Amount,
     pub btc_refund_address: String,
     pub cancel_timelock: CancelTimelock,
@@ -246,7 +241,6 @@ pub struct BalanceArgs {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct BalanceResponse {
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub balance: bitcoin::Amount,
 }
 
@@ -1802,13 +1796,20 @@ impl CheckElectrumNodeArgs {
             return Ok(CheckElectrumNodeResponse { available: false });
         };
 
-        // Check if the node is available
-        let res =
-            bitcoin_wallet::Client::new(&[url.as_str().to_string()], Duration::from_secs(60)).await;
+        // Check if the node is available by performing a lightweight RPC call.
+        // This forces a real connection and TLS handshake (for ssl:// URLs).
+        let mut client =
+            match bitcoin_wallet::Client::new(&[url.as_str().to_string()], Duration::from_secs(60))
+                .await
+            {
+                Ok(client) => client,
+                Err(_) => return Ok(CheckElectrumNodeResponse { available: false }),
+            };
 
-        Ok(CheckElectrumNodeResponse {
-            available: res.is_ok(),
-        })
+        // Force a rpc call for blockchain height.
+        let available = client.update_state(true).await.is_ok();
+
+        Ok(CheckElectrumNodeResponse { available })
     }
 }
 
diff --git a/swap/src/cli/api/tauri_bindings.rs b/swap/src/cli/api/tauri_bindings.rs
index 31d237e29c..85125f886d 100644
--- a/swap/src/cli/api/tauri_bindings.rs
+++ b/swap/src/cli/api/tauri_bindings.rs
@@ -88,16 +88,19 @@ pub struct ContextStatus {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct LockBitcoinDetails {
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub btc_lock_amount: bitcoin::Amount,
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub btc_network_fee: bitcoin::Amount,
     #[typeshare(serialized_as = "number")]
     pub xmr_receive_amount: monero::Amount,
     pub monero_receive_pool: MoneroAddressPool,
     #[typeshare(serialized_as = "string")]
     pub swap_id: Uuid,
+    /// The amount of Bitcoin the taker will only be able to refund with cooperation from the maker
+    #[typeshare(serialized_as = "number")]
+    pub btc_amnesty_amount: bitcoin::Amount,
+    /// Whether we can guarantee we'll get the full refund
+    pub has_full_refund_signature: bool,
 }
 
 #[typeshare]
@@ -106,7 +109,6 @@ pub struct SelectMakerDetails {
     #[typeshare(serialized_as = "string")]
     pub swap_id: Uuid,
     #[typeshare(serialized_as = "number")]
-    #[serde(with = "::bitcoin::amount::serde::as_sat")]
     pub btc_amount_to_swap: bitcoin::Amount,
     pub maker: QuoteWithAddress,
 }
@@ -479,10 +481,13 @@ impl bitcoin_wallet::BitcoinTauriBackgroundTask
     for TauriBackgroundProgressHandle<TauriBitcoinFullScanProgress>
 {
     fn update(&self, consumed: u64, total: u64) {
-        self.update(TauriBitcoinFullScanProgress::Known {
-            current_index: consumed,
-            assumed_total: total,
-        });
+        TauriBackgroundProgressHandle::update(
+            self,
+            TauriBitcoinFullScanProgress::Known {
+                current_index: consumed,
+                assumed_total: total,
+            },
+        );
     }
 
     fn finish(&self) {
@@ -494,7 +499,10 @@ impl bitcoin_wallet::BitcoinTauriBackgroundTask
     for TauriBackgroundProgressHandle<TauriBitcoinSyncProgress>
 {
     fn update(&self, consumed: u64, total: u64) {
-        self.update(TauriBitcoinSyncProgress::Known { consumed, total });
+        TauriBackgroundProgressHandle::update(
+            self,
+            TauriBitcoinSyncProgress::Known { consumed, total },
+        );
     }
 
     fn finish(&self) {
@@ -1026,16 +1034,13 @@ pub enum TauriSwapProgressEvent {
         #[typeshare(serialized_as = "string")]
         deposit_address: bitcoin::Address,
         #[typeshare(serialized_as = "number")]
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         max_giveable: bitcoin::Amount,
         #[typeshare(serialized_as = "number")]
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         min_bitcoin_lock_tx_fee: bitcoin::Amount,
         known_quotes: Vec<QuoteWithAddress>,
     },
     SwapSetupInflight {
         #[typeshare(serialized_as = "number")]
-        #[serde(with = "::bitcoin::amount::serde::as_sat")]
         btc_lock_amount: bitcoin::Amount,
     },
     RetrievingMoneroBlockheight,
@@ -1077,6 +1082,14 @@ pub enum TauriSwapProgressEvent {
     },
     WaitingForCancelTimelockExpiration, // TODO: Add current confirmations and target confirmations here?
     CancelTimelockExpired,
+    BtcCancelPublished {
+        #[typeshare(serialized_as = "string")]
+        btc_cancel_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_cancel_confirmations: u32,
+        #[typeshare(serialized_as = "number")]
+        btc_cancel_target_confirmations: u32,
+    },
     BtcCancelled {
         #[typeshare(serialized_as = "string")]
         btc_cancel_txid: Txid,
@@ -1093,6 +1106,24 @@ pub enum TauriSwapProgressEvent {
         #[typeshare(serialized_as = "string")]
         btc_refund_txid: Txid,
     },
+    BtcPartialRefundPublished {
+        #[typeshare(serialized_as = "string")]
+        btc_partial_refund_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+    },
+    // BtcAmnesty was published but not yet confirmed.
+    // Requires BtcPartialRefund to be published first.
+    BtcAmnestyPublished {
+        #[typeshare(serialized_as = "string")]
+        btc_amnesty_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+    },
     // tx_early_refund has been confirmed
     BtcEarlyRefunded {
         #[typeshare(serialized_as = "string")]
@@ -1103,6 +1134,75 @@ pub enum TauriSwapProgressEvent {
         #[typeshare(serialized_as = "string")]
         btc_refund_txid: Txid,
     },
+    // We got partially refunded. Might still be able to get amnesty.
+    BtcPartiallyRefunded {
+        #[typeshare(serialized_as = "string")]
+        btc_partial_refund_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+    },
+    /// Waiting for the earnest deposit timelock to expire after partial refund confirmed.
+    WaitingForEarnestDepositTimelockExpiration {
+        #[typeshare(serialized_as = "string")]
+        btc_partial_refund_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+        /// Total blocks required for timelock (target)
+        #[typeshare(serialized_as = "number")]
+        target_blocks: u32,
+        /// Blocks remaining until expiry
+        #[typeshare(serialized_as = "number")]
+        blocks_until_expiry: u32,
+    },
+    // BtcAmnesty was confirmed.
+    BtcAmnestyReceived {
+        #[typeshare(serialized_as = "string")]
+        btc_amnesty_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+    },
+    // TxWithhold has been published (waiting for confirmation)
+    BtcWithholdPublished {
+        #[typeshare(serialized_as = "string")]
+        btc_withhold_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+    },
+    // TxWithhold has been confirmed - amnesty output is withheld
+    BtcWithheld {
+        #[typeshare(serialized_as = "string")]
+        btc_withhold_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+    },
+    // Alice published TxMercy
+    BtcMercyPublished {
+        #[typeshare(serialized_as = "string")]
+        btc_mercy_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+    },
+    // TxMercy has been confirmed - user received withheld funds back
+    BtcMercyConfirmed {
+        #[typeshare(serialized_as = "string")]
+        btc_mercy_txid: Txid,
+        #[typeshare(serialized_as = "number")]
+        btc_lock_amount: bitcoin::Amount,
+        #[typeshare(serialized_as = "number")]
+        btc_amnesty_amount: bitcoin::Amount,
+    },
     BtcPunished,
     AttemptingCooperativeRedeem,
     CooperativeRedeemAccepted,
diff --git a/swap/src/cli/cancel_and_refund.rs b/swap/src/cli/cancel_and_refund.rs
index 3768072391..5c3857465a 100644
--- a/swap/src/cli/cancel_and_refund.rs
+++ b/swap/src/cli/cancel_and_refund.rs
@@ -1,11 +1,12 @@
 use crate::monero::BlockHeight;
 use crate::protocol::bob::BobState;
 use crate::protocol::Database;
-use anyhow::{bail, Result};
+use anyhow::{bail, Context, Result};
 use bitcoin::Txid;
 use bitcoin_wallet::BitcoinWallet;
 use std::sync::Arc;
 use swap_core::bitcoin::ExpiredTimelocks;
+use swap_machine::bob::{RefundType, State6};
 use uuid::Uuid;
 
 pub async fn cancel_and_refund(
@@ -68,14 +69,26 @@ pub async fn cancel(
         } => state.cancel(monero_wallet_restore_blockheight),
         BobState::CancelTimelockExpired(state6) => state6,
         BobState::BtcRefunded(state6) => state6,
+        BobState::BtcCancelPublished(state6) => state6,
         BobState::BtcCancelled(state6) => state6,
         BobState::BtcRefundPublished(state6) => state6,
         BobState::BtcEarlyRefundPublished(state6) => state6,
+        BobState::BtcPartialRefundPublished(state6) => state6,
+        BobState::BtcPartiallyRefunded(state6) => state6,
+        BobState::BtcReclaimConfirmed(state6) => state6,
+        BobState::BtcReclaimPublished(state6) => state6,
+        BobState::WaitingForReclaimTimelockExpiration(state6) => state6,
+        BobState::ReclaimTimelockExpired(state6) => state6,
+        BobState::BtcWithholdPublished(state6) => state6,
+        BobState::BtcMercyPublished(state6) => state6,
+
         BobState::Started { .. }
         | BobState::BtcRedeemed(_)
         | BobState::XmrRedeemed { .. }
         | BobState::BtcPunished { .. }
         | BobState::BtcEarlyRefunded { .. }
+        | BobState::BtcWithheld { .. }
+        | BobState::BtcMercyConfirmed { .. }
         | BobState::SafelyAborted => bail!(
             "Cannot cancel swap {} because it is in state {} which is not cancellable.",
             swap_id,
@@ -93,7 +106,7 @@ pub async fn cancel(
     // Attempt to just publish the cancel transaction
     match state6.submit_tx_cancel(bitcoin_wallet.as_ref()).await {
         Ok((txid, _)) => {
-            let state = BobState::BtcCancelled(state6);
+            let state = BobState::BtcCancelPublished(state6);
             db.insert_latest_state(swap_id, state.clone().into())
                 .await?;
             Ok((txid, state))
@@ -105,7 +118,7 @@ pub async fn cancel(
         Err(err) => {
             // Check if Alice has already published the cancel transaction while we were absent
             if let Some(tx) = state6.check_for_tx_cancel(bitcoin_wallet.as_ref()).await? {
-                let state = BobState::BtcCancelled(state6);
+                let state = BobState::BtcCancelPublished(state6);
                 db.insert_latest_state(swap_id, state.clone().into())
                     .await?;
                 tracing::info!("Alice has already cancelled the swap");
@@ -139,6 +152,17 @@ pub async fn cancel(
                 Ok(ExpiredTimelocks::Cancel { .. }) => {
                     bail!(err.context("Failed to cancel swap even though cancel timelock has expired. This is unexpected."));
                 }
+                Ok(ExpiredTimelocks::WaitingForRemainingRefund { blocks_left }) => {
+                    bail!(err.context(
+                        format!(
+                            "Cannot cancel swap because partial refund is already in progress. Waiting {} blocks for amnesty timelock.",
+                            blocks_left
+                        )
+                    ));
+                }
+                Ok(ExpiredTimelocks::RemainingRefund) => {
+                    bail!(err.context("Cannot cancel swap because we are in the partial refund phase. TxReclaim can be published."));
+                }
                 Err(timelock_err) => {
                     bail!(err
                         .context(timelock_err)
@@ -183,16 +207,27 @@ pub async fn refund(
             monero_wallet_restore_blockheight,
         } => state.cancel(monero_wallet_restore_blockheight),
         BobState::CancelTimelockExpired(state6) => state6,
+        BobState::BtcCancelPublished(state6) => state6,
         BobState::BtcCancelled(state6) => state6,
         BobState::BtcRefunded(state6) => state6,
         BobState::BtcRefundPublished(state6) => state6,
         BobState::BtcEarlyRefundPublished(state6) => state6,
+        BobState::BtcPartialRefundPublished(state6) => state6,
+        BobState::BtcPartiallyRefunded(state6) => state6,
+        BobState::BtcReclaimPublished(state6) => state6,
+        BobState::BtcReclaimConfirmed(state6) => state6,
+        BobState::WaitingForReclaimTimelockExpiration(state6) => state6,
+        BobState::ReclaimTimelockExpired(state6) => state6,
+        BobState::BtcWithholdPublished(state6) => state6,
+        BobState::BtcMercyPublished(state6) => state6,
         BobState::Started { .. }
         | BobState::SwapSetupCompleted(_)
         | BobState::BtcRedeemed(_)
         | BobState::BtcEarlyRefunded { .. }
         | BobState::XmrRedeemed { .. }
         | BobState::BtcPunished { .. }
+        | BobState::BtcWithheld { .. }
+        | BobState::BtcMercyConfirmed { .. }
         | BobState::SafelyAborted => bail!(
             "Cannot refund swap {} because it is in state {} which is not refundable.",
             swap_id,
@@ -200,52 +235,124 @@ pub async fn refund(
         ),
     };
 
-    tracing::info!(%swap_id, "Attempting to manually refund swap");
+    tracing::info!(%swap_id, "Checking timelocks before attempting to manually refund swap");
 
-    // Attempt to just publish the refund transaction
-    match state6.publish_refund_btc(bitcoin_wallet.as_ref()).await {
-        Ok(_) => {
-            let state = BobState::BtcRefunded(state6);
-            db.insert_latest_state(swap_id, state.clone().into())
-                .await?;
-
-            Ok(state)
+    match state6.expired_timelock(bitcoin_wallet.as_ref()).await? {
+        ExpiredTimelocks::None { blocks_left } => {
+            // Cancel timelock isn't even expired -> no refund possible
+            bail!(
+                "Cannot refund swap because the cancel timelock has not expired yet. Blocks left: {}",
+                blocks_left
+            );
         }
-
-        // If we fail to submit the refund transaction it can have one of two reasons:
-        // 1. The cancel transaction has not been published yet
-        // 2. The refund timelock has already expired and we have been punished
-        Err(bitcoin_publication_err) => {
-            match state6.expired_timelock(bitcoin_wallet.as_ref()).await {
-                // We have been punished
-                Ok(ExpiredTimelocks::Punish { .. }) => {
-                    let state = BobState::BtcPunished {
-                        state: state6.clone(),
-                        tx_lock_id: state6.tx_lock_id(),
-                    };
-                    db.insert_latest_state(swap_id, state.clone().into())
-                        .await?;
-                    tracing::info!("You have been punished for not refunding in time");
-                    bail!(bitcoin_publication_err
-                        .context("Cannot refund swap because we have already been punished"));
-                }
-                Ok(ExpiredTimelocks::None { blocks_left }) => {
-                    bail!(
-                        bitcoin_publication_err.context(format!(
-                            "Cannot refund swap because the cancel timelock has not expired yet. Blocks left: {}",
-                            blocks_left
-                        ))
-                    );
-                }
-                Ok(ExpiredTimelocks::Cancel { .. }) => {
-                    bail!(bitcoin_publication_err.context("Failed to refund swap even though cancel timelock has expired. This is unexpected."));
-                }
-                Err(e) => {
-                    bail!(bitcoin_publication_err
-                        .context(e)
-                        .context("Failed to refund swap and could not check timelock status"));
-                }
-            }
+        ExpiredTimelocks::Cancel { .. } => {
+            // Refund possible
+        }
+        ExpiredTimelocks::Punish { .. } => {
+            // We have been punished -> can't refund Bitcoin.
+            // Only option left is cooperative redeem which is out of scope for this function
+            let state = BobState::BtcPunished {
+                state: state6.clone(),
+                tx_lock_id: state6.tx_lock_id(),
+            };
+            db.insert_latest_state(swap_id, state.into()).await?;
+            bail!("Cannot refund swap because we have already been punished. Resume the swap to attempt cooperative redeem.");
+        }
+        ExpiredTimelocks::WaitingForRemainingRefund { .. } | ExpiredTimelocks::RemainingRefund => {
+            // This means we already published TxPartialRefund, so we try to reclaim the
+            // deposit
+            tracing::info!("TxPartialRefund was already published, attempting to reclaim the remaining Bitcoin (anti-spam deposit)");
+            return reclaim(swap_id, state6, bitcoin_wallet, db)
+                .await
+                .context("Couldn't reclaim anti-spam deposit");
         }
     }
+
+    let (refund_tx, refund_type) = state6.construct_best_bitcoin_refund_tx().await?;
+
+    tracing::info!("Best possible refund available: {refund_type}");
+    tracing::info!("Attempting to publish Bitcoin refund transaction");
+
+    let (_txid, subscription) = bitcoin_wallet
+        .ensure_broadcasted(refund_tx, &refund_type.to_string())
+        .await?;
+
+    // First save the "published" state
+    let published_state = match &refund_type {
+        RefundType::Full => BobState::BtcRefundPublished(state6.clone()),
+        RefundType::Partial { .. } => BobState::BtcPartialRefundPublished(state6.clone()),
+    };
+
+    db.insert_latest_state(swap_id, published_state.into())
+        .await?;
+
+    // Wait for the transaction to be confirmed
+    tracing::info!("Waiting for refund transaction to be confirmed...");
+    subscription.wait_until_final().await?;
+
+    // Now save and return the confirmed state
+    let confirmed_state = match refund_type {
+        RefundType::Full => BobState::BtcRefunded(state6),
+        RefundType::Partial { .. } => BobState::BtcPartiallyRefunded(state6),
+    };
+
+    db.insert_latest_state(swap_id, confirmed_state.clone().into())
+        .await?;
+
+    Ok(confirmed_state)
+}
+
+/// On the partial refund path we need to attempt to reclaim the remaining
+/// Bitcoin (anti-spam deposit) after completing the partial refund.
+/// Waits for the remaining-refund timelock to expire, then publishes TxReclaim.
+/// Races against Alice confirming TxWithhold — whichever confirms first wins.
+async fn reclaim(
+    swap_id: Uuid,
+    state6: State6,
+    bitcoin_wallet: Arc<dyn BitcoinWallet>,
+    db: Arc<dyn Database + Send + Sync>,
+) -> Result<BobState> {
+    let remaining_refund_timelock = state6
+        .remaining_refund_timelock
+        .context("Can't reclaim because remaining_refund_timelock is missing")?;
+
+    let tx_partial_refund = state6.construct_tx_partial_refund()?;
+    let tx_withhold = state6.construct_tx_withhold()?;
+
+    let partial_refund_sub = bitcoin_wallet.subscribe_to(Box::new(tx_partial_refund)).await;
+    let withhold_sub = bitcoin_wallet.subscribe_to(Box::new(tx_withhold)).await;
+
+    let state6_for_withhold = state6.clone();
+    let db_for_reclaim = db.clone();
+
+    let reclaim_future = async {
+        partial_refund_sub
+            .wait_until_confirmed_with(remaining_refund_timelock)
+            .await
+            .context("Failed waiting for remaining refund timelock to expire")?;
+
+        tracing::info!("Remaining refund timelock expired, publishing TxReclaim");
+
+        let tx_reclaim = state6.signed_amnesty_transaction().context("Couldn't construct signed TxReclaim")?;
+        let (_txid, sub) = bitcoin_wallet.ensure_broadcasted(tx_reclaim, "reclaim").await.context("Couldn't broadcast TxReclaim")?;
+        db_for_reclaim.insert_latest_state(swap_id, BobState::BtcReclaimPublished(state6.clone()).into()).await?;
+
+        sub.wait_until_final().await.context("Failed waiting for TxReclaim confirmation")?;
+        tracing::info!("TxReclaim confirmed, anti-spam deposit reclaimed");
+        anyhow::Ok(BobState::BtcReclaimConfirmed(state6))
+    };
+
+    let withhold_future = async {
+        withhold_sub.wait_until_final().await.context("Failed waiting for TxWithhold confirmation")?;
+        tracing::info!("Alice confirmed TxWithhold, anti-spam deposit is burnt");
+        anyhow::Ok(BobState::BtcWithheld(state6_for_withhold))
+    };
+
+    let state = tokio::select! {
+        result = reclaim_future => result?,
+        result = withhold_future => result?,
+    };
+
+    db.insert_latest_state(swap_id, state.clone().into()).await?;
+    Ok(state)
 }
diff --git a/swap/src/cli/command.rs b/swap/src/cli/command.rs
index 3185caa949..383afae150 100644
--- a/swap/src/cli/command.rs
+++ b/swap/src/cli/command.rs
@@ -397,7 +397,6 @@ mod tests {
     use super::*;
 
     use crate::cli::api::api_test::*;
-    use swap_serde::monero::address::MoneroAddressNetworkMismatch;
 
     const BINARY_NAME: &str = "swap";
     const ARGS_DATA_DIR: &str = "/tmp/dir/";
@@ -416,53 +415,6 @@ mod tests {
         .unwrap();
     }
 
-    #[tokio::test]
-    async fn given_buy_xmr_on_mainnet_with_testnet_address_then_fails() {
-        let raw_ars = [
-            BINARY_NAME,
-            "buy-xmr",
-            "--receive-address",
-            MONERO_STAGENET_ADDRESS,
-            "--change-address",
-            BITCOIN_TESTNET_ADDRESS,
-            "--seller",
-            MULTI_ADDRESS,
-        ];
-
-        let err = parse_args_and_apply_defaults(raw_ars).await.unwrap_err();
-        assert_eq!(
-            err.downcast_ref::<MoneroAddressNetworkMismatch>().unwrap(),
-            &MoneroAddressNetworkMismatch {
-                expected: monero_address::Network::Mainnet,
-                actual: monero_address::Network::Stagenet
-            }
-        );
-    }
-
-    #[tokio::test]
-    async fn given_buy_xmr_on_testnet_with_mainnet_address_then_fails() {
-        let raw_ars = [
-            BINARY_NAME,
-            "--testnet",
-            "buy-xmr",
-            "--receive-address",
-            MONERO_MAINNET_ADDRESS,
-            "--change-address",
-            BITCOIN_MAINNET_ADDRESS,
-            "--seller",
-            MULTI_ADDRESS,
-        ];
-
-        let err = parse_args_and_apply_defaults(raw_ars).await.unwrap_err();
-        assert_eq!(
-            err.downcast_ref::<MoneroAddressNetworkMismatch>().unwrap(),
-            &MoneroAddressNetworkMismatch {
-                expected: monero_address::Network::Stagenet,
-                actual: monero_address::Network::Mainnet
-            }
-        );
-    }
-
     #[tokio::test]
     async fn given_resume_on_mainnet_then_defaults_to_mainnet() {
         let raw_ars = [BINARY_NAME, "resume", "--swap-id", SWAP_ID];
@@ -602,66 +554,4 @@ mod tests {
         simple_positive(&raw_ars, (true, true, None), cli_cmd).await;
     }
 
-    #[tokio::test]
-    async fn only_bech32_addresses_mainnet_are_allowed() {
-        // TODO: not apply defaults
-        let mut raw_ars = [
-            BINARY_NAME,
-            "buy-xmr",
-            "--change-address",
-            "",
-            "--receive-address",
-            MONERO_MAINNET_ADDRESS,
-            "--seller",
-            MULTI_ADDRESS,
-        ];
-        raw_ars[3] = "1A5btpLKZjgYm8R22rJAhdbTFVXgSRA2Mp";
-        parse_args_and_custom(raw_ars, async |_, _, _| unreachable!())
-            .await
-            .unwrap_err();
-
-        raw_ars[3] = "36vn4mFhmTXn7YcNwELFPxTXhjorw2ppu2";
-        parse_args_and_custom(raw_ars, async |_, _, _| unreachable!())
-            .await
-            .unwrap_err();
-
-        raw_ars[3] = "bc1qh4zjxrqe3trzg7s6m7y67q2jzrw3ru5mx3z7j3";
-        let ParseResult::Success(_) = parse_args_and_custom(raw_ars, async |_, _, _| Ok(()))
-            .await
-            .unwrap()
-        else {
-            panic!()
-        };
-    }
-
-    #[tokio::test]
-    async fn only_bech32_addresses_testnet_are_allowed() {
-        let mut raw_ars = [
-            BINARY_NAME,
-            "--testnet",
-            "buy-xmr",
-            "--change-address",
-            "",
-            "--receive-address",
-            MONERO_STAGENET_ADDRESS,
-            "--seller",
-            MULTI_ADDRESS,
-        ];
-        raw_ars[4] = "n2czxyeFCQp9e8WRyGpy4oL4YfQAeKkkUH";
-        parse_args_and_custom(raw_ars, async |_, _, _| unreachable!())
-            .await
-            .unwrap_err();
-        raw_ars[4] = "2ND9a4xmQG89qEWG3ETRuytjKpLmGrW7Jvf";
-        parse_args_and_custom(raw_ars, async |_, _, _| unreachable!())
-            .await
-            .unwrap_err();
-
-        raw_ars[4] = "tb1q958vfh3wkdp232pktq8zzvmttyxeqnj80zkz3v";
-        let ParseResult::Success(_) = parse_args_and_custom(raw_ars, async |_, _, _| Ok(()))
-            .await
-            .unwrap()
-        else {
-            panic!()
-        };
-    }
 }
diff --git a/swap/src/cli/event_loop.rs b/swap/src/cli/event_loop.rs
index 221ce467e9..433ac41cc8 100644
--- a/swap/src/cli/event_loop.rs
+++ b/swap/src/cli/event_loop.rs
@@ -710,7 +710,14 @@ impl EventLoopHandle {
                 }
                 // These are errors thrown by the swap_setup/bob behaviour
                 Ok(Err(err)) => {
-                    Err(backoff::Error::transient(err.context("A network error occurred while setting up the swap")))
+                    use swap_p2p::protocols::swap_setup::bob::Error as SetupError;
+                    if err.downcast_ref::<SetupError>()
+                        .is_some_and(|e| matches!(e, SetupError::SwapRejected(_)))
+                    {
+                        Err(backoff::Error::permanent(err))
+                    } else {
+                        Err(backoff::Error::transient(err.context("A network error occurred while setting up the swap")))
+                    }
                 }
                 // This will happen if we don't establish a connection to Alice within the timeout of the MPSC channel
                 // The protocol does not dial Alice it self
diff --git a/swap/src/cli/watcher.rs b/swap/src/cli/watcher.rs
index 299f30b2f4..7dc542f3b4 100644
--- a/swap/src/cli/watcher.rs
+++ b/swap/src/cli/watcher.rs
@@ -107,7 +107,7 @@ impl Watcher {
             self.cached_timelocks.insert(swap_id, new_timelock_status);
 
             // If the swap has to be refunded, do it in the background
-            if let Some(ExpiredTimelocks::Cancel { .. }) = new_timelock_status {
+            if matches!(new_timelock_status, Some(ExpiredTimelocks::Cancel { .. }) | Some(ExpiredTimelocks::RemainingRefund)) {
                 // If the swap is already refunded, we can skip the refund
                 if matches!(state, BobState::BtcRefunded(_)) {
                     continue;
diff --git a/swap/src/common/tracing_util.rs b/swap/src/common/tracing_util.rs
index 53cfff7c2f..6e785b529f 100644
--- a/swap/src/common/tracing_util.rs
+++ b/swap/src/common/tracing_util.rs
@@ -1,4 +1,4 @@
-use std::io::{self, IsTerminal};
+use std::io;
 use std::path::Path;
 use std::str::FromStr;
 
@@ -110,10 +110,9 @@ pub fn init(
     );
 
     // Layer for writing to the terminal
-    let is_terminal = std::io::stderr().is_terminal();
     let terminal_layer = fmt::layer()
         .with_writer(std::io::stderr)
-        .with_ansi(is_terminal)
+        .with_ansi(true)
         .with_timer(UtcTime::rfc_3339())
         .with_target(true)
         .with_file(true)
diff --git a/swap/src/protocol/alice/swap.rs b/swap/src/protocol/alice/swap.rs
index 1d9d9e8941..67c6faed44 100644
--- a/swap/src/protocol/alice/swap.rs
+++ b/swap/src/protocol/alice/swap.rs
@@ -272,7 +272,7 @@ where
                     // Retry repeatedly to broadcast tx_early_refund
                     result = async {
                         backoff::future::retry_notify(backoff, || async {
-                            bitcoin_wallet.broadcast(tx_early_refund.clone(), "early_refund").await.map_err(backoff::Error::transient)
+                            bitcoin_wallet.ensure_broadcasted(tx_early_refund.clone(), "early_refund").await.map_err(backoff::Error::transient)
                         }, |e, wait_time: Duration| {
                             tracing::warn!(
                                 %tx_early_refund_txid,
@@ -425,6 +425,17 @@ where
                         state3,
                     }
                 }
+                burn_instruction = event_loop_handle.wait_for_burn_on_refund_instruction() => {
+                    let burn = burn_instruction.context("Failed to receive burn instruction")?;
+                    let mut updated_state3 = (*state3).clone();
+                    updated_state3.should_publish_tx_withhold = Some(burn);
+
+                    AliceState::XmrLockTransferProofSent {
+                        monero_wallet_restore_blockheight,
+                        transfer_proof,
+                        state3: Box::new(updated_state3),
+                    }
+                }
             }
         }
         AliceState::EncSigLearned {
@@ -480,7 +491,7 @@ where
                 }
 
                 bitcoin_wallet
-                    .broadcast(tx_redeem.clone(), "redeem")
+                    .ensure_broadcasted(tx_redeem.clone(), "redeem")
                     .await
                     .map(Some)
                     .map_err(backoff::Error::transient)
@@ -543,15 +554,26 @@ where
                 .subscribe_to(Box::new(state3.tx_lock.clone()))
                 .await;
 
-            // TODO: Retry here
-            tx_lock_status_subscription
-                .wait_until_confirmed_with(state3.cancel_timelock)
-                .await?;
+            select! {
+                result = tx_lock_status_subscription.wait_until_confirmed_with(state3.cancel_timelock) => {
+                    result?;
+                    AliceState::CancelTimelockExpired {
+                        monero_wallet_restore_blockheight,
+                        transfer_proof,
+                        state3,
+                    }
+                }
+                burn_instruction = event_loop_handle.wait_for_burn_on_refund_instruction() => {
+                    let burn = burn_instruction.context("Failed to receive burn instruction")?;
+                    let mut updated_state3 = (*state3).clone();
+                    updated_state3.should_publish_tx_withhold = Some(burn);
 
-            AliceState::CancelTimelockExpired {
-                monero_wallet_restore_blockheight,
-                transfer_proof,
-                state3,
+                    AliceState::WaitingForCancelTimelockExpiration {
+                        monero_wallet_restore_blockheight,
+                        transfer_proof,
+                        state3: Box::new(updated_state3),
+                    }
+                }
             }
         }
         AliceState::CancelTimelockExpired {
@@ -613,8 +635,23 @@ where
                 .subscribe_to(Box::new(state3.tx_cancel()))
                 .await;
 
+            // We wait for either TxFullRefund or TxPartialRefund to be published
+            // - both allow us to extract the Monero refund key.
+            // Otherwise we punish, once that timelock expired.
+
+            // TODO: should we retry here?
             select! {
-                spend_key = state3.watch_for_btc_tx_refund(&*bitcoin_wallet) => {
+                spend_key = state3.watch_for_btc_tx_full_refund(&*bitcoin_wallet) => {
+                    let spend_key = spend_key?;
+
+                    AliceState::BtcRefunded {
+                        monero_wallet_restore_blockheight,
+                        transfer_proof,
+                        spend_key,
+                        state3,
+                    }
+                }
+                spend_key = state3.watch_for_btc_tx_partial_refund(&*bitcoin_wallet) => {
                     let spend_key = spend_key?;
 
                     AliceState::BtcRefunded {
@@ -633,13 +670,51 @@ where
                         state3,
                     }
                 }
+                burn_instruction = event_loop_handle.wait_for_burn_on_refund_instruction() => {
+                    let burn = burn_instruction.context("Failed to receive burn instruction")?;
+                    let mut updated_state3 = (*state3).clone();
+                    updated_state3.should_publish_tx_withhold = Some(burn);
+
+                    AliceState::BtcCancelled {
+                        monero_wallet_restore_blockheight,
+                        transfer_proof,
+                        state3: Box::new(updated_state3),
+                    }
+                }
             }
         }
         AliceState::BtcRefunded {
             transfer_proof,
             spend_key,
             state3,
-            ..
+            monero_wallet_restore_blockheight,
+        } => AliceState::XmrRefundable {
+            monero_wallet_restore_blockheight,
+            transfer_proof,
+            spend_key,
+            state3,
+        },
+        AliceState::BtcPartiallyRefunded {
+            transfer_proof,
+            spend_key,
+            state3,
+            monero_wallet_restore_blockheight,
+        } => {
+            // Bob has the pre-signed TxReclaim from swap setup and can
+            // publish it himself after the remaining refund timelock expires.
+            // TODO: implement system for publishing TxWithhold at this point
+            AliceState::XmrRefundable {
+                monero_wallet_restore_blockheight,
+                transfer_proof,
+                spend_key,
+                state3,
+            }
+        }
+        AliceState::XmrRefundable {
+            monero_wallet_restore_blockheight: _,
+            transfer_proof,
+            spend_key,
+            state3,
         } => {
             retry(
                 "Refund Monero",
@@ -660,7 +735,9 @@ where
             .await
             .expect("We should never run out of retries while refunding Monero");
 
-            AliceState::XmrRefunded
+            AliceState::XmrRefunded {
+                state3: Some(state3),
+            }
         }
         AliceState::BtcPunishable {
             monero_wallet_restore_blockheight,
@@ -697,7 +774,87 @@ where
             .await
             .expect("We should never run out of retries while publishing the punish transaction")
         }
-        AliceState::XmrRefunded => AliceState::XmrRefunded,
+        AliceState::XmrRefunded { state3 } => {
+            // Only publish TxWithhold
+            let Some(mut state3) = state3 else {
+                tracing::info!(
+                    "Running a pre-partial refund swap, there is no amnesty output to burn"
+                );
+                return Ok(AliceState::XmrRefunded { state3: None });
+            };
+
+            // Fetch the burn decision, if it was made via the controller
+            if let Some(burn_decision) = event_loop_handle.get_burn_on_refund_instruction().await {
+                state3.should_publish_tx_withhold = Some(burn_decision);
+            }
+
+            if !state3.should_publish_tx_withhold.unwrap_or(false) {
+                tracing::info!("Not instructed to partially burn the takers refund. Finishing");
+                return Ok(AliceState::XmrRefunded {
+                    state3: Some(state3),
+                });
+            }
+
+            let signed_tx = state3.signed_withhold_transaction().context("Can't withhold the amnesty output after Bob refunded because we couldn't construct the transaction")?;
+
+            bitcoin_wallet
+                .ensure_broadcasted(signed_tx, "withhold")
+                .await
+                .context("Couldn't publish TxWithhold")?;
+
+            AliceState::BtcWithholdPublished { state3 }
+        }
+        AliceState::BtcWithholdPublished { state3 } => {
+            let tx_withhold = state3
+                .tx_withhold()
+                .context("Can't construct TxWithhold even though we published it")?;
+
+            let subscription = bitcoin_wallet.subscribe_to(Box::new(tx_withhold)).await;
+
+            subscription
+                .wait_until_final()
+                .await
+                .context("Failed to wait for TxWithhold to be confirmed")?;
+
+            AliceState::BtcWithholdConfirmed { state3 }
+        }
+        AliceState::BtcWithholdConfirmed { state3 } => {
+            // Nothing to do here. Mercy is triggered manually.
+            AliceState::BtcWithholdConfirmed { state3 }
+        }
+        AliceState::BtcMercyGranted { state3 } => {
+            // Operator has decided to grant mercy to Bob
+            let signed_tx = state3
+                .signed_mercy_transaction()
+                .context("Failed to construct signed TxMercy")?;
+
+            bitcoin_wallet
+                .ensure_broadcasted(signed_tx, "mercy")
+                .await
+                .context("Failed to publish TxMercy")?;
+
+            tracing::info!("TxMercy published successfully");
+
+            AliceState::BtcMercyPublished { state3 }
+        }
+        AliceState::BtcMercyPublished { state3 } => {
+            // Wait for TxMercy to be confirmed
+            let tx_mercy = state3
+                .tx_mercy()
+                .context("Couldn't construct TxMercy even though we have published it")?;
+
+            let subscription = bitcoin_wallet
+                .subscribe_to(Box::new(tx_mercy))
+                .await;
+
+            subscription
+                .wait_until_final()
+                .await
+                .context("Failed to wait for TxMercy to be confirmed")?;
+
+            AliceState::BtcMercyConfirmed { state3 }
+        }
+        AliceState::BtcMercyConfirmed { state3 } => AliceState::BtcMercyConfirmed { state3 },
         AliceState::BtcRedeemed => AliceState::BtcRedeemed,
         AliceState::BtcPunished {
             state3,
@@ -840,28 +997,91 @@ pub(crate) fn has_already_processed_enc_sig(state: &AliceState) -> bool {
 
 #[cfg(test)]
 mod tests {
+    use super::build_transfer_destinations;
+    use crate::protocol::alice::TipConfig;
+    use rust_decimal::Decimal;
+
+    const TEST_ADDRESS_STR: &str = "53gEuGZUhP9JMEBZoGaFNzhwEgiG7hwQdMCqFxiyiTeFPmkbt1mAoNybEUvYBKHcnrSgxnVWgZsTvRBaHBNXPa8tHiCU51a";
+
+    fn test_address() -> monero_address::MoneroAddress {
+        monero_address::MoneroAddress::from_str_with_unchecked_network(TEST_ADDRESS_STR).unwrap()
+    }
+
     #[test]
     fn test_build_transfer_destinations_without_tip() {
-        todo!("implement once unit tests compile again")
+        let lock_amount = monero_oxide_ext::Amount::from_pico(1_000_000_000_000); // 1 XMR
+        let tip = TipConfig {
+            ratio: Decimal::ZERO,
+            address: test_address(),
+        };
+
+        let result = build_transfer_destinations(test_address(), lock_amount, tip).unwrap();
+
+        assert_eq!(result.len(), 1);
+        assert_eq!(result[0].1, lock_amount);
     }
 
     #[test]
     fn test_build_transfer_destinations_with_tip() {
-        todo!("implement once unit tests compile again")
+        let lock_amount = monero_oxide_ext::Amount::from_pico(10_000_000_000_000); // 10 XMR
+        let tip = TipConfig {
+            ratio: Decimal::new(1, 2), // 0.01 = 1%
+            address: test_address(),
+        };
+
+        let result = build_transfer_destinations(test_address(), lock_amount, tip).unwrap();
+
+        // Tip = 10 XMR * 0.01 = 0.1 XMR = 100_000_000_000 pico >> 30_000_000 threshold
+        assert_eq!(result.len(), 2);
+        assert_eq!(result[0].1, lock_amount);
+        assert_eq!(result[1].1, monero_oxide_ext::Amount::from_pico(100_000_000_000));
     }
 
     #[test]
     fn test_build_transfer_destinations_with_small_tip() {
-        todo!("implement once unit tests compile again")
+        // ratio * amount < 30_000_000 piconero threshold
+        let lock_amount = monero_oxide_ext::Amount::from_pico(2_000_000_000); // 0.002 XMR
+        let tip = TipConfig {
+            ratio: Decimal::new(1, 2), // 0.01
+            address: test_address(),
+        };
+
+        let result = build_transfer_destinations(test_address(), lock_amount, tip).unwrap();
+
+        // Tip = 0.002 XMR * 0.01 = 20_000_000 piconero < 30_000_000 threshold
+        assert_eq!(result.len(), 1);
+        assert_eq!(result[0].1, lock_amount);
     }
 
     #[test]
     fn test_build_transfer_destinations_with_zero_tip() {
-        todo!("implement once unit tests compile again")
+        // Nonzero ratio but tiny lock amount -> effective tip rounds to near-zero
+        let lock_amount = monero_oxide_ext::Amount::from_pico(100);
+        let tip = TipConfig {
+            ratio: Decimal::new(1, 1), // 0.1 = 10%
+            address: test_address(),
+        };
+
+        let result = build_transfer_destinations(test_address(), lock_amount, tip).unwrap();
+
+        // Tip = 100 * 0.1 = 10 piconero << 30_000_000 threshold
+        assert_eq!(result.len(), 1);
+        assert_eq!(result[0].1, lock_amount);
     }
 
     #[test]
     fn test_build_transfer_destinations_with_fractional_tip() {
-        todo!("implement once unit tests compile again")
+        let lock_amount = monero_oxide_ext::Amount::from_pico(1_000_000_000_000); // 1 XMR
+        let tip = TipConfig {
+            ratio: Decimal::new(5, 3), // 0.005 = 0.5%
+            address: test_address(),
+        };
+
+        let result = build_transfer_destinations(test_address(), lock_amount, tip).unwrap();
+
+        // Tip = 1 XMR * 0.005 = 0.005 XMR = 5_000_000_000 pico >> 30_000_000 threshold
+        assert_eq!(result.len(), 2);
+        assert_eq!(result[0].1, lock_amount);
+        assert_eq!(result[1].1, monero_oxide_ext::Amount::from_pico(5_000_000_000));
     }
 }
diff --git a/swap/src/protocol/bob/swap.rs b/swap/src/protocol/bob/swap.rs
index 5933bb10fc..517869063a 100644
--- a/swap/src/protocol/bob/swap.rs
+++ b/swap/src/protocol/bob/swap.rs
@@ -13,10 +13,12 @@ use crate::protocol::bob::common::{
 };
 use crate::protocol::bob::*;
 use crate::protocol::{bob, Database};
-use anyhow::{Context as AnyContext, Result};
+use anyhow::{Context as AnyContext, Result, anyhow};
 use std::sync::Arc;
 use std::time::Duration;
-use swap_core::bitcoin::{ExpiredTimelocks, TxCancel, TxRefund};
+use swap_core::bitcoin::{
+    ExpiredTimelocks, TxCancel, TxMercy, TxFullRefund, TxPartialRefund, TxReclaim,
+};
 use swap_core::monero::BlockHeight;
 use swap_env::env;
 use tokio::select;
@@ -29,7 +31,7 @@ const PRE_BTC_LOCK_APPROVAL_TIMEOUT_SECS: u64 = 60 * 3;
 /// This is necessary because sometimes our acknowledgement might not reach Alice.
 pub fn has_already_processed_transfer_proof(state: &BobState) -> bool {
     // This match statement MUST match all states which Bob can enter after receiving the transfer proof.
-    // We do not match any of the cancel / refund states because in those, the swap cannot be successfull anymore.
+    // We do not match any of the cancel / refund states because in those, the swap cannot be successful anymore.
     matches!(
         state,
         |BobState::XmrLockTransactionSeen { .. }| BobState::XmrLocked(..)
@@ -46,8 +48,10 @@ pub fn has_already_processed_transfer_proof(state: &BobState) -> bool {
 // - We want to attempt recovery via cooperative XMR redeem once.
 // - If unsuccessful, we exit to avoid an infinite retry loop.
 // - The swap can still be manually resumed later and retried if desired.
+//
+// The same is true for the BtcWithheld.
 pub fn is_run_at_most_once(state: &BobState) -> bool {
-    matches!(state, BobState::BtcPunished { .. })
+    matches!(state, BobState::BtcPunished { .. } | BobState::BtcWithheld(..))
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -111,12 +115,26 @@ async fn next_state(
             change_address,
             tx_lock_fee,
         } => {
-            let tx_refund_fee = bitcoin_wallet
-                .estimate_fee(TxRefund::weight(), Some(btc_amount))
-                .await?;
             let tx_cancel_fee = bitcoin_wallet
                 .estimate_fee(TxCancel::weight(), Some(btc_amount))
                 .await?;
+            let tx_refund_fee = bitcoin_wallet
+                .estimate_fee(TxFullRefund::weight(), Some(btc_amount))
+                .await?;
+
+            // At this point we don't know how high btc_amnesty_amount is.
+            // This means we don't know how large the amount of the partial refund and amnesty transactions will be.
+            // We therefore specify the same upper limit on tx fees as for the other transactions, even though
+            // the maximum fee percentage might be higher due to that.
+            let tx_partial_refund_fee = bitcoin_wallet
+                .estimate_fee(TxPartialRefund::weight(), Some(btc_amount))
+                .await?;
+            let tx_reclaim_fee = bitcoin_wallet
+                .estimate_fee(TxReclaim::weight(), Some(btc_amount))
+                .await?;
+            let tx_mercy_fee = bitcoin_wallet
+                .estimate_fee(TxMercy::weight(), Some(btc_amount))
+                .await?;
 
             // Emit an event to tauri that we are negotiating with the maker to lock the Bitcoin
             event_emitter.emit_swap_progress_event(
@@ -132,6 +150,9 @@ async fn next_state(
                     btc: btc_amount,
                     tx_lock_fee,
                     tx_refund_fee,
+                    tx_partial_refund_fee,
+                    tx_reclaim_fee,
+                    tx_mercy_fee,
                     tx_cancel_fee,
                     bitcoin_refund_address: change_address,
                 })
@@ -144,6 +165,7 @@ async fn next_state(
         BobState::SwapSetupCompleted(state2) => {
             // Alice and Bob have exchanged all necessary signatures
             let xmr_receive_amount = state2.xmr;
+            let btc_amnesty_amount = state2.btc_amnesty_amount.context("btc_amnesty_amount missing")?;
 
             // Sign the Bitcoin lock transaction
             let (state3, tx_lock) = state2.lock_btc().await?;
@@ -162,9 +184,11 @@ async fn next_state(
             let details = LockBitcoinDetails {
                 btc_lock_amount,
                 btc_network_fee,
+                btc_amnesty_amount,
                 xmr_receive_amount,
                 monero_receive_pool,
                 swap_id,
+                has_full_refund_signature: state3.refund_signatures.has_full_refund_encsig()
             };
 
             // We request approval before publishing the Bitcoin lock transaction,
@@ -245,29 +269,10 @@ async fn next_state(
                 .emit_swap_progress_event(swap_id, TauriSwapProgressEvent::BtcLockPublishInflight);
 
             retry(
-                "Check and publish Bitcoin lock transaction",
+                "Publish Bitcoin lock transaction",
                 || async {
-                    // TODO: We could also only check this if the broadcast failed
-
-                    // Check if the transaction has already been broadcasted.
-                    // It could be that the operation was aborted after the transaction reached the Electrum server
-                    // but before we transitioned to the BtcLocked state
-                    tracing::debug!(txid = %state3.tx_lock_id(), "Checking if Bitcoin lock transaction has already been published");
-
-                    if state3
-                        .is_tx_lock_published(&*bitcoin_wallet)
-                        .await
-                        .map_err(backoff::Error::transient)?
-                    {
-                        tracing::info!(txid = %state3.tx_lock_id(), "Bitcoin lock transaction already published, skipping publish");
-                        return Ok(());
-                    }
-
-                    // Publish the signed Bitcoin lock transaction
-                    tracing::info!(txid = %state3.tx_lock_id(), "Publishing Bitcoin lock transaction");
-
                     bitcoin_wallet
-                        .broadcast(btc_lock_tx_signed.clone(), "lock")
+                        .ensure_broadcasted(btc_lock_tx_signed.clone(), "lock")
                         .await
                         .map_err(backoff::Error::transient)?;
 
@@ -277,7 +282,7 @@ async fn next_state(
                 None,
             )
             .await
-            .context("Failed to check/publish Bitcoin lock transaction")?;
+            .context("Failed to publish Bitcoin lock transaction")?;
 
             BobState::BtcLocked {
                 state3,
@@ -818,13 +823,13 @@ async fn next_state(
 
                     // Then we check if tx_cancel is present on the chain
                     if state6.check_for_tx_cancel(&*bitcoin_wallet).await.context("Failed to check for existence of tx_cancel before cancelling").map_err(backoff::Error::transient)?.is_some() {
-                        return Ok(BobState::BtcCancelled(state6.clone()));
+                        return Ok(BobState::BtcCancelPublished(state6.clone()));
                     }
 
                     // If none of the above are present, we publish tx_cancel
                     state6.submit_tx_cancel(&*bitcoin_wallet).await.context("Failed to submit tx_cancel after ensuring both tx_early_refund and tx_cancel are not present").map_err(backoff::Error::transient)?;
 
-                    Ok(BobState::BtcCancelled(state6))
+                    Ok(BobState::BtcCancelPublished(state6))
                     }
                 },
                 None,
@@ -833,8 +838,64 @@ async fn next_state(
             .await
             .expect("we never stop retrying to check for tx_redeem, tx_early_refund and tx_cancel then publishing tx_cancel if necessary")
         }
+        BobState::BtcCancelPublished(state) => {
+            let btc_cancel_txid = state.construct_tx_cancel()?.txid();
+            let tx_early_refund = state.construct_tx_early_refund();
+            let tx_early_refund_txid = tx_early_refund.txid();
+            let btc_finality_confirmations = env_config.bitcoin_finality_confirmations;
+
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::BtcCancelPublished {
+                    btc_cancel_txid,
+                    btc_cancel_confirmations: 0,
+                    btc_cancel_target_confirmations: btc_finality_confirmations,
+                },
+            );
+
+            let tx_cancel_for_sub = state.construct_tx_cancel()?;
+            let (tx_cancel_sub, tx_early_refund_sub): (
+                bitcoin_wallet::Subscription,
+                bitcoin_wallet::Subscription,
+            ) = tokio::join!(
+                bitcoin_wallet.subscribe_to(Box::new(tx_cancel_for_sub)),
+                bitcoin_wallet.subscribe_to(Box::new(tx_early_refund)),
+            );
+
+            let tx_cancel_confirmed = tx_cancel_sub.wait_until(|status| {
+                let bitcoin_wallet::primitives::ScriptStatus::Confirmed(confirmed) = status else {
+                    return false;
+                };
+                event_emitter.emit_swap_progress_event(
+                    swap_id,
+                    TauriSwapProgressEvent::BtcCancelPublished {
+                        btc_cancel_txid,
+                        btc_cancel_confirmations: confirmed.confirmations(),
+                        btc_cancel_target_confirmations: btc_finality_confirmations,
+                    },
+                );
+                confirmed.meets_target(btc_finality_confirmations)
+            });
+
+            // TxCancel and TxEarlyRefund spend the same UTXO (TxLock output).
+            // We wait for whichever confirms first.
+            select! {
+                _ = tx_cancel_confirmed => {
+                    event_emitter.emit_swap_progress_event(
+                        swap_id,
+                        TauriSwapProgressEvent::BtcCancelled { btc_cancel_txid },
+                    );
+
+                    BobState::BtcCancelled(state)
+                },
+                _ = tx_early_refund_sub.wait_until_final() => {
+                    tracing::info!(%tx_early_refund_txid, "Alice refunded us our Bitcoin early while waiting for TxCancel confirmation");
+
+                    BobState::BtcEarlyRefunded(state)
+                },
+            }
+        }
         BobState::BtcCancelled(state) => {
-            // TODO: We should differentiate between BtcCancelPublished and BtcCancelled (confirmed)
             let btc_cancel_txid = state.construct_tx_cancel()?.txid();
 
             event_emitter.emit_swap_progress_event(
@@ -844,35 +905,66 @@ async fn next_state(
 
             let bitcoin_wallet_for_retry = bitcoin_wallet.clone();
             let state_for_retry = state.clone();
+
             retry(
                 "Check timelocks and try to refund",
                 || {
                     let bitcoin_wallet = bitcoin_wallet_for_retry.clone();
                     let state = state_for_retry.clone();
                     async move {
-                    match state.expired_timelock(&*bitcoin_wallet).await.map_err(backoff::Error::transient)? {
-                        ExpiredTimelocks::None { .. } => {
-                            Err(backoff::Error::Permanent(anyhow::anyhow!(
-                                "Internal error: canceled state reached before cancel timelock was expired"
-                            )))
-                        }
-                        ExpiredTimelocks::Cancel { .. } => {
-                            let btc_refund_txid = state.publish_refund_btc(&*bitcoin_wallet).await.context("Failed to publish refund transaction after ensuring cancel timelock has expired and refund timelock has not expired").map_err(backoff::Error::transient)?;
-
-                            tracing::info!(%btc_refund_txid, "Refunded our Bitcoin");
-
-                            Ok(BobState::BtcRefundPublished(state.clone()))
-                        }
-                        ExpiredTimelocks::Punish => {
-                            let tx_lock_id = state.tx_lock_id();
-
-                            Ok(BobState::BtcPunished {
-                                tx_lock_id,
-                                state,
-                            })
+                        match state.expired_timelock(&*bitcoin_wallet).await.map_err(backoff::Error::transient)? {
+                            ExpiredTimelocks::None { .. } => {
+                                Err(backoff::Error::Permanent(anyhow::anyhow!(
+                                    "Internal error: canceled state reached before cancel timelock was expired"
+                                )))
+                            }
+                            ExpiredTimelocks::Cancel { .. } => {
+                                // Publish the best Bitcoin refund transaction we can sign:
+                                //  - either full refund, if alice sent use that signature (prioritized)
+                                //  - or just partial refund.
+                                tracing::debug!("Attempting to refund Bitcoin");
+                            
+                                if state.refund_signatures.has_full_refund_encsig() {
+                                    let full_refund_tx = state.signed_full_refund_transaction().context("Couldn't construct full refund Bitcoin transaction")?;
+                                    tracing::debug!("Have full refund signature, attempting full refund");
+                                    bitcoin_wallet.ensure_broadcasted(full_refund_tx, "full refund")
+                                        .await
+                                        .context("Couldn't ensure broadcast of Bitcoin full refund transaction")
+                                        .map_err(backoff::Error::transient)?;
+
+                                    Ok(BobState::BtcRefundPublished(state.clone()))
+                                } else if state.refund_signatures.has_partial_refund_encsig() {
+                                    let partial_refund_tx = state.signed_partial_refund_transaction().context("Couldn't construct partial refund Bitcoin transaction")?;
+                                    tracing::debug!("Don't have full refund signature, attempting partial refund");
+                                    bitcoin_wallet.ensure_broadcasted(partial_refund_tx, "partial refund")
+                                        .await
+                                        .context("Couldn't ensure broadcast of Bitcoin partial refund transaction")
+                                        .map_err(backoff::Error::transient)?;
+                                
+                                    Ok(BobState::BtcPartialRefundPublished(state.clone()))
+                                } else {
+                                    unreachable!("We must have either partial of full refund signatures")
+                                }
+                            }
+                            ExpiredTimelocks::Punish => {
+                                let tx_lock_id = state.tx_lock_id();
+
+                                Ok(BobState::BtcPunished {
+                                    tx_lock_id,
+                                    state,
+                                })
+                            }
+                            ExpiredTimelocks::WaitingForRemainingRefund { blocks_left } => {
+                                Ok(BobState::WaitingForReclaimTimelockExpiration(state))
+                            }
+                            ExpiredTimelocks::RemainingRefund => {
+                                // TxPartialRefund was published and timelock expired
+                                // We transition to BtcPartiallyRefunded and handle the reclaim from there
+                                tracing::info!("Bitcoin was partially refunded and the remainig refund timelock expired");
+                                Ok(BobState::BtcPartiallyRefunded(state))
+                            }
                         }
                     }
-                    }
                 },
                 None,
                 None,
@@ -885,7 +977,7 @@ async fn next_state(
             event_emitter.emit_swap_progress_event(
                 swap_id,
                 TauriSwapProgressEvent::BtcRefundPublished {
-                    btc_refund_txid: state.signed_refund_transaction()?.compute_txid(),
+                    btc_refund_txid: state.signed_full_refund_transaction()?.compute_txid(),
                 },
             );
 
@@ -978,16 +1070,99 @@ async fn next_state(
                 },
             }
         }
+        BobState::BtcPartialRefundPublished(state)=> {
+            // 1. Emit a Tauri event
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::BtcPartialRefundPublished {
+                    btc_partial_refund_txid: state.construct_tx_partial_refund()?.txid(),
+                    btc_lock_amount: state.tx_lock.lock_amount(),
+                    btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                },
+            );
+
+            // TxEarlyRefund might still get published+confirmed before the PartialRefund gets confirmed
+            // 2. Wait for either refund transaction to be confirmed
+            
+            let tx_partial_refund = state.construct_tx_partial_refund()?;
+            let tx_early_refund = state.construct_tx_early_refund();
+
+            let (tx_partial_refund_status, tx_early_refund_status) = tokio::join!(
+                bitcoin_wallet.subscribe_to(Box::new(tx_partial_refund.clone())),
+                bitcoin_wallet.subscribe_to(Box::new(tx_early_refund.clone())),
+            );
+
+            select!{
+                _ = tx_partial_refund_status.wait_until_final() => {
+                    tracing::info!("TxPartialRefund has been confirmed");
+                    BobState::BtcPartiallyRefunded(state)
+                }
+                _ = tx_early_refund_status.wait_until_final() => {
+                    tracing::info!("TxEarlyRefund has been confirmed");
+                    BobState::BtcEarlyRefunded(state)
+                }
+            }
+        }
+        BobState::BtcPartiallyRefunded(state) => {
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::BtcPartiallyRefunded {
+                    btc_partial_refund_txid: state.construct_tx_partial_refund()?.txid(),
+                    btc_lock_amount: state.tx_lock.lock_amount(),
+                    btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                },
+            );
+
+            // Transition to waiting state where we race remaining_refund_timelock
+            // against Alice potentially publishing TxWithhold
+            BobState::WaitingForReclaimTimelockExpiration(state)
+        }
         BobState::BtcRefunded(state) => {
             event_emitter.emit_swap_progress_event(
                 swap_id,
                 TauriSwapProgressEvent::BtcRefunded {
-                    btc_refund_txid: state.signed_refund_transaction()?.compute_txid(),
+                    btc_refund_txid: state.signed_full_refund_transaction()?.compute_txid(),
                 },
             );
 
             BobState::BtcRefunded(state)
         }
+        BobState::BtcReclaimPublished(state) => {
+            // Here we just wait for the amnesty transaction to be confirmed
+            let tx_amnesty = state.construct_tx_amnesty().context("Couldn't construct Bitcoin amnesty transaction")?;
+
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::BtcAmnestyPublished {
+                    btc_amnesty_txid: tx_amnesty.txid(),
+                    btc_lock_amount: state.tx_lock.lock_amount(),
+                    btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                },
+            );
+
+            let subscription = bitcoin_wallet.subscribe_to(Box::new(tx_amnesty.clone())).await;
+
+            retry("Waiting for Bitcoin amnesty transaction to be published by Alice", || async {
+                subscription.clone()
+                    .wait_until_final()
+                    .await
+                    .context("Failed to wait for Bitcoin amnesty transaction to be confirmed")
+                    .map_err(backoff::Error::transient)?;
+
+                event_emitter.emit_swap_progress_event(
+                    swap_id,
+                    TauriSwapProgressEvent::BtcAmnestyReceived {
+                        btc_amnesty_txid: state.construct_tx_amnesty()?.txid(),
+                        btc_lock_amount: state.tx_lock.lock_amount(),
+                        btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                    },
+                );
+
+                Ok(BobState::BtcReclaimConfirmed(state.clone()))
+            }, None, None)
+            .await
+            .context("Failed to wait for Bitcoin amnesty transaction to be confirmed")?
+        }
         BobState::BtcPunished { state, tx_lock_id } => {
             tracing::info!("You have been punished for not refunding in time");
             event_emitter.emit_swap_progress_event(swap_id, TauriSwapProgressEvent::BtcPunished);
@@ -1120,8 +1295,171 @@ async fn next_state(
                 }
             };
         }
-        // TODO: Emit a Tauri event here
-        BobState::BtcEarlyRefunded(state) => BobState::BtcEarlyRefunded(state),
+        BobState::BtcEarlyRefunded(state) => {
+            event_emitter.emit_swap_progress_event(swap_id, TauriSwapProgressEvent::BtcEarlyRefunded {
+                btc_early_refund_txid: state.construct_tx_early_refund().txid(),
+            });
+            BobState::BtcEarlyRefunded(state)
+        },
+        BobState::BtcReclaimConfirmed(state) => {
+            event_emitter.emit_swap_progress_event(swap_id, TauriSwapProgressEvent::BtcAmnestyReceived {
+                btc_amnesty_txid: state.construct_tx_amnesty()?.txid(),
+                btc_lock_amount: state.tx_lock.lock_amount(),
+                btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+            });
+            BobState::BtcReclaimConfirmed(state)
+        },
+        BobState::WaitingForReclaimTimelockExpiration(state) => {
+            // Race between:
+            // - Remaining refund timelock expiring (so we can publish TxReclaim)
+            // - Alice publishing TxWithhold
+            let tx_partial_refund = state.construct_tx_partial_refund()?;
+            let tx_withhold = state.construct_tx_withhold()?;
+
+            let remaining_refund_timelock = state.remaining_refund_timelock.context(
+                "Can't wait for remaining refund timelock because remaining_refund_timelock is missing",
+            )?;
+
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::WaitingForEarnestDepositTimelockExpiration {
+                    btc_partial_refund_txid: tx_partial_refund.txid(),
+                    btc_lock_amount: state.tx_lock.lock_amount(),
+                    btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                    target_blocks: remaining_refund_timelock.into(),
+                    blocks_until_expiry: remaining_refund_timelock.into(),
+                },
+            );
+
+            let (tx_partial_refund_status, tx_withhold_status) = tokio::join!(
+                bitcoin_wallet.subscribe_to(Box::new(tx_partial_refund.clone())),
+                bitcoin_wallet.subscribe_to(Box::new(tx_withhold)),
+            );
+
+            // Emit a tauri event everytime the TxPartialRefund status changes so we can
+            // show an estimate when we will be able to claim the remaining bitcoin
+            let timelock_expired_future = tx_partial_refund_status.wait_until(|status| {
+                event_emitter.emit_swap_progress_event(
+                    swap_id,
+                    TauriSwapProgressEvent::WaitingForEarnestDepositTimelockExpiration {
+                        btc_partial_refund_txid: tx_partial_refund.txid(),
+                        btc_lock_amount: state.tx_lock.lock_amount(),
+                        btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                        target_blocks: remaining_refund_timelock.into(),
+                        blocks_until_expiry: status.blocks_left_until(remaining_refund_timelock),
+                    },
+                );
+
+                status.is_confirmed_with(remaining_refund_timelock.0)
+            });
+
+            select! {
+                // Wait for remaining_refund_timelock confirmations on tx_partial_refund
+                result =  timelock_expired_future => {
+                    result?;
+                    tracing::info!("Remaining refund timelock expired, can now publish TxReclaim");
+                    BobState::ReclaimTimelockExpired(state)
+                }
+                // Watch for Alice publishing TxWithhold
+                _ = tx_withhold_status.wait_until_seen() => {
+                    tracing::info!("Alice published TxWithhold, amnesty output is being burnt");
+                    BobState::BtcWithholdPublished(state)
+                }
+            }
+        }
+        BobState::ReclaimTimelockExpired(state) => {
+            // TODO: We should retry this and the check
+            // First check if TxWithhold was seen (we may have missed it while offline)
+            let tx_withhold = state.construct_tx_withhold()?;
+            let tx_withhold_status = bitcoin_wallet.status_of_script(&tx_withhold).await?;
+
+            if tx_withhold_status.has_been_seen() {
+                tracing::info!("TxWithhold was already published, transitioning to BtcWithholdPublished");
+                return Ok(BobState::BtcWithholdPublished(state));
+            }
+
+            // TxWithhold not published, we can publish TxReclaim
+            // Alice always sends the amnesty signature in swap setup
+            let transaction = state.signed_amnesty_transaction()
+                .context("Couldn't construct Bitcoin amnesty transaction")?;
+            bitcoin_wallet.ensure_broadcasted(transaction, "amnesty")
+                .await
+                .context("Couldn't ensure broadcast of Bitcoin amnesty transaction")?;
+            BobState::BtcReclaimPublished(state)
+        }
+        BobState::BtcWithholdPublished(state) => {
+            // Wait for TxWithhold confirmation
+            let tx_withhold = state.construct_tx_withhold()?;
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::BtcWithholdPublished {
+                    btc_withhold_txid: tx_withhold.txid(),
+                    btc_lock_amount: state.tx_lock.lock_amount(),
+                    btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                },
+            );
+            let subscription = bitcoin_wallet.subscribe_to(Box::new(tx_withhold)).await;
+
+            subscription.wait_until_final().await?;
+            tracing::info!("TxWithhold confirmed, amnesty output is burnt");
+            BobState::BtcWithheld(state)
+        }
+        BobState::BtcWithheld(state) => {
+            // Watch for Alice publishing TxMercy
+            // Alice may grant mercy after withholding our refund
+            // However, we don't expect Alice to publish the tx at once, if at all.
+            // Thus we only check once, and then stop the swap.
+            // User's can still manually resume the swap to check again.
+            let tx_withhold = state.construct_tx_withhold()?;
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::BtcWithheld {
+                    btc_withhold_txid: tx_withhold.txid(),
+                    btc_lock_amount: state.tx_lock.lock_amount(),
+                    btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                },
+            );
+
+            let tx_mercy = state.construct_tx_mercy()?;
+
+            let mercy_status = bitcoin_wallet.status_of_script(&tx_mercy).await.context("Failed to check TxMercy status")?;
+
+            if mercy_status.has_been_seen() {
+                BobState::BtcMercyPublished(state)
+            } else {
+                BobState::BtcWithheld(state)
+            }
+        }
+        BobState::BtcMercyPublished(state) => {
+            // Wait for TxMercy confirmation
+            let tx_mercy = state.construct_tx_mercy()?;
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::BtcMercyPublished {
+                    btc_mercy_txid: tx_mercy.txid(),
+                    btc_lock_amount: state.tx_lock.lock_amount(),
+                    btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                },
+            );
+            let subscription = bitcoin_wallet.subscribe_to(Box::new(tx_mercy)).await;
+
+            subscription.wait_until_final().await?;
+            tracing::info!("TxMercy confirmed, received withheld funds back");
+            BobState::BtcMercyConfirmed(state)
+        }
+        BobState::BtcMercyConfirmed(state) => {
+            // Terminal state - we received the withheld funds back
+            let tx_mercy = state.construct_tx_mercy()?;
+            event_emitter.emit_swap_progress_event(
+                swap_id,
+                TauriSwapProgressEvent::BtcMercyConfirmed {
+                    btc_mercy_txid: tx_mercy.txid(),
+                    btc_lock_amount: state.tx_lock.lock_amount(),
+                    btc_amnesty_amount: state.btc_amnesty_amount.unwrap_or(bitcoin::Amount::ZERO),
+                },
+            );
+            BobState::BtcMercyConfirmed(state)
+        }
         BobState::SafelyAborted => BobState::SafelyAborted,
         BobState::XmrRedeemed { tx_lock_id } => {
             event_emitter.emit_swap_progress_event(
diff --git a/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command.rs b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command.rs
index 01991be165..b75d4f9028 100644
--- a/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command.rs
+++ b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command.rs
@@ -11,7 +11,7 @@ use swap::{asb, cli};
 
 #[tokio::test]
 async fn given_alice_and_bob_manually_refund_after_funds_locked_both_refund() {
-    harness::setup_test(FastCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(FastCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
@@ -51,12 +51,12 @@ async fn given_alice_and_bob_manually_refund_after_funds_locked_both_refund() {
         // Bob manually cancels
         bob_join_handle.abort();
         let (_, state) = cli::cancel(bob_swap.id, bob_swap.bitcoin_wallet, bob_swap.db).await?;
-        assert!(matches!(state, BobState::BtcCancelled { .. }));
+        assert!(matches!(state, BobState::BtcCancelPublished { .. }));
 
         let (bob_swap, bob_join_handle) = ctx
             .stop_and_resume_bob_from_db(bob_join_handle, bob_swap_id)
             .await;
-        assert!(matches!(bob_swap.state, BobState::BtcCancelled { .. }));
+        assert!(matches!(bob_swap.state, BobState::BtcCancelPublished { .. }));
 
         // Bob manually refunds
         bob_join_handle.abort();
diff --git a/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_partial_refund.rs b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_partial_refund.rs
new file mode 100644
index 0000000000..470ee9694c
--- /dev/null
+++ b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_partial_refund.rs
@@ -0,0 +1,86 @@
+pub mod harness;
+
+use harness::alice_run_until::is_xmr_lock_transaction_sent;
+use harness::bob_run_until::is_btc_locked;
+use harness::FastAmnestyConfig;
+use rust_decimal::Decimal;
+use swap::asb::FixedRate;
+use swap::protocol::alice::AliceState;
+use swap::protocol::bob::BobState;
+use swap::protocol::{alice, bob};
+use swap::{asb, cli};
+use swap_env::config::RefundPolicy;
+
+/// Bob locks BTC, Alice locks XMR but stops cooperating.
+/// Bob manually cancels and does a partial refund via CLI, then calls refund
+/// again to reclaim the anti-spam deposit. Alice does NOT withhold, so Bob ends
+/// up in BtcReclaimConfirmed.
+#[tokio::test]
+async fn given_partial_refund_bob_manually_reclaims_deposit_via_cli() {
+    let refund_policy = Some(RefundPolicy {
+        anti_spam_deposit_ratio: Decimal::new(5, 2),
+        always_withhold_deposit: false,
+    });
+
+    harness::setup_test(FastAmnestyConfig, None, refund_policy, |mut ctx| async move {
+        let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
+        let bob_swap_id = bob_swap.id;
+        let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
+
+        let alice_swap = ctx.alice_next_swap().await;
+        let alice_swap = tokio::spawn(alice::run_until(
+            alice_swap,
+            is_xmr_lock_transaction_sent,
+            FixedRate::default(),
+        ));
+
+        let bob_state = bob_swap.await??;
+        assert!(matches!(bob_state, BobState::BtcLocked { .. }));
+
+        let alice_state = alice_swap.await??;
+        assert!(matches!(alice_state, AliceState::XmrLockTransactionSent { .. }));
+
+        let (bob_swap, bob_join_handle) = ctx
+            .stop_and_resume_bob_from_db(bob_join_handle, bob_swap_id)
+            .await;
+
+        // Wait for cancel timelock to expire
+        if let BobState::BtcLocked { state3, .. } = bob_swap.state.clone() {
+            bob_swap
+                .bitcoin_wallet
+                .subscribe_to(Box::new(state3.tx_lock))
+                .await
+                .wait_until_confirmed_with(state3.cancel_timelock)
+                .await?;
+        } else {
+            panic!("Bob in unexpected state {}", bob_swap.state);
+        }
+
+        // Bob manually cancels + partial refunds
+        bob_join_handle.abort();
+        let bob_state =
+            cli::cancel_and_refund(bob_swap.id, bob_swap.bitcoin_wallet.clone(), bob_swap.db.clone()).await?;
+        assert!(matches!(bob_state, BobState::BtcPartiallyRefunded { .. }));
+
+        // Restart Alice so she can refund XMR via manual command
+        ctx.restart_alice().await;
+        let alice_swap = ctx.alice_next_swap().await;
+
+        // Run Bob's reclaim and Alice's manual refund in parallel
+        let (bob_state, alice_state) = tokio::try_join!(
+            cli::refund(bob_swap.id, bob_swap.bitcoin_wallet, bob_swap.db),
+            asb::refund(
+                alice_swap.swap_id,
+                alice_swap.bitcoin_wallet,
+                alice_swap.monero_wallet,
+                alice_swap.db,
+            ),
+        )?;
+
+        ctx.assert_bob_amnesty_received(bob_state).await;
+        ctx.assert_alice_refunded(alice_state).await;
+
+        Ok(())
+    })
+    .await
+}
diff --git a/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_partial_refund_withheld.rs b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_partial_refund_withheld.rs
new file mode 100644
index 0000000000..fbae7d0ed0
--- /dev/null
+++ b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_partial_refund_withheld.rs
@@ -0,0 +1,97 @@
+pub mod harness;
+
+use std::time::Duration;
+
+use harness::alice_run_until::is_xmr_lock_transaction_sent;
+use harness::bob_run_until::is_btc_locked;
+use harness::SlowAmnestyConfig;
+use rust_decimal::Decimal;
+use swap::asb::FixedRate;
+use swap::protocol::alice::AliceState;
+use swap::protocol::bob::BobState;
+use swap::protocol::{alice, bob};
+use swap::{asb, cli};
+use swap_env::config::RefundPolicy;
+
+/// Bob locks BTC, Alice locks XMR but stops cooperating.
+/// Bob manually cancels and does a partial refund via CLI, then calls refund
+/// again to reclaim the deposit. Alice withholds the deposit before Bob's
+/// reclaim timelock expires, so Bob ends up in BtcWithheld.
+#[tokio::test]
+async fn given_partial_refund_alice_withholds_deposit_while_bob_reclaims_via_cli() {
+    let refund_policy = Some(RefundPolicy {
+        anti_spam_deposit_ratio: Decimal::new(5, 2),
+        always_withhold_deposit: true,
+    });
+
+    harness::setup_test(SlowAmnestyConfig, None, refund_policy, |mut ctx| async move {
+        let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
+        let bob_swap_id = bob_swap.id;
+        let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
+
+        let alice_swap = ctx.alice_next_swap().await;
+        let alice_swap = tokio::spawn(alice::run_until(
+            alice_swap,
+            is_xmr_lock_transaction_sent,
+            FixedRate::default(),
+        ));
+
+        let bob_state = bob_swap.await??;
+        assert!(matches!(bob_state, BobState::BtcLocked { .. }));
+
+        let alice_state = alice_swap.await??;
+        assert!(matches!(alice_state, AliceState::XmrLockTransactionSent { .. }));
+
+        let (bob_swap, bob_join_handle) = ctx
+            .stop_and_resume_bob_from_db(bob_join_handle, bob_swap_id)
+            .await;
+
+        // Wait for cancel timelock to expire
+        if let BobState::BtcLocked { state3, .. } = bob_swap.state.clone() {
+            bob_swap
+                .bitcoin_wallet
+                .subscribe_to(Box::new(state3.tx_lock))
+                .await
+                .wait_until_confirmed_with(state3.cancel_timelock)
+                .await?;
+        } else {
+            panic!("Bob in unexpected state {}", bob_swap.state);
+        }
+
+        // Bob manually cancels + partial refunds
+        bob_join_handle.abort();
+        let bob_state =
+            cli::cancel_and_refund(bob_swap.id, bob_swap.bitcoin_wallet.clone(), bob_swap.db.clone()).await?;
+        assert!(matches!(bob_state, BobState::BtcPartiallyRefunded { .. }));
+
+        // Restart Alice so she can refund XMR and publish TxWithhold via manual command
+        ctx.restart_alice().await;
+        let alice_swap = ctx.alice_next_swap().await;
+
+        // Spawn Alice's manual refund (runs in background: refunds XMR, publishes TxWithhold)
+        let alice_refund = tokio::spawn(asb::refund(
+            alice_swap.swap_id,
+            alice_swap.bitcoin_wallet,
+            alice_swap.monero_wallet,
+            alice_swap.db,
+        ));
+
+        // Generate Monero blocks so Alice's XMR refund confirms in time
+        tokio::time::sleep(Duration::from_secs(15)).await;
+        ctx.monero.generate_blocks().await?;
+
+        // Bob calls refund again — races reclaim against Alice's TxWithhold
+        // Alice's withhold should win because SlowAmnestyConfig has a long timelock
+        let bob_state =
+            cli::refund(bob_swap.id, bob_swap.bitcoin_wallet, bob_swap.db).await?;
+
+        ctx.assert_bob_withheld(bob_state).await;
+
+        // Alice should be in withhold confirmed state
+        let alice_state = alice_refund.await??;
+        ctx.assert_alice_withhold_confirmed(alice_state).await;
+
+        Ok(())
+    })
+    .await
+}
diff --git a/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs
index ddda32680a..89433e5c0a 100644
--- a/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs
+++ b/swap/tests/alice_and_bob_refund_using_cancel_and_refund_command_timelock_not_expired.rs
@@ -12,7 +12,7 @@ use swap::{asb, cli};
 
 #[tokio::test]
 async fn given_alice_and_bob_manually_cancel_when_timelock_not_expired_errors() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
diff --git a/swap/tests/alice_and_bob_refund_using_cancel_then_refund_command.rs b/swap/tests/alice_and_bob_refund_using_cancel_then_refund_command.rs
index 62c339bc1d..8936568c53 100644
--- a/swap/tests/alice_and_bob_refund_using_cancel_then_refund_command.rs
+++ b/swap/tests/alice_and_bob_refund_using_cancel_then_refund_command.rs
@@ -11,7 +11,7 @@ use swap::{asb, cli};
 
 #[tokio::test]
 async fn given_alice_and_bob_manually_cancel_and_refund_after_funds_locked_both_refund() {
-    harness::setup_test(FastCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(FastCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
diff --git a/swap/tests/alice_broken_wallet_rpc_after_started_btc_early_refund.rs b/swap/tests/alice_broken_wallet_rpc_after_started_btc_early_refund.rs
index 1102516589..4a8a4a16ec 100644
--- a/swap/tests/alice_broken_wallet_rpc_after_started_btc_early_refund.rs
+++ b/swap/tests/alice_broken_wallet_rpc_after_started_btc_early_refund.rs
@@ -10,7 +10,7 @@ use crate::harness::SlowCancelConfig;
 
 #[tokio::test]
 async fn alice_zero_xmr_refunds_bitcoin() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_handle) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
 
diff --git a/swap/tests/alice_empty_balance_after_started_btc_early_refund.rs b/swap/tests/alice_empty_balance_after_started_btc_early_refund.rs
index 61d412414f..c63988260f 100644
--- a/swap/tests/alice_empty_balance_after_started_btc_early_refund.rs
+++ b/swap/tests/alice_empty_balance_after_started_btc_early_refund.rs
@@ -10,7 +10,7 @@ use crate::harness::SlowCancelConfig;
 
 #[tokio::test]
 async fn alice_zero_xmr_refunds_bitcoin() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_handle) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
 
diff --git a/swap/tests/alice_manually_punishes_after_bob_dead.rs b/swap/tests/alice_manually_punishes_after_bob_dead.rs
index 9cd9f4474d..f29fc0fdf3 100644
--- a/swap/tests/alice_manually_punishes_after_bob_dead.rs
+++ b/swap/tests/alice_manually_punishes_after_bob_dead.rs
@@ -14,7 +14,7 @@ use swap::protocol::{alice, bob};
 /// punish command. Bob then cooperates with Alice and redeems XMR with her key.
 #[tokio::test]
 async fn alice_manually_punishes_after_bob_dead() {
-    harness::setup_test(FastPunishConfig, None, |mut ctx| async move {
+    harness::setup_test(FastPunishConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
diff --git a/swap/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs b/swap/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs
index 21d1cb1025..543bf24a3e 100644
--- a/swap/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs
+++ b/swap/tests/alice_manually_punishes_after_bob_dead_and_bob_cancels.rs
@@ -14,7 +14,7 @@ use swap::protocol::{alice, bob};
 /// punish command. Then Bob tries to refund.
 #[tokio::test]
 async fn alice_manually_punishes_after_bob_dead_and_bob_cancels() {
-    harness::setup_test(FastPunishConfig, None, |mut ctx| async move {
+    harness::setup_test(FastPunishConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
@@ -77,13 +77,13 @@ async fn alice_manually_punishes_after_bob_dead_and_bob_cancels() {
         bob_join_handle.abort();
 
         let (_, state) = cli::cancel(bob_swap_id, bob_swap.bitcoin_wallet, bob_swap.db).await?;
-        // Bob should be in BtcCancelled state now.
-        assert!(matches!(state, BobState::BtcCancelled { .. }));
+        // Bob should be in BtcCancelPublished state now.
+        assert!(matches!(state, BobState::BtcCancelPublished { .. }));
 
         let (bob_swap, _) = ctx
             .stop_and_resume_bob_from_db(bob_join_handle, bob_swap_id)
             .await;
-        assert!(matches!(bob_swap.state, BobState::BtcCancelled { .. }));
+        assert!(matches!(bob_swap.state, BobState::BtcCancelPublished { .. }));
         // Alice punished Bob, so he should be in the BtcPunished state.
         let error = cli::refund(bob_swap_id, bob_swap.bitcoin_wallet, bob_swap.db)
             .await
diff --git a/swap/tests/alice_manually_redeems_after_enc_sig_learned.rs b/swap/tests/alice_manually_redeems_after_enc_sig_learned.rs
index ad2e97f596..bcb24c7560 100644
--- a/swap/tests/alice_manually_redeems_after_enc_sig_learned.rs
+++ b/swap/tests/alice_manually_redeems_after_enc_sig_learned.rs
@@ -11,7 +11,7 @@ use swap::protocol::{alice, bob};
 /// after learning encsig from Bob
 #[tokio::test]
 async fn alice_manually_redeems_after_enc_sig_learned() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, _) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run(bob_swap));
 
diff --git a/swap/tests/alice_punishes_after_restart_bob_dead.rs b/swap/tests/alice_punishes_after_restart_bob_dead.rs
index cabf76a0b3..91518e2d7a 100644
--- a/swap/tests/alice_punishes_after_restart_bob_dead.rs
+++ b/swap/tests/alice_punishes_after_restart_bob_dead.rs
@@ -12,7 +12,7 @@ use swap::protocol::{alice, bob};
 /// the encsig and fail to refund or redeem. Alice cancels and punishes. Bob then cooperates with Alice and redeems XMR with her key.
 #[tokio::test]
 async fn alice_punishes_after_restart_if_bob_dead() {
-    harness::setup_test(FastPunishConfig, None, |mut ctx| async move {
+    harness::setup_test(FastPunishConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
diff --git a/swap/tests/alice_refunds_after_restart_bob_refunded.rs b/swap/tests/alice_refunds_after_restart_bob_refunded.rs
index b79f52a2ad..7b3dd89832 100644
--- a/swap/tests/alice_refunds_after_restart_bob_refunded.rs
+++ b/swap/tests/alice_refunds_after_restart_bob_refunded.rs
@@ -10,7 +10,7 @@ use swap::protocol::{alice, bob};
 /// Eventually Alice comes back online and refunds as well.
 #[tokio::test]
 async fn alice_refunds_after_restart_if_bob_already_refunded() {
-    harness::setup_test(FastCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(FastCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, _) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run(bob_swap));
 
diff --git a/swap/tests/concurrent_bobs_after_xmr_lock_proof_sent.rs b/swap/tests/concurrent_bobs_after_xmr_lock_proof_sent.rs
index e48683afe6..ec3053b4cc 100644
--- a/swap/tests/concurrent_bobs_after_xmr_lock_proof_sent.rs
+++ b/swap/tests/concurrent_bobs_after_xmr_lock_proof_sent.rs
@@ -9,7 +9,7 @@ use swap::protocol::{alice, bob};
 
 #[tokio::test]
 async fn concurrent_bobs_after_xmr_lock_proof_sent() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap_1, bob_join_handle_1) = ctx.bob_swap().await;
 
         let swap_id = bob_swap_1.id;
diff --git a/swap/tests/concurrent_bobs_before_xmr_lock_proof_sent.rs b/swap/tests/concurrent_bobs_before_xmr_lock_proof_sent.rs
index 775a1e2a35..a255c5ea31 100644
--- a/swap/tests/concurrent_bobs_before_xmr_lock_proof_sent.rs
+++ b/swap/tests/concurrent_bobs_before_xmr_lock_proof_sent.rs
@@ -9,7 +9,7 @@ use swap::protocol::{alice, bob};
 
 #[tokio::test]
 async fn concurrent_bobs_before_xmr_lock_proof_sent() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap_1, bob_join_handle_1) = ctx.bob_swap().await;
 
         let swap_id = bob_swap_1.id;
diff --git a/swap/tests/ensure_same_swap_id.rs b/swap/tests/ensure_same_swap_id.rs
index 8deb1428cc..309f89904a 100644
--- a/swap/tests/ensure_same_swap_id.rs
+++ b/swap/tests/ensure_same_swap_id.rs
@@ -5,7 +5,7 @@ use swap::protocol::bob;
 
 #[tokio::test]
 async fn ensure_same_swap_id_for_alice_and_bob() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, _) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         tokio::spawn(bob::run(bob_swap));
diff --git a/swap/tests/happy_path.rs b/swap/tests/happy_path.rs
index da0ee150bc..bb0b983c98 100644
--- a/swap/tests/happy_path.rs
+++ b/swap/tests/happy_path.rs
@@ -7,7 +7,7 @@ use tokio::join;
 
 #[tokio::test]
 async fn happy_path() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, _) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run(bob_swap));
 
diff --git a/swap/tests/happy_path_alice_developer_tip.rs b/swap/tests/happy_path_alice_developer_tip.rs
index eba9df567e..cc2be6b664 100644
--- a/swap/tests/happy_path_alice_developer_tip.rs
+++ b/swap/tests/happy_path_alice_developer_tip.rs
@@ -11,6 +11,7 @@ async fn happy_path_alice_developer_tip() {
     harness::setup_test(
         SlowCancelConfig,
         Some((Decimal::from_f32_retain(0.1).unwrap(), false)),
+        None,
         |mut ctx| async move {
             let (bob_swap, _) = ctx.bob_swap().await;
             let bob_swap = tokio::spawn(bob::run(bob_swap));
diff --git a/swap/tests/happy_path_alice_developer_tip_subaddress.rs b/swap/tests/happy_path_alice_developer_tip_subaddress.rs
index df34d3c6d5..2589279b2d 100644
--- a/swap/tests/happy_path_alice_developer_tip_subaddress.rs
+++ b/swap/tests/happy_path_alice_developer_tip_subaddress.rs
@@ -11,6 +11,7 @@ async fn happy_path_alice_developer_tip_subaddress() {
     harness::setup_test(
         SlowCancelConfig,
         Some((Decimal::from_f32_retain(0.1).unwrap(), true)),
+        None,
         |mut ctx| async move {
             let (bob_swap, _) = ctx.bob_swap().await;
             let bob_swap = tokio::spawn(bob::run(bob_swap));
diff --git a/swap/tests/happy_path_alice_does_not_send_transfer_proof.rs b/swap/tests/happy_path_alice_does_not_send_transfer_proof.rs
index 06faace348..8260b6fb8b 100644
--- a/swap/tests/happy_path_alice_does_not_send_transfer_proof.rs
+++ b/swap/tests/happy_path_alice_does_not_send_transfer_proof.rs
@@ -12,7 +12,7 @@ use swap::protocol::{alice, bob};
 /// even when Alice goes offline and doesn't send the transfer proof.
 #[tokio::test]
 async fn given_alice_goes_offline_after_xmr_locked_bob_detects_xmr_via_view_key() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         // Bob runs until he detects the Monero as having been locked
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
diff --git a/swap/tests/happy_path_bob_offline_while_alice_redeems_btc.rs b/swap/tests/happy_path_bob_offline_while_alice_redeems_btc.rs
index 1b4774acef..0b97a659bf 100644
--- a/swap/tests/happy_path_bob_offline_while_alice_redeems_btc.rs
+++ b/swap/tests/happy_path_bob_offline_while_alice_redeems_btc.rs
@@ -8,37 +8,42 @@ use tokio::join;
 
 #[tokio::test]
 async fn given_bob_restarts_while_alice_redeems_btc() {
-    harness::setup_test(harness::SlowCancelConfig, None, |mut ctx| async move {
-        let (bob_swap, bob_handle) = ctx.bob_swap().await;
-        let swap_id = bob_swap.id;
-
-        let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_encsig_sent));
-
-        let alice_swap = ctx.alice_next_swap().await;
-        let alice_swap = tokio::spawn(alice::run(alice_swap, FixedRate::default()));
-
-        let (bob_state, alice_state) = join!(bob_swap, alice_swap);
-        ctx.assert_alice_redeemed(alice_state??).await;
-        assert!(matches!(bob_state??, BobState::EncSigSent { .. }));
-
-        let (bob_swap, _) = ctx.stop_and_resume_bob_from_db(bob_handle, swap_id).await;
-
-        if let BobState::EncSigSent(state4) = bob_swap.state.clone() {
-            bob_swap
-                .bitcoin_wallet
-                .subscribe_to(Box::new(state4.tx_lock))
-                .await
-                .wait_until_confirmed_with(state4.cancel_timelock)
-                .await?;
-        } else {
-            panic!("Bob in unexpected state {}", bob_swap.state);
-        }
-
-        // Restart Bob
-        let bob_state = bob::run(bob_swap).await?;
-        ctx.assert_bob_redeemed(bob_state).await;
-
-        Ok(())
-    })
+    harness::setup_test(
+        harness::SlowCancelConfig,
+        None,
+        None,
+        |mut ctx| async move {
+            let (bob_swap, bob_handle) = ctx.bob_swap().await;
+            let swap_id = bob_swap.id;
+
+            let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_encsig_sent));
+
+            let alice_swap = ctx.alice_next_swap().await;
+            let alice_swap = tokio::spawn(alice::run(alice_swap, FixedRate::default()));
+
+            let (bob_state, alice_state) = join!(bob_swap, alice_swap);
+            ctx.assert_alice_redeemed(alice_state??).await;
+            assert!(matches!(bob_state??, BobState::EncSigSent { .. }));
+
+            let (bob_swap, _) = ctx.stop_and_resume_bob_from_db(bob_handle, swap_id).await;
+
+            if let BobState::EncSigSent(state4) = bob_swap.state.clone() {
+                bob_swap
+                    .bitcoin_wallet
+                    .subscribe_to(Box::new(state4.tx_lock))
+                    .await
+                    .wait_until_confirmed_with(state4.cancel_timelock)
+                    .await?;
+            } else {
+                panic!("Bob in unexpected state {}", bob_swap.state);
+            }
+
+            // Restart Bob
+            let bob_state = bob::run(bob_swap).await?;
+            ctx.assert_bob_redeemed(bob_state).await;
+
+            Ok(())
+        },
+    )
     .await;
 }
diff --git a/swap/tests/happy_path_restart_alice_after_xmr_locked.rs b/swap/tests/happy_path_restart_alice_after_xmr_locked.rs
index 1461947c60..6ab91c02e2 100644
--- a/swap/tests/happy_path_restart_alice_after_xmr_locked.rs
+++ b/swap/tests/happy_path_restart_alice_after_xmr_locked.rs
@@ -8,7 +8,7 @@ use swap::protocol::{alice, bob};
 
 #[tokio::test]
 async fn given_alice_restarts_after_xmr_is_locked_resume_swap() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, _) = ctx.bob_swap().await;
         let bob_swap = tokio::spawn(bob::run(bob_swap));
 
diff --git a/swap/tests/happy_path_restart_bob_after_xmr_locked.rs b/swap/tests/happy_path_restart_bob_after_xmr_locked.rs
index 07b44ebc7e..c35b8e065f 100644
--- a/swap/tests/happy_path_restart_bob_after_xmr_locked.rs
+++ b/swap/tests/happy_path_restart_bob_after_xmr_locked.rs
@@ -8,7 +8,7 @@ use swap::protocol::{alice, bob};
 
 #[tokio::test]
 async fn given_bob_restarts_after_xmr_is_locked_resume_swap() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_xmr_locked));
diff --git a/swap/tests/happy_path_restart_bob_before_xmr_locked.rs b/swap/tests/happy_path_restart_bob_before_xmr_locked.rs
index 07b44ebc7e..c35b8e065f 100644
--- a/swap/tests/happy_path_restart_bob_before_xmr_locked.rs
+++ b/swap/tests/happy_path_restart_bob_before_xmr_locked.rs
@@ -8,7 +8,7 @@ use swap::protocol::{alice, bob};
 
 #[tokio::test]
 async fn given_bob_restarts_after_xmr_is_locked_resume_swap() {
-    harness::setup_test(SlowCancelConfig, None, |mut ctx| async move {
+    harness::setup_test(SlowCancelConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_xmr_locked));
diff --git a/swap/tests/harness/mod.rs b/swap/tests/harness/mod.rs
index 768bfbde6d..26939cd611 100644
--- a/swap/tests/harness/mod.rs
+++ b/swap/tests/harness/mod.rs
@@ -13,6 +13,7 @@ use rust_decimal::Decimal;
 use std::cmp::Ordering;
 use std::fmt;
 use std::path::PathBuf;
+use swap_env::config::RefundPolicy;
 
 use std::sync::Arc;
 use std::time::Duration;
@@ -49,6 +50,7 @@ use uuid::Uuid;
 pub async fn setup_test<T, F, C>(
     _config: C,
     developer_tip_ratio: Option<(Decimal, bool)>,
+    refund_policy: Option<RefundPolicy>,
     testfn: T,
 ) where
     T: Fn(TestContext) -> F,
@@ -150,7 +152,13 @@ pub async fn setup_test<T, F, C>(
         .parse()
         .expect("failed to parse Alice's address");
 
-    let (alice_handle, alice_swap_handle) = start_alice(
+    let alice_rpc_port = std::net::TcpListener::bind(("127.0.0.1", 0))
+        .unwrap()
+        .local_addr()
+        .unwrap()
+        .port();
+
+    let (alice_handle, alice_swap_handle, alice_rpc_server_handle) = start_alice(
         &alice_seed,
         alice_db_path.clone(),
         alice_listen_address.clone(),
@@ -158,9 +166,15 @@ pub async fn setup_test<T, F, C>(
         alice_bitcoin_wallet.clone(),
         alice_monero_wallet.clone(),
         developer_tip.clone(),
+        refund_policy.clone().unwrap_or_default(),
+        alice_rpc_port,
     )
     .await;
 
+    let alice_rpc_client = jsonrpsee::http_client::HttpClientBuilder::default()
+        .build(format!("http://127.0.0.1:{}", alice_rpc_port))
+        .expect("Failed to create RPC client");
+
     let bob_seed = Seed::random().unwrap();
     let bob_starting_balances = StartingBalances::new(btc_amount * 10, monero::Amount::ZERO, None);
     let bob_monero_dir = TempDir::new().unwrap().path().join("bob-monero-wallets");
@@ -196,6 +210,9 @@ pub async fn setup_test<T, F, C>(
         alice_seed,
         alice_db_path,
         alice_listen_address,
+        alice_rpc_port,
+        alice_rpc_server_handle,
+        alice_rpc_client,
         alice_starting_balances,
         alice_bitcoin_wallet,
         alice_monero_wallet,
@@ -207,7 +224,9 @@ pub async fn setup_test<T, F, C>(
         bob_monero_wallet,
         developer_tip_monero_wallet,
         developer_tip,
+        refund_policy: refund_policy.unwrap_or_default(),
         monerod_container_id: containers._monerod_container.id().to_string(),
+        monero,
     };
 
     testfn(test).await.unwrap()
@@ -298,7 +317,13 @@ async fn start_alice(
     bitcoin_wallet: Arc<bitcoin_wallet::Wallet>,
     monero_wallet: Arc<monero::Wallets>,
     developer_tip: TipConfig,
-) -> (AliceApplicationHandle, Receiver<alice::Swap>) {
+    refund_policy: RefundPolicy,
+    rpc_port: u16,
+) -> (
+    AliceApplicationHandle,
+    Receiver<alice::Swap>,
+    tokio_util::task::AbortOnDropHandle<()>,
+) {
     if let Some(parent_dir) = db_path.parent() {
         ensure_directory_exists(parent_dir).unwrap();
     }
@@ -332,24 +357,41 @@ async fn start_alice(
     .unwrap();
     swarm.listen_on(listen_address).unwrap();
 
-    let (event_loop, swap_handle, _service) = asb::EventLoop::new(
+    let (event_loop, swap_handle, service) = asb::EventLoop::new(
         swarm,
         env_config,
-        bitcoin_wallet,
-        monero_wallet,
-        db,
+        bitcoin_wallet.clone(),
+        monero_wallet.clone(),
+        db.clone(),
         FixedRate::default(),
         min_buy,
         max_buy,
         None,
         developer_tip,
+        refund_policy,
     )
     .unwrap();
 
+    let rpc_server_handle = asb::rpc::RpcServer::start(
+        "127.0.0.1".to_string(),
+        rpc_port,
+        bitcoin_wallet,
+        monero_wallet,
+        service,
+        db,
+    )
+    .await
+    .expect("Failed to start RPC server")
+    .spawn();
+
     let peer_id = event_loop.peer_id();
     let handle = tokio::spawn(event_loop.run());
 
-    (AliceApplicationHandle { handle, peer_id }, swap_handle)
+    (
+        AliceApplicationHandle { handle, peer_id },
+        swap_handle,
+        rpc_server_handle,
+    )
 }
 
 #[allow(clippy::too_many_arguments)]
@@ -424,6 +466,7 @@ async fn init_test_wallets(
         .finality_confirmations(1_u32)
         .target_block(1_u32)
         .sync_interval(Duration::from_secs(3)) // high sync interval to speed up tests
+        .use_mempool_space_fee_estimation(false)
         .build()
         .await
         .expect("could not init btc wallet");
@@ -645,7 +688,7 @@ impl BobParams {
     }
 }
 
-pub struct BobApplicationHandle(JoinHandle<()>);
+pub struct BobApplicationHandle(pub JoinHandle<()>);
 
 impl BobApplicationHandle {
     pub fn abort(&self) {
@@ -670,10 +713,15 @@ pub struct TestContext {
     btc_amount: bitcoin::Amount,
     xmr_amount: monero::Amount,
     developer_tip: TipConfig,
+    refund_policy: RefundPolicy,
 
     alice_seed: Seed,
     alice_db_path: PathBuf,
     alice_listen_address: Multiaddr,
+    alice_rpc_port: u16,
+    #[allow(dead_code)]
+    alice_rpc_server_handle: tokio_util::task::AbortOnDropHandle<()>,
+    pub alice_rpc_client: jsonrpsee::http_client::HttpClient,
 
     alice_starting_balances: StartingBalances,
     alice_bitcoin_wallet: Arc<bitcoin_wallet::Wallet>,
@@ -690,6 +738,10 @@ pub struct TestContext {
 
     // Store the container ID as String instead of reference
     monerod_container_id: String,
+
+    // Handle for the Monero deamon. This allows us to skip waiting times by generating
+    // blocks instantly
+    pub monero: Monero,
 }
 
 impl TestContext {
@@ -706,8 +758,12 @@ impl TestContext {
 
     pub async fn restart_alice(&mut self) {
         self.alice_handle.abort();
+        // Abort the old RPC server to release the port before starting a new one
+        self.alice_rpc_server_handle.abort();
+        // Small delay to ensure port is released
+        tokio::time::sleep(Duration::from_millis(100)).await;
 
-        let (alice_handle, alice_swap_handle) = start_alice(
+        let (alice_handle, alice_swap_handle, alice_rpc_server_handle) = start_alice(
             &self.alice_seed,
             self.alice_db_path.clone(),
             self.alice_listen_address.clone(),
@@ -715,11 +771,14 @@ impl TestContext {
             self.alice_bitcoin_wallet.clone(),
             self.alice_monero_wallet.clone(),
             self.developer_tip.clone(),
+            self.refund_policy.clone(),
+            self.alice_rpc_port,
         )
         .await;
 
         self.alice_handle = alice_handle;
         self.alice_swap_handle = alice_swap_handle;
+        self.alice_rpc_server_handle = alice_rpc_server_handle;
     }
 
     pub async fn alice_next_swap(&mut self) -> alice::Swap {
@@ -775,7 +834,7 @@ impl TestContext {
     }
 
     pub async fn assert_alice_refunded(&mut self, state: AliceState) {
-        assert!(matches!(state, AliceState::XmrRefunded));
+        assert!(matches!(state, AliceState::XmrRefunded { .. }));
 
         assert_eventual_balance(
             self.alice_bitcoin_wallet.as_ref(),
@@ -795,6 +854,51 @@ impl TestContext {
         .unwrap();
     }
 
+    pub async fn assert_alice_withhold_confirmed(&mut self, state: AliceState) {
+        assert!(matches!(state, AliceState::BtcWithholdConfirmed { .. }));
+
+        // Same as refunded - Alice still has her XMR back
+        assert_eventual_balance(
+            self.alice_bitcoin_wallet.as_ref(),
+            Ordering::Equal,
+            self.alice_refunded_btc_balance(),
+        )
+        .await
+        .unwrap();
+
+        assert_eventual_balance(
+            &*self.alice_monero_wallet.main_wallet().await,
+            Ordering::Greater,
+            self.alice_refunded_xmr_balance(),
+        )
+        .await
+        .unwrap();
+    }
+
+    pub async fn assert_alice_mercy_confirmed(&mut self, state: AliceState) {
+        assert!(matches!(
+            state,
+            AliceState::BtcMercyConfirmed { .. }
+        ));
+
+        // Same as refunded - Alice still has her XMR back
+        assert_eventual_balance(
+            self.alice_bitcoin_wallet.as_ref(),
+            Ordering::Equal,
+            self.alice_refunded_btc_balance(),
+        )
+        .await
+        .unwrap();
+
+        assert_eventual_balance(
+            &*self.alice_monero_wallet.main_wallet().await,
+            Ordering::Greater,
+            self.alice_refunded_xmr_balance(),
+        )
+        .await
+        .unwrap();
+    }
+
     pub async fn assert_alice_developer_tip_received(&self) {
         assert_eventual_balance(
             &*self.developer_tip_monero_wallet.main_wallet().await,
@@ -898,6 +1002,124 @@ impl TestContext {
         .unwrap();
     }
 
+    pub async fn assert_bob_partially_refunded(&self, state: BobState) {
+        self.bob_bitcoin_wallet.sync().await.unwrap();
+
+        let (lock_tx_id, cancel_fee, partial_refund_fee, amnesty_amount) = match state {
+            BobState::BtcPartiallyRefunded(state6) => (
+                state6.tx_lock_id(),
+                state6.tx_cancel_fee,
+                state6.tx_partial_refund_fee.expect("partial refund fee"),
+                state6.btc_amnesty_amount.expect("amnesty amount"),
+            ),
+            _ => panic!("Bob is not in btc partially refunded state: {:?}", state),
+        };
+        let lock_tx_bitcoin_fee = self
+            .bob_bitcoin_wallet
+            .transaction_fee(lock_tx_id)
+            .await
+            .unwrap();
+
+        let btc_balance_after_swap = self.bob_bitcoin_wallet.balance().await.unwrap();
+        let expected_balance = self.bob_starting_balances.btc
+            - lock_tx_bitcoin_fee
+            - cancel_fee
+            - partial_refund_fee
+            - amnesty_amount;
+
+        assert_eq!(btc_balance_after_swap, expected_balance);
+    }
+
+    pub async fn assert_bob_amnesty_received(&self, state: BobState) {
+        self.bob_bitcoin_wallet.sync().await.unwrap();
+
+        let (lock_tx_id, cancel_fee, partial_refund_fee, amnesty_fee) = match state {
+            BobState::BtcReclaimConfirmed(state6) => (
+                state6.tx_lock_id(),
+                state6.tx_cancel_fee,
+                state6.tx_partial_refund_fee.expect("partial refund fee"),
+                state6.tx_reclaim_fee.expect("amnesty fee"),
+            ),
+            _ => panic!("Bob is not in btc amnesty confirmed state: {:?}", state),
+        };
+        let lock_tx_bitcoin_fee = self
+            .bob_bitcoin_wallet
+            .transaction_fee(lock_tx_id)
+            .await
+            .unwrap();
+
+        let btc_balance_after_swap = self.bob_bitcoin_wallet.balance().await.unwrap();
+        // Bob gets full amount back minus all the fees
+        let expected_balance = self.bob_starting_balances.btc
+            - lock_tx_bitcoin_fee
+            - cancel_fee
+            - partial_refund_fee
+            - amnesty_fee;
+
+        assert_eq!(btc_balance_after_swap, expected_balance);
+    }
+
+    pub async fn assert_bob_withheld(&self, state: BobState) {
+        self.bob_bitcoin_wallet.sync().await.unwrap();
+
+        let (lock_tx_id, cancel_fee, partial_refund_fee, amnesty_amount) = match state {
+            BobState::BtcWithheld(state6) => (
+                state6.tx_lock_id(),
+                state6.tx_cancel_fee,
+                state6.tx_partial_refund_fee.expect("partial refund fee"),
+                state6.btc_amnesty_amount.expect("amnesty amount"),
+            ),
+            _ => panic!("Bob is not in btc withheld state: {:?}", state),
+        };
+        let lock_tx_bitcoin_fee = self
+            .bob_bitcoin_wallet
+            .transaction_fee(lock_tx_id)
+            .await
+            .unwrap();
+
+        let btc_balance_after_swap = self.bob_bitcoin_wallet.balance().await.unwrap();
+        // Bob lost the amnesty amount (it was withheld)
+        let expected_balance = self.bob_starting_balances.btc
+            - lock_tx_bitcoin_fee
+            - cancel_fee
+            - partial_refund_fee
+            - amnesty_amount;
+
+        assert_eq!(btc_balance_after_swap, expected_balance);
+    }
+
+    pub async fn assert_bob_mercy_received(&self, state: BobState) {
+        self.bob_bitcoin_wallet.sync().await.unwrap();
+
+        let (lock_tx_id, cancel_fee, partial_refund_fee, mercy_fee) = match state {
+            BobState::BtcMercyConfirmed(state6) => (
+                state6.tx_lock_id(),
+                state6.tx_cancel_fee,
+                state6.tx_partial_refund_fee.expect("partial refund fee"),
+                state6.tx_mercy_fee.expect("mercy fee"),
+            ),
+            _ => panic!(
+                "Bob is not in btc mercy confirmed state: {:?}",
+                state
+            ),
+        };
+        let lock_tx_bitcoin_fee = self
+            .bob_bitcoin_wallet
+            .transaction_fee(lock_tx_id)
+            .await
+            .unwrap();
+
+        let btc_balance_after_swap = self.bob_bitcoin_wallet.balance().await.unwrap();
+        // Bob gets full amount back via mercy
+        let expected_balance = self.bob_starting_balances.btc
+            - lock_tx_bitcoin_fee
+            - cancel_fee
+            - partial_refund_fee
+            - mercy_fee;
+
+        assert_eq!(btc_balance_after_swap, expected_balance);
+    }
+
     fn alice_redeemed_xmr_balance(&self) -> monero::Amount {
         self.alice_starting_balances.xmr - self.xmr_amount
     }
@@ -1212,6 +1434,22 @@ pub mod alice_run_until {
     pub fn is_btc_redeemed(state: &AliceState) -> bool {
         matches!(state, AliceState::BtcRedeemed { .. })
     }
+
+    pub fn is_btc_partially_refunded(state: &AliceState) -> bool {
+        matches!(state, AliceState::BtcPartiallyRefunded { .. })
+    }
+
+    pub fn is_xmr_refunded(state: &AliceState) -> bool {
+        matches!(state, AliceState::XmrRefunded { .. })
+    }
+
+    pub fn is_btc_withhold_confirmed(state: &AliceState) -> bool {
+        matches!(state, AliceState::BtcWithholdConfirmed { .. })
+    }
+
+    pub fn is_btc_mercy_confirmed(state: &AliceState) -> bool {
+        matches!(state, AliceState::BtcMercyConfirmed { .. })
+    }
 }
 
 pub mod bob_run_until {
@@ -1232,6 +1470,30 @@ pub mod bob_run_until {
     pub fn is_encsig_sent(state: &BobState) -> bool {
         matches!(state, BobState::EncSigSent(..))
     }
+
+    pub fn is_btc_partially_refunded(state: &BobState) -> bool {
+        matches!(state, BobState::BtcPartiallyRefunded(..))
+    }
+
+    pub fn is_waiting_for_remaining_refund_timelock(state: &BobState) -> bool {
+        matches!(state, BobState::WaitingForReclaimTimelockExpiration(..))
+    }
+
+    pub fn is_remaining_refund_timelock_expired(state: &BobState) -> bool {
+        matches!(state, BobState::ReclaimTimelockExpired(..))
+    }
+
+    pub fn is_btc_amnesty_confirmed(state: &BobState) -> bool {
+        matches!(state, BobState::BtcReclaimConfirmed(..))
+    }
+
+    pub fn is_btc_withheld(state: &BobState) -> bool {
+        matches!(state, BobState::BtcWithheld(..))
+    }
+
+    pub fn is_btc_mercy_confirmed(state: &BobState) -> bool {
+        matches!(state, BobState::BtcMercyConfirmed(..))
+    }
 }
 
 pub struct SlowCancelConfig;
@@ -1267,3 +1529,35 @@ impl GetConfig for FastPunishConfig {
         }
     }
 }
+
+pub struct FastAmnestyConfig;
+
+impl GetConfig for FastAmnestyConfig {
+    fn get_config() -> Config {
+        Config {
+            bitcoin_cancel_timelock: CancelTimelock::new(10).into(),
+            bitcoin_remaining_refund_timelock: 3,
+            ..env::Regtest::get_config()
+        }
+    }
+}
+
+/// Config with a longer remaining refund timelock for burn tests.
+/// Alice needs time to refund XMR (which waits for 10 Monero confirmations)
+/// before publishing the burn transaction.
+pub struct SlowAmnestyConfig;
+
+impl GetConfig for SlowAmnestyConfig {
+    fn get_config() -> Config {
+        Config {
+            bitcoin_cancel_timelock: CancelTimelock::new(10).into(),
+            // Much longer timelock to give Alice time to:
+            // 1. Wait for 10 Monero confirmations on the lock tx
+            // 2. Sweep the XMR to her wallet
+            // 3. Then publish the burn transaction
+            // In regtest, each BTC block is ~5s, so 100 blocks is ~8 minutes
+            bitcoin_remaining_refund_timelock: 100,
+            ..env::Regtest::get_config()
+        }
+    }
+}
diff --git a/swap/tests/partial_refund_alice_burns.rs b/swap/tests/partial_refund_alice_burns.rs
new file mode 100644
index 0000000000..f7bd355c98
--- /dev/null
+++ b/swap/tests/partial_refund_alice_burns.rs
@@ -0,0 +1,86 @@
+pub mod harness;
+
+use std::time::Duration;
+
+use harness::alice_run_until::is_xmr_lock_transaction_sent;
+use harness::bob_run_until::is_btc_partially_refunded;
+use harness::SlowAmnestyConfig;
+use rust_decimal::Decimal;
+use swap::asb::FixedRate;
+use swap::protocol::alice::AliceState;
+use swap::protocol::bob::BobState;
+use swap::protocol::{alice, bob};
+use swap_env::config::RefundPolicy;
+
+/// Bob locks Btc and Alice locks Xmr. Alice does not act so Bob does a partial
+/// refund. Alice then withholds the deposit, denying Bob access to the amnesty.
+#[tokio::test]
+async fn given_partial_refund_alice_burns_the_amnesty() {
+    // Use 5% anti-spam deposit ratio - Bob gets 95% immediately, 5% locked in amnesty
+    // Alice withholds the deposit
+    let refund_policy = Some(RefundPolicy {
+        anti_spam_deposit_ratio: Decimal::new(5, 2), // 0.05 = 5%
+        always_withhold_deposit: true,
+    });
+
+    harness::setup_test(
+        SlowAmnestyConfig,
+        None,
+        refund_policy,
+        |mut ctx| async move {
+            // Start Bob's swap
+            let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
+            let bob_swap_id = bob_swap.id;
+            // Bob runs until he has done the partial refund
+            let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_partially_refunded));
+
+            // Alice sends XMR lock then stops
+            let alice_swap = ctx.alice_next_swap().await;
+            let alice_swap = tokio::spawn(alice::run_until(
+                alice_swap,
+                is_xmr_lock_transaction_sent,
+                FixedRate::default(),
+            ));
+
+            // Alice finishes first (just sends XMR lock and stops)
+            let alice_state = alice_swap.await??;
+            assert!(matches!(
+                alice_state,
+                AliceState::XmrLockTransactionSent { .. }
+            ));
+
+            // Bob runs until partial refund is done
+            let bob_state = bob_swap.await??;
+            assert!(matches!(bob_state, BobState::BtcPartiallyRefunded { .. }));
+
+            // Restart Alice so she can refund her XMR and withhold Bob's deposit
+            // Alice needs to publish withhold BEFORE Bob's remaining refund timelock expires
+            ctx.restart_alice().await;
+            let alice_swap = ctx.alice_next_swap().await;
+            let alice_swap = tokio::spawn(alice::run(alice_swap, FixedRate::default()));
+
+            // Bob continues - he's watching for TxWithhold while waiting for timelock
+            // Alice's withhold should get published before Bob's timelock expires
+            let (bob_swap, _) = ctx
+                .stop_and_resume_bob_from_db(bob_join_handle, bob_swap_id)
+                .await;
+            let bob_swap = tokio::spawn(bob::run(bob_swap));
+
+            // Generate some Monero blocks such that Alice's
+            // monero refund transaction gets confirmed in time.
+            tokio::time::sleep(Duration::from_secs(15)).await;
+            ctx.monero.generate_blocks().await?;
+
+            // Bob should end up in BtcWithheld because Alice's withhold beat his amnesty
+            let bob_state = bob_swap.await??;
+            ctx.assert_bob_withheld(bob_state).await;
+
+            // Alice should be in withhold confirmed state
+            let alice_state = alice_swap.await??;
+            ctx.assert_alice_withhold_confirmed(alice_state).await;
+
+            Ok(())
+        },
+    )
+    .await;
+}
diff --git a/swap/tests/partial_refund_alice_burns_after_command.rs b/swap/tests/partial_refund_alice_burns_after_command.rs
new file mode 100644
index 0000000000..69ae09b635
--- /dev/null
+++ b/swap/tests/partial_refund_alice_burns_after_command.rs
@@ -0,0 +1,96 @@
+pub mod harness;
+
+use std::time::Duration;
+
+use harness::alice_run_until::is_xmr_lock_transaction_sent;
+use harness::bob_run_until::is_btc_partially_refunded;
+use harness::SlowAmnestyConfig;
+use rust_decimal::Decimal;
+use swap::asb::FixedRate;
+use swap::protocol::alice::AliceState;
+use swap::protocol::bob::BobState;
+use swap::protocol::{alice, bob};
+use swap_controller_api::AsbApiClient;
+use swap_env::config::RefundPolicy;
+
+/// Bob locks Btc and Alice locks Xmr. Alice does not act so Bob does a partial
+/// refund. Alice receives an RPC command to withhold the deposit and then withholds it.
+#[tokio::test]
+async fn given_partial_refund_alice_burns_after_command() {
+    // Use 5% anti-spam deposit ratio - Bob gets 95% immediately, 5% locked in amnesty
+    // Alice does NOT withhold by default - always_withhold_deposit is false
+    let refund_policy = Some(RefundPolicy {
+        anti_spam_deposit_ratio: Decimal::new(5, 2), // 0.05 = 5%
+        always_withhold_deposit: false,               // Do not withhold by default
+    });
+
+    harness::setup_test(
+        SlowAmnestyConfig,
+        None,
+        refund_policy,
+        |mut ctx| async move {
+            // Start Bob's swap
+            let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
+            let bob_swap_id = bob_swap.id;
+            // Bob runs until he has done the partial refund
+            let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_partially_refunded));
+
+            // Alice sends XMR lock then stops
+            let alice_swap = ctx.alice_next_swap().await;
+            let alice_swap_id = alice_swap.swap_id;
+            let alice_swap = tokio::spawn(alice::run_until(
+                alice_swap,
+                is_xmr_lock_transaction_sent,
+                FixedRate::default(),
+            ));
+
+            // Alice finishes first (just sends XMR lock and stops)
+            let alice_state = alice_swap.await??;
+            assert!(matches!(
+                alice_state,
+                AliceState::XmrLockTransactionSent { .. }
+            ));
+
+            // Bob runs until partial refund is done
+            let bob_state = bob_swap.await??;
+            assert!(matches!(bob_state, BobState::BtcPartiallyRefunded { .. }));
+
+            // Restart Alice so she can refund her XMR and withhold Bob's deposit
+            // Alice needs to publish withhold BEFORE Bob's remaining refund timelock expires
+            ctx.restart_alice().await;
+            let alice_swap = ctx.alice_next_swap().await;
+
+            // Send RPC command to Alice to withhold this swap's deposit
+            // Must be done AFTER restart (so EventLoopHandle exists) but BEFORE running the swap
+            ctx.alice_rpc_client
+                .set_withhold_deposit(alice_swap_id, true)
+                .await
+                .expect("Failed to send withhold command to Alice");
+
+            let alice_swap = tokio::spawn(alice::run(alice_swap, FixedRate::default()));
+
+            // Bob continues - he's watching for TxWithhold while waiting for timelock
+            // Alice's withhold should get published before Bob's timelock expires
+            let (bob_swap, _) = ctx
+                .stop_and_resume_bob_from_db(bob_join_handle, bob_swap_id)
+                .await;
+            let bob_swap = tokio::spawn(bob::run(bob_swap));
+
+            // Generate some Monero blocks such that Alice's
+            // monero refund transaction gets confirmed in time.
+            tokio::time::sleep(Duration::from_secs(15)).await;
+            ctx.monero.generate_blocks().await?;
+
+            // Bob should end up in BtcWithheld because Alice's withhold beat his amnesty
+            let bob_state = bob_swap.await??;
+            ctx.assert_bob_withheld(bob_state).await;
+
+            // Alice should be in withhold confirmed state
+            let alice_state = alice_swap.await??;
+            ctx.assert_alice_withhold_confirmed(alice_state).await;
+
+            Ok(())
+        },
+    )
+    .await;
+}
diff --git a/swap/tests/partial_refund_alice_grants_final_amnesty.rs b/swap/tests/partial_refund_alice_grants_final_amnesty.rs
new file mode 100644
index 0000000000..2879835688
--- /dev/null
+++ b/swap/tests/partial_refund_alice_grants_final_amnesty.rs
@@ -0,0 +1,115 @@
+pub mod harness;
+
+use std::time::Duration;
+
+use harness::FastAmnestyConfig;
+use rust_decimal::Decimal;
+use swap::asb::FixedRate;
+use swap::protocol::alice::AliceState;
+use swap::protocol::{alice, bob};
+use swap_controller_api::AsbApiClient;
+use swap_env::config::RefundPolicy;
+use swap_machine::bob::BobState;
+
+use crate::harness::alice_run_until::is_xmr_refunded;
+use crate::harness::bob_run_until;
+
+/// Bob locks Btc and Alice locks Xmr. Alice does not act so Bob does a partial
+/// refund. Alice withholds the deposit, then later grants mercy to Bob.
+/// NOTE: This test cannot pass yet because we haven't implemented the manual
+/// trigger for mercy. BtcWithholdConfirmed is currently terminal.
+#[tokio::test]
+async fn given_partial_refund_alice_grants_mercy() {
+    // Use 5% anti-spam deposit ratio - Bob gets 95% immediately, 5% locked in amnesty
+    // Alice withholds the deposit, then grants mercy
+    let refund_policy = Some(RefundPolicy {
+        anti_spam_deposit_ratio: Decimal::new(5, 2), // 0.05 = 5%
+        always_withhold_deposit: true,
+    });
+
+    harness::setup_test(
+        FastAmnestyConfig,
+        None,
+        refund_policy,
+        |mut ctx| async move {
+            let (bob_swap, bob_app_handle) = ctx.bob_swap().await;
+            let bob_state = tokio::spawn(bob::run_until(
+                bob_swap,
+                bob_run_until::is_btc_partially_refunded,
+            ));
+
+            let alice_swap = ctx.alice_next_swap().await;
+            let alice_swap = tokio::spawn(alice::run_until(
+                alice_swap,
+                is_xmr_refunded,
+                FixedRate::default(),
+            ));
+
+            // Wait for bob to partially refund - stop here such that he doesn't publish amnesty
+            // TODO: fix regtest blocktimes instead
+            let _bob_state = bob_state.await??;
+
+            let alice_state = alice_swap.await??;
+            assert!(matches!(alice_state, AliceState::XmrRefunded { .. }));
+
+            ctx.monero.generate_blocks().await?;
+
+            // Restart alice and wait for bob to be withheld.
+            ctx.restart_alice().await;
+            let alice_swap = ctx.alice_next_swap().await;
+            let swap_id = alice_swap.swap_id;
+            let alice_swap = tokio::spawn(alice::run(alice_swap, FixedRate::default()));
+
+            // Give alice time to publish TxWithhold before restarting bob
+            tokio::time::sleep(Duration::from_secs(20)).await;
+
+            let (bob_swap, bob_app_handle) = ctx
+                .stop_and_resume_bob_from_db(bob_app_handle, swap_id)
+                .await;
+            let bob_state = tokio::spawn(bob::run(bob_swap)); // Bob should stop automatically after BtcWithheld
+
+            let alice_state = alice_swap.await??;
+            assert!(matches!(
+                alice_state,
+                AliceState::BtcWithholdConfirmed { .. }
+            ));
+
+            let bob_state = bob_state.await??;
+            assert!(matches!(bob_state, BobState::BtcWithheld(..)));
+
+            // Simulate alice's controller sending the mercy command via `controller` cli
+            ctx.restart_alice().await;
+            ctx.alice_rpc_client.grant_mercy(swap_id).await?;
+
+            let alice_swap = ctx.alice_next_swap().await;
+            let alice_swap = tokio::spawn(alice::run(alice_swap, FixedRate::default()));
+
+            let (bob_swap, _) = ctx
+                .stop_and_resume_bob_from_db(bob_app_handle, swap_id)
+                .await;
+            assert!(matches!(bob_swap.state, BobState::BtcWithheld(..)));
+
+            let alice_state = alice_swap.await??;
+            // Only start bob again after alice published the tx. otherwise bob immediately
+            // terminates when not finding the tx.
+            // TODO: maybe make bob check for a few minutes before giving up?
+            let bob_state = tokio::spawn(bob::run(bob_swap));
+            let bob_state = bob_state.await??;
+
+            assert!(
+                matches!(
+                    alice_state,
+                    AliceState::BtcMercyConfirmed { .. }
+                ),
+                "Actual state: {alice_state}"
+            );
+            assert!(
+                matches!(bob_state, bob::BobState::BtcMercyConfirmed(..)),
+                "Actual state: {bob_state}"
+            );
+
+            Ok(())
+        },
+    )
+    .await;
+}
diff --git a/swap/tests/partial_refund_bob_claims_amnesty.rs b/swap/tests/partial_refund_bob_claims_amnesty.rs
new file mode 100644
index 0000000000..e175069b08
--- /dev/null
+++ b/swap/tests/partial_refund_bob_claims_amnesty.rs
@@ -0,0 +1,55 @@
+pub mod harness;
+
+use harness::alice_run_until::is_xmr_lock_transaction_sent;
+use harness::FastAmnestyConfig;
+use rust_decimal::Decimal;
+use swap::asb::FixedRate;
+use swap::protocol::alice::AliceState;
+use swap::protocol::{alice, bob};
+use swap_env::config::RefundPolicy;
+
+/// Bob locks Btc and Alice locks Xmr. Alice does not act so Bob does a partial
+/// refund, waits for the remaining refund timelock, and then claims the amnesty.
+#[tokio::test]
+async fn given_partial_refund_bob_claims_amnesty_after_timelock() {
+    // Use 5% anti-spam deposit ratio - Bob gets 95% immediately, 5% locked in amnesty
+    // Alice does NOT withhold - Bob can claim amnesty after timelock
+    let refund_policy = Some(RefundPolicy {
+        anti_spam_deposit_ratio: Decimal::new(5, 2), // 0.05 = 5%
+        always_withhold_deposit: false,
+    });
+
+    harness::setup_test(FastAmnestyConfig, None, refund_policy, |mut ctx| async move {
+        let (bob_swap, _) = ctx.bob_swap().await;
+        let bob_swap = tokio::spawn(bob::run(bob_swap));
+
+        let alice_swap = ctx.alice_next_swap().await;
+        let alice_swap = tokio::spawn(alice::run_until(
+            alice_swap,
+            is_xmr_lock_transaction_sent,
+            FixedRate::default(),
+        ));
+
+        // Alice finishes first (just sends XMR lock and stops)
+        let alice_state = alice_swap.await??;
+        assert!(matches!(
+            alice_state,
+            AliceState::XmrLockTransactionSent { .. }
+        ));
+
+        // Bob takes longer: cancel timelock -> partial refund -> remaining refund timelock -> amnesty
+        let bob_state = bob_swap.await??;
+        ctx.assert_bob_amnesty_received(bob_state).await;
+
+        // Restart Alice so she can refund her XMR
+        ctx.restart_alice().await;
+        let alice_swap = ctx.alice_next_swap().await;
+        let alice_swap = tokio::spawn(alice::run(alice_swap, FixedRate::default()));
+
+        let alice_state = alice_swap.await??;
+        ctx.assert_alice_refunded(alice_state).await;
+
+        Ok(())
+    })
+    .await;
+}
diff --git a/swap/tests/partial_refund_bob_restart_detects_withhold.rs b/swap/tests/partial_refund_bob_restart_detects_withhold.rs
new file mode 100644
index 0000000000..c9a4ff543c
--- /dev/null
+++ b/swap/tests/partial_refund_bob_restart_detects_withhold.rs
@@ -0,0 +1,88 @@
+pub mod harness;
+
+use std::time::Duration;
+
+use harness::bob_run_until::is_remaining_refund_timelock_expired;
+use harness::FastAmnestyConfig;
+use rust_decimal::Decimal;
+use swap::asb::FixedRate;
+use swap::protocol::bob::BobState;
+use swap::protocol::{alice, bob};
+use swap_env::config::RefundPolicy;
+
+/// Bob does a partial refund, reaches ReclaimTimelockExpired, then crashes.
+/// While Bob is offline, Alice publishes TxWithhold.
+/// When Bob restarts, he detects the TxWithhold and transitions to BtcWithheld
+/// instead of trying to publish TxReclaim against a spent UTXO.
+///
+/// This tests the defensive check in ReclaimTimelockExpired (bob/swap.rs)
+/// that verifies TxWithhold hasn't been published before attempting TxReclaim.
+#[tokio::test]
+async fn bob_restart_at_reclaim_timelock_expired_detects_withhold() {
+    let refund_policy = Some(RefundPolicy {
+        anti_spam_deposit_ratio: Decimal::new(5, 2), // 0.05 = 5%
+        always_withhold_deposit: true,
+    });
+
+    harness::setup_test(
+        FastAmnestyConfig,
+        None,
+        refund_policy,
+        |mut ctx| async move {
+            // Start Bob and save his swap ID for later restart
+            let (bob_swap, bob_app_handle) = ctx.bob_swap().await;
+            let bob_swap_id = bob_swap.id;
+
+            // Bob runs until ReclaimTimelockExpired.
+            // With FastAmnestyConfig (3-block remaining refund timelock), this
+            // happens quickly — well before Alice finishes XMR recovery.
+            let bob_task = tokio::spawn(bob::run_until(
+                bob_swap,
+                is_remaining_refund_timelock_expired,
+            ));
+
+            // Alice runs all the way to BtcWithholdConfirmed.
+            // She will: lock XMR → see cancel → see partial refund → recover
+            // XMR → publish TxWithhold → wait for confirmation.
+            let alice_swap = ctx.alice_next_swap().await;
+            let alice_task =
+                tokio::spawn(alice::run(alice_swap, FixedRate::default()));
+
+            // Bob finishes first (3-block timelock is much faster than XMR recovery)
+            let bob_state = bob_task.await??;
+            assert!(
+                matches!(bob_state, BobState::ReclaimTimelockExpired(..)),
+                "Expected ReclaimTimelockExpired, got: {bob_state}"
+            );
+
+            // Stop Bob's event loop and prepare for restart
+            let (bob_swap, _) = ctx
+                .stop_and_resume_bob_from_db(bob_app_handle, bob_swap_id)
+                .await;
+            // Verify Bob loaded the correct state from DB
+            assert!(
+                matches!(bob_swap.state, BobState::ReclaimTimelockExpired(..)),
+                "Expected ReclaimTimelockExpired after DB load, got: {}",
+                bob_swap.state
+            );
+
+            // Help Alice's Monero recovery along by generating blocks
+            tokio::time::sleep(Duration::from_secs(15)).await;
+            ctx.monero.generate_blocks().await?;
+
+            // Wait for Alice to finish: XMR recovered, TxWithhold confirmed
+            let alice_state = alice_task.await??;
+            ctx.assert_alice_withhold_confirmed(alice_state).await;
+
+            // Now restart Bob. He's in ReclaimTimelockExpired but TxWithhold
+            // has been published while he was offline. The defensive check
+            // should detect it and route to BtcWithholdPublished → BtcWithheld.
+            let bob_task = tokio::spawn(bob::run(bob_swap));
+            let bob_state = bob_task.await??;
+            ctx.assert_bob_withheld(bob_state).await;
+
+            Ok(())
+        },
+    )
+    .await;
+}
diff --git a/swap/tests/punish.rs b/swap/tests/punish.rs
index 4829c7ebec..0d5d2d47db 100644
--- a/swap/tests/punish.rs
+++ b/swap/tests/punish.rs
@@ -10,7 +10,7 @@ use swap::protocol::{alice, bob};
 /// the encsig and fail to refund or redeem. Alice punishes. Bob then cooperates with Alice and redeems XMR with her key.
 #[tokio::test]
 async fn alice_punishes_if_bob_never_acts_after_fund() {
-    harness::setup_test(FastPunishConfig, None, |mut ctx| async move {
+    harness::setup_test(FastPunishConfig, None, None, |mut ctx| async move {
         let (bob_swap, bob_join_handle) = ctx.bob_swap().await;
         let bob_swap_id = bob_swap.id;
         let bob_swap = tokio::spawn(bob::run_until(bob_swap, is_btc_locked));
diff --git a/swap/tests/swap_rejected_deposit_too_small.rs b/swap/tests/swap_rejected_deposit_too_small.rs
new file mode 100644
index 0000000000..f9abb2cadb
--- /dev/null
+++ b/swap/tests/swap_rejected_deposit_too_small.rs
@@ -0,0 +1,46 @@
+pub mod harness;
+
+use harness::FastAmnestyConfig;
+use rust_decimal::Decimal;
+use swap::protocol::bob;
+use swap_env::config::RefundPolicy;
+
+/// Bob tries to swap a very small BTC amount (10,000 sats).
+/// Alice has a 5% anti-spam deposit ratio.
+///
+/// Alice computes: amnesty = max(10000 * 0.05, 3001) = 3001 sats.
+/// But 3001 / 10000 = 30.01% which exceeds the 20% ceiling.
+///
+/// Alice rejects the swap during setup and sends an error to Bob.
+/// Bob must receive a clear rejection error (not a timeout or generic
+/// "connection closed" error).
+#[tokio::test]
+async fn swap_rejected_due_to_small_deposit_reported_to_bob() {
+    let refund_policy = Some(RefundPolicy {
+        anti_spam_deposit_ratio: Decimal::new(5, 2), // 0.05 = 5%
+        always_withhold_deposit: false,
+    });
+
+    harness::setup_test(FastAmnestyConfig, None, refund_policy, |ctx| async move {
+        // 10,000 sats is small enough that the minimum fee floor (3001 sats)
+        // pushes the amnesty ratio above the 20% ceiling.
+        let small_btc = bitcoin::Amount::from_sat(10_000);
+        let (bob_swap, event_loop) = ctx.bob_params.new_swap(small_btc).await?;
+        let bob_event_loop = tokio::spawn(event_loop.run());
+
+        let result = bob::run(bob_swap).await;
+
+        let err = result.expect_err("Expected swap to be rejected due to small deposit");
+        let err_msg = format!("{:#}", err);
+
+        assert!(
+            err_msg.contains("Anti-spam deposit ratio"),
+            "Expected rejection error about anti-spam deposit ratio, got: {err_msg}"
+        );
+
+        bob_event_loop.abort();
+
+        Ok(())
+    })
+    .await;
+}