diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index d4f3ba1ebc..c8904130c7 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -25,9 +25,11 @@ jobs:
       - name: Install Tauri OS dependencies
         run: |
           sudo apt update && sudo apt install -y \
+            libsoup-3.0-0 \
             libgtk-3-dev \
             libayatana-appindicator3-dev \
             libwebkit2gtk-4.0-dev \
+            libwebkit2gtk-4.1-dev \
             webkit2gtk-driver \
             ffmpeg \
             xvfb
@@ -46,8 +48,10 @@ jobs:
           restore-keys: cargo-
       - name: Setup node environment
         uses: ./.github/actions/init-env-node
-      - name: Build CLI
-        run: cargo build -p gitbutler-cli
+      - name: Build gitbutler-cli & gitbutler-git
+        run: |
+          cargo build -p gitbutler-git
+          cargo build -p gitbutler-cli
       - name: Build SvelteKit
         run: pnpm build:desktop -- --mode development
       - name: Build Tauri
@@ -55,7 +59,7 @@ jobs:
       - name: Install tauri-driver
         run: |
           if [ ! -e "$HOME/.cargo/bin/tauri-driver" ]; then
-            cargo install tauri-driver@0.1.3
+            cargo install tauri-driver
           fi
 
       # Run it through `xvfb-run` to have a fake display server which allows our
diff --git a/Cargo.lock b/Cargo.lock
index dae30b3e2a..0645aad512 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -94,6 +94,23 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
 
+[[package]]
+name = "android_log-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
+
+[[package]]
+name = "android_logger"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826"
+dependencies = [
+ "android_log-sys",
+ "env_filter",
+ "log",
+]
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -164,6 +181,15 @@ version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
@@ -176,6 +202,23 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "ashpd"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
+dependencies = [
+ "enumflags2",
+ "futures-channel",
+ "futures-util",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "tokio",
+ "url",
+ "zbus 4.4.0",
+]
+
 [[package]]
 name = "assert_cmd"
 version = "2.0.16"
@@ -202,6 +245,18 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "async-broadcast"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
+dependencies = [
+ "event-listener 5.3.1",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-channel"
 version = "2.3.1"
@@ -239,6 +294,17 @@ dependencies = [
  "futures-lite 1.13.0",
 ]
 
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock 3.4.0",
+ "blocking",
+ "futures-lite 2.3.0",
+]
+
 [[package]]
 name = "async-io"
 version = "1.13.0"
@@ -315,6 +381,26 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "async-process"
+version = "2.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374"
+dependencies = [
+ "async-channel",
+ "async-io 2.3.4",
+ "async-lock 3.4.0",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener 5.3.1",
+ "futures-lite 2.3.0",
+ "rustix 0.38.34",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "async-recursion"
 version = "1.1.1"
@@ -385,26 +471,25 @@ dependencies = [
 
 [[package]]
 name = "atk"
-version = "0.15.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
+checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4"
 dependencies = [
  "atk-sys",
- "bitflags 1.3.2",
  "glib",
  "libc",
 ]
 
 [[package]]
 name = "atk-sys"
-version = "0.15.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
+checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.2.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -429,8 +514,8 @@ dependencies = [
  "axum-core",
  "bytes",
  "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
+ "http",
+ "http-body",
  "http-body-util",
  "itoa 1.0.11",
  "matchit",
@@ -455,8 +540,8 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
+ "http",
+ "http-body",
  "http-body-util",
  "mime",
  "pin-project-lite",
@@ -492,12 +577,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -516,21 +595,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bit_field"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -542,6 +606,9 @@ name = "bitflags"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bitvec"
@@ -579,6 +646,15 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "block2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+dependencies = [
+ "objc2",
+]
+
 [[package]]
 name = "blocking"
 version = "1.6.1"
@@ -731,36 +807,69 @@ dependencies = [
 
 [[package]]
 name = "cairo-rs"
-version = "0.15.12"
+version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
+checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "cairo-sys-rs",
  "glib",
  "libc",
+ "once_cell",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-sys-rs"
-version = "0.15.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
+checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 6.2.2",
+ "system-deps",
+]
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
 ]
 
 [[package]]
 name = "cargo_toml"
-version = "0.15.3"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
+checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719"
 dependencies = [
  "serde",
- "toml 0.7.8",
+ "toml 0.8.19",
 ]
 
 [[package]]
@@ -806,15 +915,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "cfg-expr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
-dependencies = [
- "smallvec",
-]
-
 [[package]]
 name = "cfg-expr"
 version = "0.15.8"
@@ -946,16 +1046,32 @@ dependencies = [
 
 [[package]]
 name = "cocoa"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
 dependencies = [
  "bitflags 1.3.2",
  "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types",
+ "cocoa-foundation 0.1.2",
+ "core-foundation 0.9.4",
+ "core-graphics 0.23.2",
+ "foreign-types 0.5.0",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
+dependencies = [
+ "bitflags 2.6.0",
+ "block",
+ "cocoa-foundation 0.2.0",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
+ "foreign-types 0.5.0",
  "libc",
  "objc",
 ]
@@ -968,17 +1084,25 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
 dependencies = [
  "bitflags 1.3.2",
  "block",
- "core-foundation",
- "core-graphics-types",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
  "libc",
  "objc",
 ]
 
 [[package]]
-name = "color_quant"
-version = "1.1.0"
+name = "cocoa-foundation"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
+dependencies = [
+ "bitflags 2.6.0",
+ "block",
+ "core-foundation 0.10.0",
+ "core-graphics-types 0.2.0",
+ "libc",
+ "objc",
+]
 
 [[package]]
 name = "colorchoice"
@@ -1056,6 +1180,34 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "cookie_store"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
+dependencies = [
+ "cookie",
+ "idna 0.5.0",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time",
+ "url",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1066,6 +1218,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -1074,14 +1236,27 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core-graphics"
-version = "0.22.3"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
+ "core-graphics-types 0.2.0",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -1092,7 +1267,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
  "libc",
 ]
 
@@ -1331,6 +1517,12 @@ dependencies = [
  "parking_lot_core 0.9.10",
 ]
 
+[[package]]
+name = "data-url"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
+
 [[package]]
 name = "deranged"
 version = "0.3.11"
@@ -1352,6 +1544,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.18"
@@ -1474,12 +1677,55 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "dlopen2"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6"
+dependencies = [
+ "dlopen2_derive",
+ "libc",
+ "once_cell",
+ "winapi",
+]
+
+[[package]]
+name = "dlopen2_derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "dpi"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "dtoa"
 version = "1.0.9"
@@ -1501,6 +1747,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -1518,7 +1770,7 @@ dependencies = [
  "rustc_version",
  "toml 0.8.19",
  "vswhom",
- "winreg 0.52.0",
+ "winreg",
 ]
 
 [[package]]
@@ -1536,6 +1788,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
 [[package]]
 name = "enumflags2"
 version = "0.7.10"
@@ -1558,10 +1816,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "equivalent"
-version = "1.0.1"
+name = "env_filter"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
 
 [[package]]
 name = "errno"
@@ -1611,22 +1889,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "exr"
-version = "1.72.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
-dependencies = [
- "bit_field",
- "flume",
- "half",
- "lebe",
- "miniz_oxide 0.7.4",
- "rayon-core",
- "smallvec",
- "zune-inflate",
-]
-
 [[package]]
 name = "faster-hex"
 version = "0.9.0"
@@ -1720,15 +1982,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "spin",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1741,7 +1994,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -1750,6 +2024,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1934,11 +2214,10 @@ dependencies = [
 
 [[package]]
 name = "gdk"
-version = "0.15.4"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
+checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646"
 dependencies = [
- "bitflags 1.3.2",
  "cairo-rs",
  "gdk-pixbuf",
  "gdk-sys",
@@ -1950,35 +2229,35 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.15.11"
+version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
+checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
 dependencies = [
- "bitflags 1.3.2",
  "gdk-pixbuf-sys",
  "gio",
  "glib",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.15.10"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
+checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
 dependencies = [
  "gio-sys",
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.2.2",
+ "system-deps",
 ]
 
 [[package]]
 name = "gdk-sys"
-version = "0.15.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
+checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -1988,33 +2267,47 @@ dependencies = [
  "libc",
  "pango-sys",
  "pkg-config",
- "system-deps 6.2.2",
+ "system-deps",
 ]
 
 [[package]]
 name = "gdkwayland-sys"
-version = "0.15.3"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2"
+checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a"
 dependencies = [
  "gdk-sys",
  "glib-sys",
  "gobject-sys",
  "libc",
  "pkg-config",
- "system-deps 6.2.2",
+ "system-deps",
+]
+
+[[package]]
+name = "gdkx11"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2ea8a4909d530f79921290389cbd7c34cb9d623bfe970eaae65ca5f9cd9cce"
+dependencies = [
+ "gdk",
+ "gdkx11-sys",
+ "gio",
+ "glib",
+ "libc",
+ "x11",
 ]
 
 [[package]]
 name = "gdkx11-sys"
-version = "0.15.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
+checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043"
 dependencies = [
  "gdk-sys",
  "glib-sys",
  "libc",
- "system-deps 6.2.2",
+ "system-deps",
  "x11",
 ]
 
@@ -2041,6 +2334,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -2063,16 +2366,6 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "gif"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
 [[package]]
 name = "gimli"
 version = "0.29.0"
@@ -2081,31 +2374,33 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "gio"
-version = "0.15.12"
+version = "0.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
+checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
 dependencies = [
- "bitflags 1.3.2",
  "futures-channel",
  "futures-core",
  "futures-io",
+ "futures-util",
  "gio-sys",
  "glib",
  "libc",
  "once_cell",
+ "pin-project-lite",
+ "smallvec",
  "thiserror",
 ]
 
 [[package]]
 name = "gio-sys"
-version = "0.15.10"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d"
+checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.2.2",
+ "system-deps",
  "winapi",
 ]
 
@@ -2196,7 +2491,7 @@ dependencies = [
  "once_cell",
  "pretty_assertions",
  "regex",
- "reqwest 0.12.7",
+ "reqwest",
  "serde",
  "serial_test",
  "tempfile",
@@ -2323,7 +2618,7 @@ dependencies = [
  "sha2",
  "tempfile",
  "walkdir",
- "zip",
+ "zip 0.6.6",
 ]
 
 [[package]]
@@ -2579,18 +2874,24 @@ dependencies = [
  "gix",
  "log",
  "once_cell",
- "open 5.3.0",
+ "open",
  "parking_lot 0.12.3",
  "pretty_assertions",
- "reqwest 0.12.7",
+ "reqwest",
  "serde",
  "serde_json",
  "tauri",
  "tauri-build",
- "tauri-plugin-context-menu",
+ "tauri-plugin-dialog",
+ "tauri-plugin-fs",
+ "tauri-plugin-http",
  "tauri-plugin-log",
+ "tauri-plugin-os",
+ "tauri-plugin-process",
+ "tauri-plugin-shell",
  "tauri-plugin-single-instance",
  "tauri-plugin-store",
+ "tauri-plugin-updater",
  "tauri-plugin-window-state",
  "tempfile",
  "thiserror",
@@ -3810,19 +4111,22 @@ dependencies = [
 
 [[package]]
 name = "glib"
-version = "0.15.12"
+version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
+checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "futures-channel",
  "futures-core",
  "futures-executor",
  "futures-task",
+ "futures-util",
+ "gio-sys",
  "glib-macros",
  "glib-sys",
  "gobject-sys",
  "libc",
+ "memchr",
  "once_cell",
  "smallvec",
  "thiserror",
@@ -3830,27 +4134,26 @@ dependencies = [
 
 [[package]]
 name = "glib-macros"
-version = "0.15.13"
+version = "0.18.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"
+checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
 dependencies = [
- "anyhow",
  "heck 0.4.1",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 2.0.0",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.76",
 ]
 
 [[package]]
 name = "glib-sys"
-version = "0.15.10"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
+checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
 dependencies = [
  "libc",
- "system-deps 6.2.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -3859,38 +4162,24 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
-[[package]]
-name = "globset"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
-dependencies = [
- "aho-corasick",
- "bstr",
- "log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
-]
-
 [[package]]
 name = "gobject-sys"
-version = "0.15.10"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
+checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 6.2.2",
+ "system-deps",
 ]
 
 [[package]]
 name = "gtk"
-version = "0.15.5"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
+checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c"
 dependencies = [
  "atk",
- "bitflags 1.3.2",
  "cairo-rs",
  "field-offset",
  "futures-channel",
@@ -3901,16 +4190,15 @@ dependencies = [
  "gtk-sys",
  "gtk3-macros",
  "libc",
- "once_cell",
  "pango",
  "pkg-config",
 ]
 
 [[package]]
 name = "gtk-sys"
-version = "0.15.3"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
+checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722"
 dependencies = [
  "atk-sys",
  "cairo-sys-rs",
@@ -3921,40 +4209,20 @@ dependencies = [
  "gobject-sys",
  "libc",
  "pango-sys",
- "system-deps 6.2.2",
+ "system-deps",
 ]
 
 [[package]]
 name = "gtk3-macros"
-version = "0.15.6"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d"
+checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e"
 dependencies = [
- "anyhow",
  "proc-macro-crate 1.3.1",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.4.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -3968,7 +4236,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.1.0",
+ "http",
  "indexmap 2.4.0",
  "slab",
  "tokio",
@@ -4018,15 +4286,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -4098,17 +4357,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa 1.0.11",
-]
-
 [[package]]
 name = "http"
 version = "1.1.0"
@@ -4120,17 +4368,6 @@ dependencies = [
  "itoa 1.0.11",
 ]
 
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.12",
- "pin-project-lite",
-]
-
 [[package]]
 name = "http-body"
 version = "1.0.1"
@@ -4138,7 +4375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.1.0",
+ "http",
 ]
 
 [[package]]
@@ -4149,8 +4386,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
+ "http",
+ "http-body",
  "pin-project-lite",
 ]
 
@@ -4178,30 +4415,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
-[[package]]
-name = "hyper"
-version = "0.14.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa 1.0.11",
- "pin-project-lite",
- "socket2 0.5.7",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
 [[package]]
 name = "hyper"
 version = "1.4.1"
@@ -4211,9 +4424,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.6",
- "http 1.1.0",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "httparse",
  "httpdate",
  "itoa 1.0.11",
@@ -4230,14 +4443,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
 dependencies = [
  "futures-util",
- "http 1.1.0",
- "hyper 1.4.1",
+ "http",
+ "hyper",
  "hyper-util",
  "rustls",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
  "tower-service",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -4246,26 +4460,13 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
 dependencies = [
- "hyper 1.4.1",
+ "hyper",
  "hyper-util",
  "pin-project-lite",
  "tokio",
  "tower-service",
 ]
 
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper 0.14.30",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -4274,7 +4475,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -4291,9 +4492,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "hyper 1.4.1",
+ "http",
+ "http-body",
+ "hyper",
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
@@ -4343,46 +4544,22 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
 ]
 
 [[package]]
-name = "ignore"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
-dependencies = [
- "crossbeam-deque",
- "globset",
- "log",
- "memchr",
- "regex-automata 0.4.7",
- "same-file",
- "walkdir",
- "winapi-util",
-]
-
-[[package]]
-name = "image"
-version = "0.24.9"
+name = "idna"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "exr",
- "gif",
- "jpeg-decoder",
- "num-traits",
- "png",
- "qoi",
- "tiff",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -4419,9 +4596,9 @@ dependencies = [
 
 [[package]]
 name = "infer"
-version = "0.13.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
+checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199"
 dependencies = [
  "cfb",
 ]
@@ -4566,9 +4743,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "javascriptcore-rs"
-version = "0.16.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
+checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc"
 dependencies = [
  "bitflags 1.3.2",
  "glib",
@@ -4577,14 +4754,14 @@ dependencies = [
 
 [[package]]
 name = "javascriptcore-rs-sys"
-version = "0.4.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
+checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 5.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -4614,16 +4791,18 @@ dependencies = [
 
 [[package]]
 name = "jni"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
  "cesu8",
+ "cfg-if",
  "combine",
  "jni-sys",
  "log",
  "thiserror",
  "walkdir",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -4641,15 +4820,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-dependencies = [
- "rayon",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.70"
@@ -4682,6 +4852,17 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "keyboard-types"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
+dependencies = [
+ "bitflags 2.6.0",
+ "serde",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "keyring"
 version = "2.3.3"
@@ -4745,10 +4926,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
-name = "lebe"
-version = "0.5.2"
+name = "libappindicator"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a"
+dependencies = [
+ "glib",
+ "gtk",
+ "gtk-sys",
+ "libappindicator-sys",
+ "log",
+]
+
+[[package]]
+name = "libappindicator-sys"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
+dependencies = [
+ "gtk-sys",
+ "libloading",
+ "once_cell",
+]
 
 [[package]]
 name = "libc"
@@ -4770,6 +4969,16 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
 [[package]]
 name = "libredox"
 version = "0.1.3"
@@ -4985,6 +5194,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "minisign-verify"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.7.4"
@@ -5034,6 +5249,25 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdcebb6db83796481097dedc7747809243cc81d9ed83e6a938b76d4ea0b249cf"
 
+[[package]]
+name = "muda"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1"
+dependencies = [
+ "cocoa 0.26.0",
+ "crossbeam-channel",
+ "dpi",
+ "gtk",
+ "keyboard-types",
+ "objc",
+ "once_cell",
+ "png",
+ "serde",
+ "thiserror",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.12"
@@ -5053,14 +5287,16 @@ dependencies = [
 
 [[package]]
 name = "ndk"
-version = "0.6.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "jni-sys",
+ "log",
  "ndk-sys",
  "num_enum",
+ "raw-window-handle",
  "thiserror",
 ]
 
@@ -5072,9 +5308,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
 
 [[package]]
 name = "ndk-sys"
-version = "0.3.0"
+version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
  "jni-sys",
 ]
@@ -5254,23 +5490,23 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.5.11"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
 dependencies = [
  "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.11"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.76",
 ]
 
 [[package]]
@@ -5303,6 +5539,106 @@ dependencies = [
  "objc_id",
 ]
 
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-foundation",
+ "objc2-quartz-core",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "dispatch",
+ "libc",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
 [[package]]
 name = "objc_exception"
 version = "0.1.2"
@@ -5342,16 +5678,6 @@ version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 
-[[package]]
-name = "open"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
-dependencies = [
- "pathdiff",
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "open"
 version = "5.3.0"
@@ -5371,7 +5697,7 @@ checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
  "once_cell",
  "openssl-macros",
@@ -5444,6 +5770,16 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "os_pipe"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -5452,11 +5788,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "pango"
-version = "0.15.10"
+version = "0.18.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
+checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
 dependencies = [
- "bitflags 1.3.2",
+ "gio",
  "glib",
  "libc",
  "once_cell",
@@ -5465,14 +5801,14 @@ dependencies = [
 
 [[package]]
 name = "pango-sys"
-version = "0.15.10"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa"
+checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 6.2.2",
+ "system-deps",
 ]
 
 [[package]]
@@ -5900,6 +6236,15 @@ dependencies = [
  "toml_edit 0.19.15",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "3.1.0"
@@ -5996,6 +6341,12 @@ dependencies = [
  "prost",
 ]
 
+[[package]]
+name = "psl-types"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
+
 [[package]]
 name = "ptr_meta"
 version = "0.1.4"
@@ -6017,12 +6368,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "qoi"
-version = "0.4.1"
+name = "publicsuffix"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
 dependencies = [
- "bytemuck",
+ "idna 0.3.0",
+ "psl-types",
 ]
 
 [[package]]
@@ -6034,6 +6386,54 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quinn"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2 0.5.7",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+dependencies = [
+ "bytes",
+ "rand 0.8.5",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+dependencies = [
+ "libc",
+ "once_cell",
+ "socket2 0.5.7",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.37"
@@ -6132,9 +6532,9 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.5.2"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
 [[package]]
 name = "rayon"
@@ -6244,48 +6644,6 @@ dependencies = [
  "bytecheck",
 ]
 
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.30",
- "hyper-tls 0.5.0",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration 0.5.1",
- "tokio",
- "tokio-native-tls",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "winreg 0.50.0",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.12.7"
@@ -6294,16 +6652,18 @@ checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "base64 0.22.1",
  "bytes",
+ "cookie",
+ "cookie_store",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.6",
- "http 1.1.0",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper",
  "hyper-rustls",
- "hyper-tls 0.6.0",
+ "hyper-tls",
  "hyper-util",
  "ipnet",
  "js-sys",
@@ -6313,19 +6673,26 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile 2.1.3",
+ "quinn",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.1",
- "system-configuration 0.6.1",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tokio-rustls",
+ "tokio-util",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
+ "webpki-roots",
  "windows-registry",
 ]
 
@@ -6340,17 +6707,17 @@ dependencies = [
 
 [[package]]
 name = "rfd"
-version = "0.10.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
+checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251"
 dependencies = [
+ "ashpd",
  "block",
  "dispatch",
  "glib-sys",
  "gobject-sys",
  "gtk-sys",
  "js-sys",
- "lazy_static",
  "log",
  "objc",
  "objc-foundation",
@@ -6359,7 +6726,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows 0.37.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6458,6 +6825,12 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -6501,21 +6874,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
 dependencies = [
  "once_cell",
+ "ring",
  "rustls-pki-types",
  "rustls-webpki",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64 0.21.7",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "2.1.3"
@@ -6582,6 +6947,32 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
+dependencies = [
+ "dyn-clone",
+ "indexmap 1.9.3",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+ "url",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 2.0.76",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -6622,7 +7013,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "sha2",
- "zbus",
+ "zbus 3.15.2",
 ]
 
 [[package]]
@@ -6632,7 +7023,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.6.0",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -6686,6 +7077,17 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-untagged"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6"
+dependencies = [
+ "erased-serde",
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.209"
@@ -6697,13 +7099,23 @@ dependencies = [
  "syn 2.0.76",
 ]
 
+[[package]]
+name = "serde_derive_internals"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
 dependencies = [
- "indexmap 2.4.0",
  "itoa 1.0.11",
  "memchr",
  "ryu",
@@ -6799,9 +7211,9 @@ dependencies = [
 
 [[package]]
 name = "serialize-to-javascript"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5"
+checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
 dependencies = [
  "serde",
  "serde_json",
@@ -6810,13 +7222,13 @@ dependencies = [
 
 [[package]]
 name = "serialize-to-javascript-impl"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
+checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -6876,6 +7288,16 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shared_child"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "shell-words"
 version = "1.1.0"
@@ -6970,31 +7392,52 @@ dependencies = [
 ]
 
 [[package]]
-name = "soup2"
-version = "0.2.1"
+name = "softbuffer"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
+checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd"
 dependencies = [
- "bitflags 1.3.2",
+ "bytemuck",
+ "cfg_aliases",
+ "core-graphics 0.23.2",
+ "foreign-types 0.5.0",
+ "js-sys",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "raw-window-handle",
+ "redox_syscall 0.5.3",
+ "wasm-bindgen",
+ "web-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "soup3"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f"
+dependencies = [
+ "futures-channel",
  "gio",
  "glib",
  "libc",
- "once_cell",
- "soup2-sys",
+ "soup3-sys",
 ]
 
 [[package]]
-name = "soup2-sys"
-version = "0.2.0"
+name = "soup3-sys"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
+checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27"
 dependencies = [
- "bitflags 1.3.2",
  "gio-sys",
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 5.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -7002,9 +7445,6 @@ name = "spin"
 version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
 
 [[package]]
 name = "ssh2"
@@ -7026,9 +7466,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "state"
-version = "0.5.3"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
 dependencies = [
  "loom",
 ]
@@ -7099,6 +7539,17 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
+[[package]]
+name = "swift-rs"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -7171,17 +7622,6 @@ dependencies = [
  "windows 0.57.0",
 ]
 
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys 0.5.0",
-]
-
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
@@ -7189,18 +7629,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.6.0",
- "core-foundation",
- "system-configuration-sys 0.6.0",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
+ "core-foundation 0.9.4",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -7213,56 +7643,36 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "system-deps"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
-dependencies = [
- "cfg-expr 0.9.1",
- "heck 0.3.3",
- "pkg-config",
- "toml 0.5.11",
- "version-compare 0.0.11",
-]
-
 [[package]]
 name = "system-deps"
 version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
 dependencies = [
- "cfg-expr 0.15.8",
+ "cfg-expr",
  "heck 0.5.0",
  "pkg-config",
  "toml 0.8.19",
- "version-compare 0.2.0",
+ "version-compare",
 ]
 
 [[package]]
 name = "tao"
-version = "0.16.9"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab"
+checksum = "d3a97abbc7d6cfd0720da3e06fcb1cf2ac87cbfdb5bbbce103a1279a211c4d81"
 dependencies = [
- "bitflags 1.3.2",
- "cairo-rs",
- "cc",
- "cocoa",
- "core-foundation",
- "core-graphics",
+ "bitflags 2.6.0",
+ "cocoa 0.26.0",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
  "crossbeam-channel",
  "dispatch",
- "gdk",
- "gdk-pixbuf",
- "gdk-sys",
+ "dlopen2",
+ "dpi",
  "gdkwayland-sys",
  "gdkx11-sys",
- "gio",
- "glib",
- "glib-sys",
  "gtk",
- "image",
  "instant",
  "jni",
  "lazy_static",
@@ -7274,15 +7684,14 @@ dependencies = [
  "objc",
  "once_cell",
  "parking_lot 0.12.3",
- "png",
  "raw-window-handle",
  "scopeguard",
- "serde",
  "tao-macros",
  "unicode-segmentation",
- "uuid",
- "windows 0.39.0",
- "windows-implement 0.39.0",
+ "url",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
+ "windows-version",
  "x11-dl",
 ]
 
@@ -7322,85 +7731,83 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "1.7.2"
+version = "2.0.0-rc.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e33e3ba00a3b05eb6c57ef135781717d33728b48acf914bb05629e74d897d29"
+checksum = "997e79de4c7a13b494a02c8104aa146a5d871ce83e5943e522bc5f8f35c8dab8"
 dependencies = [
  "anyhow",
  "bytes",
- "cocoa",
- "dirs-next",
+ "cocoa 0.26.0",
+ "dirs 5.0.1",
  "dunce",
  "embed_plist",
- "encoding_rs",
- "flate2",
  "futures-util",
  "getrandom 0.2.15",
- "glib",
  "glob",
  "gtk",
  "heck 0.5.0",
- "http 0.2.12",
- "ignore",
- "indexmap 1.9.3",
+ "http",
+ "http-range",
+ "jni",
+ "libc",
+ "log",
+ "mime",
+ "muda",
  "objc",
- "once_cell",
- "open 3.2.0",
- "os_info",
  "percent-encoding",
- "rand 0.8.5",
  "raw-window-handle",
- "regex",
- "reqwest 0.11.27",
- "rfd",
- "semver",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_repr",
  "serialize-to-javascript",
  "state",
- "sys-locale",
- "tar",
+ "swift-rs",
+ "tauri-build",
  "tauri-macros",
  "tauri-runtime",
  "tauri-runtime-wry",
  "tauri-utils",
- "tempfile",
  "thiserror",
  "tokio",
+ "tray-icon",
  "url",
- "uuid",
+ "urlpattern",
  "webkit2gtk",
  "webview2-com",
- "windows 0.39.0",
+ "window-vibrancy",
+ "windows 0.58.0",
 ]
 
 [[package]]
 name = "tauri-build"
-version = "1.5.4"
+version = "2.0.0-rc.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fb5a90a64241ddb7217d3210d844149070a911e87e8a107a707a1d4973f164"
+checksum = "032b966611a9324c2185fb9039ccfb938dbe00ec96fa1fe1596c9a1a98a6c87b"
 dependencies = [
  "anyhow",
  "cargo_toml",
- "dirs-next",
+ "dirs 5.0.1",
+ "glob",
  "heck 0.5.0",
  "json-patch",
+ "schemars",
  "semver",
  "serde",
  "serde_json",
  "tauri-utils",
  "tauri-winres",
+ "toml 0.8.19",
  "walkdir",
 ]
 
 [[package]]
 name = "tauri-codegen"
-version = "1.4.5"
+version = "2.0.0-rc.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93a9e3f5cebf779a63bf24903e714ec91196c307d8249a0008b882424328bcda"
+checksum = "0f4138f3ee5fafa703c4504da58b6b94693655d0ddff8daf1e831b6dc04f4125"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "brotli",
  "ico",
  "json-patch",
@@ -7408,71 +7815,185 @@ dependencies = [
  "png",
  "proc-macro2",
  "quote",
- "regex",
  "semver",
  "serde",
  "serde_json",
  "sha2",
+ "syn 2.0.76",
  "tauri-utils",
  "thiserror",
  "time",
+ "url",
  "uuid",
  "walkdir",
 ]
 
 [[package]]
 name = "tauri-macros"
-version = "1.4.6"
+version = "2.0.0-rc.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1d0e989f54fe06c5ef0875c5e19cf96453d099a0a774d5192ab47e80471cdab"
+checksum = "a5995206394cd30411fc5c8ae195e498357f63e11ed960ea32b53512dcb2a5a5"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.76",
  "tauri-codegen",
  "tauri-utils",
 ]
 
 [[package]]
-name = "tauri-plugin-context-menu"
-version = "0.8.1"
-source = "git+https://github.com/c2r0b/tauri-plugin-context-menu?branch=main#1cdd3b55677054ba0e237893435fdc05006b9a3e"
+name = "tauri-plugin"
+version = "2.0.0-rc.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4658d4bfb0e9c8abc8fa9d3e45b4e5fcbfe1be850316d96cefa6a1d4ffc215be"
 dependencies = [
- "cocoa",
- "dispatch",
- "gdk",
- "glib",
- "gtk",
- "image",
- "lazy_static",
- "libc",
- "objc",
+ "anyhow",
+ "glob",
+ "plist",
+ "schemars",
  "serde",
+ "serde_json",
+ "tauri-utils",
+ "toml 0.8.19",
+ "walkdir",
+]
+
+[[package]]
+name = "tauri-plugin-dialog"
+version = "2.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23f9acd91025e9b624969422e4c707f7cdcded6de66aa0559bc4d91339753cc2"
+dependencies = [
+ "dunce",
+ "log",
+ "raw-window-handle",
+ "rfd",
+ "serde",
+ "serde_json",
  "tauri",
- "time",
- "winapi",
+ "tauri-plugin",
+ "tauri-plugin-fs",
+ "thiserror",
+]
+
+[[package]]
+name = "tauri-plugin-fs"
+version = "2.0.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5df6b25b1f2b7b61565e66c4dbee9eb39e5635d2a763206e380e07cc3f601a67"
+dependencies = [
+ "anyhow",
+ "glob",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "tauri-plugin-http"
+version = "2.0.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1eef17218eaa8bd0fc6cafb7831c63d82ef83b3950d59dc817d92d5320c4f20c"
+dependencies = [
+ "data-url",
+ "http",
+ "regex",
+ "reqwest",
+ "schemars",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "tauri-plugin-fs",
+ "thiserror",
+ "tokio",
+ "url",
+ "urlpattern",
 ]
 
 [[package]]
 name = "tauri-plugin-log"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#677bade9089f2963e5858cc5062e5504787eaf7f"
+version = "2.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9537844ef72ea15d69819d638569ae0fbbcd8a77111a1cf6ef4428bd90bae2c3"
 dependencies = [
+ "android_logger",
  "byte-unit",
+ "cocoa 0.25.0",
  "fern",
  "log",
+ "objc",
  "serde",
  "serde_json",
  "serde_repr",
+ "swift-rs",
  "tauri",
+ "tauri-plugin",
+ "thiserror",
  "time",
 ]
 
+[[package]]
+name = "tauri-plugin-os"
+version = "2.0.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b54cfeb26356822d3be3db4282041b03552f573a694b6b28aded7d95c62a039"
+dependencies = [
+ "gethostname",
+ "log",
+ "os_info",
+ "serde",
+ "serde_json",
+ "serialize-to-javascript",
+ "sys-locale",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+]
+
+[[package]]
+name = "tauri-plugin-process"
+version = "2.0.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d3663df0cd3e96feb37d46aad5d499d2edfcca5c62548ad34f1684e0019168"
+dependencies = [
+ "tauri",
+ "tauri-plugin",
+]
+
+[[package]]
+name = "tauri-plugin-shell"
+version = "2.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46315cccdbc7686bfb9f17e4aab757e5bb50118bc42e52784cae3917c59ac4d7"
+dependencies = [
+ "encoding_rs",
+ "log",
+ "open",
+ "os_pipe",
+ "regex",
+ "schemars",
+ "serde",
+ "serde_json",
+ "shared_child",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "tauri-plugin-single-instance"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#677bade9089f2963e5858cc5062e5504787eaf7f"
+version = "2.0.0-rc.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de552151b4c9ba9ff72c7244dccaadd47f88d1f0d5caa2603c5c1c12b7636edc"
 dependencies = [
  "log",
  "serde",
@@ -7480,87 +8001,122 @@ dependencies = [
  "tauri",
  "thiserror",
  "windows-sys 0.52.0",
- "zbus",
+ "zbus 4.4.0",
 ]
 
 [[package]]
 name = "tauri-plugin-store"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#677bade9089f2963e5858cc5062e5504787eaf7f"
+version = "2.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfc658c2fe037e25e8af70d72ce2a757203be3fd8db13893fe872fa9847f9cac"
 dependencies = [
+ "dunce",
  "log",
  "serde",
  "serde_json",
  "tauri",
+ "tauri-plugin",
  "thiserror",
 ]
 
+[[package]]
+name = "tauri-plugin-updater"
+version = "2.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dfd104b50e1c17998fc131edd21ced948a9605bac7eb6827f94e099a644f924"
+dependencies = [
+ "base64 0.22.1",
+ "dirs 5.0.1",
+ "flate2",
+ "futures-util",
+ "http",
+ "infer",
+ "minisign-verify",
+ "reqwest",
+ "semver",
+ "serde",
+ "serde_json",
+ "tar",
+ "tauri",
+ "tauri-plugin",
+ "tempfile",
+ "thiserror",
+ "time",
+ "tokio",
+ "url",
+ "windows-sys 0.59.0",
+ "zip 2.2.0",
+]
+
 [[package]]
 name = "tauri-plugin-window-state"
-version = "0.1.1"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#677bade9089f2963e5858cc5062e5504787eaf7f"
+version = "2.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb6839228cbd225b95681c766cc51113e9dad62c4b3f6ebb102234413ba85ee2"
 dependencies = [
- "bincode",
  "bitflags 2.6.0",
  "log",
  "serde",
  "serde_json",
  "tauri",
+ "tauri-plugin",
  "thiserror",
 ]
 
 [[package]]
 name = "tauri-runtime"
-version = "0.14.5"
+version = "2.0.0-rc.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33fda7d213e239077fad52e96c6b734cecedb30c2382118b64f94cb5103ff3a"
+checksum = "7c0830152f7e56a6c43080ced8f1c30a785a237ca3cfaa559ddf52d4be633275"
 dependencies = [
+ "dpi",
  "gtk",
- "http 0.2.12",
- "http-range",
- "rand 0.8.5",
+ "http",
+ "jni",
  "raw-window-handle",
  "serde",
  "serde_json",
  "tauri-utils",
  "thiserror",
  "url",
- "uuid",
- "webview2-com",
- "windows 0.39.0",
+ "windows 0.58.0",
 ]
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.14.10"
+version = "2.0.0-rc.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18c447dcd9b0f09c7dc4b752cc33e72788805bfd761fbda5692d30c48289efec"
+checksum = "6f185bd051f52bece7ef2b197e1f285dab57e3891faa8eacc991459792b077c1"
 dependencies = [
- "cocoa",
+ "cocoa 0.26.0",
  "gtk",
+ "http",
+ "jni",
+ "log",
  "percent-encoding",
- "rand 0.8.5",
  "raw-window-handle",
+ "softbuffer",
+ "tao",
  "tauri-runtime",
  "tauri-utils",
- "uuid",
+ "url",
  "webkit2gtk",
  "webview2-com",
- "windows 0.39.0",
+ "windows 0.58.0",
  "wry",
 ]
 
 [[package]]
 name = "tauri-utils"
-version = "1.6.1"
+version = "2.0.0-rc.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0c939e88d82903a0a7dfb28388b12a3c03504d6bd6086550edaa3b6d8beaa"
+checksum = "f04e02a821a99d544d93b44870799aaf75c8c0dda1853baf064261da3070b892"
 dependencies = [
  "brotli",
+ "cargo_metadata",
  "ctor",
  "dunce",
  "glob",
- "heck 0.5.0",
  "html5ever",
  "infer",
  "json-patch",
@@ -7570,14 +8126,19 @@ dependencies = [
  "phf 0.11.2",
  "proc-macro2",
  "quote",
+ "regex",
+ "schemars",
  "semver",
  "serde",
+ "serde-untagged",
  "serde_json",
  "serde_with",
+ "swift-rs",
  "thiserror",
+ "toml 0.8.19",
  "url",
+ "urlpattern",
  "walkdir",
- "windows-version",
 ]
 
 [[package]]
@@ -7656,17 +8217,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tiff"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
-dependencies = [
- "flate2",
- "jpeg-decoder",
- "weezl",
-]
-
 [[package]]
 name = "time"
 version = "0.3.36"
@@ -7800,15 +8350,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml"
 version = "0.7.8"
@@ -7855,6 +8396,17 @@ dependencies = [
  "winnow 0.5.40",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.4.0",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.21.1"
@@ -7890,11 +8442,11 @@ dependencies = [
  "axum",
  "base64 0.22.1",
  "bytes",
- "h2 0.4.6",
- "http 1.1.0",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper",
  "hyper-timeout",
  "hyper-util",
  "percent-encoding",
@@ -8026,12 +8578,39 @@ dependencies = [
  "tracing-log",
 ]
 
+[[package]]
+name = "tray-icon"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0aeee1ab20514132ef14bf3f4725f39246e82fd4866f7bbd209c36907be44e3"
+dependencies = [
+ "core-graphics 0.24.0",
+ "crossbeam-channel",
+ "dirs 5.0.1",
+ "libappindicator",
+ "muda",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "once_cell",
+ "png",
+ "serde",
+ "thiserror",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -8058,6 +8637,47 @@ dependencies = [
  "arrayvec",
 ]
 
+[[package]]
+name = "unic-char-property"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
+dependencies = [
+ "unic-char-range",
+]
+
+[[package]]
+name = "unic-char-range"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
+
+[[package]]
+name = "unic-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
+
+[[package]]
+name = "unic-ucd-ident"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-version"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
+dependencies = [
+ "unic-common",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.15"
@@ -8104,17 +8724,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
- "idna",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
+[[package]]
+name = "urlpattern"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609"
+dependencies = [
+ "derive_more",
+ "regex",
+ "serde",
+ "unic-ucd-ident",
+ "url",
+]
+
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -8162,12 +8795,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
-
 [[package]]
 name = "version-compare"
 version = "0.2.0"
@@ -8338,9 +8965,9 @@ dependencies = [
 
 [[package]]
 name = "webkit2gtk"
-version = "0.18.2"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370"
+checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a"
 dependencies = [
  "bitflags 1.3.2",
  "cairo-rs",
@@ -8356,20 +8983,18 @@ dependencies = [
  "javascriptcore-rs",
  "libc",
  "once_cell",
- "soup2",
+ "soup3",
  "webkit2gtk-sys",
 ]
 
 [[package]]
 name = "webkit2gtk-sys"
-version = "0.18.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
+checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c"
 dependencies = [
- "atk-sys",
  "bitflags 1.3.2",
  "cairo-sys-rs",
- "gdk-pixbuf-sys",
  "gdk-sys",
  "gio-sys",
  "glib-sys",
@@ -8377,56 +9002,56 @@ dependencies = [
  "gtk-sys",
  "javascriptcore-rs-sys",
  "libc",
- "pango-sys",
  "pkg-config",
- "soup2-sys",
- "system-deps 6.2.2",
+ "soup3-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+dependencies = [
+ "rustls-pki-types",
 ]
 
 [[package]]
 name = "webview2-com"
-version = "0.19.1"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
+checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows 0.39.0",
- "windows-implement 0.39.0",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
 ]
 
 [[package]]
 name = "webview2-com-macros"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"
+checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.76",
 ]
 
 [[package]]
 name = "webview2-com-sys"
-version = "0.19.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7"
+checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886"
 dependencies = [
- "regex",
- "serde",
- "serde_json",
  "thiserror",
- "windows 0.39.0",
- "windows-bindgen",
- "windows-metadata",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
 ]
 
-[[package]]
-name = "weezl"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -8449,7 +9074,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -8459,30 +9084,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
-dependencies = [
- "windows_aarch64_msvc 0.37.0",
- "windows_i686_gnu 0.37.0",
- "windows_i686_msvc 0.37.0",
- "windows_x86_64_gnu 0.37.0",
- "windows_x86_64_msvc 0.37.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.39.0"
+name = "window-vibrancy"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
+checksum = "d8cdd6999298d969289d8078dae02ce798ad23452075985cccba8b6326711ecf"
 dependencies = [
- "windows-implement 0.39.0",
- "windows_aarch64_msvc 0.39.0",
- "windows_i686_gnu 0.39.0",
- "windows_i686_msvc 0.39.0",
- "windows_x86_64_gnu 0.39.0",
- "windows_x86_64_msvc 0.39.0",
+ "cocoa 0.26.0",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.59.0",
+ "windows-version",
 ]
 
 [[package]]
@@ -8514,16 +9125,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-bindgen"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41"
-dependencies = [
- "windows-metadata",
- "windows-tokens",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -8558,16 +9159,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-implement"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"
-dependencies = [
- "syn 1.0.109",
- "windows-tokens",
-]
-
 [[package]]
 name = "windows-implement"
 version = "0.57.0"
@@ -8612,12 +9203,6 @@ dependencies = [
  "syn 2.0.76",
 ]
 
-[[package]]
-name = "windows-metadata"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
-
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -8659,17 +9244,11 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.42.0"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
@@ -8699,6 +9278,21 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -8730,12 +9324,6 @@ dependencies = [
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows-tokens"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
-
 [[package]]
 name = "windows-version"
 version = "0.1.1"
@@ -8763,18 +9351,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -8793,18 +9369,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -8829,18 +9393,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -8859,18 +9411,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -8907,18 +9447,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -8955,16 +9483,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "winreg"
 version = "0.52.0"
@@ -8977,40 +9495,42 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.24.11"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55c80b12287eb1ff7c365fc2f7a5037cb6181bd44c9fce81c8d1cf7605ffad6"
+checksum = "49b8049c8f239cdbfaaea4bacb9646f6b208938ceec0acd5b3e99cd05f70903f"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
  "block",
- "cocoa",
- "core-graphics",
+ "cocoa 0.26.0",
+ "core-graphics 0.24.0",
  "crossbeam-channel",
+ "dpi",
  "dunce",
- "gdk",
- "gio",
- "glib",
+ "gdkx11",
  "gtk",
  "html5ever",
- "http 0.2.12",
+ "http",
+ "javascriptcore-rs",
+ "jni",
  "kuchikiki",
  "libc",
- "log",
+ "ndk",
  "objc",
  "objc_id",
  "once_cell",
- "serde",
- "serde_json",
+ "percent-encoding",
+ "raw-window-handle",
  "sha2",
- "soup2",
- "tao",
+ "soup3",
+ "tao-macros",
  "thiserror",
- "url",
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows 0.39.0",
- "windows-implement 0.39.0",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
+ "windows-version",
+ "x11-dl",
 ]
 
 [[package]]
@@ -9076,12 +9596,12 @@ version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
 dependencies = [
- "async-broadcast",
+ "async-broadcast 0.5.1",
  "async-executor",
- "async-fs",
+ "async-fs 1.6.0",
  "async-io 1.13.0",
  "async-lock 2.8.0",
- "async-process",
+ "async-process 1.8.1",
  "async-recursion",
  "async-task",
  "async-trait",
@@ -9106,9 +9626,48 @@ dependencies = [
  "uds_windows",
  "winapi",
  "xdg-home",
- "zbus_macros",
- "zbus_names",
- "zvariant",
+ "zbus_macros 3.15.2",
+ "zbus_names 2.6.1",
+ "zvariant 3.15.2",
+]
+
+[[package]]
+name = "zbus"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+dependencies = [
+ "async-broadcast 0.7.1",
+ "async-executor",
+ "async-fs 2.1.2",
+ "async-io 2.3.4",
+ "async-lock 3.4.0",
+ "async-process 2.2.4",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener 5.3.1",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "rand 0.8.5",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tokio",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros 4.4.0",
+ "zbus_names 3.0.0",
+ "zvariant 4.2.0",
 ]
 
 [[package]]
@@ -9122,7 +9681,20 @@ dependencies = [
  "quote",
  "regex",
  "syn 1.0.109",
- "zvariant_utils",
+ "zvariant_utils 1.0.1",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+ "zvariant_utils 2.1.0",
 ]
 
 [[package]]
@@ -9133,7 +9705,18 @@ checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
 dependencies = [
  "serde",
  "static_assertions",
- "zvariant",
+ "zvariant 3.15.2",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant 4.2.0",
 ]
 
 [[package]]
@@ -9183,6 +9766,21 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "zip"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "crossbeam-utils",
+ "displaydoc",
+ "indexmap 2.4.0",
+ "memchr",
+ "thiserror",
+]
+
 [[package]]
 name = "zstd"
 version = "0.11.2+zstd.1.5.2"
@@ -9213,26 +9811,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "zune-inflate"
-version = "0.2.54"
+name = "zvariant"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db"
 dependencies = [
- "simd-adler32",
+ "byteorder",
+ "enumflags2",
+ "libc",
+ "serde",
+ "static_assertions",
+ "zvariant_derive 3.15.2",
 ]
 
 [[package]]
 name = "zvariant"
-version = "3.15.2"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
 dependencies = [
- "byteorder",
+ "endi",
  "enumflags2",
- "libc",
  "serde",
  "static_assertions",
- "zvariant_derive",
+ "url",
+ "zvariant_derive 4.2.0",
 ]
 
 [[package]]
@@ -9245,7 +9848,20 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "zvariant_utils",
+ "zvariant_utils 1.0.1",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+ "zvariant_utils 2.1.0",
 ]
 
 [[package]]
@@ -9258,3 +9874,14 @@ dependencies = [
  "quote",
  "syn 1.0.109",
 ]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
diff --git a/apps/desktop/e2e/scripts/confirm-analytics.sh b/apps/desktop/e2e/scripts/confirm-analytics.sh
new file mode 100644
index 0000000000..7bc759a341
--- /dev/null
+++ b/apps/desktop/e2e/scripts/confirm-analytics.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+DATA_DIR="$HOME/.local/share/com.gitbutler.app.dev"
+if [ ! -d "$DATA_DIR" ]; then
+  echo "Creating data dir: $DATA_DIR"
+  mkdir -p $DATA_DIR
+fi
+echo "Confirming analytics"
+echo '{"appAnalyticsConfirmed":true}' > $DATA_DIR/settings.json
\ No newline at end of file
diff --git a/apps/desktop/e2e/scripts/init.sh b/apps/desktop/e2e/scripts/init.sh
new file mode 100644
index 0000000000..7ebe5dd42c
--- /dev/null
+++ b/apps/desktop/e2e/scripts/init.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+TEMP_DIR=${1:?The first argument is a temp dir}
+# Convert to absolute path
+TEMP_DIR=$(realpath "$TEMP_DIR")
+
+
+CLI=$(realpath "../../target/debug/gitbutler-cli")
+
+DATA_DIR="$HOME/.local/share/com.gitbutler.app.dev"
+if [ -d "$DATA_DIR" ]; then
+  rm -rf $DATA_DIR
+fi
+
+function setGitDefaults() {
+  git config user.email "test@example.com"
+  git config user.name "Test User"
+  git config init.defaultBranch master
+}
+
+function tick() {
+  if test -z "${tick+set}"; then
+    tick=1675176957
+  else
+    tick=$($tick + 60)
+  fi
+  GIT_COMMITTER_DATE="$tick +0100"
+  GIT_AUTHOR_DATE="$tick +0100"
+  export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
+}
+tick
+
+if [ -d "$TEMP_DIR" ]; then
+  rm -rf "$TEMP_DIR"
+fi
+mkdir "$TEMP_DIR"
+
+(
+  cd "$TEMP_DIR"
+  git init remote
+  cd remote
+  setGitDefaults
+  echo first >file
+  git add . && git commit -m "init"
+)
\ No newline at end of file
diff --git a/apps/desktop/e2e/tests/add-project.spec.ts b/apps/desktop/e2e/tests/add-project.spec.ts
index a19be2d910..0524396742 100644
--- a/apps/desktop/e2e/tests/add-project.spec.ts
+++ b/apps/desktop/e2e/tests/add-project.spec.ts
@@ -1,25 +1,32 @@
-import { setElementValue, spawnAndLog, findAndClick } from '../utils.js';
+import { spawnAndLog, findAndClick, setElementValue } from '../utils';
+
+const TEMP_DIR = '/tmp/gitbutler-add-project';
+const REPO_NAME = 'one-vbranch-on-integration';
 
 describe('Project', () => {
 	before(() => {
 		spawnAndLog('bash', [
 			'-c',
-			'./e2e/scripts/init-repositories.sh ../../target/debug/gitbutler-cli'
+			`
+				source ./e2e/scripts/init.sh ${TEMP_DIR}
+				cd ${TEMP_DIR};
+				git clone remote ${REPO_NAME} && cd ${REPO_NAME}
+				$CLI project -s dev add --switch-to-integration "$(git rev-parse --symbolic-full-name "@{u}")"
+				$CLI branch create virtual
+			`
 		]);
 	});
 
 	it('should add a local project', async () => {
 		await findAndClick('button[data-testid="analytics-continue"]');
 
-		// Workaround selecting path via fileDialog by setting a hidden input value
 		const dirInput = await $('input[data-testid="test-directory-path"]');
-		setElementValue(dirInput, `/tmp/gb-e2e-repos/one-vbranch-on-integration`);
+		setElementValue(dirInput, `${TEMP_DIR}/${REPO_NAME}`);
 
-		await findAndClick('button[data-testid="add-local-project"]');
-		await findAndClick('button[data-testid="set-base-branch"]');
-		await findAndClick('button[data-testid="accept-git-auth"]');
+		await $('button[data-testid="add-local-project"]').then(async (b) => await b.click());
+		await $('button[data-testid="set-base-branch"]').then(async (b) => await b.click());
+		await $('button[data-testid="accept-git-auth"]').then(async (b) => await b.click());
 
-		const workspaceButton = await $('button=Workspace');
-		await expect(workspaceButton).toExist();
+		await expect($('button=Workspace')).toExist();
 	});
 });
diff --git a/apps/desktop/e2e/tests/drag-file.spec.ts b/apps/desktop/e2e/tests/drag-file.spec.ts
new file mode 100644
index 0000000000..a5d2c4ceba
--- /dev/null
+++ b/apps/desktop/e2e/tests/drag-file.spec.ts
@@ -0,0 +1,38 @@
+import { spawnAndLog } from '../utils';
+import { codeForSelectors as dragAndDrop } from 'html-dnd';
+
+const TEMP_DIR = '/tmp/gitbutler-drag-files';
+const REPO_NAME = 'simple-drag-test';
+
+describe('Drag', () => {
+	before(() => {
+		spawnAndLog('bash', [
+			'-c',
+			`
+				source ./e2e/scripts/init.sh ${TEMP_DIR}
+				bash ./e2e/scripts/confirm-analytics.sh
+				cd ${TEMP_DIR};
+				git clone remote ${REPO_NAME} && cd ${REPO_NAME}
+				$CLI project -s dev add --switch-to-integration "$(git rev-parse --symbolic-full-name "@{u}")"
+				$CLI branch create virtual-one
+				$CLI branch create virtual-two
+				echo "hello world" > hello
+			`
+		]);
+	});
+
+	it('drag file from one lane to another', async () => {
+		const fileSelector = '[data-testid="file-helloworld.txt"]';
+		const dropSelector = '[data-testid="virtual-two-files-dz"]';
+
+		const fileItem = await $(fileSelector);
+		const dropTarget = await $(dropSelector);
+		await fileItem.waitForDisplayed();
+		await dropTarget.waitForDisplayed();
+
+		// The actual drop target can be different from the element with the `dropZone` directive..
+		await driver.executeScript(dragAndDrop, [fileSelector, dropSelector + ' .dropzone-target']);
+
+		await expect('[data-testid="branch-virtual-two"] [data-testid="file-hello"]').toBeDisplayed();
+	});
+});
diff --git a/apps/desktop/e2e/utils.ts b/apps/desktop/e2e/utils.ts
index f0c3ad5150..d9ae2f15f5 100644
--- a/apps/desktop/e2e/utils.ts
+++ b/apps/desktop/e2e/utils.ts
@@ -1,8 +1,5 @@
-import { browser } from '@wdio/globals';
 import { spawnSync } from 'node:child_process';
 
-const DEFAULT_TIMEOUT = 5_000;
-
 export async function spawnAndLog(command: string, args: string[]) {
 	const result = spawnSync(command, args);
 	console.log(`Exec command: ${command} ${args.join(' ')}`);
@@ -12,12 +9,10 @@ export async function spawnAndLog(command: string, args: string[]) {
 	return result.status;
 }
 
-export async function findAndClick(selector: string, timeout?: number) {
+export async function findAndClick(selector: string) {
 	const button = await $(selector);
-	await button.waitForClickable({
-		timeout: timeout ?? DEFAULT_TIMEOUT
-	});
-	await browser.execute('arguments[0].click();', button);
+	await button.isClickable();
+	await button.click();
 }
 
 export async function setElementValue(targetElement: WebdriverIO.Element, value: string) {
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index e76828f314..8552acba85 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -41,13 +41,22 @@
 		"@sveltejs/adapter-static": "catalog:svelte",
 		"@sveltejs/kit": "catalog:svelte",
 		"@sveltejs/vite-plugin-svelte": "catalog:svelte",
-		"@tauri-apps/api": "^1.6.0",
+		"@tauri-apps/api": "2.0.0-rc.3",
+		"@tauri-apps/plugin-dialog": "2.0.0-rc.0",
+		"@tauri-apps/plugin-http": "2.0.0-rc.1",
+		"@tauri-apps/plugin-log": "2.0.0-rc.0",
+		"@tauri-apps/plugin-os": "2.0.0-rc.0",
+		"@tauri-apps/plugin-process": "2.0.0-rc.0",
+		"@tauri-apps/plugin-shell": "2.0.0-rc.0",
+		"@tauri-apps/plugin-store": "2.0.0-rc.0",
+		"@tauri-apps/plugin-updater": "2.0.0-rc.0",
 		"@testing-library/jest-dom": "^6.4.8",
 		"@testing-library/svelte": "^5.2.1",
 		"@types/diff-match-patch": "^1.0.36",
 		"@types/git-url-parse": "^9.0.3",
 		"@types/lscache": "^1.3.4",
 		"@types/marked": "^5.0.2",
+		"@types/node": "^22.3.0",
 		"@types/postcss-pxtorem": "^6.0.3",
 		"@vitest/ui": "^2.0.5",
 		"@wdio/cli": "^8.39.1",
@@ -62,6 +71,7 @@
 		"diff-match-patch": "^1.0.5",
 		"fuse.js": "^7.0.0",
 		"git-url-parse": "^14.0.0",
+		"html-dnd": "^1.2.1",
 		"jsdom": "^24.1.1",
 		"lscache": "^1.3.2",
 		"marked": "^10.0.0",
@@ -76,15 +86,13 @@
 		"svelte": "catalog:svelte",
 		"svelte-check": "catalog:svelte",
 		"svelte-french-toast": "^1.2.0",
-		"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1",
-		"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
 		"tinykeys": "^2.1.0",
 		"ts-node": "^10.9.2",
 		"vite": "catalog:",
-		"vitest": "^2.0.5",
-		"@types/node": "^22.3.0"
+		"vitest": "^2.0.5"
 	},
 	"dependencies": {
+		"@tauri-apps/plugin-fs": "2.0.0-rc.1",
 		"openai": "^4.47.3"
 	}
 }
diff --git a/apps/desktop/src/hooks.client.ts b/apps/desktop/src/hooks.client.ts
index 37bf13e38f..e412f71467 100644
--- a/apps/desktop/src/hooks.client.ts
+++ b/apps/desktop/src/hooks.client.ts
@@ -1,6 +1,6 @@
 import { showError } from '$lib/notifications/toasts';
 import { captureException } from '@sentry/sveltekit';
-import { error as logErrorToFile } from 'tauri-plugin-log-api';
+import { error as logErrorToFile } from '@tauri-apps/plugin-log';
 import type { HandleClientError } from '@sveltejs/kit';
 
 // SvelteKit error handler.
@@ -25,20 +25,23 @@ window.onunhandledrejection = (e: PromiseRejectionEvent) => {
 };
 
 function logError(error: unknown) {
-	let message = error instanceof Error ? error.message : String(error);
-	const stack = error instanceof Error ? error.stack : undefined;
+	try {
+		let message = error instanceof Error ? error.message : String(error);
+		const stack = error instanceof Error ? error.stack : undefined;
 
-	const id = captureException(message, {
-		mechanism: {
-			type: 'sveltekit',
-			handled: false
-		}
-	});
-	message = `${id}: ${message}\n`;
-	if (stack) message = `${message}\n${stack}\n`;
+		const id = captureException(message, {
+			mechanism: {
+				type: 'sveltekit',
+				handled: false
+			}
+		});
+		message = `${id}: ${message}\n`;
+		if (stack) message = `${message}\n${stack}\n`;
 
-	logErrorToFile(message);
-	console.error(message);
-	showError('Something went wrong', message);
-	return id;
+		logErrorToFile(message);
+		showError('Something went wrong', message);
+		return id;
+	} catch (err: unknown) {
+		console.error('Error while trying to log error.', err);
+	}
 }
diff --git a/apps/desktop/src/lib/ai/anthropicClient.ts b/apps/desktop/src/lib/ai/anthropicClient.ts
index d8d3459c87..4d8471cfb1 100644
--- a/apps/desktop/src/lib/ai/anthropicClient.ts
+++ b/apps/desktop/src/lib/ai/anthropicClient.ts
@@ -1,7 +1,7 @@
 import { SHORT_DEFAULT_COMMIT_TEMPLATE, SHORT_DEFAULT_BRANCH_TEMPLATE } from '$lib/ai/prompts';
 import { type AIClient, type AnthropicModelName, type Prompt } from '$lib/ai/types';
 import { buildFailureFromAny, ok, type Result } from '$lib/result';
-import { fetch, Body } from '@tauri-apps/api/http';
+import { fetch } from '@tauri-apps/plugin-http';
 
 type AnthropicAPIResponse = {
 	content: { text: string }[];
@@ -18,13 +18,13 @@ export class AnthropicAIClient implements AIClient {
 	) {}
 
 	async evaluate(prompt: Prompt): Promise<Result<string, Error>> {
-		const body = Body.json({
+		const body = JSON.stringify({
 			messages: prompt,
 			max_tokens: 1024,
 			model: this.modelName
 		});
 
-		const response = await fetch<AnthropicAPIResponse>('https://api.anthropic.com/v1/messages', {
+		const response = await fetch('https://api.anthropic.com/v1/messages', {
 			method: 'POST',
 			headers: {
 				'x-api-key': this.apiKey,
@@ -34,11 +34,12 @@ export class AnthropicAIClient implements AIClient {
 			body
 		});
 
-		if (response.ok && response.data?.content?.[0]?.text) {
-			return ok(response.data.content[0].text);
+		const data = (await response.json()) as AnthropicAPIResponse;
+		if (response.ok) {
+			return ok(data.content[0]?.text || '');
 		} else {
 			return buildFailureFromAny(
-				`Anthropic returned error code ${response.status} ${response.data?.error?.message}`
+				`Anthropic returned error code ${response.status} ${data?.error?.message}`
 			);
 		}
 	}
diff --git a/apps/desktop/src/lib/ai/butlerClient.ts b/apps/desktop/src/lib/ai/butlerClient.ts
index d6d4f8211a..1e986fdc46 100644
--- a/apps/desktop/src/lib/ai/butlerClient.ts
+++ b/apps/desktop/src/lib/ai/butlerClient.ts
@@ -1,7 +1,7 @@
-import { SHORT_DEFAULT_BRANCH_TEMPLATE, SHORT_DEFAULT_COMMIT_TEMPLATE } from '$lib/ai/prompts';
+import { SHORT_DEFAULT_BRANCH_TEMPLATE, SHORT_DEFAULT_COMMIT_TEMPLATE } from './prompts';
 import { map, type Result } from '$lib/result';
-import type { AIClient, ModelKind, Prompt } from '$lib/ai/types';
 import type { HttpClient } from '$lib/backend/httpClient';
+import type { AIClient, ModelKind, Prompt } from './types';
 
 export class ButlerAIClient implements AIClient {
 	defaultCommitTemplate = SHORT_DEFAULT_COMMIT_TEMPLATE;
diff --git a/apps/desktop/src/lib/ai/ollamaClient.ts b/apps/desktop/src/lib/ai/ollamaClient.ts
index 127a51b73c..02e582cd4c 100644
--- a/apps/desktop/src/lib/ai/ollamaClient.ts
+++ b/apps/desktop/src/lib/ai/ollamaClient.ts
@@ -1,8 +1,8 @@
-import { LONG_DEFAULT_BRANCH_TEMPLATE, LONG_DEFAULT_COMMIT_TEMPLATE } from '$lib/ai/prompts';
-import { MessageRole, type PromptMessage, type AIClient, type Prompt } from '$lib/ai/types';
+import { LONG_DEFAULT_BRANCH_TEMPLATE, LONG_DEFAULT_COMMIT_TEMPLATE } from './prompts';
+import { MessageRole, type PromptMessage, type AIClient, type Prompt } from './types';
 import { andThen, buildFailureFromAny, ok, wrap, wrapAsync, type Result } from '$lib/result';
 import { isNonEmptyObject } from '@gitbutler/ui/utils/typeguards';
-import { fetch, Body, Response } from '@tauri-apps/api/http';
+import { fetch } from '@tauri-apps/plugin-http';
 
 export const DEFAULT_OLLAMA_ENDPOINT = 'http://127.0.0.1:11434';
 export const DEFAULT_OLLAMA_MODEL_NAME = 'llama3';
@@ -132,9 +132,9 @@ ${JSON.stringify(OLLAMA_CHAT_MESSAGE_FORMAT_SCHEMA, null, 2)}`
 	 * @param request - The OllamaChatRequest object containing the request details.
 	 * @returns A Promise that resolves to the Response object.
 	 */
-	private async fetchChat(request: OllamaChatRequest): Promise<Result<Response<any>, Error>> {
+	private async fetchChat(request: OllamaChatRequest): Promise<Result<any, Error>> {
 		const url = new URL(OllamaAPEndpoint.Chat, this.endpoint);
-		const body = Body.json(request);
+		const body = JSON.stringify(request);
 		return await wrapAsync(
 			async () =>
 				await fetch(url.toString(), {
diff --git a/apps/desktop/src/lib/ai/openAIClient.ts b/apps/desktop/src/lib/ai/openAIClient.ts
index 757b977b14..4147a3243e 100644
--- a/apps/desktop/src/lib/ai/openAIClient.ts
+++ b/apps/desktop/src/lib/ai/openAIClient.ts
@@ -1,6 +1,6 @@
-import { SHORT_DEFAULT_BRANCH_TEMPLATE, SHORT_DEFAULT_COMMIT_TEMPLATE } from '$lib/ai/prompts';
+import { SHORT_DEFAULT_BRANCH_TEMPLATE, SHORT_DEFAULT_COMMIT_TEMPLATE } from './prompts';
 import { andThen, buildFailureFromAny, ok, wrapAsync, type Result } from '$lib/result';
-import type { OpenAIModelName, Prompt, AIClient } from '$lib/ai/types';
+import type { OpenAIModelName, Prompt, AIClient } from './types';
 import type OpenAI from 'openai';
 import type { ChatCompletion } from 'openai/resources/index.mjs';
 
diff --git a/apps/desktop/src/lib/ai/prompts.ts b/apps/desktop/src/lib/ai/prompts.ts
index 7c0757adaa..51d9409d2f 100644
--- a/apps/desktop/src/lib/ai/prompts.ts
+++ b/apps/desktop/src/lib/ai/prompts.ts
@@ -1,4 +1,4 @@
-import { type Prompt, MessageRole } from '$lib/ai/types';
+import { type Prompt, MessageRole } from './types';
 
 export const SHORT_DEFAULT_COMMIT_TEMPLATE: Prompt = [
 	{
diff --git a/apps/desktop/src/lib/ai/service.test.ts b/apps/desktop/src/lib/ai/service.test.ts
index 82e9d7a722..dcb5a36bd4 100644
--- a/apps/desktop/src/lib/ai/service.test.ts
+++ b/apps/desktop/src/lib/ai/service.test.ts
@@ -1,15 +1,15 @@
-import { AnthropicAIClient } from '$lib/ai/anthropicClient';
-import { ButlerAIClient } from '$lib/ai/butlerClient';
-import { OpenAIClient } from '$lib/ai/openAIClient';
-import { SHORT_DEFAULT_BRANCH_TEMPLATE, SHORT_DEFAULT_COMMIT_TEMPLATE } from '$lib/ai/prompts';
-import { AISecretHandle, AIService, GitAIConfigKey, KeyOption, buildDiff } from '$lib/ai/service';
+import { AnthropicAIClient } from './anthropicClient';
+import { ButlerAIClient } from './butlerClient';
+import { OpenAIClient } from './openAIClient';
+import { SHORT_DEFAULT_BRANCH_TEMPLATE, SHORT_DEFAULT_COMMIT_TEMPLATE } from './prompts';
+import { AISecretHandle, AIService, GitAIConfigKey, KeyOption, buildDiff } from './service';
 import {
 	AnthropicModelName,
 	ModelKind,
 	OpenAIModelName,
 	type AIClient,
 	type Prompt
-} from '$lib/ai/types';
+} from './types';
 import { HttpClient } from '$lib/backend/httpClient';
 import { buildFailureFromAny, ok, unwrap, type Result } from '$lib/result';
 import { Hunk } from '$lib/vbranches/types';
diff --git a/apps/desktop/src/lib/ai/service.ts b/apps/desktop/src/lib/ai/service.ts
index 593428ca83..89b457586d 100644
--- a/apps/desktop/src/lib/ai/service.ts
+++ b/apps/desktop/src/lib/ai/service.ts
@@ -1,11 +1,7 @@
-import { AnthropicAIClient } from '$lib/ai/anthropicClient';
-import { ButlerAIClient } from '$lib/ai/butlerClient';
-import {
-	DEFAULT_OLLAMA_ENDPOINT,
-	DEFAULT_OLLAMA_MODEL_NAME,
-	OllamaClient
-} from '$lib/ai/ollamaClient';
-import { OpenAIClient } from '$lib/ai/openAIClient';
+import { AnthropicAIClient } from './anthropicClient';
+import { ButlerAIClient } from './butlerClient';
+import { DEFAULT_OLLAMA_ENDPOINT, DEFAULT_OLLAMA_MODEL_NAME, OllamaClient } from './ollamaClient';
+import { OpenAIClient } from './openAIClient';
 import {
 	OpenAIModelName,
 	type AIClient,
@@ -13,7 +9,7 @@ import {
 	ModelKind,
 	MessageRole,
 	type Prompt
-} from '$lib/ai/types';
+} from './types';
 import { buildFailureFromAny, isFailure, ok, type Result } from '$lib/result';
 import { splitMessage } from '$lib/utils/commitMessage';
 import OpenAI from 'openai';
diff --git a/apps/desktop/src/lib/backend/ipc.ts b/apps/desktop/src/lib/backend/ipc.ts
index 18deb233d4..cea059f8cb 100644
--- a/apps/desktop/src/lib/backend/ipc.ts
+++ b/apps/desktop/src/lib/backend/ipc.ts
@@ -1,5 +1,5 @@
+import { invoke as invokeTauri } from '@tauri-apps/api/core';
 import { listen as listenTauri } from '@tauri-apps/api/event';
-import { invoke as invokeTauri } from '@tauri-apps/api/tauri';
 import type { EventCallback, EventName } from '@tauri-apps/api/event';
 
 export enum Code {
diff --git a/apps/desktop/src/lib/backend/projects.ts b/apps/desktop/src/lib/backend/projects.ts
index e784043db0..55eb4b2adf 100644
--- a/apps/desktop/src/lib/backend/projects.ts
+++ b/apps/desktop/src/lib/backend/projects.ts
@@ -2,7 +2,7 @@ import { invoke } from '$lib/backend/ipc';
 import { showError } from '$lib/notifications/toasts';
 import { persisted } from '$lib/persisted/persisted';
 import * as toasts from '$lib/utils/toasts';
-import { open } from '@tauri-apps/api/dialog';
+import { open } from '@tauri-apps/plugin-dialog';
 import { plainToInstance } from 'class-transformer';
 import { get, writable } from 'svelte/store';
 import type { HttpClient } from './httpClient';
diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts
index 1847dab755..c06a9bab11 100644
--- a/apps/desktop/src/lib/backend/tauri.ts
+++ b/apps/desktop/src/lib/backend/tauri.ts
@@ -1,11 +1,10 @@
 import { invoke as invokeIpc, listen as listenIpc } from './ipc';
 import { getVersion } from '@tauri-apps/api/app';
-import { checkUpdate, onUpdaterEvent } from '@tauri-apps/api/updater';
+import { check } from '@tauri-apps/plugin-updater';
 
 export class Tauri {
 	invoke = invokeIpc;
 	listen = listenIpc;
-	checkUpdate = checkUpdate;
-	onUpdaterEvent = onUpdaterEvent;
+	checkUpdate = check;
 	currentVersion = getVersion;
 }
diff --git a/apps/desktop/src/lib/backend/updater.test.ts b/apps/desktop/src/lib/backend/updater.test.ts
index 513820c7c1..f8a8d617df 100644
--- a/apps/desktop/src/lib/backend/updater.test.ts
+++ b/apps/desktop/src/lib/backend/updater.test.ts
@@ -2,6 +2,7 @@ import { Tauri } from './tauri';
 import { UPDATE_INTERVAL_MS, UpdaterService } from './updater';
 import { get } from 'svelte/store';
 import { expect, test, describe, vi, beforeEach, afterEach } from 'vitest';
+import type { Update } from '@tauri-apps/plugin-updater';
 
 /**
  * It is important to understand the sync `get` method performs a store subscription
@@ -16,7 +17,6 @@ describe('Updater', () => {
 		tauri = new Tauri();
 		updater = new UpdaterService(tauri);
 		vi.spyOn(tauri, 'listen').mockReturnValue(async () => {});
-		vi.spyOn(tauri, 'onUpdaterEvent').mockReturnValue(Promise.resolve(() => {}));
 		vi.spyOn(tauri, 'currentVersion').mockReturnValue(Promise.resolve('0.1'));
 	});
 
@@ -28,38 +28,33 @@ describe('Updater', () => {
 	test('should not show up-to-date on interval check', async () => {
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: false
-			})
+				available: false
+			} as Update)
 		);
-
-		vi.spyOn(tauri, 'onUpdaterEvent').mockImplementation(async (handler) => {
-			handler({ status: 'UPTODATE' });
-			return await Promise.resolve(() => {});
-		});
-
 		await updater.checkForUpdate();
-		expect(get(updater.update)).toHaveProperty('status', undefined);
+		expect(get(updater.update)).toMatchObject({});
 	});
 
 	test('should show up-to-date on manual check', async () => {
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: false
-			})
+				available: false,
+				version: '1'
+			} as Update)
 		);
 		await updater.checkForUpdate(true); // manual = true;
-		expect(get(updater.update)).toHaveProperty('status', 'UPTODATE');
+		expect(get(updater.update)).toHaveProperty('status', 'Up-to-date');
 	});
 
 	test('should prompt again on new version', async () => {
 		const body = 'release notes';
-		const date = '2024-01-01';
 
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: true,
-				manifest: { version: '1', body, date }
-			})
+				available: true,
+				version: '1',
+				body
+			} as Update)
 		);
 
 		await updater.checkForUpdate();
@@ -70,9 +65,10 @@ describe('Updater', () => {
 
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: true,
-				manifest: { version: '2', body, date }
-			})
+				available: true,
+				version: '2',
+				body
+			} as Update)
 		);
 		await updater.checkForUpdate();
 		const update2 = get(updater.update);
@@ -83,13 +79,13 @@ describe('Updater', () => {
 	test('should not prompt download for seen version', async () => {
 		const version = '1';
 		const body = 'release notes';
-		const date = '2024-01-01';
 
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: true,
-				manifest: { version, body, date }
-			})
+				available: true,
+				version,
+				body
+			} as Update)
 		);
 		const updater = new UpdaterService(tauri);
 		await updater.checkForUpdate();
@@ -101,22 +97,20 @@ describe('Updater', () => {
 		updater.dismiss();
 		await updater.checkForUpdate();
 		const update2 = get(updater.update);
-		expect(update2).toHaveProperty('version', undefined);
-		expect(update2).toHaveProperty('releaseNotes', undefined);
+		expect(update2).toMatchObject({});
 	});
 
 	test('should check for updates continously', async () => {
 		const mock = vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: false
-			})
+				available: false
+			} as Update)
 		);
 
 		const unsubscribe = updater.update.subscribe(() => {});
-		await vi.advanceTimersToNextTimerAsync();
 		expect(mock).toHaveBeenCalledOnce();
 
-		for (let i = 2; i < 24; i++) {
+		for (let i = 2; i < 12; i++) {
 			await vi.advanceTimersByTimeAsync(UPDATE_INTERVAL_MS);
 			expect(mock).toHaveBeenCalledTimes(i);
 		}
diff --git a/apps/desktop/src/lib/backend/updater.ts b/apps/desktop/src/lib/backend/updater.ts
index e931ce2c3d..01ca5a2617 100644
--- a/apps/desktop/src/lib/backend/updater.ts
+++ b/apps/desktop/src/lib/backend/updater.ts
@@ -1,17 +1,30 @@
 import { Tauri } from './tauri';
 import { showToast } from '$lib/notifications/toasts';
-import { relaunch } from '@tauri-apps/api/process';
-import {
-	installUpdate,
-	type UpdateResult,
-	type UpdateManifest,
-	type UpdateStatus
-} from '@tauri-apps/api/updater';
+import { relaunch } from '@tauri-apps/plugin-process';
+import { type DownloadEvent, Update } from '@tauri-apps/plugin-updater';
 import posthog from 'posthog-js';
-import { derived, readable, writable } from 'svelte/store';
-
-type Status = UpdateStatus | 'DOWNLOADED';
-const TIMEOUT_SECONDS = 30;
+import { writable } from 'svelte/store';
+
+type UpdateStatus = {
+	version?: string;
+	releaseNotes?: string;
+	status?: InstallStatus | undefined;
+};
+
+export type InstallStatus =
+	| 'Checking'
+	| 'Downloading'
+	| 'Downloaded'
+	| 'Installing'
+	| 'Done'
+	| 'Up-to-date'
+	| 'Error';
+
+const downloadStatusMap: { [K in DownloadEvent['event']]: InstallStatus } = {
+	Started: 'Downloading',
+	Progress: 'Downloading',
+	Finished: 'Downloaded'
+};
 
 export const UPDATE_INTERVAL_MS = 3600000; // Hourly
 
@@ -25,33 +38,17 @@ export const UPDATE_INTERVAL_MS = 3600000; // Hourly
  */
 export class UpdaterService {
 	readonly loading = writable(false);
-	readonly status = writable<Status | undefined>();
-	private manifest = writable<UpdateManifest | undefined>(undefined, () => {
+	readonly update = writable<UpdateStatus>({}, () => {
 		this.start();
 		return () => {
 			this.stop();
 		};
 	});
 
-	private currentVersion = readable<string | undefined>(undefined, (set) => {
-		this.tauri.currentVersion().then((version) => set(version));
-	});
-
-	readonly update = derived(
-		[this.manifest, this.status, this.currentVersion],
-		([manifest, status, currentVersion]) => {
-			return {
-				version: manifest?.version,
-				releaseNotes: manifest?.body,
-				status,
-				currentVersion
-			};
-		}
-	);
-
 	private intervalId: any;
 	private seenVersion: string | undefined;
-	private lastCheckWasManual = false;
+	private tauriDownload: Update['download'] | undefined;
+	private tauriInstall: Update['install'] | undefined;
 
 	unlistenStatus?: () => void;
 	unlistenMenu?: () => void;
@@ -62,18 +59,6 @@ export class UpdaterService {
 		this.unlistenMenu = this.tauri.listen<string>('menu://global/update/clicked', () => {
 			this.checkForUpdate(true);
 		});
-
-		this.unlistenStatus = await this.tauri.onUpdaterEvent((event) => {
-			const { error, status } = event;
-			if (status !== 'UPTODATE' || this.lastCheckWasManual) {
-				this.status.set(status);
-			}
-			if (error) {
-				handleError(error, false);
-				posthog.capture('App Update Status Error', { error });
-			}
-		});
-
 		setInterval(async () => await this.checkForUpdate(), UPDATE_INTERVAL_MS);
 		this.checkForUpdate();
 	}
@@ -81,7 +66,6 @@ export class UpdaterService {
 	private async stop() {
 		this.unlistenStatus?.();
 		this.unlistenMenu?.();
-
 		if (this.intervalId) {
 			clearInterval(this.intervalId);
 			this.intervalId = undefined;
@@ -90,55 +74,81 @@ export class UpdaterService {
 
 	async checkForUpdate(manual = false) {
 		this.loading.set(true);
-		this.lastCheckWasManual = manual;
 		try {
-			const update = await Promise.race([
-				this.tauri.checkUpdate(), // In DEV mode this never returns.
-				new Promise<UpdateResult>((_resolve, reject) =>
-					// For manual testing use resolve instead of reject here.
-					setTimeout(
-						() => reject(`Timed out after ${TIMEOUT_SECONDS} seconds.`),
-						TIMEOUT_SECONDS * 1000
-					)
-				)
-			]);
-			await this.processUpdate(update, manual);
+			this.handleUpdate(await this.tauri.checkUpdate(), manual); // In DEV mode this never returns.
 		} catch (err: unknown) {
-			// No toast unless manually invoked.
-			if (manual) {
-				handleError(err, true);
-			} else {
-				console.error(err);
-			}
+			handleError(err, manual);
 		} finally {
 			this.loading.set(false);
 		}
 	}
 
-	private async processUpdate(update: UpdateResult, manual: boolean) {
-		const { shouldUpdate, manifest } = update;
-		if (shouldUpdate === false && manual) {
-			this.status.set('UPTODATE');
+	private handleUpdate(update: Update | null, manual: boolean) {
+		if (update === null) {
+			this.update.set({});
+			return;
 		}
-		if (manifest && manifest.version !== this.seenVersion) {
-			this.manifest.set(manifest);
-			this.seenVersion = manifest.version;
+		if (!update.available && manual) {
+			this.setStatus('Up-to-date');
+		} else if (
+			update.available &&
+			update.version !== this.seenVersion &&
+			update.currentVersion !== '0.0.0' // DEV mode.
+		) {
+			const { version, body, download, install } = update;
+			this.tauriDownload = download;
+			this.tauriInstall = install;
+			this.seenVersion = version;
+			this.update.set({
+				version,
+				releaseNotes: body,
+				status: undefined
+			});
 		}
 	}
 
-	async installUpdate() {
+	async downloadAndInstall() {
 		this.loading.set(true);
 		try {
-			await installUpdate();
+			await this.download();
+			await this.install();
 			posthog.capture('App Update Successful');
-		} catch (err: any) {
+		} catch (error: any) {
 			// We expect toast to be shown by error handling in `onUpdaterEvent`
-			posthog.capture('App Update Install Error', { error: err });
+			handleError(error, true);
+			this.update.set({ status: 'Error' });
+			posthog.capture('App Update Install Error', { error });
 		} finally {
 			this.loading.set(false);
 		}
 	}
 
+	private async download() {
+		if (!this.tauriDownload) {
+			throw new Error('Download function not available.');
+		}
+		this.setStatus('Downloading');
+		await this.tauriDownload((progress: DownloadEvent) => {
+			this.setStatus(downloadStatusMap[progress.event]);
+		});
+		this.setStatus('Downloaded');
+	}
+
+	private async install() {
+		if (!this.tauriInstall) {
+			throw new Error('Install function not available.');
+		}
+		this.setStatus('Installing');
+		await this.tauriInstall();
+		this.setStatus('Done');
+	}
+
+	private setStatus(status: InstallStatus) {
+		this.update.update((update) => {
+			return { ...update, status };
+		});
+	}
+
 	async relaunchApp() {
 		try {
 			await relaunch();
@@ -148,8 +158,7 @@ export class UpdaterService {
 	}
 
 	dismiss() {
-		this.manifest.set(undefined);
-		this.status.set(undefined);
+		this.update.set({});
 	}
 }
 
diff --git a/apps/desktop/src/lib/barmenuActions/ProjectSettingsMenuAction.svelte b/apps/desktop/src/lib/barmenuActions/ProjectSettingsMenuAction.svelte
index 4acd97e27c..f839417cec 100644
--- a/apps/desktop/src/lib/barmenuActions/ProjectSettingsMenuAction.svelte
+++ b/apps/desktop/src/lib/barmenuActions/ProjectSettingsMenuAction.svelte
@@ -6,7 +6,7 @@
 	import * as events from '$lib/utils/events';
 	import { createKeybind } from '$lib/utils/hotkeys';
 	import { unsubscribe } from '$lib/utils/unsubscribe';
-	import { open } from '@tauri-apps/api/shell';
+	import { open } from '@tauri-apps/plugin-shell';
 	import { onMount } from 'svelte';
 	import { goto } from '$app/navigation';
 
diff --git a/apps/desktop/src/lib/branch/BranchCard.svelte b/apps/desktop/src/lib/branch/BranchCard.svelte
index 42e6c0edc1..6b9a161c5d 100644
--- a/apps/desktop/src/lib/branch/BranchCard.svelte
+++ b/apps/desktop/src/lib/branch/BranchCard.svelte
@@ -156,7 +156,7 @@
 								/>
 							</div>
 						{:else if branch.commits.length === 0}
-							<Dropzones>
+							<Dropzones id={branch.name}>
 								<div class="new-branch">
 									<EmptyStatePlaceholder image={laneNewSvg} width="11rem">
 										<svelte:fragment slot="title">This is a new branch</svelte:fragment>
diff --git a/apps/desktop/src/lib/branch/BranchLane.svelte b/apps/desktop/src/lib/branch/BranchLane.svelte
index 5130c49bb9..bec74c6726 100644
--- a/apps/desktop/src/lib/branch/BranchLane.svelte
+++ b/apps/desktop/src/lib/branch/BranchLane.svelte
@@ -117,7 +117,7 @@
 	});
 </script>
 
-<div class="wrapper" data-tauri-drag-region>
+<div class="wrapper" data-testid="branch-{branch.name}" data-tauri-drag-region>
 	<BranchCard {commitBoxOpen} {isLaneCollapsed} />
 
 	{#await $selectedFile then [commitId, selected]}
diff --git a/apps/desktop/src/lib/branch/Dropzones.svelte b/apps/desktop/src/lib/branch/Dropzones.svelte
index d3550b68b2..7c63ad9ec4 100644
--- a/apps/desktop/src/lib/branch/Dropzones.svelte
+++ b/apps/desktop/src/lib/branch/Dropzones.svelte
@@ -11,9 +11,10 @@
 
 	interface Props {
 		children: Snippet;
+		id?: string;
 	}
 
-	const { children }: Props = $props();
+	const { children, id }: Props = $props();
 
 	const actions = $derived(branchDragActionsFactory.build($branch));
 </script>
@@ -42,6 +43,7 @@
 		accepts={actions.acceptBranchDrop.bind(actions)}
 		ondrop={actions.onBranchDrop.bind(actions)}
 		fillHeight
+		id={id ? id + '-files-dz' : undefined}
 	>
 		{@render children()}
 
diff --git a/apps/desktop/src/lib/components/AppUpdater.svelte b/apps/desktop/src/lib/components/AppUpdater.svelte
index 43a561f5f3..609b9a41ee 100644
--- a/apps/desktop/src/lib/components/AppUpdater.svelte
+++ b/apps/desktop/src/lib/components/AppUpdater.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { UpdaterService } from '$lib/backend/updater';
+	import { UpdaterService, type InstallStatus } from '$lib/backend/updater';
 	import { showToast } from '$lib/notifications/toasts';
 	import { getContext } from '$lib/utils/context';
 	import Button from '@gitbutler/ui/Button.svelte';
@@ -11,10 +11,10 @@
 
 	let version = $state<string | undefined>();
 	let releaseNotes = $state<string | undefined>();
-	let status = $state<string | undefined>();
+	let status = $state<InstallStatus | undefined>();
 
 	$effect(() => {
-		({ version, releaseNotes, status } = $update || {});
+		({ version, releaseNotes, status } = $update);
 	});
 
 	function handleDismiss() {
@@ -22,14 +22,14 @@
 	}
 </script>
 
-{#if version || status === 'UPTODATE'}
+{#if version || status === 'Up-to-date'}
 	<div class="update-banner" data-testid="update-banner" class:busy={$loading}>
 		<div class="floating-button">
 			<Button icon="cross-small" style="ghost" onclick={handleDismiss} />
 		</div>
 		<div class="img">
 			<div class="circle-img">
-				{#if status !== 'DONE' && status !== 'UPTODATE'}
+				{#if status !== 'Done' && status !== 'Up-to-date'}
 					<svg
 						class="arrow-img"
 						width="12"
@@ -96,17 +96,19 @@
 		</div>
 
 		<h4 class="text-13 label">
-			{#if status === 'UPTODATE'}
+			{#if status === 'Up-to-date'}
 				You are up-to-date!
-			{:else if status === 'PENDING'}
-				Downloading update...
-			{:else if status === 'DOWNLOADED'}
-				Installing update...
-			{:else if status === 'DONE'}
+			{:else if status === 'Downloading'}
+				Downloading update…
+			{:else if status === 'Downloaded'}
+				Update downloaded
+			{:else if status === 'Installing'}
+				Installing update…
+			{:else if status === 'Done'}
 				Install complete
-			{:else if status === 'CHECKING'}
+			{:else if status === 'Checking'}
 				Checking for update…
-			{:else if status === 'ERROR'}
+			{:else if status === 'Error'}
 				Error occurred
 			{:else if version}
 				New version available
@@ -130,7 +132,7 @@
 				</Button>
 			{/if}
 			<div class="status-section">
-				{#if status !== 'ERROR' && status !== 'UPTODATE'}
+				{#if status !== 'Error' && status !== 'Up-to-date'}
 					<div class="sliding-gradient"></div>
 				{/if}
 				<div class="cta-btn" transition:fade={{ duration: 100 }}>
@@ -141,12 +143,12 @@
 							kind="solid"
 							testId="download-update"
 							onmousedown={async () => {
-								await updaterService.installUpdate();
+								await updaterService.downloadAndInstall();
 							}}
 						>
 							Update to {version}
 						</Button>
-					{:else if status === 'UPTODATE'}
+					{:else if status === 'Up-to-date'}
 						<Button
 							wide
 							style="pop"
@@ -158,7 +160,7 @@
 						>
 							Got it!
 						</Button>
-					{:else if status === 'DONE'}
+					{:else if status === 'Done'}
 						<Button
 							style="pop"
 							kind="solid"
diff --git a/apps/desktop/src/lib/components/AppUpdater.test.ts b/apps/desktop/src/lib/components/AppUpdater.test.ts
index 651314dc12..e1e25bf4ba 100644
--- a/apps/desktop/src/lib/components/AppUpdater.test.ts
+++ b/apps/desktop/src/lib/components/AppUpdater.test.ts
@@ -2,7 +2,9 @@ import AppUpdater from './AppUpdater.svelte';
 import { Tauri } from '$lib/backend/tauri';
 import { UpdaterService } from '$lib/backend/updater';
 import { render, screen } from '@testing-library/svelte';
+import { get } from 'svelte/store';
 import { expect, test, describe, vi, beforeEach, afterEach } from 'vitest';
+import type { Update } from '@tauri-apps/plugin-updater';
 
 describe('AppUpdater', () => {
 	let tauri: Tauri;
@@ -15,7 +17,6 @@ describe('AppUpdater', () => {
 		updater = new UpdaterService(tauri);
 		context = new Map([[UpdaterService, updater]]);
 		vi.spyOn(tauri, 'listen').mockReturnValue(async () => {});
-		vi.spyOn(tauri, 'onUpdaterEvent').mockReturnValue(Promise.resolve(() => {}));
 		vi.spyOn(tauri, 'currentVersion').mockReturnValue(Promise.resolve('0.1'));
 	});
 
@@ -27,8 +28,8 @@ describe('AppUpdater', () => {
 	test('should be hidden if no update', async () => {
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: false
-			})
+				version: '1'
+			} as Update)
 		);
 
 		render(AppUpdater, { context });
@@ -41,13 +42,10 @@ describe('AppUpdater', () => {
 	test('should display download button', async () => {
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: true,
-				manifest: {
-					version: '1',
-					body: 'release notes',
-					date: '2024-01-01'
-				}
-			})
+				available: true,
+				version: '1',
+				body: 'release notes'
+			} as Update)
 		);
 
 		render(AppUpdater, { context });
@@ -60,8 +58,8 @@ describe('AppUpdater', () => {
 	test('should display up-to-date on manaul check', async () => {
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: false
-			})
+				available: false
+			} as Update)
 		);
 		render(AppUpdater, { context });
 		updater.checkForUpdate(true);
@@ -74,18 +72,31 @@ describe('AppUpdater', () => {
 	test('should display restart button on install complete', async () => {
 		vi.spyOn(tauri, 'checkUpdate').mockReturnValue(
 			Promise.resolve({
-				shouldUpdate: true,
-				manifest: { version: '1', body: 'release notes', date: '2024-01-01' }
-			})
+				available: true,
+				currentVersion: '1',
+				version: '2',
+				body: 'release notes',
+				download: () => {
+					console.log('HELLO');
+				},
+				install: () => {
+					console.log('WORLD');
+				}
+			} as Update)
 		);
-		vi.spyOn(tauri, 'onUpdaterEvent').mockImplementation(async (handler) => {
-			handler({ status: 'DONE' });
-			return () => {};
-		});
 
 		render(AppUpdater, { context });
-		updater.checkForUpdate(true);
+		await updater.checkForUpdate(true);
+		await vi.runOnlyPendingTimersAsync();
+		console.log('download and install');
+		await updater.downloadAndInstall();
+		await vi.runOnlyPendingTimersAsync();
+		await vi.advanceTimersToNextTimerAsync();
+		await vi.advanceTimersToNextTimerAsync();
+		await vi.advanceTimersToNextTimerAsync();
+		await vi.advanceTimersToNextTimerAsync();
 		await vi.advanceTimersToNextTimerAsync();
+		console.log(get(updater.update));
 
 		const button = screen.getByTestId('restart-app');
 		expect(button).toBeVisible();
diff --git a/apps/desktop/src/lib/components/ProjectSetup.svelte b/apps/desktop/src/lib/components/ProjectSetup.svelte
index 158f04c279..7c4b9d730c 100644
--- a/apps/desktop/src/lib/components/ProjectSetup.svelte
+++ b/apps/desktop/src/lib/components/ProjectSetup.svelte
@@ -27,7 +27,7 @@
 		loading = true;
 		try {
 			// TODO: Refactor temporary solution to forcing Windows to use system executable
-			if ($platformName === 'win32') {
+			if (platformName === 'windows') {
 				project.preferred_key = 'systemExecutable';
 				await projectService.updateProject(project);
 				await baseBranchService.refresh();
@@ -41,7 +41,7 @@
 </script>
 
 <DecorativeSplitView img={newProjectSvg}>
-	{#if selectedBranch[0] && selectedBranch[0] !== '' && $platformName !== 'win32'}
+	{#if selectedBranch[0] && selectedBranch[0] !== '' && platformName !== 'windows'}
 		{@const [remoteName, branchName] = selectedBranch[0].split(/\/(.*)/s)}
 		<KeysForm {remoteName} {branchName} disabled={loading} />
 		<div class="actions">
@@ -59,7 +59,7 @@
 			on:branchSelected={async (e) => {
 				selectedBranch = e.detail;
 				// TODO: Temporary solution to forcing Windows to use system executable
-				if ($platformName === 'win32') {
+				if (platformName === 'windows') {
 					setTarget();
 				}
 			}}
diff --git a/apps/desktop/src/lib/components/ProjectSetupTarget.svelte b/apps/desktop/src/lib/components/ProjectSetupTarget.svelte
index 4df8a6bb8f..465035eb29 100644
--- a/apps/desktop/src/lib/components/ProjectSetupTarget.svelte
+++ b/apps/desktop/src/lib/components/ProjectSetupTarget.svelte
@@ -270,7 +270,7 @@
 			testId="set-base-branch"
 			id="set-base-branch"
 		>
-			{#if $platformName === 'win32'}
+			{#if platformName === 'windows'}
 				Let's go
 			{:else}
 				Continue
diff --git a/apps/desktop/src/lib/components/ShareIssueModal.svelte b/apps/desktop/src/lib/components/ShareIssueModal.svelte
index b9d3780e7a..5507bbca47 100644
--- a/apps/desktop/src/lib/components/ShareIssueModal.svelte
+++ b/apps/desktop/src/lib/components/ShareIssueModal.svelte
@@ -54,8 +54,8 @@
 	}
 
 	async function readZipFile(path: string, filename?: string): Promise<File | Blob> {
-		const { readBinaryFile } = await import('@tauri-apps/api/fs');
-		const file = await readBinaryFile(path);
+		const { readFile } = await import('@tauri-apps/plugin-fs');
+		const file = await readFile(path);
 		const fileName = filename ?? path.split('/').pop();
 		return fileName
 			? new File([file], fileName, { type: 'application/zip' })
diff --git a/apps/desktop/src/lib/config/appSettings.ts b/apps/desktop/src/lib/config/appSettings.ts
index 0a846bdbe2..5d5205cd02 100644
--- a/apps/desktop/src/lib/config/appSettings.ts
+++ b/apps/desktop/src/lib/config/appSettings.ts
@@ -5,8 +5,8 @@
  * @module appSettings
  */
 
+import { Store } from '@tauri-apps/plugin-store';
 import { writable, type Writable } from 'svelte/store';
-import { Store } from 'tauri-plugin-store-api';
 
 const store = new Store('settings.json');
 
diff --git a/apps/desktop/src/lib/dragging/dropzone.ts b/apps/desktop/src/lib/dragging/dropzone.ts
index d686b23512..5fefba1a7f 100644
--- a/apps/desktop/src/lib/dragging/dropzone.ts
+++ b/apps/desktop/src/lib/dragging/dropzone.ts
@@ -43,9 +43,9 @@ export class Dropzone {
 		this.registerListeners();
 
 		// Mark the dropzone as active
+		this.activated = true;
 		setTimeout(() => {
 			this.configuration.onActivationStart();
-			this.activated = true;
 		}, 10);
 	}
 
diff --git a/apps/desktop/src/lib/dropzone/Dropzone.svelte b/apps/desktop/src/lib/dropzone/Dropzone.svelte
index 49f0c481d9..a89628f3aa 100644
--- a/apps/desktop/src/lib/dropzone/Dropzone.svelte
+++ b/apps/desktop/src/lib/dropzone/Dropzone.svelte
@@ -5,6 +5,7 @@
 	interface Props {
 		disabled?: boolean;
 		fillHeight?: boolean;
+		id?: string;
 		accepts: (data: any) => boolean;
 		ondrop: (data: any) => Promise<void> | void;
 		overlay: Snippet<[{ hovered: boolean; activated: boolean }]>;
@@ -14,6 +15,7 @@
 	const {
 		disabled = false,
 		fillHeight = false,
+		id,
 		accepts,
 		ondrop,
 		overlay,
@@ -53,6 +55,7 @@
 		target: '.dropzone-target'
 	}}
 	class:fill-height={fillHeight}
+	data-testid={id}
 	class="dropzone-container"
 >
 	{@render overlay({ hovered, activated })}
diff --git a/apps/desktop/src/lib/editorLink/editorLink.ts b/apps/desktop/src/lib/editorLink/editorLink.ts
index 8ac1a1b28c..5fe56db04e 100644
--- a/apps/desktop/src/lib/editorLink/editorLink.ts
+++ b/apps/desktop/src/lib/editorLink/editorLink.ts
@@ -1,4 +1,4 @@
-import { invoke } from '@tauri-apps/api/tauri';
+import { invoke } from '@tauri-apps/api/core';
 import { readable } from 'svelte/store';
 
 export const editor = readable<string>('vscode', (set) => {
diff --git a/apps/desktop/src/lib/file/FileContextMenu.svelte b/apps/desktop/src/lib/file/FileContextMenu.svelte
index 74fb161904..bc8ded0036 100644
--- a/apps/desktop/src/lib/file/FileContextMenu.svelte
+++ b/apps/desktop/src/lib/file/FileContextMenu.svelte
@@ -12,7 +12,7 @@
 	import Button from '@gitbutler/ui/Button.svelte';
 	import Modal from '@gitbutler/ui/Modal.svelte';
 	import { join } from '@tauri-apps/api/path';
-	import { open as openFile } from '@tauri-apps/api/shell';
+	import { open as openFile } from '@tauri-apps/plugin-shell';
 
 	export let target: HTMLElement | undefined;
 	export let isUnapplied;
diff --git a/apps/desktop/src/lib/file/FileListItem.svelte b/apps/desktop/src/lib/file/FileListItem.svelte
index b813002810..d2e7dbaaa2 100644
--- a/apps/desktop/src/lib/file/FileListItem.svelte
+++ b/apps/desktop/src/lib/file/FileListItem.svelte
@@ -166,18 +166,18 @@
 			draggableEl && addAnimationEndListener(draggableEl);
 		}
 
-		onDestroy(() => {
-			// Ensure any listeners are removed if the component is destroyed before animation ends
-			if (draggableEl && animationEndHandler) {
-				draggableEl.removeEventListener('animationend', animationEndHandler);
-			}
-			files.forEach((f) => {
-				const lockedElement = document.getElementById(`file-${f.id}`);
-				if (lockedElement && animationEndHandler) {
-					lockedElement.removeEventListener('animationend', animationEndHandler);
-				}
-			});
-		});
+		// onDestroy(() => {
+		// 	// Ensure any listeners are removed if the component is destroyed before animation ends
+		// 	if (draggableEl && animationEndHandler) {
+		// 		draggableEl.removeEventListener('animationend', animationEndHandler);
+		// 	}
+		// 	files.forEach((f) => {
+		// 		const lockedElement = document.getElementById(`file-${f.id}`);
+		// 		if (lockedElement && animationEndHandler) {
+		// 			lockedElement.removeEventListener('animationend', animationEndHandler);
+		// 		}
+		// 	});
+		// });
 	}}
 	oncontextmenu={async (e) => {
 		if (fileIdSelection.has(file.id, $commit?.id)) {
diff --git a/apps/desktop/src/lib/hunk/HunkContextMenu.svelte b/apps/desktop/src/lib/hunk/HunkContextMenu.svelte
index 1c37500906..4d7dca515b 100644
--- a/apps/desktop/src/lib/hunk/HunkContextMenu.svelte
+++ b/apps/desktop/src/lib/hunk/HunkContextMenu.svelte
@@ -5,7 +5,7 @@
 	import { editor } from '$lib/editorLink/editorLink';
 	import { getContext } from '$lib/utils/context';
 	import { BranchController } from '$lib/vbranches/branchController';
-	import { open as openFile } from '@tauri-apps/api/shell';
+	import { open as openFile } from '@tauri-apps/plugin-shell';
 
 	interface Props {
 		target: HTMLElement | undefined;
diff --git a/apps/desktop/src/lib/navigation/Navigation.svelte b/apps/desktop/src/lib/navigation/Navigation.svelte
index 4e00b5efc3..a45f2b2634 100644
--- a/apps/desktop/src/lib/navigation/Navigation.svelte
+++ b/apps/desktop/src/lib/navigation/Navigation.svelte
@@ -106,9 +106,9 @@
 		tabindex="0"
 	>
 		<!-- condition prevents split second UI shift -->
-		{#if $platformName || env.PUBLIC_TESTING}
+		{#if platformName || env.PUBLIC_TESTING}
 			<div class="navigation-top">
-				{#if $platformName === 'darwin'}
+				{#if platformName === 'macos'}
 					<div class="drag-region" data-tauri-drag-region></div>
 				{/if}
 				<ProjectSelector isNavCollapsed={$isNavCollapsed} />
diff --git a/apps/desktop/src/lib/onboarding/CloneForm.svelte b/apps/desktop/src/lib/onboarding/CloneForm.svelte
index 19c357174c..3c01201460 100644
--- a/apps/desktop/src/lib/onboarding/CloneForm.svelte
+++ b/apps/desktop/src/lib/onboarding/CloneForm.svelte
@@ -10,9 +10,9 @@
 	import { getContext } from '$lib/utils/context';
 	import Button from '@gitbutler/ui/Button.svelte';
 	import * as Sentry from '@sentry/sveltekit';
-	import { open } from '@tauri-apps/api/dialog';
 	import { documentDir } from '@tauri-apps/api/path';
 	import { join } from '@tauri-apps/api/path';
+	import { open } from '@tauri-apps/plugin-dialog';
 	import { posthog } from 'posthog-js';
 	import { onMount } from 'svelte';
 	import { goto } from '$app/navigation';
diff --git a/apps/desktop/src/lib/platform/platform.ts b/apps/desktop/src/lib/platform/platform.ts
index d9481a312a..8d52f72c9f 100644
--- a/apps/desktop/src/lib/platform/platform.ts
+++ b/apps/desktop/src/lib/platform/platform.ts
@@ -1,6 +1,3 @@
-import { platform } from '@tauri-apps/api/os';
-import { readable } from 'svelte/store';
+import { platform } from '@tauri-apps/plugin-os';
 
-export const platformName = readable<string | undefined>(undefined, (set) => {
-	platform().then((platform) => set(platform));
-});
+export const platformName = platform();
diff --git a/apps/desktop/src/lib/secrets/secretsService.ts b/apps/desktop/src/lib/secrets/secretsService.ts
index 91a584d171..88f8b6d388 100644
--- a/apps/desktop/src/lib/secrets/secretsService.ts
+++ b/apps/desktop/src/lib/secrets/secretsService.ts
@@ -1,13 +1,7 @@
-import { AISecretHandle } from '$lib/ai/service';
 import { invoke } from '$lib/backend/ipc';
 import { buildContext } from '$lib/utils/context';
 import type { GitConfigService } from '$lib/backend/gitConfigService';
 
-const MIGRATION_HANDLES = [
-	AISecretHandle.AnthropicKey.toString(),
-	AISecretHandle.OpenAIKey.toString()
-];
-
 export type SecretsService = {
 	get(handle: string): Promise<string | undefined>;
 	set(handle: string, secret: string): Promise<void>;
@@ -22,12 +16,6 @@ export class RustSecretService implements SecretsService {
 	async get(handle: string) {
 		const secret = await invoke<string>('secret_get_global', { handle });
 		if (secret) return secret;
-
-		if (MIGRATION_HANDLES.includes(handle)) {
-			const key = 'gitbutler.' + handle;
-			const migratedSecret = await this.migrate(key, handle);
-			if (migratedSecret !== undefined) return migratedSecret;
-		}
 	}
 
 	async set(handle: string, secret: string) {
diff --git a/apps/desktop/src/lib/settings/PreferencesForm.svelte b/apps/desktop/src/lib/settings/PreferencesForm.svelte
index 714efa8073..61913e8c3d 100644
--- a/apps/desktop/src/lib/settings/PreferencesForm.svelte
+++ b/apps/desktop/src/lib/settings/PreferencesForm.svelte
@@ -13,7 +13,7 @@
 	import Toggle from '$lib/shared/Toggle.svelte';
 	import { getContext } from '$lib/utils/context';
 	import Button from '@gitbutler/ui/Button.svelte';
-	import { invoke } from '@tauri-apps/api/tauri';
+	import { invoke } from '@tauri-apps/api/core';
 	import { onMount } from 'svelte';
 
 	const projectService = getContext(ProjectService);
diff --git a/apps/desktop/src/lib/uncommitedFiles/watcher.ts b/apps/desktop/src/lib/uncommitedFiles/watcher.ts
index 000fcc976c..aee40be7a4 100644
--- a/apps/desktop/src/lib/uncommitedFiles/watcher.ts
+++ b/apps/desktop/src/lib/uncommitedFiles/watcher.ts
@@ -1,7 +1,7 @@
 import { listen } from '$lib/backend/ipc';
 import { parseRemoteFiles } from '$lib/vbranches/remoteCommits';
 import { RemoteFile } from '$lib/vbranches/types';
-import { invoke } from '@tauri-apps/api/tauri';
+import { invoke } from '@tauri-apps/api/core';
 import { plainToInstance } from 'class-transformer';
 import { readable, type Readable } from 'svelte/store';
 import type { Project } from '$lib/backend/projects';
diff --git a/apps/desktop/src/lib/utils/theme.ts b/apps/desktop/src/lib/utils/theme.ts
index 0b2a7ae26b..e317cb418f 100644
--- a/apps/desktop/src/lib/utils/theme.ts
+++ b/apps/desktop/src/lib/utils/theme.ts
@@ -1,6 +1,7 @@
-import { appWindow, type Theme } from '@tauri-apps/api/window';
+import { getCurrentWindow, type Theme } from '@tauri-apps/api/window';
 import { writable, type Writable } from 'svelte/store';
 import type { Settings } from '$lib/settings/userSettings';
+const appWindow = getCurrentWindow();
 
 export const theme = writable('dark');
 
diff --git a/apps/desktop/src/lib/utils/url.ts b/apps/desktop/src/lib/utils/url.ts
index e3dc07ebf3..f4c3e8afc4 100644
--- a/apps/desktop/src/lib/utils/url.ts
+++ b/apps/desktop/src/lib/utils/url.ts
@@ -1,5 +1,5 @@
 import { showToast } from '$lib/notifications/toasts';
-import { open } from '@tauri-apps/api/shell';
+import { open } from '@tauri-apps/plugin-shell';
 import GitUrlParse from 'git-url-parse';
 import { posthog } from 'posthog-js';
 
diff --git a/apps/desktop/src/routes/[projectId]/settings/+page.svelte b/apps/desktop/src/routes/[projectId]/settings/+page.svelte
index 14b5fd01fb..818481fe13 100644
--- a/apps/desktop/src/routes/[projectId]/settings/+page.svelte
+++ b/apps/desktop/src/routes/[projectId]/settings/+page.svelte
@@ -45,7 +45,7 @@
 	{/if}
 	<CloudForm />
 	<DetailsForm />
-	{#if $platformName !== 'win32'}
+	{#if platformName !== 'windows'}
 		<KeysForm showProjectName={false} />
 		<Spacer />
 	{/if}
diff --git a/apps/desktop/wdio.conf.ts b/apps/desktop/wdio.conf.ts
index 55c222ff15..317b44bc6f 100644
--- a/apps/desktop/wdio.conf.ts
+++ b/apps/desktop/wdio.conf.ts
@@ -17,7 +17,7 @@ export const config: Options.WebdriverIO = {
 			// @ts-expect-error custom tauri capabilities
 			maxInstances: 1,
 			'tauri:options': {
-				application: '../../target/release/git-butler-dev'
+				application: '../../target/debug/gitbutler-tauri'
 			}
 		}
 	],
diff --git a/crates/gitbutler-tauri/.gitignore b/crates/gitbutler-tauri/.gitignore
index 6e3d190918..635a7fb370 100644
--- a/crates/gitbutler-tauri/.gitignore
+++ b/crates/gitbutler-tauri/.gitignore
@@ -1 +1,5 @@
-/gitbutler-git-*
+# Tauri generated output.
+gen/
+
+# Extra binaries, figure out why they end up in this directory on build.
+gitbutler-git-*
diff --git a/crates/gitbutler-tauri/Cargo.toml b/crates/gitbutler-tauri/Cargo.toml
index a485a744df..e20a917022 100644
--- a/crates/gitbutler-tauri/Cargo.toml
+++ b/crates/gitbutler-tauri/Cargo.toml
@@ -7,6 +7,7 @@ publish = false
 
 [lib]
 doctest = false
+crate-type = ["lib", "staticlib", "cdylib"]
 
 [[bin]]
 name = "gitbutler-tauri"
@@ -14,7 +15,7 @@ path = "src/main.rs"
 test = false
 
 [build-dependencies]
-tauri-build = { version = "1.5.3", features = [] }
+tauri-build = { version = "2.0.0-rc", features = [] }
 
 [dev-dependencies]
 pretty_assertions = "1.4"
@@ -34,11 +35,16 @@ once_cell = "1.19"
 reqwest = { version = "0.12.4", features = ["json"] }
 serde.workspace = true
 serde_json = { version = "1.0", features = ["std", "arbitrary_precision"] }
-tauri-plugin-context-menu = { git = "https://github.com/c2r0b/tauri-plugin-context-menu", branch = "main" }
-tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+tauri-plugin-single-instance = { version = "2.0.0-rc" }
+tauri-plugin-window-state = { version = "2.0.0-rc" }
+tauri-plugin-store = { version = "2.0.0-rc" }
+tauri-plugin-log = { version = "2.0.0-rc" }
+tauri-plugin-shell = "2.0.0-rc.2"
+tauri-plugin-os = "2.0.0-rc.0"
+tauri-plugin-process = "2.0.0-rc.0"
+tauri-plugin-dialog = "2.0.0-rc.2"
+tauri-plugin-updater = "2.0.0-rc.1"
+tauri-plugin-fs = "2.0.0-rc"
 parking_lot.workspace = true
 log = "^0.4"
 thiserror.workspace = true
@@ -67,21 +73,13 @@ gitbutler-diff.workspace = true
 gitbutler-operating-modes.workspace = true
 gitbutler-edit-mode.workspace = true
 open = "5"
+tauri-plugin-http = "2.0.0-rc"
 
 [dependencies.tauri]
-version = "1.7.0"
+version = "2.0.0-rc"
 features = [
-    "http-all",
-    "os-all",
-    "dialog-open",
-    "fs-read-file",
-    "path-all",
-    "process-relaunch",
     "protocol-asset",
-    "shell-open",
-    "window-maximize",
-    "window-start-dragging",
-    "window-unmaximize",
+    "unstable",
 ]
 
 [lints.clippy]
diff --git a/crates/gitbutler-tauri/capabilities/main.json b/crates/gitbutler-tauri/capabilities/main.json
new file mode 100644
index 0000000000..cebadc9118
--- /dev/null
+++ b/crates/gitbutler-tauri/capabilities/main.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "../gen/schemas/desktop-schema.json",
+	"identifier": "main-capability",
+	"description": "Figuring things out",
+	"windows": ["main"],
+	"local": true,
+	"permissions": [
+		"core:window:allow-start-dragging",
+		"core:window:default",
+		"log:default",
+		"shell:allow-open",
+		"store:default",
+		"updater:default"
+	]
+}
diff --git a/crates/gitbutler-tauri/capabilities/migrated.json b/crates/gitbutler-tauri/capabilities/migrated.json
new file mode 100644
index 0000000000..e0d0315c9b
--- /dev/null
+++ b/crates/gitbutler-tauri/capabilities/migrated.json
@@ -0,0 +1,7 @@
+{
+	"identifier": "migrated",
+	"description": "permissions that were migrated from v1",
+	"local": true,
+	"windows": ["main"],
+	"permissions": ["core:default"]
+}
diff --git a/crates/gitbutler-tauri/src/logs.rs b/crates/gitbutler-tauri/src/logs.rs
index e0d973e9e3..bbd61e2255 100644
--- a/crates/gitbutler-tauri/src/logs.rs
+++ b/crates/gitbutler-tauri/src/logs.rs
@@ -7,7 +7,7 @@ use tracing_subscriber::{fmt::format::FmtSpan, layer::SubscriberExt, Layer};
 
 pub fn init(app_handle: &AppHandle, performance_logging: bool) {
     let logs_dir = app_handle
-        .path_resolver()
+        .path()
         .app_log_dir()
         .expect("failed to get logs dir");
     fs::create_dir_all(&logs_dir).expect("failed to create logs dir");
@@ -88,11 +88,7 @@ pub fn init(app_handle: &AppHandle, performance_logging: bool) {
 
 fn get_server_addr(app_handle: &AppHandle) -> (Ipv4Addr, u16) {
     let config = app_handle.config();
-    let product_name = config
-        .package
-        .product_name
-        .as_ref()
-        .expect("product name not set");
+    let product_name = config.product_name.as_ref().expect("product name not set");
     let port = if product_name.eq("GitButler") {
         6667
     } else if product_name.eq("GitButler Nightly") {
diff --git a/crates/gitbutler-tauri/src/main.rs b/crates/gitbutler-tauri/src/main.rs
index 121983a134..a6e0eed140 100644
--- a/crates/gitbutler-tauri/src/main.rs
+++ b/crates/gitbutler-tauri/src/main.rs
@@ -16,16 +16,15 @@ use gitbutler_tauri::{
     askpass, commands, config, github, logs, menu, modes, projects, remotes, repo, secret, undo,
     users, virtual_branches, zip, App, WindowState,
 };
+use tauri::Emitter;
 use tauri::{generate_context, Manager};
-use tauri_plugin_log::LogTarget;
+use tauri_plugin_log::{Target, TargetKind};
 
 fn main() {
     let performance_logging = std::env::var_os("GITBUTLER_PERFORMANCE_LOG").is_some();
     gitbutler_project::configure_git2();
     let tauri_context = generate_context!();
-    gitbutler_secret::secret::set_application_namespace(
-        &tauri_context.config().tauri.bundle.identifier,
-    );
+    gitbutler_secret::secret::set_application_namespace(&tauri_context.config().identifier);
 
     tokio::runtime::Builder::new_multi_thread()
         .enable_all()
@@ -35,33 +34,30 @@ fn main() {
             tauri::async_runtime::set(tokio::runtime::Handle::current());
 
             let log = tauri_plugin_log::Builder::default()
-                .log_name("ui-logs")
-                .target(LogTarget::LogDir)
+                .target(Target::new(TargetKind::LogDir {
+                    file_name: Some("ui-logs".to_string()),
+                }))
                 .level(log::LevelFilter::Error);
 
             tauri::Builder::default()
                 .setup(move |tauri_app| {
                     let window = gitbutler_tauri::window::create(
-                        &tauri_app.handle(),
+                        tauri_app.handle(),
                         "main",
                         "index.html".into(),
                     )
                     .expect("Failed to create window");
-                    #[cfg(debug_assertions)]
-                    window.open_devtools();
 
-                    tokio::task::spawn(async move {
-                        let mut six_hours =
-                            tokio::time::interval(tokio::time::Duration::new(6 * 60 * 60, 0));
-                        loop {
-                            six_hours.tick().await;
-                            _ = window.emit_and_trigger("tauri://update", ());
-                        }
-                    });
+                    // TODO(mtsgrd): Is there a better way to disable devtools in E2E tests?
+                    #[cfg(debug_assertions)]
+                    if tauri_app.config().product_name != Some("GitButler Test".to_string()) {
+                        window.open_devtools();
+                    }
 
                     let app_handle = tauri_app.handle();
 
-                    logs::init(&app_handle, performance_logging);
+                    logs::init(app_handle, performance_logging);
+
                     tracing::info!(
                         "system git executable for fetch/push: {git:?}",
                         git = gix::path::env::exe_invocation(),
@@ -82,14 +78,14 @@ fn main() {
                             let handle = app_handle.clone();
                             move |event| {
                                 handle
-                                    .emit_all("git_prompt", event)
+                                    .emit("git_prompt", event)
                                     .expect("tauri event emission doesn't fail in practice")
                             }
                         });
                     }
 
                     let (app_data_dir, app_cache_dir, app_log_dir) = {
-                        let paths = app_handle.path_resolver();
+                        let paths = app_handle.path();
                         (
                             paths.app_data_dir().expect("missing app data dir"),
                             paths.app_cache_dir().expect("missing app cache dir"),
@@ -118,11 +114,21 @@ fn main() {
                     app_handle.manage(credentials::Helper::default());
                     app_handle.manage(app);
 
+                    tauri_app.on_menu_event(move |_handle, event| {
+                        menu::handle_event(&window.clone(), &event)
+                    });
                     Ok(())
                 })
                 .plugin(tauri_plugin_window_state::Builder::default().build())
+                .plugin(tauri_plugin_http::init())
+                .plugin(tauri_plugin_shell::init())
+                .plugin(tauri_plugin_os::init())
+                .plugin(tauri_plugin_process::init())
                 .plugin(tauri_plugin_single_instance::init(|_, _, _| {}))
-                .plugin(tauri_plugin_context_menu::init())
+                .plugin(tauri_plugin_updater::Builder::new().build())
+                .plugin(tauri_plugin_dialog::init())
+                .plugin(tauri_plugin_fs::init())
+                // .plugin(tauri_plugin_context_menu::init())
                 .plugin(tauri_plugin_store::Builder::default().build())
                 .plugin(log.build())
                 .invoke_handler(tauri::generate_handler![
@@ -210,11 +216,9 @@ fn main() {
                     modes::abort_edit_and_return_to_workspace,
                     modes::edit_initial_index_state
                 ])
-                .menu(menu::build(tauri_context.package_info()))
-                .on_menu_event(|event| menu::handle_event(&event))
-                .on_window_event(|event| {
-                    let window = event.window();
-                    match event.event() {
+                .menu(menu::build)
+                .on_window_event(|window, event| {
+                    match event {
                         #[cfg(target_os = "macos")]
                         tauri::WindowEvent::CloseRequested { api, .. } => {
                             if window.app_handle().windows().len() == 1 {
@@ -239,7 +243,7 @@ fn main() {
                                 .ok();
                         }
                         _ => {}
-                    }
+                    };
                 })
                 .build(tauri_context)
                 .expect("Failed to build tauri app")
diff --git a/crates/gitbutler-tauri/src/menu.rs b/crates/gitbutler-tauri/src/menu.rs
index e99913baf4..441784e36d 100644
--- a/crates/gitbutler-tauri/src/menu.rs
+++ b/crates/gitbutler-tauri/src/menu.rs
@@ -1,13 +1,14 @@
 use std::{env, fs};
 
 use anyhow::Context;
-use gitbutler_error::{error, error::Code};
+use gitbutler_error::error::{self, Code};
 use serde_json::json;
 #[cfg(target_os = "macos")]
-use tauri::AboutMetadata;
+use tauri::menu::AboutMetadata;
+use tauri::Emitter;
 use tauri::{
-    AppHandle, CustomMenuItem, Manager, Menu, MenuItem, PackageInfo, Runtime, Submenu,
-    WindowMenuEvent,
+    menu::{Menu, MenuEvent, MenuItemBuilder, PredefinedMenuItem, Submenu, SubmenuBuilder},
+    AppHandle, Manager, Runtime, WebviewWindow,
 };
 use tracing::instrument;
 
@@ -15,21 +16,22 @@ use crate::error::Error;
 
 #[tauri::command(async)]
 #[instrument(skip(handle), err(Debug))]
-pub fn menu_item_set_enabled(
-    handle: AppHandle,
-    menu_item_id: &str,
-    enabled: bool,
-) -> Result<(), Error> {
+pub fn menu_item_set_enabled(handle: AppHandle, id: &str, enabled: bool) -> Result<(), Error> {
     let window = handle
         .get_window("main")
         .expect("main window always present");
 
     let menu_item = window
-        .menu_handle()
-        .try_get_item(menu_item_id)
-        .with_context(|| error::Context::new(format!("menu item not found: {}", menu_item_id)))?;
+        .menu()
+        .context("menu not found")?
+        .get(id)
+        .with_context(|| error::Context::new(format!("menu item not found: {}", id)))?;
 
-    menu_item.set_enabled(enabled).context(Code::Unknown)?;
+    menu_item
+        .as_menuitem()
+        .context(Code::Unknown)?
+        .set_enabled(enabled)
+        .context(Code::Unknown)?;
 
     Ok(())
 }
@@ -55,254 +57,239 @@ fn check_if_installed(executable_name: &str) -> bool {
     }
 }
 
-pub fn build(_package_info: &PackageInfo) -> Menu {
-    let mut menu = Menu::new();
-
-    // Used in different menus depending on target os.
-    let check_for_updates = CustomMenuItem::new("global/update", "Check for updates…");
+pub fn build<R: Runtime>(handle: &AppHandle<R>) -> tauri::Result<tauri::menu::Menu<R>> {
+    let check_for_updates =
+        MenuItemBuilder::with_id("global/update", "Check for updates…").build(handle)?;
 
     #[cfg(target_os = "macos")]
-    {
-        let app_name = &_package_info.name;
-
-        menu = menu.add_submenu(Submenu::new(
-            app_name,
-            Menu::new()
-                .add_native_item(MenuItem::About(
-                    app_name.to_string(),
-                    AboutMetadata::default(),
-                ))
-                .add_native_item(MenuItem::Separator)
-                .add_item(CustomMenuItem::new("global/settings", "Settings").accelerator("Cmd+,"))
-                .add_item(check_for_updates)
-                .add_native_item(MenuItem::Separator)
-                .add_native_item(MenuItem::Services)
-                .add_native_item(MenuItem::Separator)
-                .add_native_item(MenuItem::Hide)
-                .add_native_item(MenuItem::HideOthers)
-                .add_native_item(MenuItem::ShowAll)
-                .add_native_item(MenuItem::Separator)
-                .add_native_item(MenuItem::Quit),
-        ));
-    }
+    let app_name = handle
+        .config()
+        .product_name
+        .clone()
+        .context("App name not defined.")?;
 
-    let mut file_menu = Menu::new();
-
-    file_menu = file_menu.add_item(
-        CustomMenuItem::new("file/add-local-repo", "Add Local Repository…")
-            .accelerator("CmdOrCtrl+O"),
-    );
-    file_menu = file_menu.add_item(
-        CustomMenuItem::new("file/clone-repo", "Clone Repository…")
-            .accelerator("CmdOrCtrl+Shift+O"),
-    );
+    #[cfg(target_os = "macos")]
+    let mac_menu = &SubmenuBuilder::new(handle, app_name)
+        .about(Some(AboutMetadata::default()))
+        .separator()
+        .text("global/settings", "Settings")
+        .item(&check_for_updates)
+        .separator()
+        .services()
+        .separator()
+        .hide()
+        .hide_others()
+        .show_all()
+        .separator()
+        .quit()
+        .build()?;
+
+    let file_menu = &SubmenuBuilder::new(handle, "File")
+        .items(&[
+            &MenuItemBuilder::with_id("file/add-local-repo", "Add Local Repository…")
+                .accelerator("CmdOrCtrl+O")
+                .build(handle)?,
+            &MenuItemBuilder::with_id("file/clone-repo", "Clone Repository…")
+                .accelerator("CmdOrCtrl+Shift+O")
+                .build(handle)?,
+            &PredefinedMenuItem::separator(handle)?,
+        ])
+        .build()?;
 
     #[cfg(target_os = "macos")]
-    {
-        // NB: macOS has the concept of having an app running but its
-        // window closed, but other platforms do not
-        file_menu = file_menu.add_native_item(MenuItem::Separator);
-        file_menu = file_menu.add_native_item(MenuItem::CloseWindow);
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        file_menu = file_menu.add_native_item(MenuItem::Separator);
-        file_menu = file_menu.add_native_item(MenuItem::Quit);
-        file_menu = file_menu.add_item(check_for_updates)
-    }
+    file_menu.append(&PredefinedMenuItem::close_window(handle, None)?)?;
 
-    menu = menu.add_submenu(Submenu::new("File", file_menu));
+    #[cfg(not(target_os = "macos"))]
+    file_menu.append_items(&[&PredefinedMenuItem::quit(handle, None)?, &check_for_updates])?;
 
     #[cfg(not(target_os = "linux"))]
-    let mut edit_menu = Menu::new();
+    let edit_menu = &Submenu::new(handle, "Edit", true)?;
 
     #[cfg(target_os = "macos")]
     {
-        edit_menu = edit_menu.add_native_item(MenuItem::Undo);
-        edit_menu = edit_menu.add_native_item(MenuItem::Redo);
-        edit_menu = edit_menu.add_native_item(MenuItem::Separator);
+        edit_menu.append_items(&[
+            &PredefinedMenuItem::undo(handle, None)?,
+            &PredefinedMenuItem::redo(handle, None)?,
+            &PredefinedMenuItem::separator(handle)?,
+        ])?;
     }
-
     #[cfg(not(target_os = "linux"))]
     {
-        edit_menu = edit_menu.add_native_item(MenuItem::Cut);
-        edit_menu = edit_menu.add_native_item(MenuItem::Copy);
-        edit_menu = edit_menu.add_native_item(MenuItem::Paste);
+        edit_menu.append_items(&[
+            &PredefinedMenuItem::cut(handle, None)?,
+            &PredefinedMenuItem::copy(handle, None)?,
+            &PredefinedMenuItem::paste(handle, None)?,
+        ])?;
     }
 
     #[cfg(target_os = "macos")]
-    {
-        edit_menu = edit_menu.add_native_item(MenuItem::SelectAll);
-    }
-
-    #[cfg(not(target_os = "linux"))]
-    {
-        menu = menu.add_submenu(Submenu::new("Edit", edit_menu));
-    }
+    edit_menu.append(&PredefinedMenuItem::select_all(handle, None)?)?;
 
-    let mut view_menu = Menu::new();
+    let view_menu = &Submenu::new(handle, "View", true)?;
 
     #[cfg(target_os = "macos")]
-    {
-        view_menu = view_menu.add_native_item(MenuItem::EnterFullScreen);
-    }
-
-    view_menu = view_menu.add_item(
-        CustomMenuItem::new("view/switch-theme", "Switch Theme").accelerator("CmdOrCtrl+T"),
-    );
-
-    view_menu = view_menu.add_native_item(MenuItem::Separator);
-    view_menu = view_menu
-        .add_item(CustomMenuItem::new("view/zoom-in", "Zoom In").accelerator("CmdOrCtrl+="));
-    view_menu = view_menu
-        .add_item(CustomMenuItem::new("view/zoom-out", "Zoom Out").accelerator("CmdOrCtrl+-"));
-    view_menu = view_menu
-        .add_item(CustomMenuItem::new("view/zoom-reset", "Reset Zoom").accelerator("CmdOrCtrl+0"));
-
-    view_menu = view_menu.add_native_item(MenuItem::Separator);
+    view_menu.append(&PredefinedMenuItem::fullscreen(handle, None)?)?;
+    view_menu.append_items(&[
+        &MenuItemBuilder::with_id("view/switch-theme", "Switch Theme")
+            .accelerator("CmdOrCtrl+T")
+            .build(handle)?,
+        &PredefinedMenuItem::separator(handle)?,
+        &MenuItemBuilder::with_id("view/zoom-in", "Zoom In")
+            .accelerator("CmdOrCtrl+=")
+            .build(handle)?,
+        &MenuItemBuilder::with_id("view/zoom-out", "Zoom Out")
+            .accelerator("CmdOrCtrl+-")
+            .build(handle)?,
+        &MenuItemBuilder::with_id("view/zoom-reset", "Reset Zoom")
+            .accelerator("CmdOrCtrl+0")
+            .build(handle)?,
+        &PredefinedMenuItem::separator(handle)?,
+    ])?;
 
     #[cfg(any(debug_assertions, feature = "devtools"))]
-    {
-        view_menu = view_menu.add_item(CustomMenuItem::new("view/devtools", "Developer Tools"));
-    }
-
-    view_menu = view_menu
-        .add_item(CustomMenuItem::new("view/reload", "Reload View").accelerator("CmdOrCtrl+R"));
-
-    menu = menu.add_submenu(Submenu::new("View", view_menu));
-
-    let mut project_menu = Menu::new();
-    project_menu = project_menu.add_item(
-        CustomMenuItem::new("project/history", "Project History").accelerator("CmdOrCtrl+Shift+H"),
-    );
-    project_menu = project_menu.add_item(CustomMenuItem::new(
-        "project/open-in-vscode",
-        "Open in VS Code",
-    ));
-
-    project_menu = project_menu.add_native_item(MenuItem::Separator);
-    project_menu =
-        project_menu.add_item(CustomMenuItem::new("project/settings", "Project Settings"));
-    menu = menu.add_submenu(Submenu::new("Project", project_menu));
+    view_menu.append_items(&[
+        &MenuItemBuilder::with_id("view/devtools", "Developer Tools").build(handle)?,
+        &MenuItemBuilder::with_id("view/reload", "Reload View")
+            .accelerator("CmdOrCtrl+R")
+            .build(handle)?,
+    ])?;
+
+    let project_menu = &SubmenuBuilder::new(handle, "Project")
+        .item(
+            &MenuItemBuilder::with_id("project/history", "Project History")
+                .accelerator("CmdOrCtrl+Shift+H")
+                .build(handle)?,
+        )
+        .text("project/open-in-vscode", "Open in VS Code")
+        .separator()
+        .text("project/settings", "Project Settings")
+        .build()?;
 
     #[cfg(target_os = "macos")]
-    {
-        let mut window_menu = Menu::new();
-        window_menu = window_menu.add_native_item(MenuItem::Minimize);
-
-        window_menu = window_menu.add_native_item(MenuItem::Zoom);
-        window_menu = window_menu.add_native_item(MenuItem::Separator);
-
-        window_menu = window_menu.add_native_item(MenuItem::CloseWindow);
-        menu = menu.add_submenu(Submenu::new("Window", window_menu));
-    }
-
-    let mut help_menu = Menu::new();
-    help_menu = help_menu.add_item(CustomMenuItem::new("help/documentation", "Documentation"));
-    help_menu = help_menu.add_item(CustomMenuItem::new("help/github", "Source Code"));
-    help_menu = help_menu.add_item(CustomMenuItem::new("help/release-notes", "Release Notes"));
-    help_menu = help_menu.add_native_item(MenuItem::Separator);
-    help_menu = help_menu.add_item(CustomMenuItem::new(
-        "help/share-debug-info",
-        "Share Debug Info…",
-    ));
-    help_menu = help_menu.add_item(CustomMenuItem::new("help/report-issue", "Report an Issue…"));
-    help_menu = help_menu.add_native_item(MenuItem::Separator);
-    help_menu = help_menu.add_item(CustomMenuItem::new("help/discord", "Discord"));
-    help_menu = help_menu.add_item(CustomMenuItem::new("help/youtube", "YouTube"));
-    help_menu = help_menu.add_item(CustomMenuItem::new("help/x", "X"));
-    help_menu = help_menu.add_native_item(MenuItem::Separator);
-    help_menu = help_menu.add_item(disabled_menu_item(
-        "help/version",
-        &format!("Version {}", _package_info.version),
-    ));
-    menu = menu.add_submenu(Submenu::new("Help", help_menu));
-
-    menu
-}
-
-fn disabled_menu_item(id: &str, title: &str) -> CustomMenuItem {
-    let mut item = CustomMenuItem::new(id, title);
-    item.enabled = false;
-    item
+    let window_menu = &SubmenuBuilder::new(handle, "Window")
+        .items(&[
+            &PredefinedMenuItem::minimize(handle, None)?,
+            &PredefinedMenuItem::maximize(handle, None)?,
+            &PredefinedMenuItem::separator(handle)?,
+            &PredefinedMenuItem::close_window(handle, None)?,
+        ])
+        .build()?;
+
+    let help_menu = &SubmenuBuilder::new(handle, "Help")
+        .text("help/documentation", "Documentation")
+        .text("help/github", "Source Code")
+        .text("help/release-notes", "Release Notes")
+        .separator()
+        .text("help/share-debug-info", "Share Debug Info…")
+        .text("help/report-issue", "Report an Issue…")
+        .separator()
+        .text("help/discord", "Discord")
+        .text("help/youtube", "YouTube")
+        .text("help/x", "X")
+        .separator()
+        .item(
+            &MenuItemBuilder::with_id(
+                "help/version",
+                &format!("Version {}", handle.package_info().version),
+            )
+            .enabled(false)
+            .build(handle)?,
+        )
+        .build()?;
+
+    Menu::with_items(
+        handle,
+        &[
+            #[cfg(target_os = "macos")]
+            mac_menu,
+            file_menu,
+            #[cfg(not(target_os = "linux"))]
+            edit_menu,
+            view_menu,
+            project_menu,
+            #[cfg(target_os = "macos")]
+            window_menu,
+            help_menu,
+        ],
+    )
 }
 
-pub fn handle_event<R: Runtime>(event: &WindowMenuEvent<R>) {
-    if event.menu_item_id() == "file/add-local-repo" {
-        emit(event.window(), "menu://file/add-local-repo/clicked");
+pub fn handle_event(webview: &WebviewWindow, event: &MenuEvent) {
+    if event.id() == "file/add-local-repo" {
+        emit(webview, "menu://file/add-local-repo/clicked");
         return;
     }
 
-    if event.menu_item_id() == "file/clone-repo" {
-        emit(event.window(), "menu://file/clone-repo/clicked");
+    if event.id() == "file/clone-repo" {
+        emit(webview, "menu://file/clone-repo/clicked");
         return;
     }
 
     #[cfg(any(debug_assertions, feature = "devtools"))]
     {
-        if event.menu_item_id() == "view/devtools" {
-            event.window().open_devtools();
+        if event.id() == "view/devtools" {
+            webview.open_devtools();
             return;
         }
     }
 
-    if event.menu_item_id() == "view/switch-theme" {
-        emit(event.window(), "menu://view/switch-theme/clicked");
+    if event.id() == "view/switch-theme" {
+        emit(webview, "menu://view/switch-theme/clicked");
         return;
     }
 
-    if event.menu_item_id() == "view/reload" {
-        emit(event.window(), "menu://view/reload/clicked");
+    if event.id() == "view/reload" {
+        emit(webview, "menu://view/reload/clicked");
         return;
     }
 
-    if event.menu_item_id() == "view/zoom-in" {
-        emit(event.window(), "menu://view/zoom-in/clicked");
+    if event.id() == "view/zoom-in" {
+        emit(webview, "menu://view/zoom-in/clicked");
         return;
     }
 
-    if event.menu_item_id() == "view/zoom-out" {
-        emit(event.window(), "menu://view/zoom-out/clicked");
+    if event.id() == "view/zoom-out" {
+        emit(webview, "menu://view/zoom-out/clicked");
         return;
     }
 
-    if event.menu_item_id() == "view/zoom-reset" {
-        emit(event.window(), "menu://view/zoom-reset/clicked");
+    if event.id() == "view/zoom-reset" {
+        emit(webview, "menu://view/zoom-reset/clicked");
         return;
     }
 
-    if event.menu_item_id() == "help/share-debug-info" {
-        emit(event.window(), "menu://help/share-debug-info/clicked");
+    if event.id() == "help/share-debug-info" {
+        emit(webview, "menu://help/share-debug-info/clicked");
         return;
     }
 
-    if event.menu_item_id() == "project/history" {
-        emit(event.window(), "menu://project/history/clicked");
+    if event.id() == "project/history" {
+        emit(webview, "menu://project/history/clicked");
         return;
     }
 
-    if event.menu_item_id() == "project/open-in-vscode" {
-        emit(event.window(), "menu://project/open-in-vscode/clicked");
+    if event.id() == "project/open-in-vscode" {
+        emit(webview, "menu://project/open-in-vscode/clicked");
         return;
     }
 
-    if event.menu_item_id() == "project/settings" {
-        emit(event.window(), "menu://project/settings/clicked");
+    if event.id() == "project/settings" {
+        emit(webview, "menu://project/settings/clicked");
         return;
     }
 
-    if event.menu_item_id() == "global/settings" {
-        emit(event.window(), "menu://global/settings/clicked");
+    if event.id() == "global/settings" {
+        emit(webview, "menu://global/settings/clicked");
         return;
     }
 
-    if event.menu_item_id() == "global/update" {
-        emit(event.window(), "menu://global/update/clicked");
+    if event.id() == "global/update" {
+        emit(webview, "menu://global/update/clicked");
         return;
     }
 
     'open_link: {
-        let result = match event.menu_item_id() {
+        let result = match event.id().0.as_str() {
             "help/documentation" => open::that("https://docs.gitbutler.com"),
             "help/github" => open::that("https://github.com/gitbutlerapp/gitbutler"),
             "help/release-notes" => {
@@ -318,16 +305,16 @@ pub fn handle_event<R: Runtime>(event: &WindowMenuEvent<R>) {
         };
 
         if let Err(err) = result {
-            tracing::error!(error = ?err, "failed to open url for {}", event.menu_item_id());
+            tracing::error!(error = ?err, "failed to open url for {}", event.id().0);
         }
 
         return;
     }
 
-    tracing::error!("unhandled 'help' menu event: {}", event.menu_item_id());
+    tracing::error!("unhandled 'help' menu event: {}", event.id().0);
 }
 
-fn emit<R: Runtime>(window: &tauri::Window<R>, event: &str) {
+fn emit<R: Runtime>(window: &tauri::WebviewWindow<R>, event: &str) {
     if let Err(err) = window.emit(event, json!({})) {
         tracing::error!(error = ?err, "failed to emit event");
     }
diff --git a/crates/gitbutler-tauri/src/window.rs b/crates/gitbutler-tauri/src/window.rs
index 5455b073dd..113701301b 100644
--- a/crates/gitbutler-tauri/src/window.rs
+++ b/crates/gitbutler-tauri/src/window.rs
@@ -12,7 +12,7 @@ pub(super) mod state {
         use anyhow::{Context, Result};
         use gitbutler_project::ProjectId;
         use gitbutler_watcher::Change;
-        use tauri::Manager;
+        use tauri::Emitter;
 
         /// A change we want to inform the frontend about.
         #[derive(Debug, Clone, PartialEq, Eq)]
@@ -64,7 +64,7 @@ pub(super) mod state {
         impl ChangeForFrontend {
             pub(super) fn send(&self, app_handle: &tauri::AppHandle) -> Result<()> {
                 app_handle
-                    .emit_all(&self.name, Some(&self.payload))
+                    .emit(&self.name, Some(&self.payload))
                     .context("emit event")?;
                 tracing::trace!(event_name = self.name);
                 Ok(())
@@ -204,16 +204,16 @@ pub fn create(
     handle: &tauri::AppHandle,
     label: &state::WindowLabelRef,
     window_relative_url: String,
-) -> tauri::Result<tauri::Window> {
+) -> tauri::Result<tauri::WebviewWindow> {
     tracing::info!("creating window '{label}' created at '{window_relative_url}'");
-    let window = tauri::WindowBuilder::new(
+    let window = tauri::WebviewWindowBuilder::new(
         handle,
         label,
-        tauri::WindowUrl::App(window_relative_url.into()),
+        tauri::WebviewUrl::App(window_relative_url.into()),
     )
     .resizable(true)
     .title(handle.package_info().name.clone())
-    .disable_file_drop_handler()
+    .disable_drag_drop_handler()
     .min_inner_size(800.0, 600.0)
     .inner_size(1160.0, 720.0)
     .build()?;
@@ -225,19 +225,19 @@ pub fn create(
     handle: &tauri::AppHandle,
     label: &state::WindowLabelRef,
     window_relative_url: String,
-) -> tauri::Result<tauri::Window> {
+) -> tauri::Result<tauri::WebviewWindow> {
     tracing::info!("creating window '{label}' created at '{window_relative_url}'");
-    let window = tauri::WindowBuilder::new(
+    let window = tauri::WebviewWindowBuilder::new(
         handle,
         label,
-        tauri::WindowUrl::App(window_relative_url.into()),
+        tauri::WebviewUrl::App(window_relative_url.into()),
     )
     .resizable(true)
     .title(handle.package_info().name.clone())
     .min_inner_size(800.0, 600.0)
     .inner_size(1160.0, 720.0)
     .hidden_title(true)
-    .disable_file_drop_handler()
+    .disable_drag_drop_handler()
     .title_bar_style(tauri::TitleBarStyle::Overlay)
     .build()?;
     Ok(window)
diff --git a/crates/gitbutler-tauri/tauri.conf.json b/crates/gitbutler-tauri/tauri.conf.json
index d70cc81c7d..be125c1a47 100644
--- a/crates/gitbutler-tauri/tauri.conf.json
+++ b/crates/gitbutler-tauri/tauri.conf.json
@@ -1,76 +1,48 @@
 {
+	"productName": "GitButler Dev",
+	"identifier": "com.gitbutler.app.dev",
 	"build": {
 		"beforeDevCommand": "pnpm dev:internal-tauri",
 		"beforeBuildCommand": "[ $CI = true ] || pnpm build:desktop -- --mode development",
-		"devPath": "http://localhost:1420",
-		"distDir": "../../apps/desktop/build",
-		"withGlobalTauri": false
+		"frontendDist": "../../apps/desktop/build",
+		"devUrl": "http://localhost:1420"
 	},
-	"package": {
-		"productName": "GitButler Dev"
+	"bundle": {
+		"active": true,
+		"targets": ["app", "dmg", "appimage", "deb", "rpm", "msi"],
+		"category": "DeveloperTool",
+		"copyright": "Copyright © 2023-2024 GitButler. All rights reserved.",
+		"icon": [
+			"icons/dev/32x32.png",
+			"icons/dev/128x128.png",
+			"icons/dev/128x128@2x.png",
+			"icons/dev/icon.icns",
+			"icons/dev/icon.ico"
+		]
 	},
-	"tauri": {
-		"allowlist": {
-			"fs": {
-				"readFile": true,
-				"scope": ["$APPCACHE/archives/*", "$RESOURCE/_up_/scripts/*"]
-			},
-			"shell": {
-				"open": "^((https://)|(http://)|(mailto:)|(vscode://)|(vscodium://)).+"
-			},
-			"dialog": {
-				"open": true
-			},
-			"os": {
-				"all": true
-			},
-			"protocol": {
-				"asset": true,
-				"assetScope": ["$APPCACHE/images/*"]
-			},
-			"process": {
-				"relaunch": true
-			},
-			"window": {
-				"startDragging": true,
-				"maximize": true,
-				"unmaximize": true
-			},
-			"path": {
-				"all": true
-			},
-			"http": {
-				"all": true,
-				"request": true,
-				"scope": [
-					"https://api.anthropic.com/v1/messages",
-					"http://127.0.0.1:11434/api/chat",
-					"http://127.0.0.1:11434/api/generate",
-					"http://127.0.0.1:11434/api/embeddings"
-				]
-			}
-		},
-		"bundle": {
-			"active": true,
-			"identifier": "com.gitbutler.app.dev",
-			"category": "DeveloperTool",
-			"copyright": "Copyright © 2023-2024 GitButler. All rights reserved.",
-			"icon": [
-				"icons/dev/32x32.png",
-				"icons/dev/128x128.png",
-				"icons/dev/128x128@2x.png",
-				"icons/dev/icon.icns",
-				"icons/dev/icon.ico"
+	"plugins": {
+		"updater": {
+			"active": false,
+			"dialog": false,
+			"endpoints": [
+				"https://app.gitbutler.com/releases/nightly/{{target}}-{{arch}}/{{current_version}}"
 			],
-			"targets": ["app", "dmg", "appimage", "deb", "rpm", "updater", "msi"]
-		},
+			"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDYwNTc2RDhBM0U0MjM4RUIKUldUck9FSStpbTFYWUE5UkJ3eXhuekZOL2V2RnpKaFUxbGJRNzBMVmF5V0gzV1JvN3hRblJMRDIK"
+		}
+	},
+	"app": {
+		"withGlobalTauri": false,
 		"security": {
+			"assetProtocol": {
+				"scope": ["$APPCACHE/images/*"],
+				"enable": true
+			},
 			"csp": {
-				"default-src": "'self'",
-				"img-src": "'self' asset: https://asset.localhost data: tauri://localhost https://avatars.githubusercontent.com https://*.gitbutler.com https://gitbutler-public.s3.amazonaws.com https://*.gravatar.com https://lh3.googleusercontent.com",
-				"connect-src": "'self' https://eu.posthog.com https://eu.i.posthog.com https://app.gitbutler.com https://o4504644069687296.ingest.sentry.io ws://localhost:7703 https://github.com https://api.github.com",
 				"script-src": "'self' https://eu.posthog.com https://eu.i.posthog.com",
-				"style-src": "'self' 'unsafe-inline'"
+				"style-src": "'self' 'unsafe-inline'",
+				"img-src": "'self' asset: https://asset.localhost data: tauri://localhost https://avatars.githubusercontent.com https://*.gitbutler.com https://gitbutler-public.s3.amazonaws.com https://*.gravatar.com https://lh3.googleusercontent.com",
+				"default-src": "'self'",
+				"connect-src": "'self' https://eu.posthog.com https://eu.i.posthog.com https://app.gitbutler.com https://o4504644069687296.ingest.sentry.io ws://localhost:7703 https://github.com https://api.github.com ipc: http://ipc.localhost"
 			}
 		}
 	}
diff --git a/crates/gitbutler-tauri/tauri.conf.nightly.json b/crates/gitbutler-tauri/tauri.conf.nightly.json
index 77021bba9a..1e7f4da1c3 100644
--- a/crates/gitbutler-tauri/tauri.conf.nightly.json
+++ b/crates/gitbutler-tauri/tauri.conf.nightly.json
@@ -1,44 +1,41 @@
 {
+	"productName": "GitButler Nightly",
 	"build": {
-		"beforeBuildCommand": "[ $CI = true ] || pnpm build:desktop -- --mode nightly && cargo build --release -p gitbutler-git && bash ./gitbutler-tauri/inject-git-binaries.sh"
+		"beforeBuildCommand": "[ $CI = true ] || pnpm build:desktop -- --mode nightly && cargo build --release -p gitbutler-git && bash ./crates/gitbutler-tauri/inject-git-binaries.sh"
 	},
-	"package": {
-		"productName": "GitButler Nightly"
-	},
-	"tauri": {
-		"allowlist": {
-			"shell": {
-				"open": "^((https://)|(http://)|(mailto:)|(vscode://)|(vscodium://)).+"
-			}
-    },
-		"bundle": {
-			"identifier": "com.gitbutler.app.nightly",
-			"icon": [
-				"icons/32x32.png",
-				"icons/128x128.png",
-				"icons/128x128@2x.png",
-				"icons/icon.icns",
-				"icons/icon.ico"
-			],
-			"externalBin": [
-				"gitbutler-git-setsid",
-				"gitbutler-git-askpass"
-			],
-			"windows": {
-				"certificateThumbprint": null
-			},
+	"bundle": {
+		"createUpdaterArtifacts": true,
+		"icon": [
+			"icons/32x32.png",
+			"icons/128x128.png",
+			"icons/128x128@2x.png",
+			"icons/icon.icns",
+			"icons/icon.ico"
+		],
+		"externalBin": ["gitbutler-git-setsid", "gitbutler-git-askpass"],
+		"windows": {
+			"certificateThumbprint": null
+		},
+		"linux": {
 			"rpm": {
-				"depends": [
-					"webkit2gtk4.0-devel"
-				]
+				"depends": ["webkit2gtk4.0-devel"]
 			},
 			"deb": {
-				"depends": [
-					"libwebkit2gtk-4.0-dev",
-					"libgtk-3-dev"
-				]
+				"depends": ["libwebkit2gtk-4.0-dev", "libgtk-3-dev"]
 			}
-		},
+		}
+	},
+	"plugins": {
+		"updater": {
+			"active": true,
+			"dialog": false,
+			"endpoints": [
+				"https://app.gitbutler.com/releases/nightly/{{target}}-{{arch}}/{{current_version}}"
+			],
+			"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDYwNTc2RDhBM0U0MjM4RUIKUldUck9FSStpbTFYWUE5UkJ3eXhuekZOL2V2RnpKaFUxbGJRNzBMVmF5V0gzV1JvN3hRblJMRDIK"
+		}
+	},
+	"app": {
 		"security": {
 			"csp": {
 				"default-src": "'self'",
@@ -47,14 +44,6 @@
 				"script-src": "'self' https://eu.posthog.com https://eu.i.posthog.com",
 				"style-src": "'self' 'unsafe-inline'"
 			}
-		},
-		"updater": {
-			"active": true,
-			"dialog": false,
-			"endpoints": [
-				"https://app.gitbutler.com/releases/nightly/{{target}}-{{arch}}/{{current_version}}"
-			],
-			"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDYwNTc2RDhBM0U0MjM4RUIKUldUck9FSStpbTFYWUE5UkJ3eXhuekZOL2V2RnpKaFUxbGJRNzBMVmF5V0gzV1JvN3hRblJMRDIK"
 		}
 	}
 }
diff --git a/crates/gitbutler-tauri/tauri.conf.release.json b/crates/gitbutler-tauri/tauri.conf.release.json
index b8348db7e9..bde3349996 100644
--- a/crates/gitbutler-tauri/tauri.conf.release.json
+++ b/crates/gitbutler-tauri/tauri.conf.release.json
@@ -1,44 +1,39 @@
 {
+	"productName": "GitButler",
 	"build": {
 		"beforeBuildCommand": "[ $CI = true ] || pnpm build:desktop -- --mode production && cargo build --release -p gitbutler-git && bash ./gitbutler-tauri/inject-git-binaries.sh"
 	},
-	"package": {
-		"productName": "GitButler"
+	"bundle": {
+		"identifier": "com.gitbutler.app",
+		"icon": [
+			"icons/32x32.png",
+			"icons/128x128.png",
+			"icons/128x128@2x.png",
+			"icons/icon.icns",
+			"icons/icon.ico"
+		],
+		"externalBin": ["gitbutler-git-setsid", "gitbutler-git-askpass"],
+		"windows": {
+			"certificateThumbprint": null
+		},
+		"rpm": {
+			"depends": ["webkit2gtk4.0-devel"]
+		},
+		"deb": {
+			"depends": ["libwebkit2gtk-4.0-dev", "libgtk-3-dev"]
+		}
 	},
-	"tauri": {
-		"allowlist": {
-			"shell": {
-				"open": "^((https://)|(http://)|(mailto:)|(vscode://)|(vscodium://)).+"
-			}
-    },
-		"bundle": {
-			"identifier": "com.gitbutler.app",
-			"icon": [
-				"icons/32x32.png",
-				"icons/128x128.png",
-				"icons/128x128@2x.png",
-				"icons/icon.icns",
-				"icons/icon.ico"
-			],
-			"externalBin": [
-				"gitbutler-git-setsid",
-				"gitbutler-git-askpass"
+	"plugins": {
+		"updater": {
+			"active": true,
+			"dialog": false,
+			"endpoints": [
+				"https://app.gitbutler.com/releases/release/{{target}}-{{arch}}/{{current_version}}"
 			],
-			"windows": {
-				"certificateThumbprint": null
-			},
-			"rpm": {
-				"depends": [
-					"webkit2gtk4.0-devel"
-				]
-			},
-			"deb": {
-				"depends": [
-					"libwebkit2gtk-4.0-dev",
-					"libgtk-3-dev"
-				]
-			}
-		},
+			"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDYwNTc2RDhBM0U0MjM4RUIKUldUck9FSStpbTFYWUE5UkJ3eXhuekZOL2V2RnpKaFUxbGJRNzBMVmF5V0gzV1JvN3hRblJMRDIK"
+		}
+	},
+	"app": {
 		"security": {
 			"csp": {
 				"default-src": "'self'",
@@ -47,14 +42,6 @@
 				"script-src": "'self' https://eu.posthog.com https://eu.i.posthog.com",
 				"style-src": "'self' 'unsafe-inline'"
 			}
-		},
-		"updater": {
-			"active": true,
-			"dialog": false,
-			"endpoints": [
-				"https://app.gitbutler.com/releases/release/{{target}}-{{arch}}/{{current_version}}"
-			],
-			"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDYwNTc2RDhBM0U0MjM4RUIKUldUck9FSStpbTFYWUE5UkJ3eXhuekZOL2V2RnpKaFUxbGJRNzBMVmF5V0gzV1JvN3hRblJMRDIK"
 		}
 	}
 }
diff --git a/crates/gitbutler-tauri/tauri.conf.test.json b/crates/gitbutler-tauri/tauri.conf.test.json
index d6d69649b1..50a84073f4 100644
--- a/crates/gitbutler-tauri/tauri.conf.test.json
+++ b/crates/gitbutler-tauri/tauri.conf.test.json
@@ -1,54 +1,10 @@
 {
+	"productName": "GitButler Test",
 	"build": {
 		"beforeBuildCommand": "[ $CI = true ] || pnpm build:desktop -- --mode development",
-		"distDir": "../../apps/desktop/build"
+		"frontendDist": "../../apps/desktop/build"
 	},
-	"package": {
-		"productName": "GitButler Dev"
-	},
-	"tauri": {
-		"allowlist": {
-			"fs": {
-				"readFile": true,
-				"scope": ["$APPCACHE/archives/*", "$RESOURCE/_up_/scripts/*"]
-			},
-			"shell": {
-				"open": "^((https://)|(http://)|(mailto:)|(vscode://)|(vscodium://)).+"
-			},
-			"dialog": {
-				"open": true
-			},
-			"os": {
-				"all": true
-			},
-			"protocol": {
-				"asset": true,
-				"assetScope": ["$APPCACHE/images/*"]
-			},
-			"process": {
-				"relaunch": true
-			},
-			"window": {
-				"startDragging": true,
-				"maximize": true,
-				"unmaximize": true
-			},
-			"path": {
-				"all": true
-			},
-			"http": {
-				"all": true,
-				"request": true,
-				"scope": [
-					"https://api.anthropic.com/v1/messages",
-					"http://127.0.0.1:11434/api/chat",
-					"http://127.0.0.1:11434/api/generate",
-					"http://127.0.0.1:11434/api/embeddings"
-				]
-			}
-		},
-		"bundle": {
-			"active": false
-		}
+	"bundle": {
+		"active": false
 	}
 }
diff --git a/package.json b/package.json
index 6004e92a56..0d23aed125 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
 		"act:test:e2e": "act -j test -W .github/workflows/test-e2e.yml -P catthehacker/ubuntu:act-22.04",
 		"build": "turbo run build --no-daemon",
 		"build:desktop": "turbo run --filter @gitbutler/desktop build --no-daemon",
-		"build:test": "pnpm exec tauri build --config crates/gitbutler-tauri/tauri.conf.test.json",
+		"build:test": "pnpm exec tauri build --config crates/gitbutler-tauri/tauri.conf.test.json -- --profile dev",
 		"check": "turbo run check --no-daemon",
 		"tauri": "tauri",
 		"lint": "turbo run //#globallint --no-daemon",
@@ -30,7 +30,7 @@
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.5.0",
-		"@tauri-apps/cli": "^1.6.0",
+		"@tauri-apps/cli": "2.0.0-rc.7",
 		"@types/eslint__js": "^8.42.3",
 		"@types/node": "^22.3.0",
 		"@typescript-eslint/parser": "^7.13.1",
diff --git a/packages/ui/src/lib/file/FileListItem.svelte b/packages/ui/src/lib/file/FileListItem.svelte
index 7a389c15a9..d9ffdd613a 100644
--- a/packages/ui/src/lib/file/FileListItem.svelte
+++ b/packages/ui/src/lib/file/FileListItem.svelte
@@ -68,6 +68,7 @@
 	tabindex="-1"
 	{onclick}
 	{onkeydown}
+	data-testid={'file-' + filePath}
 	oncontextmenu={(e) => {
 		if (oncontextmenu) {
 			e.preventDefault();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b9688992dd..3d5c96ae9b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,8 +34,8 @@ importers:
         specifier: ^9.5.0
         version: 9.5.0
       '@tauri-apps/cli':
-        specifier: ^1.6.0
-        version: 1.6.0
+        specifier: 2.0.0-rc.7
+        version: 2.0.0-rc.7
       '@types/eslint__js':
         specifier: ^8.42.3
         version: 8.42.3
@@ -87,6 +87,9 @@ importers:
 
   apps/desktop:
     dependencies:
+      '@tauri-apps/plugin-fs':
+        specifier: 2.0.0-rc.1
+        version: 2.0.0-rc.1
       openai:
         specifier: ^4.47.3
         version: 4.47.3
@@ -164,8 +167,32 @@ importers:
         specifier: catalog:svelte
         version: 3.1.1(svelte@5.0.0-next.196)(vite@5.2.13(@types/node@22.3.0))
       '@tauri-apps/api':
-        specifier: ^1.6.0
-        version: 1.6.0
+        specifier: 2.0.0-rc.3
+        version: 2.0.0-rc.3
+      '@tauri-apps/plugin-dialog':
+        specifier: 2.0.0-rc.0
+        version: 2.0.0-rc.0
+      '@tauri-apps/plugin-http':
+        specifier: 2.0.0-rc.1
+        version: 2.0.0-rc.1
+      '@tauri-apps/plugin-log':
+        specifier: 2.0.0-rc.0
+        version: 2.0.0-rc.0
+      '@tauri-apps/plugin-os':
+        specifier: 2.0.0-rc.0
+        version: 2.0.0-rc.0
+      '@tauri-apps/plugin-process':
+        specifier: 2.0.0-rc.0
+        version: 2.0.0-rc.0
+      '@tauri-apps/plugin-shell':
+        specifier: 2.0.0-rc.0
+        version: 2.0.0-rc.0
+      '@tauri-apps/plugin-store':
+        specifier: 2.0.0-rc.0
+        version: 2.0.0-rc.0
+      '@tauri-apps/plugin-updater':
+        specifier: 2.0.0-rc.0
+        version: 2.0.0-rc.0
       '@testing-library/jest-dom':
         specifier: ^6.4.8
         version: 6.4.8
@@ -229,6 +256,9 @@ importers:
       git-url-parse:
         specifier: ^14.0.0
         version: 14.0.0
+      html-dnd:
+        specifier: ^1.2.1
+        version: 1.2.1
       jsdom:
         specifier: ^24.1.1
         version: 24.1.1
@@ -271,12 +301,6 @@ importers:
       svelte-french-toast:
         specifier: ^1.2.0
         version: 1.2.0(svelte@5.0.0-next.196)
-      tauri-plugin-log-api:
-        specifier: github:tauri-apps/tauri-plugin-log#v1
-        version: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/2bb26e22f7f7b4f164bad02f0ae4085796f77fff
-      tauri-plugin-store-api:
-        specifier: github:tauri-apps/tauri-plugin-store#v1
-        version: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/5f5404feea43b6cddd65e4171f52e92ca161a2aa
       tinykeys:
         specifier: ^2.1.0
         version: 2.1.0
@@ -2135,75 +2159,101 @@ packages:
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
     engines: {node: '>=14.16'}
 
-  '@tauri-apps/api@1.6.0':
-    resolution: {integrity: sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==}
-    engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
+  '@tauri-apps/api@2.0.0-rc.3':
+    resolution: {integrity: sha512-k1erUfnoOFJwL5VNFZz0BQZ2agNstG7CNOjwpdWMl1vOaVuSn4DhJtXB0Deh9lZaaDlfrykKOyZs9c3XXpMi5Q==}
 
-  '@tauri-apps/cli-darwin-arm64@1.6.0':
-    resolution: {integrity: sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==}
+  '@tauri-apps/cli-darwin-arm64@2.0.0-rc.7':
+    resolution: {integrity: sha512-DUdO1TCj+cViFkOWtYotq4UNBGfHvl1xLK85n2rmpsCeveGxO9pf1CihOtADuVonHl6ETa9x/uaSTCMeMsKEbA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tauri-apps/cli-darwin-x64@1.6.0':
-    resolution: {integrity: sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==}
+  '@tauri-apps/cli-darwin-x64@2.0.0-rc.7':
+    resolution: {integrity: sha512-T36ncxLyfgKBsPXdgCfw7WeOtHwDrfkvjJoovlBH5nAejlxZC4g4pYm7/Qvpc++FRmQhcHJXP8Y+fBOSEZrfog==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@1.6.0':
-    resolution: {integrity: sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==}
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.7':
+    resolution: {integrity: sha512-afLBeWgpm++9oKsYNShqKsBCHLLgMJy+rodHIiUd9LB4VqjU/1bYfZdia0PxKjnEuOz27mG9Be5v0SDdsZsLww==}
     engines: {node: '>= 10'}
     cpu: [arm]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-gnu@1.6.0':
-    resolution: {integrity: sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==}
+  '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.7':
+    resolution: {integrity: sha512-sjT/URsuJ2ImJGe9fH0b8reewGq5R1E5t4DZRF0ZVpCpUC1yTpml0kuPWt4S0rGws/beRICPaZWW8OuColIFtQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-arm64-musl@1.6.0':
-    resolution: {integrity: sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==}
+  '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.7':
+    resolution: {integrity: sha512-s7OG30ffEBKF5BiMEIVmtd/UNHC956ihEOfZYRJwBZ9cL8qoPLjEMZYMCGB/767M4igXy1bhKaVnl8pZpk+RNw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-x64-gnu@1.6.0':
-    resolution: {integrity: sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==}
+  '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.7':
+    resolution: {integrity: sha512-Qj9ibUvq2CwJE5JQ7M/DfOw44xcf59rUGsMGuku/bSKLPu6UXEFyUFjUURcnOgcZkq9o86no7ONoKdMxm4viKQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@tauri-apps/cli-linux-x64-musl@1.6.0':
-    resolution: {integrity: sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==}
+  '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.7':
+    resolution: {integrity: sha512-75ucw3b7MVnyVNvoW+xqB1N8VGjx1vqP7HshAs+p1fSkeCOy2NvtMP7t8pdRlGQ59exH6vGvnQ/LxC5HgDP2Xg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@tauri-apps/cli-win32-arm64-msvc@1.6.0':
-    resolution: {integrity: sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==}
+  '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.7':
+    resolution: {integrity: sha512-KaWY7kVbpmJCn5INtcPX+tji7CqwmqtGechith65VIlEUUs+KyOkMdmgbsJvqe0N58VMHLFzEVfx1xtlaKGDUA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@tauri-apps/cli-win32-ia32-msvc@1.6.0':
-    resolution: {integrity: sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==}
+  '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.7':
+    resolution: {integrity: sha512-J2xVw7gcP1JY1Pj6lE+MuAUKtanD7tXyjBD6W8R2S7sD06Job9PHoonOQhm/vWlhQVtRkWPNX7K7MXbdoI/Z9w==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
 
-  '@tauri-apps/cli-win32-x64-msvc@1.6.0':
-    resolution: {integrity: sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==}
+  '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.7':
+    resolution: {integrity: sha512-0dQzFCUGjrpJBsj/JpV2XRUbH6nDbhW4NKpx6DUnFrwPe7YQwz2eexo7FAu2pLTW8HEPCPd0NvXGOCUrWM/klg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@tauri-apps/cli@1.6.0':
-    resolution: {integrity: sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==}
+  '@tauri-apps/cli@2.0.0-rc.7':
+    resolution: {integrity: sha512-FdNcr75EIPfA69gWxpk3xv78og8CVbEa8ih2Rvp9k1tyAyryOth0Ps+jNEqP/WtfFwITWTYm4JqOubSCHoFjpQ==}
     engines: {node: '>= 10'}
     hasBin: true
 
+  '@tauri-apps/plugin-dialog@2.0.0-rc.0':
+    resolution: {integrity: sha512-DPOXYe8SQ6Radk/67EOdaomlxL7oF99JO/ZUaPp1IBEs3Wro7lhlz63CfdKIBfKIZTLJLzP1R7/EiPL/GTA3Bg==}
+
+  '@tauri-apps/plugin-fs@2.0.0-rc.1':
+    resolution: {integrity: sha512-r6N5dqBNXy9YAK9XbiEqAq3ZKBIN+TWevE7ZFmSRdvdSB1urrLweYu4wxycY2kDaDPzSeeOIJhCmqdNrFT9OSA==}
+
+  '@tauri-apps/plugin-http@2.0.0-rc.1':
+    resolution: {integrity: sha512-j4WdTEKx0CFa6u8ubke0mo75pCrnu6XtrFtvjsh+zjuNYgMG/l0+A1woWXHm73f2Levskhs+KbKcLQA/nr8k2w==}
+
+  '@tauri-apps/plugin-log@2.0.0-rc.0':
+    resolution: {integrity: sha512-ztKfzUcq03dtr08vBu+xcwIEPusP6mCpuLAt6kpXEwG+HvYsC8e1/KFFokn3xvfwD+oBJ3UTL1h4kdM30GAqGw==}
+
+  '@tauri-apps/plugin-os@2.0.0-rc.0':
+    resolution: {integrity: sha512-OWAl8mooKnGykSD4iog8WRqcnOSx0gGmTJBlEExHdFeIuOHg0Ezvd+WiVLhT9LBg7go3ibNWRWpe/ZG7YEp4Vw==}
+
+  '@tauri-apps/plugin-process@2.0.0-rc.0':
+    resolution: {integrity: sha512-Z12D/kmQzG1vCVf+jLXPhPDUA0pEjFrsg4p0uwO2sotVLM9287IuTM+aIz9cuAYOxFLKcsnDG7amSCL9IfA1gw==}
+
+  '@tauri-apps/plugin-shell@2.0.0-rc.0':
+    resolution: {integrity: sha512-bhUcQcrqZoK8H1DFXapr5r1Z75oh6Kd5Tltz97XpZFLREEqp+KhN2Fvyh8r/fKAyenYsTYUIsDsyGdjdueuF9g==}
+
+  '@tauri-apps/plugin-store@2.0.0-rc.0':
+    resolution: {integrity: sha512-KqiEzq6EdRwxrl0/FwyNLwumDBM91xTchdu2a8vfkNub30GuP9z7RskP9ifVRI1gbxfa5TUDi0hKFk/SP7TANQ==}
+
+  '@tauri-apps/plugin-updater@2.0.0-rc.0':
+    resolution: {integrity: sha512-EKajf/sBpFif0cwXhTo3BmNvTZ2t2DDLRyhA8FFKugZNoOeqU97bHhPT5DIqMUPRE1tyDk9o7sXm8dKf7oz+EA==}
+
   '@terrazzo/cli@0.0.11':
     resolution: {integrity: sha512-VJTzZ+uw5bzFcvX73g9kvsEtMebRAP/J1oUB7uB8KZYkHtbjKt153jL7YZl5N6B5pHRFLFRE3RU6XPslSvG29g==}
     hasBin: true
@@ -3558,6 +3608,27 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
 
+  eslint-module-utils@2.8.2:
+    resolution: {integrity: sha512-3XnC5fDyc8M4J2E8pt8pmSVRX2M+5yWMCfI/kDZwauQeFgzQOuhcRBFKjTeJagqgk4sFKxe1mvNVnaWwImx/Tg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
   eslint-plugin-import-x@0.5.1:
     resolution: {integrity: sha512-2JK8bbFOLes+gG6tgdnM8safCxMAj4u2wjX8X1BRFPfnY7Ct2hFYESoIcVwABX/DDcdpQFLGtKmzbNEWJZD9iQ==}
     engines: {node: '>=16'}
@@ -3918,6 +3989,10 @@ packages:
     resolution: {integrity: sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==}
     engines: {node: '>=16'}
 
+  get-stdin@4.0.1:
+    resolution: {integrity: sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==}
+    engines: {node: '>=0.10.0'}
+
   get-stdin@9.0.0:
     resolution: {integrity: sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==}
     engines: {node: '>=12'}
@@ -4117,6 +4192,9 @@ packages:
     resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==}
     engines: {node: ^16.14.0 || >=18.0.0}
 
+  html-dnd@1.2.1:
+    resolution: {integrity: sha512-yO4Jg4TqFCEGVxvmAXZ8EpgQFF8YACuPiK2DXMgWGQ73bTdtZm6AgyFa/NUrmD3TyQXd4F2U3IoNWmR5cXzvgg==}
+
   html-encoding-sniffer@4.0.0:
     resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
     engines: {node: '>=18'}
@@ -4264,6 +4342,10 @@ packages:
   is-core-module@2.13.1:
     resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
 
+  is-core-module@2.15.1:
+    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
+    engines: {node: '>= 0.4'}
+
   is-data-view@1.0.1:
     resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
     engines: {node: '>= 0.4'}
@@ -4845,6 +4927,10 @@ packages:
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
+  multiline@1.0.2:
+    resolution: {integrity: sha512-DGpmDIZKKQ+EVx0sh0757V6qlb+ouuByoC5CWH7J0bOd6KRM6ka6l9LGHWfe17OKxm+4AsLs1tgiK4vZIx66RQ==}
+    engines: {node: '>=0.10.0'}
+
   mute-stream@1.0.0:
     resolution: {integrity: sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -4940,6 +5026,10 @@ packages:
   object-inspect@1.13.1:
     resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
 
+  object-inspect@1.13.2:
+    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+    engines: {node: '>= 0.4'}
+
   object-is@1.1.5:
     resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
     engines: {node: '>= 0.4'}
@@ -5858,6 +5948,11 @@ packages:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
 
+  strip-indent@1.0.1:
+    resolution: {integrity: sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
   strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -5996,14 +6091,6 @@ packages:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
 
-  tauri-plugin-log-api@https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/2bb26e22f7f7b4f164bad02f0ae4085796f77fff:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/2bb26e22f7f7b4f164bad02f0ae4085796f77fff}
-    version: 0.0.0
-
-  tauri-plugin-store-api@https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/5f5404feea43b6cddd65e4171f52e92ca161a2aa:
-    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/5f5404feea43b6cddd65e4171f52e92ca161a2aa}
-    version: 0.0.0
-
   telejson@7.2.0:
     resolution: {integrity: sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==}
 
@@ -8864,50 +8951,86 @@ snapshots:
     dependencies:
       defer-to-connect: 2.0.1
 
-  '@tauri-apps/api@1.6.0': {}
+  '@tauri-apps/api@2.0.0-rc.3': {}
 
-  '@tauri-apps/cli-darwin-arm64@1.6.0':
+  '@tauri-apps/cli-darwin-arm64@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-darwin-x64@1.6.0':
+  '@tauri-apps/cli-darwin-x64@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-linux-arm-gnueabihf@1.6.0':
+  '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-gnu@1.6.0':
+  '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-linux-arm64-musl@1.6.0':
+  '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-gnu@1.6.0':
+  '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-linux-x64-musl@1.6.0':
+  '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-win32-arm64-msvc@1.6.0':
+  '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-win32-ia32-msvc@1.6.0':
+  '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli-win32-x64-msvc@1.6.0':
+  '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.7':
     optional: true
 
-  '@tauri-apps/cli@1.6.0':
+  '@tauri-apps/cli@2.0.0-rc.7':
     optionalDependencies:
-      '@tauri-apps/cli-darwin-arm64': 1.6.0
-      '@tauri-apps/cli-darwin-x64': 1.6.0
-      '@tauri-apps/cli-linux-arm-gnueabihf': 1.6.0
-      '@tauri-apps/cli-linux-arm64-gnu': 1.6.0
-      '@tauri-apps/cli-linux-arm64-musl': 1.6.0
-      '@tauri-apps/cli-linux-x64-gnu': 1.6.0
-      '@tauri-apps/cli-linux-x64-musl': 1.6.0
-      '@tauri-apps/cli-win32-arm64-msvc': 1.6.0
-      '@tauri-apps/cli-win32-ia32-msvc': 1.6.0
-      '@tauri-apps/cli-win32-x64-msvc': 1.6.0
+      '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.7
+      '@tauri-apps/cli-darwin-x64': 2.0.0-rc.7
+      '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.7
+      '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.7
+      '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.7
+      '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.7
+      '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.7
+      '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.7
+      '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.7
+      '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.7
+
+  '@tauri-apps/plugin-dialog@2.0.0-rc.0':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
+
+  '@tauri-apps/plugin-fs@2.0.0-rc.1':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
+
+  '@tauri-apps/plugin-http@2.0.0-rc.1':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
+
+  '@tauri-apps/plugin-log@2.0.0-rc.0':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
+
+  '@tauri-apps/plugin-os@2.0.0-rc.0':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
+
+  '@tauri-apps/plugin-process@2.0.0-rc.0':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
+
+  '@tauri-apps/plugin-shell@2.0.0-rc.0':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
+
+  '@tauri-apps/plugin-store@2.0.0-rc.0':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
+
+  '@tauri-apps/plugin-updater@2.0.0-rc.0':
+    dependencies:
+      '@tauri-apps/api': 2.0.0-rc.3
 
   '@terrazzo/cli@0.0.11':
     dependencies:
@@ -10411,7 +10534,7 @@ snapshots:
       is-string: 1.0.7
       is-typed-array: 1.1.13
       is-weakref: 1.0.2
-      object-inspect: 1.13.1
+      object-inspect: 1.13.2
       object-keys: 1.1.1
       object.assign: 4.1.5
       regexp.prototype.flags: 1.5.2
@@ -10544,7 +10667,7 @@ snapshots:
       debug: 4.3.4
       enhanced-resolve: 5.17.0
       eslint: 9.5.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0))(eslint@9.5.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0))(eslint@9.5.0)
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@9.5.0)
       fast-glob: 3.3.1
       get-tsconfig: 4.7.5
@@ -10556,7 +10679,17 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0))(eslint@9.5.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0))(eslint@9.5.0):
+    dependencies:
+      debug: 3.2.7
+    optionalDependencies:
+      '@typescript-eslint/parser': 7.13.1(eslint@9.5.0)(typescript@5.4.5)
+      eslint: 9.5.0
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-module-utils@2.8.2(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0))(eslint@9.5.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
@@ -10593,9 +10726,9 @@ snapshots:
       doctrine: 2.1.0
       eslint: 9.5.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0))(eslint@9.5.0)
+      eslint-module-utils: 2.8.2(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.13.1(eslint@9.5.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1)(eslint@9.5.0))(eslint@9.5.0)
       hasown: 2.0.2
-      is-core-module: 2.13.1
+      is-core-module: 2.15.1
       is-glob: 4.0.3
       minimatch: 3.1.2
       object.fromentries: 2.0.8
@@ -11124,6 +11257,8 @@ snapshots:
 
   get-port@7.1.0: {}
 
+  get-stdin@4.0.1: {}
+
   get-stdin@9.0.0: {}
 
   get-stream@5.2.0:
@@ -11370,6 +11505,10 @@ snapshots:
     dependencies:
       lru-cache: 10.2.2
 
+  html-dnd@1.2.1:
+    dependencies:
+      multiline: 1.0.2
+
   html-encoding-sniffer@4.0.0:
     dependencies:
       whatwg-encoding: 3.1.1
@@ -11547,6 +11686,10 @@ snapshots:
     dependencies:
       hasown: 2.0.0
 
+  is-core-module@2.15.1:
+    dependencies:
+      hasown: 2.0.2
+
   is-data-view@1.0.1:
     dependencies:
       is-typed-array: 1.1.13
@@ -12088,6 +12231,10 @@ snapshots:
 
   ms@2.1.3: {}
 
+  multiline@1.0.2:
+    dependencies:
+      strip-indent: 1.0.1
+
   mute-stream@1.0.0: {}
 
   nanoevents@9.0.0: {}
@@ -12161,6 +12308,8 @@ snapshots:
 
   object-inspect@1.13.1: {}
 
+  object-inspect@1.13.2: {}
+
   object-is@1.1.5:
     dependencies:
       call-bind: 1.0.7
@@ -13198,6 +13347,10 @@ snapshots:
 
   strip-final-newline@3.0.0: {}
 
+  strip-indent@1.0.1:
+    dependencies:
+      get-stdin: 4.0.1
+
   strip-indent@3.0.0:
     dependencies:
       min-indent: 1.0.1
@@ -13351,14 +13504,6 @@ snapshots:
       mkdirp: 1.0.4
       yallist: 4.0.0
 
-  tauri-plugin-log-api@https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/2bb26e22f7f7b4f164bad02f0ae4085796f77fff:
-    dependencies:
-      '@tauri-apps/api': 1.6.0
-
-  tauri-plugin-store-api@https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/5f5404feea43b6cddd65e4171f52e92ca161a2aa:
-    dependencies:
-      '@tauri-apps/api': 1.6.0
-
   telejson@7.2.0:
     dependencies:
       memoizerific: 1.11.3
diff --git a/scripts/release.sh b/scripts/release.sh
index c5bf9bacaa..75ae9f8dfe 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -163,7 +163,7 @@ trap 'rm -rf "$TMP_DIR"' exit
 CONFIG_PATH=$(readlink -f "$PWD/../crates/gitbutler-tauri/tauri.conf.$CHANNEL.json")
 
 # update the version in the tauri release config
-jq '.package.version="'"$VERSION"'"' "$CONFIG_PATH" >"$TMP_DIR/tauri.conf.json"
+jq '.version="'"$VERSION"'"' "$CONFIG_PATH" >"$TMP_DIR/tauri.conf.json"
 
 if [ "$OS" = "windows" ]; then
 	FEATURES="windows"