diff --git a/CHANGELOG.md b/CHANGELOG.md
index 687a7a0..f5e4c57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.12.0] - 2026-06-20
+
+### Bug Fixes
+
+- *(zitadel)* Match Zitadel error codes across the full v2 error chain, restoring the "user already exists" update path and the invalid-phone fallback
+
+### Refactor
+
+- *(tests)* Migrate the e2e suite from the gRPC v1 client to the v2 HTTP API
+
+### Miscellaneous Tasks
+
+- *(deps)* Migrate to famedly-zitadel-rust-client v0.12 and drop the v1 feature, resolving the remaining security advisories
+
 ## [0.11.2] - 2026-06-02
 
 ### Bug Fixes
diff --git a/Cargo.lock b/Cargo.lock
index 85d72bd..81c1b81 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,38 +2,29 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
  "once_cell",
  "version_check",
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -44,12 +35,6 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -61,9 +46,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -76,47 +61,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
- "once_cell",
- "windows-sys 0.59.0",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
-dependencies = [
- "backtrace",
-]
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
 name = "anyhow_ext"
@@ -154,33 +136,11 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "async-stream"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "async-trait"
-version = "0.1.88"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -195,82 +155,32 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "axum"
-version = "0.6.20"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
-dependencies = [
- "async-trait",
- "axum-core",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "sync_wrapper 0.1.2",
- "tower 0.4.13",
- "tower-layer",
- "tower-service",
-]
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
-name = "axum-core"
-version = "0.3.4"
+name = "aws-lc-rs"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00"
 dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http 0.2.12",
- "http-body 0.4.6",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
+ "aws-lc-sys",
+ "zeroize",
 ]
 
 [[package]]
-name = "backtrace"
-version = "0.3.74"
+name = "aws-lc-sys"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4"
 dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
 ]
 
-[[package]]
-name = "base16ct"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-
-[[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"
@@ -283,25 +193,13 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "base64ct"
-version = "1.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -315,15 +213,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
 
 [[package]]
 name = "cache_control"
@@ -333,18 +231,21 @@ checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee"
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96"
 dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
@@ -352,26 +253,54 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "chrono"
-version = "0.4.40"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
- "serde",
  "wasm-bindgen",
  "windows-link",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
+
+[[package]]
+name = "combine"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
 
 [[package]]
 name = "config"
@@ -392,12 +321,6 @@ dependencies = [
  "yaml-rust2",
 ]
 
-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
 [[package]]
 name = "const-random"
 version = "0.1.18"
@@ -413,7 +336,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.2.17",
  "once_cell",
  "tiny-keccak",
 ]
@@ -463,31 +386,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "crc32fast"
-version = "1.4.2"
+name = "cpufeatures"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
 dependencies = [
- "cfg-if",
+ "libc",
 ]
 
 [[package]]
-name = "crunchy"
-version = "0.2.3"
+name = "crc32fast"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
 
 [[package]]
-name = "crypto-bigint"
-version = "0.5.5"
+name = "crunchy"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "generic-array",
- "rand_core 0.6.4",
- "subtle",
- "zeroize",
-]
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-common"
@@ -501,110 +421,33 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
+checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938"
 dependencies = [
  "csv-core",
  "itoa",
  "ryu",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "csv-core"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d"
+checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ct-logs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
-dependencies = [
- "sct 0.6.1",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "4.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest",
- "fiat-crypto",
- "rustc_version",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "custom_error"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6"
-
-[[package]]
-name = "darling"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "deadpool"
-version = "0.10.0"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490"
+checksum = "0be2b1d1d6ec8d846f05e137292d0b89133caf95ef33695424c09568bdd39b1b"
 dependencies = [
- "async-trait",
  "deadpool-runtime",
+ "lazy_static",
  "num_cpus",
  "tokio",
 ]
@@ -615,25 +458,13 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
 
-[[package]]
-name = "der"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
-dependencies = [
- "const-oid",
- "pem-rfc7468",
- "zeroize",
-]
-
 [[package]]
 name = "deranged"
-version = "0.4.0"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
- "powerfmt",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -643,16 +474,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
- "const-oid",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -669,75 +498,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "dyn-clone"
-version = "1.0.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
-
-[[package]]
-name = "ecdsa"
-version = "0.16.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
-dependencies = [
- "der",
- "digest",
- "elliptic-curve",
- "rfc6979",
- "signature",
- "spki",
-]
-
-[[package]]
-name = "ed25519"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
-dependencies = [
- "pkcs8",
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "2.1.1"
+name = "dunce"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "serde",
- "sha2",
- "subtle",
- "zeroize",
-]
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.13.8"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "digest",
- "ff",
- "generic-array",
- "group",
- "hkdf",
- "pem-rfc7468",
- "pkcs8",
- "rand_core 0.6.4",
- "sec1",
- "subtle",
- "zeroize",
-]
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "encoding_rs"
@@ -750,18 +520,18 @@ dependencies = [
 
 [[package]]
 name = "env_filter"
-version = "0.1.3"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef"
 dependencies = [
  "log",
 ]
 
 [[package]]
 name = "env_logger"
-version = "0.11.7"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697"
+checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a"
 dependencies = [
  "anstream",
  "anstyle",
@@ -777,17 +547,17 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "famedly-sync"
-version = "0.11.2"
+version = "0.12.0"
 dependencies = [
  "anyhow",
  "anyhow_ext",
@@ -797,14 +567,15 @@ dependencies = [
  "chrono",
  "config",
  "csv",
+ "famedly-zitadel-rust-client",
  "futures",
  "hex",
- "http 1.3.1",
+ "http",
  "indoc",
- "itertools 0.14.0",
+ "itertools",
  "ldap3",
  "native-tls",
- "reqwest 0.12.15",
+ "reqwest 0.12.28",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -818,54 +589,58 @@ dependencies = [
  "uuid",
  "vergen",
  "wiremock",
- "zitadel-rust-client",
 ]
 
 [[package]]
-name = "famedly_rust_utils"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e02eb2a9b0f1533bd3f97c08fc15f1c46886eb25f0d32758329019ef2b7cbf9"
+name = "famedly-zitadel-rust-client"
+version = "0.12.2"
+source = "git+https://github.com/famedly/zitadel-rust-client#2feabecde69e7126d4ebb398e4b855d79e0bf2b8"
 dependencies = [
+ "anyhow",
+ "anyhow_ext",
+ "anyhow_trace",
+ "base64 0.22.1",
+ "cache_control",
+ "famedly_rust_utils",
+ "futures",
+ "headers",
+ "josekit",
+ "jsonwebtoken",
+ "reqwest 0.13.4",
+ "reqwest-middleware",
+ "reqwest-retry",
  "serde",
+ "serde_json",
  "thiserror 1.0.69",
+ "time",
+ "tokio",
  "tracing",
  "url",
 ]
 
 [[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "ff"
-version = "0.13.1"
+name = "famedly_rust_utils"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393"
-dependencies = [
- "rand_core 0.6.4",
- "subtle",
-]
+checksum = "6fa26d113faa960a174abee877c619b19afb8fc7e2bc97f4b90532b55fe81254"
 
 [[package]]
-name = "fiat-crypto"
-version = "0.2.9"
+name = "fastrand"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
-name = "fixedbitset"
-version = "0.4.2"
+name = "find-msvc-tools"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
 [[package]]
 name = "flate2"
-version = "1.1.0"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -894,18 +669,24 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -918,9 +699,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -928,15 +709,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -945,15 +726,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -962,21 +743,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -986,109 +767,77 @@ dependencies = [
  "futures-task",
  "memchr",
  "pin-project-lite",
- "pin-utils",
  "slab",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.14.7"
+version = "0.14.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 dependencies = [
  "typenum",
  "version_check",
- "zeroize",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "r-efi 5.3.0",
+ "wasip2",
  "wasm-bindgen",
 ]
 
 [[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
-[[package]]
-name = "group"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
-dependencies = [
- "ff",
- "rand_core 0.6.4",
- "subtle",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.26"
+name = "getrandom"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.8.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
 name = "h2"
-version = "0.4.8"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
+checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.3.1",
- "indexmap 2.8.0",
+ "http",
+ "indexmap",
  "slab",
  "tokio",
  "tokio-util",
  "tracing",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -1101,9 +850,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
 [[package]]
 name = "hashlink"
@@ -1116,14 +865,14 @@ dependencies = [
 
 [[package]]
 name = "headers"
-version = "0.3.9"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
  "headers-core",
- "http 0.2.12",
+ "http",
  "httpdate",
  "mime",
  "sha1",
@@ -1131,30 +880,18 @@ dependencies = [
 
 [[package]]
 name = "headers-core"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
 dependencies = [
- "http 0.2.12",
+ "http",
 ]
 
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -1162,57 +899,16 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hkdf"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
-dependencies = [
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
 [[package]]
 name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http"
-version = "1.3.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
 dependencies = [
  "bytes",
- "fnv",
  "itoa",
 ]
 
-[[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"
@@ -1220,7 +916,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.3.1",
+ "http",
 ]
 
 [[package]]
@@ -1231,8 +927,8 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http",
+ "http-body",
  "pin-project-lite",
 ]
 
@@ -1250,40 +946,17 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.32"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
+checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
  "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2 0.4.8",
- "http 1.3.1",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "httparse",
  "httpdate",
  "itoa",
@@ -1293,86 +966,22 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-proxy"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
-dependencies = [
- "bytes",
- "futures",
- "headers",
- "http 0.2.12",
- "hyper 0.14.32",
- "hyper-rustls 0.22.1",
- "rustls-native-certs 0.5.0",
- "tokio",
- "tokio-rustls 0.22.0",
- "tower-service",
- "webpki",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
-dependencies = [
- "ct-logs",
- "futures-util",
- "hyper 0.14.32",
- "log",
- "rustls 0.19.1",
- "rustls-native-certs 0.5.0",
- "tokio",
- "tokio-rustls 0.22.0",
- "webpki",
-]
-
 [[package]]
 name = "hyper-rustls"
-version = "0.24.2"
+version = "0.27.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f"
 dependencies = [
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.32",
- "rustls 0.21.12",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
-dependencies = [
- "futures-util",
- "http 1.3.1",
- "hyper 1.6.0",
+ "http",
+ "hyper",
  "hyper-util",
- "rustls 0.23.25",
- "rustls-native-certs 0.8.4",
- "rustls-pki-types",
+ "rustls",
+ "rustls-native-certs",
  "tokio",
- "tokio-rustls 0.26.2",
+ "tokio-rustls",
  "tower-service",
 ]
 
-[[package]]
-name = "hyper-timeout"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
-dependencies = [
- "hyper 0.14.32",
- "pin-project-lite",
- "tokio",
- "tokio-io-timeout",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -1381,7 +990,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -1391,33 +1000,40 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "hyper 1.6.0",
+ "http",
+ "http-body",
+ "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
  "pin-project-lite",
  "socket2",
+ "system-configuration",
  "tokio",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -1433,21 +1049,23 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
+ "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1456,110 +1074,66 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
- "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
+ "icu_locale_core",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -1568,9 +1142,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -1578,110 +1152,134 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.8.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
- "serde",
+ "hashbrown 0.17.1",
 ]
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itertools"
-version = "0.10.5"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
 dependencies = [
  "either",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.11.0"
+name = "itoa"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "jni"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
 dependencies = [
- "either",
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.18",
+ "walkdir",
+ "windows-link",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.12.1"
+name = "jni-macros"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
 dependencies = [
- "either",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.14.0"
+name = "jni-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
 dependencies = [
- "either",
+ "jni-sys-macros",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.15"
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.4",
+ "libc",
+]
 
 [[package]]
 name = "josekit"
-version = "0.8.4"
-source = "git+https://github.com/famedly/josekit-rs.git?rev=5941d0f39d034e9c6d96dc47f391926f5e3038fa#5941d0f39d034e9c6d96dc47f391926f5e3038fa"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a808e078330e6af222eb0044b71d4b1ff981bfef43e7bc8133a88234e0c86a0c"
 dependencies = [
  "anyhow",
- "base64 0.21.7",
+ "base64 0.22.1",
  "flate2",
- "once_cell",
  "openssl",
  "regex",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.18",
  "time",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
 dependencies = [
- "once_cell",
+ "cfg-if",
+ "futures-util",
  "wasm-bindgen",
 ]
 
@@ -1705,7 +1303,7 @@ dependencies = [
  "base64 0.22.1",
  "js-sys",
  "pem",
- "ring 0.17.14",
+ "ring",
  "serde",
  "serde_json",
  "simple_asn1",
@@ -1716,9 +1314,6 @@ name = "lazy_static"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-dependencies = [
- "spin 0.9.8",
-]
 
 [[package]]
 name = "lber"
@@ -1756,33 +1351,36 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
-name = "libm"
-version = "0.2.11"
+name = "linux-raw-sys"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.9.3"
+name = "litemap"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
-name = "litemap"
-version = "0.7.5"
+name = "lock_api"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
 
 [[package]]
 name = "lru-slab"
@@ -1792,24 +1390,18 @@ checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
-
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
 
 [[package]]
 name = "mime"
@@ -1825,43 +1417,38 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "multimap"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
-
 [[package]]
 name = "native-tls"
-version = "0.2.14"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
 dependencies = [
  "libc",
  "log",
  "openssl",
- "openssl-probe 0.1.6",
+ "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.11.1",
+ "security-framework",
  "security-framework-sys",
  "tempfile",
 ]
@@ -1878,12 +1465,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1896,27 +1482,11 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-bigint-dig"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
-dependencies = [
- "lazy_static",
- "libm",
- "num-integer",
- "num-iter",
- "num-traits",
- "rand 0.8.5",
- "smallvec",
- "zeroize",
-]
-
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-integer"
@@ -1927,17 +1497,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-iter"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -1945,14 +1504,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
- "libm",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -1967,84 +1525,28 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "oauth2"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "getrandom 0.2.15",
- "http 0.2.12",
- "rand 0.8.5",
- "reqwest 0.11.27",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "sha2",
- "thiserror 1.0.69",
- "url",
-]
-
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
-version = "1.21.1"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
-name = "openidconnect"
-version = "3.5.0"
+name = "once_cell_polyfill"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f47e80a9cfae4462dd29c41e987edd228971d6565553fbc14b8a11e666d91590"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "dyn-clone",
- "ed25519-dalek",
- "hmac",
- "http 0.2.12",
- "itertools 0.10.5",
- "log",
- "oauth2",
- "p256",
- "p384",
- "rand 0.8.5",
- "rsa",
- "serde",
- "serde-value",
- "serde_derive",
- "serde_json",
- "serde_path_to_error",
- "serde_plain",
- "serde_with",
- "sha2",
- "subtle",
- "thiserror 1.0.69",
- "url",
-]
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "openssl"
-version = "0.10.71"
+version = "0.10.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
+checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "cfg-if",
  "foreign-types",
  "libc",
- "once_cell",
  "openssl-macros",
  "openssl-sys",
 ]
@@ -2060,12 +1562,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "openssl-probe"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
-
 [[package]]
 name = "openssl-probe"
 version = "0.2.1"
@@ -2074,9 +1570,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.106"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
+checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
 dependencies = [
  "cc",
  "libc",
@@ -2084,15 +1580,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "ordered-float"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "ordered-multimap"
 version = "0.7.3"
@@ -2104,33 +1591,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "p256"
-version = "0.13.2"
+name = "parking_lot"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
+ "lock_api",
+ "parking_lot_core",
 ]
 
 [[package]]
-name = "p384"
-version = "0.13.1"
+name = "parking_lot_core"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
 ]
 
 [[package]]
@@ -2139,84 +1619,37 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
-[[package]]
-name = "pbjson"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
-dependencies = [
- "base64 0.21.7",
- "serde",
-]
-
-[[package]]
-name = "pbjson-build"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735"
-dependencies = [
- "heck 0.4.1",
- "itertools 0.11.0",
- "prost",
- "prost-types",
-]
-
-[[package]]
-name = "pbjson-types"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12"
-dependencies = [
- "bytes",
- "chrono",
- "pbjson",
- "pbjson-build",
- "prost",
- "prost-build",
- "serde",
-]
-
 [[package]]
 name = "pem"
-version = "3.0.5"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
 dependencies = [
  "base64 0.22.1",
- "serde",
-]
-
-[[package]]
-name = "pem-rfc7468"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-dependencies = [
- "base64ct",
+ "serde_core",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
-version = "2.7.15"
+version = "2.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
+checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662"
 dependencies = [
  "memchr",
- "thiserror 2.0.12",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.15"
+version = "2.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
+checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2224,9 +1657,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.15"
+version = "2.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
+checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f"
 dependencies = [
  "pest",
  "pest_meta",
@@ -2237,50 +1670,19 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.7.15"
+version = "2.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
+checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220"
 dependencies = [
- "once_cell",
  "pest",
  "sha2",
 ]
 
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap 2.8.0",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pin-utils"
@@ -2289,32 +1691,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
-name = "pkcs1"
-version = "0.7.5"
+name = "pkg-config"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
-dependencies = [
- "der",
- "pkcs8",
- "spki",
-]
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
-name = "pkcs8"
-version = "0.10.2"
+name = "potential_utf"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
 dependencies = [
- "der",
- "spki",
+ "zerovec",
 ]
 
-[[package]]
-name = "pkg-config"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -2327,100 +1717,18 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.8.23",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.2.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb"
-dependencies = [
- "proc-macro2",
- "syn",
-]
-
-[[package]]
-name = "primeorder"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
-dependencies = [
- "elliptic-curve",
+ "zerocopy",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "prost"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
-dependencies = [
- "bytes",
- "heck 0.5.0",
- "itertools 0.12.1",
- "log",
- "multimap",
- "once_cell",
- "petgraph",
- "prettyplease",
- "prost",
- "prost-types",
- "regex",
- "syn",
- "tempfile",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
-dependencies = [
- "anyhow",
- "itertools 0.12.1",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "proxyvars"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17817f72ffb6ec975edfb587d823ee1dc131551a115c2e64adc53f19c8a40c49"
-dependencies = [
- "http 0.2.12",
- "ipnet",
-]
-
 [[package]]
 name = "quinn"
 version = "0.11.9"
@@ -2433,9 +1741,9 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.25",
+ "rustls",
  "socket2",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
  "web-time",
@@ -2447,16 +1755,17 @@ version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
 dependencies = [
+ "aws-lc-rs",
  "bytes",
- "getrandom 0.3.2",
+ "getrandom 0.3.4",
  "lru-slab",
  "rand 0.9.4",
- "ring 0.17.14",
+ "ring",
  "rustc-hash",
- "rustls 0.23.25",
+ "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tinyvec",
  "tracing",
  "web-time",
@@ -2473,34 +1782,29 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
-name = "rand"
-version = "0.8.5"
+name = "r-efi"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "rand"
@@ -2508,18 +1812,19 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
- "rand_chacha 0.9.0",
+ "rand_chacha",
  "rand_core 0.9.5",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.3.1"
+name = "rand"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
 dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
+ "chacha20",
+ "getrandom 0.4.3",
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -2534,179 +1839,185 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.5"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
-dependencies = [
- "getrandom 0.3.2",
-]
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
 [[package]]
-name = "regex"
-version = "1.11.1"
+name = "redox_syscall"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "bitflags",
 ]
 
 [[package]]
-name = "regex-automata"
-version = "0.1.10"
+name = "regex"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
- "regex-syntax 0.6.29",
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
+version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "ipnet",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
  "js-sys",
  "log",
  "mime",
- "once_cell",
+ "native-tls",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
+ "quinn",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration 0.5.1",
+ "sync_wrapper",
  "tokio",
- "tokio-rustls 0.24.1",
+ "tokio-native-tls",
+ "tokio-rustls",
+ "tower",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots",
- "winreg",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.12.15"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
- "futures-util",
- "h2 0.4.8",
- "http 1.3.1",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "http-body-util",
- "hyper 1.6.0",
- "hyper-rustls 0.27.5",
- "hyper-tls",
+ "hyper",
+ "hyper-rustls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
- "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.25",
- "rustls-native-certs 0.8.4",
- "rustls-pemfile 2.2.0",
+ "rustls",
  "rustls-pki-types",
+ "rustls-platform-verifier",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.2",
- "system-configuration 0.6.1",
+ "sync_wrapper",
  "tokio",
- "tokio-native-tls",
- "tokio-rustls 0.26.2",
- "tower 0.5.2",
+ "tokio-rustls",
+ "tower",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows-registry",
 ]
 
 [[package]]
-name = "rfc6979"
-version = "0.4.0"
+name = "reqwest-middleware"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+checksum = "07bc3f1384cffa4f274dad2d4ddd73aed32fed8f786d96c6be8aa4e5fd3c3b58"
 dependencies = [
- "hmac",
- "subtle",
+ "anyhow",
+ "async-trait",
+ "http",
+ "reqwest 0.13.4",
+ "serde",
+ "thiserror 2.0.18",
+ "tower-service",
 ]
 
 [[package]]
-name = "ring"
-version = "0.16.20"
+name = "reqwest-retry"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "fe2412db2af7d2268e7a5406be0431f37d9eb67ff390f35b395716f5f06c2eaa"
 dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
+ "anyhow",
+ "async-trait",
+ "futures",
+ "getrandom 0.2.17",
+ "http",
+ "hyper",
+ "reqwest 0.13.4",
+ "reqwest-middleware",
+ "retry-policies",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+ "wasmtimer",
+]
+
+[[package]]
+name = "retry-policies"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc05fbf560421a0357a750cbe78c7ca19d4923918490daabba313d5dbc871e47"
+dependencies = [
+ "rand 0.10.1",
 ]
 
 [[package]]
@@ -2717,9 +2028,9 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom 0.2.17",
  "libc",
- "untrusted 0.9.0",
+ "untrusted",
  "windows-sys 0.52.0",
 ]
 
@@ -2730,31 +2041,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.9.0",
+ "bitflags",
  "serde",
  "serde_derive",
 ]
 
-[[package]]
-name = "rsa"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
-dependencies = [
- "const-oid",
- "digest",
- "num-bigint-dig",
- "num-integer",
- "num-traits",
- "pkcs1",
- "pkcs8",
- "rand_core 0.6.4",
- "signature",
- "spki",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "rust-ini"
 version = "0.20.0"
@@ -2765,12 +2056,6 @@ dependencies = [
  "ordered-multimap",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -2788,241 +2073,136 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.1",
- "log",
- "ring 0.16.20",
- "sct 0.6.1",
- "webpki",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
-dependencies = [
- "log",
- "ring 0.17.14",
- "rustls-webpki 0.101.7",
- "sct 0.7.1",
-]
-
-[[package]]
-name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring 0.17.14",
- "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle",
- "zeroize",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.25"
+version = "0.23.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
+checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
 dependencies = [
+ "aws-lc-rs",
  "once_cell",
- "ring 0.17.14",
+ "ring",
  "rustls-pki-types",
- "rustls-webpki 0.103.0",
+ "rustls-webpki",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
-dependencies = [
- "openssl-probe 0.1.6",
- "rustls 0.19.1",
- "schannel",
- "security-framework 2.11.1",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
-dependencies = [
- "openssl-probe 0.1.6",
- "rustls-pemfile 2.2.0",
- "rustls-pki-types",
- "schannel",
- "security-framework 2.11.1",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d"
 dependencies = [
- "openssl-probe 0.2.1",
+ "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.3.0",
-]
-
-[[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.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
 dependencies = [
  "web-time",
+ "zeroize",
 ]
 
 [[package]]
-name = "rustls-webpki"
-version = "0.101.7"
+name = "rustls-platform-verifier"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0"
 dependencies = [
- "ring 0.17.14",
- "untrusted 0.9.0",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "rustls-webpki"
-version = "0.102.8"
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
-dependencies = [
- "ring 0.17.14",
- "rustls-pki-types",
- "untrusted 0.9.0",
-]
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.0"
+version = "0.103.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
 dependencies = [
- "ring 0.17.14",
+ "aws-lc-rs",
+ "ring",
  "rustls-pki-types",
- "untrusted 0.9.0",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-
-[[package]]
-name = "schannel"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "sct"
-version = "0.6.1"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
-name = "sct"
-version = "0.7.1"
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "ring 0.17.14",
- "untrusted 0.9.0",
+ "winapi-util",
 ]
 
 [[package]]
-name = "sec1"
-version = "0.7.3"
+name = "schannel"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
 dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "security-framework"
-version = "2.11.1"
+name = "scopeguard"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.9.0",
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "security-framework"
-version = "3.3.0"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
@@ -3031,9 +2211,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.14.0"
+version = "2.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3041,34 +2221,34 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
 [[package]]
-name = "serde-value"
-version = "0.7.0"
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
- "ordered-float",
- "serde",
+ "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3077,41 +2257,23 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
- "indexmap 2.8.0",
+ "indexmap",
  "itoa",
  "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
-dependencies = [
- "itoa",
- "serde",
-]
-
-[[package]]
-name = "serde_plain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
-dependencies = [
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
@@ -3128,43 +2290,13 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_with"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
-dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.8.0",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "serde_yaml"
 version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.8.0",
+ "indexmap",
  "itoa",
  "ryu",
  "serde",
@@ -3178,7 +2310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
  "digest",
 ]
 
@@ -3190,12 +2322,12 @@ checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
  "digest",
 ]
 
@@ -3210,90 +2342,71 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
-name = "signature"
-version = "2.2.0"
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
+[[package]]
+name = "simd_cesu8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
 dependencies = [
- "digest",
- "rand_core 0.6.4",
+ "rustc_version",
+ "simdutf8",
 ]
 
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
 [[package]]
 name = "simple_asn1"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
+checksum = "0d585997b0ac10be3c5ee635f1bab02d512760d14b7c468801ac8a01d9ae5f1d"
 dependencies = [
  "num-bigint",
  "num-traits",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "time",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "subtle"
@@ -3303,21 +2416,15 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -3329,9 +2436,9 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3340,34 +2447,13 @@ dependencies = [
 
 [[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 0.9.4",
- "system-configuration-sys 0.5.0",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags",
  "core-foundation 0.9.4",
- "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",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -3382,22 +2468,22 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.19.1"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.2",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "test-log"
-version = "0.2.17"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f46083d221181166e5b6f6b1e5f1d499f3a76888826e6cb1d057554157cd0f"
+checksum = "9b9c218384242b5c89b68303ab6f6fc53a312d923f0c14dc6bb860c6aeee40f1"
 dependencies = [
  "env_logger",
  "test-log-macros",
@@ -3405,16 +2491,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "test-log-macros"
-version = "0.2.17"
+name = "test-log-core"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "888d0c3c6db53c0fdab160d2ed5e12ba745383d3e85813f2ea0f2b1475ab553f"
+checksum = "c26ef8b00e4d382e59f6a8ddb3cd790b3a5bb29f21a358a9a69ea2f29f13f27b"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "test-log-macros"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "944ad38adcbb71eaa682c56bceeb079e4ca82b4b3edc2a0fde5cb297b77dac8d"
+dependencies = [
+ "syn",
+ "test-log-core",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -3426,11 +2522,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -3446,9 +2542,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3457,42 +2553,40 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.40"
+version = "0.3.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
+checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469"
 dependencies = [
  "deranged",
- "itoa",
  "libc",
  "num-conv",
  "num_threads",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.4"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.21"
+version = "0.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
+checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d"
 dependencies = [
  "num-conv",
  "time-core",
@@ -3509,9 +2603,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -3534,35 +2628,24 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
 dependencies = [
- "backtrace",
  "bytes",
  "libc",
  "mio",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3581,51 +2664,19 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
-dependencies = [
- "rustls 0.19.1",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.12",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
- "rustls 0.23.25",
+ "rustls",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -3634,9 +2685,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.14"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3647,9 +2698,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.20"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -3659,101 +2710,64 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.24"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.8.0",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
+ "toml_write",
  "winnow",
 ]
 
 [[package]]
-name = "tonic"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
-dependencies = [
- "async-stream",
- "async-trait",
- "axum",
- "base64 0.21.7",
- "bytes",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper-timeout",
- "percent-encoding",
- "pin-project",
- "prost",
- "rustls-native-certs 0.7.3",
- "rustls-pemfile 2.2.0",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.25.0",
- "tokio-stream",
- "tower 0.4.13",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tonic-types"
-version = "0.11.0"
+name = "toml_write"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aa089471d8d4c60ec3aef047739713a4695f0b309d4cea0073bc55201064f4"
-dependencies = [
- "prost",
- "prost-types",
- "tonic",
-]
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 1.9.3",
- "pin-project",
  "pin-project-lite",
- "rand 0.8.5",
- "slab",
+ "sync_wrapper",
  "tokio",
- "tokio-util",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
-name = "tower"
-version = "0.5.2"
+name = "tower-http"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
- "futures-core",
+ "bitflags",
+ "bytes",
  "futures-util",
+ "http",
+ "http-body",
  "pin-project-lite",
- "sync_wrapper 1.0.2",
- "tokio",
+ "tower",
  "tower-layer",
  "tower-service",
+ "url",
 ]
 
 [[package]]
@@ -3770,9 +2784,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -3781,9 +2795,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3792,9 +2806,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -3813,14 +2827,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -3837,9 +2851,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
 [[package]]
 name = "ucd-trie"
@@ -3849,15 +2863,15 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
 
 [[package]]
 name = "unsafe-libyaml"
@@ -3865,12 +2879,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -3879,22 +2887,17 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
  "serde",
+ "serde_derive",
 ]
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -3909,11 +2912,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.16.0"
+version = "1.23.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7"
 dependencies = [
+ "js-sys",
  "sha1_smol",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3946,6 +2951,16 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -3957,63 +2972,47 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.4+wasi-0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
 dependencies = [
- "cfg-if",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
- "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4021,31 +3020,45 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasmtimer"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b"
+dependencies = [
+ "futures",
+ "js-sys",
+ "parking_lot",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4062,96 +3075,93 @@ dependencies = [
 ]
 
 [[package]]
-name = "webpki"
-version = "0.21.4"
+name = "webpki-root-certs"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
+checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267"
 dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
+ "rustls-pki-types",
 ]
 
 [[package]]
-name = "webpki-roots"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
+name = "winapi-util"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
+name = "windows-core"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
+name = "windows-implement"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
-name = "windows-core"
-version = "0.52.0"
+name = "windows-interface"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
- "windows-targets 0.52.6",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-registry"
-version = "0.4.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
 dependencies = [
+ "windows-link",
  "windows-result",
  "windows-strings",
- "windows-targets 0.53.0",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.3.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.3.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -4163,26 +3173,20 @@ dependencies = [
 
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.48.5"
+name = "windows-sys"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows-link",
 ]
 
 [[package]]
@@ -4203,26 +3207,21 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.0"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -4231,15 +3230,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4249,15 +3242,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4267,9 +3254,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -4279,15 +3266,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4297,15 +3278,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4315,15 +3290,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4333,15 +3302,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4351,43 +3314,32 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
 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 = "wiremock"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "101681b74cd87b5899e87bcf5a64e83334dd313fcd3053ea72e6dba18928e301"
+checksum = "08db1edfb05d9b3c1542e521aea074442088292f00b5f28e435c714a98f85031"
 dependencies = [
  "assert-json-diff",
- "async-trait",
  "base64 0.22.1",
  "deadpool",
  "futures",
- "http 1.3.1",
+ "http",
  "http-body-util",
- "hyper 1.6.0",
+ "hyper",
  "hyper-util",
  "log",
  "once_cell",
@@ -4399,25 +3351,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.0",
-]
-
-[[package]]
-name = "write16"
-version = "1.0.0"
+name = "wit-bindgen"
+version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "yaml-rust2"
@@ -4432,11 +3375,10 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -4444,9 +3386,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4456,38 +3398,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "zerocopy-derive 0.7.35",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
-dependencies = [
- "zerocopy-derive 0.8.23",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.23"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4496,18 +3418,18 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4517,15 +3439,26 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
 
 [[package]]
 name = "zerovec"
-version = "0.10.4"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -4534,9 +3467,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4544,52 +3477,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "zitadel"
-version = "4.3.5"
+name = "zmij"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25b6681de47e2c927130b0a3ef655097b8159e64483b8781011d17255b5333e"
-dependencies = [
- "custom_error",
- "jsonwebtoken",
- "openidconnect",
- "pbjson-types",
- "prost",
- "prost-types",
- "reqwest 0.11.27",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "time",
- "tokio",
- "tonic",
- "tonic-types",
-]
-
-[[package]]
-name = "zitadel-rust-client"
-version = "0.3.0"
-source = "git+https://github.com/famedly/zitadel-rust-client#f5d604ecac2002934a8b6f83f0938953f85ac15e"
-dependencies = [
- "anyhow",
- "base64 0.22.1",
- "cache_control",
- "famedly_rust_utils",
- "futures",
- "headers",
- "hyper 0.14.32",
- "hyper-proxy",
- "josekit",
- "jsonwebtoken",
- "pbjson-types",
- "proxyvars",
- "reqwest 0.12.15",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "time",
- "tokio",
- "tonic",
- "tracing",
- "url",
- "zitadel",
-]
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/Cargo.toml b/Cargo.toml
index 7adfc95..33b550d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "famedly-sync"
-version = "0.11.2"
+version = "0.12.0"
 authors = []
 edition = "2024"
 publish = false
@@ -33,7 +33,7 @@ tracing-subscriber = "0.3.18"
 url = "2.5.2"
 uuid = { version = "1.10.0", features = ["v5"] }
 wiremock = "0.6.2"
-zitadel-rust-client = { git = "https://github.com/famedly/zitadel-rust-client", version = "0.3.0", default-features = false }
+zitadel-rust-client = { git = "https://github.com/famedly/zitadel-rust-client", package = "famedly-zitadel-rust-client", version = "0.12", default-features = false }
 
 [dependencies.reqwest]
 version = "*"
@@ -49,7 +49,6 @@ ldap3 = { version = "0.11.1", default-features = false, features = ["tls-native"
 serde_yaml = "0.9.34"
 tempfile = "3.10.1"
 test-log = { version = "0.2.16", features = ["trace", "unstable"] }
-zitadel-rust-client = { git = "https://github.com/famedly/zitadel-rust-client", version = "0.3.0", features = ["v1"] }
 
 [lints.rust]
 dead_code = "warn"
diff --git a/src/lib.rs b/src/lib.rs
index a75134e..8ebe141 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -121,6 +121,57 @@ async fn disable_users(
 	Ok(())
 }
 
+/// Import a single sync-source user into Zitadel, skipping disabled users.
+///
+/// Errors are recorded in `skipped_errors` rather than aborting the sync.
+async fn import_source_user(
+	zitadel: &Zitadel<'_>,
+	skipped_errors: &SkippedErrors,
+	new_user: &User,
+) {
+	if !new_user.enabled {
+		tracing::debug!(
+			"User with external ID {} would have been imported, but was skipped as they are disabled.",
+			new_user.external_user_id
+		);
+		return;
+	}
+
+	zitadel
+		.import_user(new_user)
+		.await
+		.with_context(|| format!("Failed to import user `{}`", new_user.external_user_id))
+		.skip_zitadel_error("importing user", skipped_errors);
+}
+
+/// Delete a user from Zitadel, recording (but not aborting on) errors.
+async fn delete_zitadel_user(
+	zitadel: &Zitadel<'_>,
+	skipped_errors: &SkippedErrors,
+	zitadel_id: &str,
+) {
+	zitadel
+		.delete_user(zitadel_id)
+		.await
+		.with_context(|| format!("Failed to delete user with Zitadel ID `{zitadel_id}`"))
+		.skip_zitadel_error("deleting user", skipped_errors);
+}
+
+/// Update an existing Zitadel user, recording (but not aborting on) errors.
+async fn update_zitadel_user(
+	zitadel: &Zitadel<'_>,
+	skipped_errors: &SkippedErrors,
+	zitadel_id: &str,
+	existing_user: &User,
+	new_user: &User,
+) {
+	zitadel
+		.update_user(zitadel_id, existing_user, new_user)
+		.await
+		.with_context(|| format!("Failed to update user `{}`", new_user.external_user_id))
+		.skip_zitadel_error("updating user", skipped_errors);
+}
+
 /// Fully sync users
 #[anyhow_trace::anyhow_trace]
 #[tracing::instrument(skip_all)]
@@ -159,21 +210,7 @@ async fn sync_users(
 			// Excess sync source users are not yet in Zitadel,
 			// so we import them
 			(Some(new_user), None) => {
-				if !new_user.enabled {
-					tracing::debug!(
-						"User with external ID {} would have been imported, but was skipped as they are disabled.",
-						new_user.external_user_id
-					);
-				} else {
-					zitadel
-						.import_user(&new_user)
-						.await
-						.with_context(|| {
-							format!("Failed to import user `{}`", new_user.external_user_id)
-						})
-						.skip_zitadel_error("importing user", skipped_errors);
-				}
-
+				import_source_user(zitadel, skipped_errors, &new_user).await;
 				source_user = sync_users.pop_front();
 			}
 
@@ -188,13 +225,7 @@ async fn sync_users(
 						new_user.external_user_id
 					);
 
-					zitadel
-						.delete_user(&zitadel_id)
-						.await
-						.with_context(|| {
-							format!("Failed to delete user with Zitadel ID `{zitadel_id}`",)
-						})
-						.skip_zitadel_error("deleting user", skipped_errors);
+					delete_zitadel_user(zitadel, skipped_errors, &zitadel_id).await;
 				}
 				zitadel_user = stream.next().await.transpose()?;
 				source_user = sync_users.pop_front();
@@ -206,21 +237,7 @@ async fn sync_users(
 			(Some(new_user), Some((_, existing_user)))
 				if new_user.external_user_id < existing_user.external_user_id =>
 			{
-				if !new_user.enabled {
-					tracing::debug!(
-						"New sync source user `{}` is disabled, skipping import.",
-						new_user.external_user_id
-					);
-				} else {
-					zitadel
-						.import_user(&new_user)
-						.await
-						.with_context(|| {
-							format!("Failed to import user `{}`", new_user.external_user_id,)
-						})
-						.skip_zitadel_error("importing user", skipped_errors);
-				}
-
+				import_source_user(zitadel, skipped_errors, &new_user).await;
 				source_user = sync_users.pop_front();
 				// Don't fetch the next zitadel user yet
 			}
@@ -254,13 +271,7 @@ async fn sync_users(
 					);
 
 					// If the user is disabled in the source, delete from Zitadel
-					zitadel
-						.delete_user(&zitadel_id)
-						.await
-						.with_context(|| {
-							format!("Failed to delete user with Zitadel ID `{zitadel_id}`",)
-						})
-						.skip_zitadel_error("deleting user", skipped_errors);
+					delete_zitadel_user(zitadel, skipped_errors, &zitadel_id).await;
 				} else {
 					tracing::info!(
 						"User {} with external ID {} will be updated.",
@@ -268,13 +279,14 @@ async fn sync_users(
 						new_user.external_user_id
 					);
 
-					zitadel
-						.update_user(&zitadel_id, &existing_user, &new_user)
-						.await
-						.with_context(|| {
-							format!("Failed to update user `{}`", new_user.external_user_id,)
-						})
-						.skip_zitadel_error("updating user", skipped_errors);
+					update_zitadel_user(
+						zitadel,
+						skipped_errors,
+						&zitadel_id,
+						&existing_user,
+						&new_user,
+					)
+					.await;
 				}
 
 				zitadel_user = stream.next().await.transpose()?;
diff --git a/src/zitadel.rs b/src/zitadel.rs
index 7ddce68..fd8bb65 100644
--- a/src/zitadel.rs
+++ b/src/zitadel.rs
@@ -54,7 +54,7 @@ impl<'s> Zitadel<'s> {
 		skipped_errors: &'s SkippedErrors,
 	) -> Result<Self> {
 		let zitadel_client =
-			ZitadelClient::new(zitadel_config.url.clone(), zitadel_config.key_file.clone())
+			ZitadelClient::new(zitadel_config.url.clone(), zitadel_config.key_file.clone(), None)
 				.await
 				.context("failed to configure zitadel_client")?;
 
@@ -70,6 +70,7 @@ impl<'s> Zitadel<'s> {
 		Ok(self
 			.zitadel_client
 			.list_users(
+				None,
 				Some(PaginationParams::DEFAULT.with_asc(true)),
 				Some(UserFieldName::NickName),
 				Some(vec![
@@ -97,6 +98,7 @@ impl<'s> Zitadel<'s> {
 		Ok(self
 			.zitadel_client
 			.list_users(
+				None,
 				Some(PaginationParams::DEFAULT.with_asc(true)),
 				Some(UserFieldName::NickName),
 				Some(vec![SearchQuery::new().with_and_query(AndQuery::new().with_queries(vec![
@@ -157,6 +159,7 @@ impl<'s> Zitadel<'s> {
 	pub async fn get_users_sample(&self) -> Result<Vec<User>> {
 		self.zitadel_client
 			.list_users(
+				None,
 				Some(PaginationParams::DEFAULT.with_asc(true).with_page_size(USER_SAMPLE_SIZE)),
 				Some(UserFieldName::NickName),
 				Some(vec![SearchQuery::new().with_type_query(TypeQuery::new(Userv2Type::Human))]),
@@ -258,13 +261,19 @@ impl<'s> Zitadel<'s> {
 			}
 
 			Err(error) => {
+				// The v2 client wraps the actual Zitadel error (including the
+				// error code we match on below) as a source in the error chain,
+				// so we must inspect the full chain rather than just the
+				// top-level `Display`.
+				let error_chain = format!("{error:#}");
+
 				// If the phone number is invalid
-				if error.to_string().contains("PHONE-so0wa") {
+				if error_chain.contains("PHONE-so0wa") {
 					user.reset_phone();
 					self.zitadel_client.create_human_user(user).await?;
 
 				// If the user already exists
-				} else if error.to_string().contains("V3-DKcYh") {
+				} else if error_chain.contains("V3-DKcYh") {
 					// Handle the case where a user with the same email already exists
 					// This can happen when the external ID changes but the email stays the same
 					// Since we are keeping deleted users in Zitadel for safety reasons unless they
@@ -371,14 +380,16 @@ impl<'s> Zitadel<'s> {
 
 		if let Err(error) = self.zitadel_client.update_human_user(zitadel_id, request.clone()).await
 		{
+			// The v2 client surfaces the Zitadel error code as a source in the
+			// error chain, so we match against the whole chain.
 			// If the new phone number is invalid
-			if error.to_string().contains("PHONE-so0wa") {
+			if format!("{error:#}").contains("PHONE-so0wa") {
 				request.reset_phone();
 				self.zitadel_client.update_human_user(zitadel_id, request).await?;
 
 				if let Err(error) = self.zitadel_client.remove_phone(zitadel_id).await {
 					// If the user didn't start out with a phone
-					if !error.to_string().contains("COMMAND-ieJ2e") {
+					if !format!("{error:#}").contains("COMMAND-ieJ2e") {
 						anyhow::bail!(error);
 					}
 				};
@@ -390,10 +401,12 @@ impl<'s> Zitadel<'s> {
 		if old_user.preferred_username != updated_user.preferred_username {
 			if let Some(preferred_username) = &updated_user.preferred_username {
 				self.zitadel_client
-					.set_user_metadata(zitadel_id, "preferred_username", preferred_username)
+					.set_user_metadata(zitadel_id, "preferred_username", preferred_username, None)
 					.await?;
 			} else {
-				self.zitadel_client.delete_user_metadata(zitadel_id, "preferred_username").await?;
+				self.zitadel_client
+					.delete_user_metadata(zitadel_id, "preferred_username", None)
+					.await?;
 			}
 		}
 
@@ -433,7 +446,7 @@ impl<'s> Zitadel<'s> {
 		let phone = human_user.phone().and_then(|human_phone| human_phone.phone()).cloned();
 		let localpart = self
 			.zitadel_client
-			.get_user_metadata(&id, "localpart")
+			.get_user_metadata(&id, "localpart", None)
 			.await
 			.pipe(|x| anyhow::Context::context(x, Skippable))
 			.with_context(|| format!("Fetching localpart metadata for {external_id:?} ({id})"))?
@@ -444,7 +457,7 @@ impl<'s> Zitadel<'s> {
 
 		let preferred_username = self
 			.zitadel_client
-			.get_user_metadata(&id, "preferred_username")
+			.get_user_metadata(&id, "preferred_username", None)
 			.await
 			.ok()
 			.and_then(|res| res.metadata().value());
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 8f05099..d66a364 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -3,12 +3,22 @@
 #![cfg(test)]
 #![allow(clippy::expect_used, dead_code)]
 
-use std::{collections::HashSet, path::Path, time::Duration};
+use std::{collections::HashSet, path::Path, pin::pin, time::Duration};
 
+use anyhow::{Context as _, Result};
 use famedly_sync::{Config, SkippedErrors, zitadel::Zitadel as SyncZitadel};
-use futures::TryStreamExt;
+use futures::{StreamExt, TryStreamExt};
 use ldap3::{Ldap as LdapClient, LdapConnAsync, LdapConnSettings, Mod};
 use tokio::sync::OnceCell;
+use zitadel_rust_client::v2::{
+	Zitadel,
+	management::{V1UserGrantProjectIdQuery, V1UserGrantQuery, V1UserGrantUserIdQuery},
+	pagination::PaginationParams,
+	users::{
+		AddHumanUserRequest, IdpLink, LoginNameQuery, Organization, SearchQuery, SetHumanEmail,
+		SetHumanPhone, SetHumanProfile, User,
+	},
+};
 
 /// Ldap client with helper functions to create tests users
 pub struct Ldap {
@@ -214,3 +224,125 @@ pub async fn cleanup_test_users(config: &Config) {
 		.await
 		.unwrap();
 }
+
+/// Test-only ergonomic helpers on top of the raw Zitadel v2 client.
+///
+/// These exist so the e2e tests can read and seed Zitadel state through the
+/// same v2 HTTP API that production uses, instead of the legacy v1/gRPC client.
+#[allow(async_fn_in_trait)]
+pub trait ZitadelExt {
+	/// Look up a single user by one of their login names.
+	///
+	/// Returns `Ok(None)` when no such user exists (the v2 API simply yields an
+	/// empty result set, unlike the v1 client which raised a `NotFound` error).
+	async fn get_user_by_login_name(&self, login_name: &str) -> Result<Option<User>>;
+
+	/// Fetch and decode a single metadata value for a user, if present.
+	async fn get_metadata(&self, org_id: &str, user_id: &str, key: &str) -> Result<Option<String>>;
+
+	/// Collect all role keys granted to a user on the given project.
+	async fn user_role_keys(
+		&self,
+		org_id: &str,
+		project_id: &str,
+		user_id: &str,
+	) -> Result<Vec<String>>;
+
+	/// Collect all identity provider links of a user.
+	async fn user_idp_links(&self, user_id: &str) -> Result<Vec<IdpLink>>;
+
+	/// Create a verified human user directly in Zitadel and return its ID.
+	///
+	/// Intended for seeding test fixtures that bypass the sync logic.
+	#[allow(clippy::too_many_arguments)]
+	async fn create_test_human_user(
+		&self,
+		org_id: &str,
+		username: &str,
+		first_name: &str,
+		last_name: &str,
+		display_name: &str,
+		nick_name: &str,
+		email: &str,
+		phone: &str,
+	) -> Result<String>;
+}
+
+impl ZitadelExt for Zitadel {
+	async fn get_user_by_login_name(&self, login_name: &str) -> Result<Option<User>> {
+		let mut stream = pin!(self.list_users(
+			None,
+			Some(PaginationParams::DEFAULT.with_asc(true)),
+			None,
+			Some(vec![
+				SearchQuery::new()
+					.with_login_name_query(LoginNameQuery::new(login_name.to_owned())),
+			]),
+		)?);
+
+		stream.next().await.transpose()
+	}
+
+	async fn get_metadata(&self, org_id: &str, user_id: &str, key: &str) -> Result<Option<String>> {
+		Ok(self.get_user_metadata(user_id, key, Some(org_id.to_owned())).await?.metadata().value())
+	}
+
+	async fn user_role_keys(
+		&self,
+		org_id: &str,
+		project_id: &str,
+		user_id: &str,
+	) -> Result<Vec<String>> {
+		let grants: Vec<_> = self
+			.search_user_grants(
+				Some(org_id.to_owned()),
+				None,
+				Some(vec![
+					V1UserGrantQuery::ProjectId {
+						project_id_query: V1UserGrantProjectIdQuery::new()
+							.with_project_id(project_id.to_owned()),
+					},
+					V1UserGrantQuery::UserId {
+						user_id_query: V1UserGrantUserIdQuery::new()
+							.with_user_id(user_id.to_owned()),
+					},
+				]),
+			)?
+			.try_collect()
+			.await?;
+
+		Ok(grants.into_iter().filter_map(|grant| grant.role_keys().cloned()).flatten().collect())
+	}
+
+	async fn user_idp_links(&self, user_id: &str) -> Result<Vec<IdpLink>> {
+		self.list_idp_links(user_id, None, None)?.try_collect().await
+	}
+
+	async fn create_test_human_user(
+		&self,
+		org_id: &str,
+		username: &str,
+		first_name: &str,
+		last_name: &str,
+		display_name: &str,
+		nick_name: &str,
+		email: &str,
+		phone: &str,
+	) -> Result<String> {
+		let request = AddHumanUserRequest::new(
+			SetHumanProfile::new(first_name.to_owned(), last_name.to_owned())
+				.with_display_name(display_name.to_owned())
+				.with_nick_name(nick_name.to_owned()),
+			SetHumanEmail::new(email.to_owned()).with_is_verified(true),
+		)
+		.with_username(username.to_owned())
+		.with_organization(Organization::new().with_org_id(org_id.to_owned()))
+		.with_phone(SetHumanPhone::new().with_phone(phone.to_owned()).with_is_verified(true));
+
+		self.create_human_user(request)
+			.await?
+			.user_id()
+			.context("created user is missing an ID")
+			.cloned()
+	}
+}
diff --git a/tests/e2e.rs b/tests/e2e.rs
index 3d2ac19..b873632 100644
--- a/tests/e2e.rs
+++ b/tests/e2e.rs
@@ -17,14 +17,11 @@ use test_log::test;
 use url::Url;
 use uuid::{Uuid, uuid};
 use wiremock::MockServer;
-use zitadel_rust_client::v1::{
-	Email, Gender, ImportHumanUserRequest, Phone, Profile, UserType, Zitadel,
-	error::{Error as ZitadelError, TonicErrorCode},
-};
+use zitadel_rust_client::v2::Zitadel;
 
 mod common;
 
-use common::{Ldap, cleanup_test_users, csv_config, ldap_config, ukt_config};
+use common::{Ldap, ZitadelExt, cleanup_test_users, csv_config, ldap_config, ukt_config};
 
 /// The Famedly UUID namespace to use to generate v5 UUIDs.
 const FAMEDLY_NAMESPACE: Uuid = uuid!("d9979cff-abee-4666-bc88-1ec45a843fb8");
@@ -32,93 +29,94 @@ const FAMEDLY_NAMESPACE: Uuid = uuid!("d9979cff-abee-4666-bc88-1ec45a843fb8");
 /// The Zitadel project role to assign to users.
 const FAMEDLY_USER_ROLE: &str = "User";
 
+/// Sync a single user with the given `uid`/`email` and assert that their
+/// Zitadel nickname is the hex-encoded `uid`.
+async fn verify_user_encoding(
+	ldap: &mut Ldap,
+	zitadel: &Zitadel,
+	config: &Config,
+	uid: &str,
+	email: &str,
+) -> Result<(), String> {
+	let login_name = email;
+	let expected_hex_id = hex::encode(uid.as_bytes());
+
+	ldap.create_user("Test", "User", "TU", login_name, None, uid, false).await;
+
+	perform_sync(config.clone()).await.map_err(|e| format!("Sync failed: {e}"))?;
+
+	let user = zitadel
+		.get_user_by_login_name(login_name)
+		.await
+		.map_err(|e| format!("Failed to get user: {e}"))?
+		.ok_or_else(|| "User not found".to_owned())?;
+
+	let human = user.human().ok_or_else(|| "User lacks human details".to_owned())?;
+	let profile = human.profile().ok_or_else(|| "User lacks profile".to_owned())?;
+	let nick_name = profile.nick_name().map_or("", String::as_str);
+
+	if nick_name != expected_hex_id {
+		return Err(format!(
+			"ID mismatch for '{uid}': expected '{expected_hex_id}', got '{nick_name}'"
+		));
+	}
+	Ok(())
+}
+
+/// Test cases for verifying correct user ID encoding (uid, email).
+const USER_ID_ENCODING_CASES: &[(&str, &str)] = &[
+	// Basic cases
+	("simple123", "simple123@example.com"),
+	("MiXed123Case", "mixed123case@example.com"),
+	// Special characters
+	("u.s-e_r", "user@example.com"),
+	("123", "123@example.com"),
+	// Unicode
+	("üsernamÉ", "username@example.com"),
+	("ὈΔΥΣΣΕΎΣ", "odysseus@example.com"),
+	("Потребител", "potrebitel@example.com"),
+	// Long string
+	("ThisIsAVeryLongUsernameThatShouldStillWork123456789", "long@example.com"),
+];
+
 #[test(tokio::test)]
 #[test_log(default_log_filter = "debug")]
 async fn test_e2e_user_id_encoding() {
-	async fn verify_user_encoding(
-		ldap: &mut Ldap,
-		zitadel: &Zitadel,
-		config: &Config,
-		uid: &str,
-		email: &str,
-	) -> Result<(), String> {
-		let login_name = email;
-		let expected_hex_id = hex::encode(uid.as_bytes());
-
-		ldap.create_user("Test", "User", "TU", login_name, None, uid, false).await;
-
-		perform_sync(config.clone()).await.map_err(|e| format!("Sync failed: {e}"))?;
-
-		let user = zitadel
-			.get_user_by_login_name(login_name)
-			.await
-			.map_err(|e| format!("Failed to get user: {e}"))?
-			.ok_or_else(|| "User not found".to_owned())?;
-
-		match user.r#type {
-			Some(UserType::Human(user)) => {
-				let profile = user.profile.ok_or_else(|| "User lacks profile".to_owned())?;
-
-				if profile.nick_name != expected_hex_id {
-					return Err(format!(
-						"ID mismatch for '{}': expected '{}', got '{}'",
-						uid, expected_hex_id, profile.nick_name
-					));
-				}
-				Ok(())
-			}
-			_ => Err("User lacks human details".to_owned()),
-		}
-	}
-
-	/// Test cases for verifying correct user ID encoding
-	/// (uid, email)
-	const TEST_CASES: &[(&str, &str)] = &[
-		// Basic cases
-		("simple123", "simple123@example.com"),
-		("MiXed123Case", "mixed123case@example.com"),
-		// Special characters
-		("u.s-e_r", "user@example.com"),
-		("123", "123@example.com"),
-		// Unicode
-		("üsernamÉ", "username@example.com"),
-		("ὈΔΥΣΣΕΎΣ", "odysseus@example.com"),
-		("Потребител", "potrebitel@example.com"),
-		// Long string
-		("ThisIsAVeryLongUsernameThatShouldStillWork123456789", "long@example.com"),
-	];
-
-	// Run all test cases
 	let config = ldap_config().await;
 	let mut ldap = Ldap::new().await;
 	let zitadel = open_zitadel_connection().await;
 
-	for (uid, email) in TEST_CASES {
+	for (uid, email) in USER_ID_ENCODING_CASES {
 		if let Err(error) = verify_user_encoding(&mut ldap, &zitadel, config, uid, email).await {
 			panic!("Test failed for ID '{uid}': {error}");
 		}
 	}
 }
 
+/// A user fixture for the ID sync-ordering test.
+struct TestUser<'a> {
+	/// Raw LDAP uid, used as the external ID.
+	uid: &'a str,
+	/// Email address / login name.
+	email: &'a str,
+	/// Phone number.
+	phone: &'a str,
+}
+
+/// Users covering a range of scripts to exercise sync ordering by external ID.
+const TEST_USERS: &[TestUser] = &[
+	TestUser { uid: "üser", email: "youser@example.com", phone: "+6666666666" },
+	TestUser { uid: "aaa", email: "aaa@example.com", phone: "+1111111111" },
+	TestUser { uid: "777", email: "777@example.com", phone: "+5555555555" },
+	TestUser { uid: "bbb", email: "bbb@example.com", phone: "+3333333333" },
+	TestUser { uid: "🦀", email: "crab@example.com", phone: "+1000000001" },
+	TestUser { uid: "한글", email: "korean@example.com", phone: "+1000000002" },
+	TestUser { uid: "عربي", email: "arabic@example.com", phone: "+1000000005" },
+];
+
 #[test(tokio::test)]
 #[test_log(default_log_filter = "debug")]
 async fn test_e2e_user_id_sync_ordering() {
-	struct TestUser<'a> {
-		uid: &'a str,
-		email: &'a str,
-		phone: &'a str,
-	}
-
-	const TEST_USERS: &[TestUser] = &[
-		TestUser { uid: "üser", email: "youser@example.com", phone: "+6666666666" },
-		TestUser { uid: "aaa", email: "aaa@example.com", phone: "+1111111111" },
-		TestUser { uid: "777", email: "777@example.com", phone: "+5555555555" },
-		TestUser { uid: "bbb", email: "bbb@example.com", phone: "+3333333333" },
-		TestUser { uid: "🦀", email: "crab@example.com", phone: "+1000000001" },
-		TestUser { uid: "한글", email: "korean@example.com", phone: "+1000000002" },
-		TestUser { uid: "عربي", email: "arabic@example.com", phone: "+1000000005" },
-	];
-
 	// Setup
 	let config = ldap_config().await;
 	let mut ldap = Ldap::new().await;
@@ -142,27 +140,28 @@ async fn test_e2e_user_id_sync_ordering() {
 			.unwrap_or_else(|_| panic!("Failed to get user {}", user.email))
 			.unwrap_or_else(|| panic!("User {} not found", user.email));
 
-		match zitadel_user.r#type {
-			Some(UserType::Human(human)) => {
-				// Verify ID encoding
-				let profile =
-					human.profile.unwrap_or_else(|| panic!("User {} lacks profile", user.email));
-				assert_eq!(
-					profile.nick_name,
-					expected_hex_id,
-					"Wrong ID encoding for user {}, got '{:?}', expected '{:?}'",
-					user.email,
-					String::from_utf8_lossy(&hex::decode(profile.nick_name.clone()).unwrap()),
-					String::from_utf8_lossy(&hex::decode(expected_hex_id.clone()).unwrap())
-				);
-
-				// Verify phone number to ensure complete sync
-				let phone =
-					human.phone.unwrap_or_else(|| panic!("User {} lacks phone", user.email));
-				assert_eq!(phone.phone, user.phone, "Wrong phone for user {}", user.email);
-			}
-			_ => panic!("User {} lacks human details", user.email),
-		}
+		let human = zitadel_user
+			.human()
+			.unwrap_or_else(|| panic!("User {} lacks human details", user.email));
+		// Verify ID encoding
+		let profile =
+			human.profile().unwrap_or_else(|| panic!("User {} lacks profile", user.email));
+		let nick_name = profile.nick_name().map_or("", String::as_str);
+		assert_eq!(
+			nick_name,
+			expected_hex_id,
+			"Wrong ID encoding for user {}, got '{:?}', expected '{:?}'",
+			user.email,
+			String::from_utf8_lossy(&hex::decode(nick_name).unwrap()),
+			String::from_utf8_lossy(&hex::decode(expected_hex_id.clone()).unwrap())
+		);
+
+		// Verify phone number to ensure complete sync
+		let phone = human
+			.phone()
+			.and_then(|phone| phone.phone())
+			.map_or_else(|| panic!("User {} lacks phone", user.email), String::as_str);
+		assert_eq!(phone, user.phone, "Wrong phone for user {}", user.email);
 	}
 
 	// Now update all users with new data
@@ -186,21 +185,18 @@ async fn test_e2e_user_id_sync_ordering() {
 			.unwrap_or_else(|_| panic!("Failed to get updated user {}", user.email))
 			.unwrap_or_else(|| panic!("Updated user {} not found", user.email));
 
-		match zitadel_user.r#type {
-			Some(UserType::Human(human)) => {
-				let profile = human
-					.profile
-					.unwrap_or_else(|| panic!("Updated user {} lacks profile", user.email));
-				let last_name = profile.last_name;
-				assert_eq!(
-					last_name,
-					format!("SN{}", user.uid),
-					"Wrong updated last_name for user {}",
-					user.email
-				);
-			}
-			_ => panic!("Updated user {} lacks human details", user.email),
-		}
+		let human = zitadel_user
+			.human()
+			.unwrap_or_else(|| panic!("Updated user {} lacks human details", user.email));
+		let profile =
+			human.profile().unwrap_or_else(|| panic!("Updated user {} lacks profile", user.email));
+		let last_name = profile.family_name().cloned().unwrap_or_default();
+		assert_eq!(
+			last_name,
+			format!("SN{}", user.uid),
+			"Wrong updated last_name for user {}",
+			user.email
+		);
 	}
 
 	// Delete users
@@ -233,17 +229,12 @@ async fn test_e2e_user_id_sync_ordering() {
 
 	// Verify all users were deleted in correct order
 	for user in TEST_USERS {
-		let result = zitadel.get_user_by_login_name(user.email).await;
-
-		assert!(
-			matches!(
-				result,
-				Err(ZitadelError::TonicResponseError(status))
-				if status.code() == TonicErrorCode::NotFound
-			),
-			"User {} still exists after deletion",
-			user.email
-		);
+		let result = zitadel
+			.get_user_by_login_name(user.email)
+			.await
+			.expect("failed to query Zitadel users");
+
+		assert!(result.is_none(), "User {} still exists after deletion", user.email);
 	}
 }
 
@@ -275,30 +266,25 @@ async fn test_e2e_simple_sync() {
 
 	let user = user.expect("could not find user");
 
-	assert_eq!(user.user_name, "simple@famedly.de");
-
-	if let Some(UserType::Human(user)) = user.r#type {
-		let profile = user.profile.expect("user lacks a profile");
-		let phone = user.phone.expect("user lacks a phone number)");
-		let email = user.email.expect("user lacks an email address");
-
-		assert_eq!(profile.first_name, "Bob");
-		assert_eq!(profile.last_name, "Tables");
-		assert_eq!(profile.display_name, "Tables, Bob");
-		assert_eq!(phone.phone, "+12015550123");
-		assert!(phone.is_phone_verified);
-		assert_eq!(email.email, "simple@famedly.de");
-		assert!(email.is_email_verified);
-	} else {
-		panic!("user lacks details");
-	}
+	assert_eq!(user.username().map(String::as_str), Some("simple@famedly.de"));
+
+	let human = user.human().expect("user lacks details");
+	let profile = human.profile().expect("user lacks a profile");
+	let phone = human.phone().expect("user lacks a phone number");
+	let email = human.email().expect("user lacks an email address");
+
+	assert_eq!(profile.given_name().map(String::as_str), Some("Bob"));
+	assert_eq!(profile.family_name().map(String::as_str), Some("Tables"));
+	assert_eq!(profile.display_name().map(String::as_str), Some("Tables, Bob"));
+	assert_eq!(phone.phone().map(String::as_str), Some("+12015550123"));
+	assert_eq!(phone.is_verified(), Some(&true));
+	assert_eq!(email.email().map(String::as_str), Some("simple@famedly.de"));
+	assert_eq!(email.is_verified(), Some(&true));
+
+	let user_id = user.user_id().expect("user lacks an ID").clone();
 
 	let preferred_username = zitadel
-		.get_user_metadata(
-			Some(config.zitadel.organization_id.clone()),
-			&user.id,
-			"preferred_username",
-		)
+		.get_metadata(&config.zitadel.organization_id, &user_id, "preferred_username")
 		.await
 		.expect("could not get user metadata");
 	assert_eq!(preferred_username, Some("Bobby".to_owned()));
@@ -306,18 +292,16 @@ async fn test_e2e_simple_sync() {
 	let uuid = Uuid::new_v5(&FAMEDLY_NAMESPACE, "simple".as_bytes());
 
 	let localpart = zitadel
-		.get_user_metadata(Some(config.zitadel.organization_id.clone()), &user.id, "localpart")
+		.get_metadata(&config.zitadel.organization_id, &user_id, "localpart")
 		.await
 		.expect("could not get user metadata");
 	assert_eq!(localpart, Some(uuid.to_string()));
 
-	let grants = zitadel
-		.list_user_grants(&config.zitadel.organization_id, &user.id)
+	let role_keys = zitadel
+		.user_role_keys(&config.zitadel.organization_id, &config.zitadel.project_id, &user_id)
 		.await
 		.expect("failed to get user grants");
-
-	let grant = grants.result.first().expect("no user grants found");
-	assert!(grant.role_keys.clone().into_iter().any(|key| key == FAMEDLY_USER_ROLE));
+	assert!(role_keys.iter().any(|key| key == FAMEDLY_USER_ROLE));
 }
 
 #[test(tokio::test)]
@@ -339,22 +323,12 @@ async fn test_e2e_sync_disabled_user() {
 	perform_sync(config.clone()).await.expect("syncing failed");
 
 	let zitadel = open_zitadel_connection().await;
-	let user = zitadel.get_user_by_login_name("disabled_user@famedly.de").await;
-
-	if let Err(error) = user {
-		match error {
-			ZitadelError::TonicResponseError(status)
-				if status.code() == TonicErrorCode::NotFound =>
-			{
-				return;
-			}
-			_ => {
-				panic!("zitadel failed while searching for user: {error}")
-			}
-		}
-	} else {
-		panic!("disabled user was synced: {user:?}");
-	}
+	let user = zitadel
+		.get_user_by_login_name("disabled_user@famedly.de")
+		.await
+		.expect("could not query Zitadel users");
+
+	assert!(user.is_none(), "disabled user was synced: {user:?}");
 }
 
 #[test(tokio::test)]
@@ -384,7 +358,8 @@ async fn test_e2e_sso() {
 		.expect("could not query Zitadel users")
 		.expect("could not find user");
 
-	let idps = zitadel.list_user_idps(user.id).await.expect("could not get user idps");
+	let user_id = user.user_id().expect("user lacks an ID");
+	let idps = zitadel.user_idp_links(user_id).await.expect("could not get user idps");
 
 	assert!(!idps.is_empty());
 }
@@ -418,13 +393,11 @@ async fn test_e2e_sync_change() {
 		.expect("could not query Zitadel users")
 		.expect("missing Zitadel user");
 
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			assert_eq!(user.phone.expect("phone missing").phone, "+12015550123");
-		}
-
-		_ => panic!("human user became a machine user?"),
-	}
+	let human = user.human().expect("human user became a machine user?");
+	assert_eq!(
+		human.phone().and_then(|phone| phone.phone()).map(String::as_str),
+		Some("+12015550123")
+	);
 }
 
 #[test(tokio::test)]
@@ -446,19 +419,19 @@ async fn test_e2e_sync_disable_and_reenable() {
 
 	perform_sync(config.clone()).await.expect("syncing failed");
 	let zitadel = open_zitadel_connection().await;
-	let user = zitadel.get_user_by_login_name("disable@famedly.de").await;
-	assert!(user.is_ok_and(|u| u.is_some()));
+	let user = zitadel.get_user_by_login_name("disable@famedly.de").await.expect("query failed");
+	assert!(user.is_some());
 
 	ldap.change_user("disable", vec![("shadowFlag", HashSet::from(["514"]))]).await;
 	perform_sync(config.clone()).await.expect("syncing failed");
-	let user = zitadel.get_user_by_login_name("disable@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound)));
+	let user = zitadel.get_user_by_login_name("disable@famedly.de").await.expect("query failed");
+	assert!(user.is_none());
 
 	ldap.change_user("disable", vec![("shadowFlag", HashSet::from(["512"]))]).await;
 	perform_sync(config.clone()).await.expect("syncing failed");
 	let zitadel = open_zitadel_connection().await;
-	let user = zitadel.get_user_by_login_name("disable@famedly.de").await;
-	assert!(user.is_ok_and(|u| u.is_some()));
+	let user = zitadel.get_user_by_login_name("disable@famedly.de").await.expect("query failed");
+	assert!(user.is_some());
 }
 
 #[test(tokio::test)]
@@ -485,9 +458,10 @@ async fn test_e2e_sync_email_change() {
 	perform_sync(config.clone()).await.expect("syncing failed");
 
 	let zitadel = open_zitadel_connection().await;
-	let user = zitadel.get_user_by_login_name("email_changed@famedly.de").await;
+	let user =
+		zitadel.get_user_by_login_name("email_changed@famedly.de").await.expect("query failed");
 
-	assert!(user.is_ok());
+	assert!(user.is_some());
 }
 
 #[test(tokio::test)]
@@ -544,12 +518,31 @@ async fn test_e2e_sync_safe_deletion() {
 	assert!(user.is_some());
 
 	// Disabled LDAP users should be deleted from Zitadel
-	let user = zitadel.get_user_by_login_name("to_be_disabled@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound)));
+	let user =
+		zitadel.get_user_by_login_name("to_be_disabled@famedly.de").await.expect("query failed");
+	assert!(user.is_none());
 
-	assert!(zitadel.get_user_by_login_name("another_user@example.test").await.is_ok());
-	assert!(zitadel.get_user_by_login_name("projectless_user@example.test").await.is_ok());
-	assert!(zitadel.get_user_by_login_name("another_org_user@example.test").await.is_ok());
+	assert!(
+		zitadel
+			.get_user_by_login_name("another_user@example.test")
+			.await
+			.expect("query failed")
+			.is_some()
+	);
+	assert!(
+		zitadel
+			.get_user_by_login_name("projectless_user@example.test")
+			.await
+			.expect("query failed")
+			.is_some()
+	);
+	assert!(
+		zitadel
+			.get_user_by_login_name("another_org_user@example.test")
+			.await
+			.expect("query failed")
+			.is_some()
+	);
 }
 
 #[test(tokio::test)]
@@ -561,28 +554,17 @@ async fn test_e2e_user_no_localpart_skipped() {
 	let zitadel = open_zitadel_connection().await;
 
 	// Create user in Zitadel
-	let user = ImportHumanUserRequest {
-		user_name: "maxmustermann".to_owned(),
-		profile: Some(Profile {
-			first_name: "Test".to_owned(),
-			last_name: "User".to_owned(),
-			display_name: "User, Test".to_owned(),
-			gender: Gender::Unspecified.into(),
-			nick_name: "deadbeef".to_owned(),
-			preferred_language: String::default(),
-		}),
-		email: Some(Email { email: "max@mustermann.de".to_owned(), is_email_verified: true }),
-		phone: Some(Phone { phone: "+12345678901".to_owned(), is_phone_verified: true }),
-		password: String::default(),
-		hashed_password: None,
-		password_change_required: false,
-		request_passwordless_registration: false,
-		otp_code: String::default(),
-		idps: vec![],
-	};
-
 	zitadel
-		.create_human_user(&config.zitadel.organization_id, user)
+		.create_test_human_user(
+			&config.zitadel.organization_id,
+			"maxmustermann",
+			"Test",
+			"User",
+			"User, Test",
+			"deadbeef",
+			"max@mustermann.de",
+			"+12345678901",
+		)
 		.await
 		.expect("Failed to create user");
 
@@ -752,14 +734,11 @@ async fn test_e2e_no_phone() {
 
 	let user = user.expect("could not find user");
 
-	if let Some(UserType::Human(user)) = user.r#type {
-		// Yes, I know, the codegen for the zitadel crate is
-		// pretty crazy. A missing phone number is represented as
-		// Some(Phone { phone: "", is_phone_Verified: _ })
-		assert_eq!(user.phone.expect("user lacks a phone number object").phone, "");
-	} else {
-		panic!("user lacks details");
-	};
+	let human = user.human().expect("user lacks details");
+	// A missing phone number may be represented either as an absent phone object
+	// or as an empty phone string, depending on the Zitadel response.
+	let phone = human.phone().and_then(|phone| phone.phone()).map_or("", String::as_str);
+	assert_eq!(phone, "");
 }
 
 #[test(tokio::test)]
@@ -799,27 +778,20 @@ async fn test_e2e_sync_invalid_phone() {
 		.expect("could not query Zitadel users");
 	assert!(user.is_some());
 	let user = user.expect("could not find user");
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			assert_eq!(
-				user.phone.expect("phone field should always be present").phone,
-				"+12015550123"
-			);
-		}
-		_ => panic!("user lacks details"),
-	}
+	let human = user.human().expect("user lacks details");
+	assert_eq!(
+		human.phone().and_then(|phone| phone.phone()).map(String::as_str),
+		Some("+12015550123")
+	);
 	let user = zitadel
 		.get_user_by_login_name("bad_phone_all_along@famedly.de")
 		.await
 		.expect("could not query Zitadel users");
 	assert!(user.is_some());
 	let user = user.expect("could not find user");
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			assert_eq!(user.phone.expect("phone field should always be present").phone, "");
-		}
-		_ => panic!("user lacks details"),
-	}
+	let human = user.human().expect("user lacks details");
+	let phone = human.phone().and_then(|phone| phone.phone()).map_or("", String::as_str);
+	assert_eq!(phone, "");
 
 	ldap.change_user("good_gone_bad_phone", vec![("telephoneNumber", HashSet::from(["abc"]))])
 		.await;
@@ -832,12 +804,9 @@ async fn test_e2e_sync_invalid_phone() {
 		.expect("could not query Zitadel users");
 	assert!(user.is_some());
 	let user = user.expect("could not find user");
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			assert_eq!(user.phone.expect("phone field should always be present").phone, "");
-		}
-		_ => panic!("user lacks details"),
-	}
+	let human = user.human().expect("user lacks details");
+	let phone = human.phone().and_then(|phone| phone.phone()).map_or("", String::as_str);
+	assert_eq!(phone, "");
 }
 
 #[test(tokio::test)]
@@ -890,14 +859,10 @@ async fn test_e2e_binary_uid() {
 		.expect("could not query Zitadel users")
 		.expect("user not found");
 
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			let profile = user.profile.expect("user lacks profile");
-			// The ID should be hex encoded in Zitadel
-			assert_eq!(profile.nick_name, hex::encode(binary_uid));
-		}
-		_ => panic!("user lacks human details"),
-	}
+	let human = user.human().expect("user lacks human details");
+	let profile = human.profile().expect("user lacks profile");
+	// The ID should be hex encoded in Zitadel
+	assert_eq!(profile.nick_name().map(String::as_str), Some(hex::encode(binary_uid).as_str()));
 
 	// Test update to a different binary ID that is valid UTF-8
 
@@ -916,15 +881,11 @@ async fn test_e2e_binary_uid() {
 		.expect("could not query Zitadel users")
 		.expect("user not found after update");
 
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			let profile = user.profile.expect("user lacks profile");
-			tracing::info!("profile: {:#?}", profile);
-			// Verify ID was updated
-			assert_eq!(profile.nick_name, hex::encode(new_binary_id));
-		}
-		_ => panic!("user lost human details after update"),
-	}
+	let human = user.human().expect("user lost human details after update");
+	let profile = human.profile().expect("user lacks profile");
+	tracing::info!("profile: {profile:#?}");
+	// Verify ID was updated
+	assert_eq!(profile.nick_name().map(String::as_str), Some(hex::encode(new_binary_id).as_str()));
 
 	// Test update to binary ID that is NOT valid UTF-8
 
@@ -943,14 +904,13 @@ async fn test_e2e_binary_uid() {
 		.expect("could not query Zitadel users")
 		.expect("user not found after update");
 
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			let profile = user.profile.expect("user lacks profile");
-			// Verify ID was updated
-			assert_eq!(profile.nick_name, hex::encode(invalid_binary_id));
-		}
-		_ => panic!("user lost human details after update"),
-	}
+	let human = user.human().expect("user lost human details after update");
+	let profile = human.profile().expect("user lacks profile");
+	// Verify ID was updated
+	assert_eq!(
+		profile.nick_name().map(String::as_str),
+		Some(hex::encode(invalid_binary_id).as_str())
+	);
 }
 
 #[test(tokio::test)]
@@ -976,9 +936,9 @@ async fn test_e2e_dry_run() {
 
 	// Assert the user does not sync, because this is a dry run
 	perform_sync(dry_run_config.clone()).await.expect("syncing failed");
-	assert!(zitadel.get_user_by_login_name("dry_run@famedly.de").await.is_err_and(
-		|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound),
-	));
+	assert!(
+		zitadel.get_user_by_login_name("dry_run@famedly.de").await.expect("query failed").is_none()
+	);
 
 	// Actually sync the user so we can test other changes=
 	perform_sync(config.clone()).await.expect("syncing failed");
@@ -992,22 +952,24 @@ async fn test_e2e_dry_run() {
 		.expect("could not query Zitadel users")
 		.expect("could not find user");
 
-	assert!(
-		matches!(user.r#type, Some(UserType::Human(user)) if user.phone.as_ref().expect("phone missing").phone == "+12015550123")
+	let human = user.human().expect("human user became a machine user?");
+	assert_eq!(
+		human.phone().and_then(|phone| phone.phone()).map(String::as_str),
+		Some("+12015550123")
 	);
 
 	// Assert that disabling a user does not sync
 	ldap.change_user("dry_run", vec![("shadowFlag", HashSet::from(["514"]))]).await;
 	perform_sync(dry_run_config.clone()).await.expect("syncing failed");
 	assert!(
-		zitadel.get_user_by_login_name("dry_run@famedly.de").await.is_ok_and(|user| user.is_some())
+		zitadel.get_user_by_login_name("dry_run@famedly.de").await.expect("query failed").is_some()
 	);
 
 	// Assert that a user deletion does not sync
 	ldap.delete_user("dry_run").await;
 	perform_sync(dry_run_config.clone()).await.expect("syncing failed");
 	assert!(
-		zitadel.get_user_by_login_name("dry_run@famedly.de").await.is_ok_and(|user| user.is_some())
+		zitadel.get_user_by_login_name("dry_run@famedly.de").await.expect("query failed").is_some()
 	);
 }
 
@@ -1072,7 +1034,7 @@ async fn test_e2e_sync_deactivated_only() {
 	let user = zitadel.get_user_by_login_name("deleted_disable_only@famedly.de").await;
 	assert!(user.is_ok_and(|u| u.is_some()));
 	let user = zitadel.get_user_by_login_name("reenabled_disable_only@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound)));
+	assert!(matches!(user, Ok(None)));
 
 	config.feature_flags.push(FeatureFlag::DeactivateOnly);
 
@@ -1098,13 +1060,13 @@ async fn test_e2e_sync_deactivated_only() {
 	perform_sync(config.clone()).await.expect("syncing failed");
 
 	let user = zitadel.get_user_by_login_name("disable_disable_only@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound)));
+	assert!(matches!(user, Ok(None)));
 	let user = zitadel.get_user_by_login_name("created_disable_only@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound)));
+	assert!(matches!(user, Ok(None)));
 	let user = zitadel.get_user_by_login_name("deleted_disable_only@famedly.de").await;
 	assert!(user.is_ok_and(|u| u.is_some()));
 	let user = zitadel.get_user_by_login_name("reenabled_disable_only@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound)));
+	assert!(matches!(user, Ok(None)));
 
 	let user = zitadel
 		.get_user_by_login_name("changed_disable_only@famedly.de")
@@ -1112,13 +1074,11 @@ async fn test_e2e_sync_deactivated_only() {
 		.expect("could not query Zitadel users")
 		.expect("missing Zitadel user");
 
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			assert_eq!(user.phone.expect("phone missing").phone, "+12015550124");
-		}
-
-		_ => panic!("human user became a machine user?"),
-	}
+	let human = user.human().expect("human user became a machine user?");
+	assert_eq!(
+		human.phone().and_then(|phone| phone.phone()).map(String::as_str),
+		Some("+12015550124")
+	);
 }
 
 #[test(tokio::test)]
@@ -1143,48 +1103,37 @@ async fn test_e2e_ukt_sync() {
 		})
 		.expect("UKT configuration is missing");
 
-	let user = ImportHumanUserRequest {
-		user_name: "delete_me@famedly.de".to_owned(),
-		profile: Some(Profile {
-			first_name: "First".to_owned(),
-			last_name: "Last".to_owned(),
-			display_name: "First Last".to_owned(),
-			gender: Gender::Unspecified.into(),
-			nick_name: "nickname".to_owned(),
-			preferred_language: String::default(),
-		}),
-		email: Some(Email { email: "delete_me@famedly.de".to_owned(), is_email_verified: true }),
-		phone: Some(Phone { phone: "+12015551111".to_owned(), is_phone_verified: true }),
-		password: String::default(),
-		hashed_password: None,
-		password_change_required: false,
-		request_passwordless_registration: false,
-		otp_code: String::default(),
-		idps: vec![],
-	};
-
 	let zitadel = open_zitadel_connection().await;
-	let user = zitadel
-		.create_human_user(&config.zitadel.organization_id, user)
+	let user_id = zitadel
+		.create_test_human_user(
+			&config.zitadel.organization_id,
+			"delete_me@famedly.de",
+			"First",
+			"Last",
+			"First Last",
+			"nickname",
+			"delete_me@famedly.de",
+			"+12015551111",
+		)
 		.await
 		.expect("failed to create user");
 
 	zitadel
 		.set_user_metadata(
-			Some(&config.zitadel.organization_id),
-			user.clone(),
-			"localpart".to_owned(),
+			&user_id,
+			"localpart",
 			"irrelevant",
+			Some(config.zitadel.organization_id.clone()),
 		)
 		.await
 		.expect("Failed to set user localpart");
 
 	zitadel
 		.set_user_metadata(
-			Some(&config.zitadel.organization_id),
-			user.clone(),
-			"preferred_username".to_owned(),
+			&user_id,
+			"preferred_username",
 			"irrelevant",
+			Some(config.zitadel.organization_id.clone()),
 		)
 		.await
 		.expect("Failed to set user preferred name");
@@ -1195,12 +1144,12 @@ async fn test_e2e_ukt_sync() {
 		.expect("could not query Zitadel users");
 	assert!(user.is_some());
 	let user = user.expect("could not find user");
-	assert_eq!(user.user_name, "delete_me@famedly.de");
+	assert_eq!(user.username().map(String::as_str), Some("delete_me@famedly.de"));
 
 	perform_sync(config.clone()).await.expect("syncing failed");
 
 	let user = zitadel.get_user_by_login_name("delete_me@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound)));
+	assert!(matches!(user, Ok(None)));
 }
 
 #[test(tokio::test)]
@@ -1217,48 +1166,41 @@ async fn test_e2e_csv_sync() {
 		.await
 		.expect("could not query Zitadel users");
 	let user = user.expect("could not find user");
-	assert_eq!(user.user_name, "john.doe@example.com");
-
-	if let Some(UserType::Human(user)) = user.r#type {
-		let profile = user.profile.expect("user lacks a profile");
-		let phone = user.phone.expect("user lacks a phone number");
-		let email = user.email.expect("user lacks an email address");
-
-		assert_eq!(profile.first_name, "John");
-		assert_eq!(profile.last_name, "Doe");
-		assert_eq!(profile.display_name, "Doe, John");
-		assert_eq!(phone.phone, "+1111111111");
-		assert!(phone.is_phone_verified);
-		assert_eq!(email.email, "john.doe@example.com");
-		assert!(email.is_email_verified);
-	} else {
-		panic!("user lacks details");
-	}
+	assert_eq!(user.username().map(String::as_str), Some("john.doe@example.com"));
+
+	let human = user.human().expect("user lacks details");
+	let profile = human.profile().expect("user lacks a profile");
+	let phone = human.phone().expect("user lacks a phone number");
+	let email = human.email().expect("user lacks an email address");
+
+	assert_eq!(profile.given_name().map(String::as_str), Some("John"));
+	assert_eq!(profile.family_name().map(String::as_str), Some("Doe"));
+	assert_eq!(profile.display_name().map(String::as_str), Some("Doe, John"));
+	assert_eq!(phone.phone().map(String::as_str), Some("+1111111111"));
+	assert_eq!(phone.is_verified(), Some(&true));
+	assert_eq!(email.email().map(String::as_str), Some("john.doe@example.com"));
+	assert_eq!(email.is_verified(), Some(&true));
+
+	let user_id = user.user_id().expect("user lacks an ID").clone();
 
 	let preferred_username = zitadel
-		.get_user_metadata(
-			Some(config.zitadel.organization_id.clone()),
-			&user.id,
-			"preferred_username",
-		)
+		.get_metadata(&config.zitadel.organization_id, &user_id, "preferred_username")
 		.await
 		.expect("could not get user metadata");
 	assert_eq!(preferred_username, Some("john.doe@example.com".to_owned()));
 
 	let localpart = zitadel
-		.get_user_metadata(Some(config.zitadel.organization_id.clone()), &user.id, "localpart")
+		.get_metadata(&config.zitadel.organization_id, &user_id, "localpart")
 		.await
 		.expect("could not get user metadata")
 		.expect("missing localpart");
 	assert_eq!(localpart, "john.doe", "Unexpected Zitadel userId for user without localpart");
 
-	let grants = zitadel
-		.list_user_grants(&config.zitadel.organization_id, &user.id)
+	let role_keys = zitadel
+		.user_role_keys(&config.zitadel.organization_id, &config.zitadel.project_id, &user_id)
 		.await
 		.expect("failed to get user grants");
-
-	let grant = grants.result.first().expect("no user grants found");
-	assert!(grant.role_keys.clone().into_iter().any(|key| key == FAMEDLY_USER_ROLE));
+	assert!(role_keys.iter().any(|key| key == FAMEDLY_USER_ROLE));
 
 	// Test user without localpart (should use UUID)
 	let user = zitadel
@@ -1267,11 +1209,15 @@ async fn test_e2e_csv_sync() {
 		.expect("could not query Zitadel users");
 
 	let user = user.expect("could not find user");
-	assert_eq!(user.user_name, "jane.smith@example.com");
+	assert_eq!(user.username().map(String::as_str), Some("jane.smith@example.com"));
 
 	let uuid = Uuid::new_v5(&FAMEDLY_NAMESPACE, "jane.smith@example.com".as_bytes());
 	let localpart = zitadel
-		.get_user_metadata(Some(config.zitadel.organization_id.clone()), &user.id, "localpart")
+		.get_metadata(
+			&config.zitadel.organization_id,
+			user.user_id().expect("user lacks an ID"),
+			"localpart",
+		)
 		.await
 		.expect("could not get user metadata");
 	assert_eq!(localpart, Some(uuid.to_string()), "Localpart metadata should match userId");
@@ -1288,7 +1234,9 @@ async fn test_e2e_csv_sync() {
 		.await
 		.expect("could not query Zitadel users")
 		.expect("Must be able to get the user pre-sync")
-		.id;
+		.user_id()
+		.expect("user lacks an ID")
+		.clone();
 
 	perform_sync(config.clone()).await.expect("syncing failed");
 
@@ -1298,30 +1246,53 @@ async fn test_e2e_csv_sync() {
 		.expect("could not query Zitadel users");
 
 	let user = user.expect("could not find user");
-	assert_eq!(user.user_name, "john.doe@example.com");
-	assert_eq!(user.id, user_id, "Zitadel userId should not change");
-
-	if let Some(UserType::Human(user)) = user.r#type {
-		let profile = user.profile.expect("user lacks a profile");
-		let phone = user.phone.expect("user lacks a phone number");
-		let email = user.email.expect("user lacks an email address");
-
-		assert_eq!(profile.first_name, "Changed_Name");
-		assert_eq!(profile.last_name, "Changed_Surname");
-		assert_eq!(profile.display_name, "Changed_Surname, Changed_Name");
-		assert_eq!(phone.phone, "+2222222222");
-		assert!(phone.is_phone_verified);
-		assert_eq!(email.email, "john.doe@example.com");
-		assert!(email.is_email_verified);
-	} else {
-		panic!("user lacks details");
-	}
+	assert_eq!(user.username().map(String::as_str), Some("john.doe@example.com"));
+	assert_eq!(user.user_id(), Some(&user_id), "Zitadel userId should not change");
+
+	let human = user.human().expect("user lacks details");
+	let profile = human.profile().expect("user lacks a profile");
+	let phone = human.phone().expect("user lacks a phone number");
+	let email = human.email().expect("user lacks an email address");
+
+	assert_eq!(profile.given_name().map(String::as_str), Some("Changed_Name"));
+	assert_eq!(profile.family_name().map(String::as_str), Some("Changed_Surname"));
+	assert_eq!(profile.display_name().map(String::as_str), Some("Changed_Surname, Changed_Name"));
+	assert_eq!(phone.phone().map(String::as_str), Some("+2222222222"));
+	assert_eq!(phone.is_verified(), Some(&true));
+	assert_eq!(email.email().map(String::as_str), Some("john.doe@example.com"));
+	assert_eq!(email.is_verified(), Some(&true));
 
 	let localpart = zitadel
-		.get_user_metadata(Some(config.zitadel.organization_id.clone()), &user.id, "localpart")
+		.get_metadata(
+			&config.zitadel.organization_id,
+			user.user_id().expect("user lacks an ID"),
+			"localpart",
+		)
 		.await
 		.expect("could not get user metadata");
-	assert_eq!(localpart, Some("john.doe".to_owned()),);
+	assert_eq!(localpart, Some("john.doe".to_owned()));
+}
+
+/// Seed the LDAP fixtures used by [`test_e2e_ldap_with_ukt_sync`].
+async fn seed_ldap_with_ukt_users(ldap: &mut Ldap) {
+	for (last_name, uid) in [
+		("To Be There", "to_be_there"),
+		("Not To Be There", "not_to_be_there"),
+		("Persist Deletion", "persist_deletion"),
+		("Not To Be There Later", "not_to_be_there_later"),
+		("To Be Changed", "to_be_changed"),
+	] {
+		ldap.create_user(
+			"John",
+			last_name,
+			"Johnny",
+			&format!("{uid}@famedly.de"),
+			Some("+12015551111"),
+			uid,
+			false,
+		)
+		.await;
+	}
 }
 
 #[test(tokio::test)]
@@ -1334,60 +1305,7 @@ async fn test_e2e_ldap_with_ukt_sync() {
 	// LDAP SYNC
 
 	let mut ldap = Ldap::new().await;
-	ldap.create_user(
-		"John",
-		"To Be There",
-		"Johnny",
-		"to_be_there@famedly.de",
-		Some("+12015551111"),
-		"to_be_there",
-		false,
-	)
-	.await;
-
-	ldap.create_user(
-		"John",
-		"Not To Be There",
-		"Johnny",
-		"not_to_be_there@famedly.de",
-		Some("+12015551111"),
-		"not_to_be_there",
-		false,
-	)
-	.await;
-
-	ldap.create_user(
-		"John",
-		"Persist Deletion",
-		"Johnny",
-		"persist_deletion@famedly.de",
-		Some("+12015551111"),
-		"persist_deletion",
-		false,
-	)
-	.await;
-
-	ldap.create_user(
-		"John",
-		"Not To Be There Later",
-		"Johnny",
-		"not_to_be_there_later@famedly.de",
-		Some("+12015551111"),
-		"not_to_be_there_later",
-		false, // Start enabled, later will be disabled
-	)
-	.await;
-
-	ldap.create_user(
-		"John",
-		"To Be Changed",
-		"Johnny",
-		"to_be_changed@famedly.de",
-		Some("+12015551111"),
-		"to_be_changed",
-		false,
-	)
-	.await;
+	seed_ldap_with_ukt_users(&mut ldap).await;
 
 	let ldap_config = ldap_config().await;
 	perform_sync(ldap_config.clone()).await.expect("syncing failed");
@@ -1415,9 +1333,7 @@ async fn test_e2e_ldap_with_ukt_sync() {
 
 	// Should be deleted based on email
 	let user = zitadel.get_user_by_login_name("not_to_be_there@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error,
-	ZitadelError::TonicResponseError(status) if status.code() ==
-	TonicErrorCode::NotFound)));
+	assert!(matches!(user, Ok(None)));
 
 	let user = zitadel
 		.get_user_by_login_name("to_be_there@famedly.de")
@@ -1437,12 +1353,11 @@ async fn test_e2e_ldap_with_ukt_sync() {
 		.expect("could not query Zitadel users");
 	assert!(user.is_some());
 	let user = user.expect("could not find user");
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			assert_eq!(user.phone.expect("phone missing").phone, "+12015551111");
-		}
-		_ => panic!("human user became a machine user?"),
-	}
+	let human = user.human().expect("human user became a machine user?");
+	assert_eq!(
+		human.phone().and_then(|phone| phone.phone()).map(String::as_str),
+		Some("+12015551111")
+	);
 
 	// UPDATES IN LDAP
 
@@ -1461,12 +1376,11 @@ async fn test_e2e_ldap_with_ukt_sync() {
 		.expect("could not query Zitadel users");
 	assert!(user.is_some());
 	let user = user.expect("could not find user");
-	match user.r#type {
-		Some(UserType::Human(user)) => {
-			assert_eq!(user.phone.expect("phone missing").phone, "+12015550123");
-		}
-		_ => panic!("human user became a machine user?"),
-	}
+	let human = user.human().expect("human user became a machine user?");
+	assert_eq!(
+		human.phone().and_then(|phone| phone.phone()).map(String::as_str),
+		Some("+12015550123")
+	);
 
 	// Should not be deleted because it's just missing from LDAP but wasn't disabled
 	let user = zitadel
@@ -1477,7 +1391,7 @@ async fn test_e2e_ldap_with_ukt_sync() {
 
 	// Should be deleted because it's disabled
 	let user = zitadel.get_user_by_login_name("not_to_be_there_later@famedly.de").await;
-	assert!(user.is_err_and(|error| matches!(error, ZitadelError::TonicResponseError(status) if status.code() == TonicErrorCode::NotFound)));
+	assert!(matches!(user, Ok(None)));
 }
 
 #[test(tokio::test)]
@@ -1509,21 +1423,26 @@ async fn test_e2e_sso_linking() {
 		.expect("could not query Zitadel users")
 		.expect("could not find user");
 
-	let idps = zitadel.list_user_idps(user.id.clone()).await.expect("could not get user IDPs");
+	let user_id = user.user_id().expect("user lacks an ID");
+	let idps = zitadel.user_idp_links(user_id).await.expect("could not get user IDPs");
 
 	assert!(!idps.is_empty(), "User should have IDP links");
 
 	let idp = idps.first().expect("No IDP link found");
 	assert_eq!(
-		idp.idp_id,
-		*config.zitadel.idp_id.as_ref().unwrap(),
+		idp.idp_id().map(String::as_str),
+		Some(config.zitadel.idp_id.as_ref().unwrap().as_str()),
 		"IDP link should match configured IDP"
 	);
-	assert_eq!(idp.provided_user_id, test_uid, "IDP provided_user_id should match plain LDAP uid");
-	assert_eq!(idp.user_id, user.id, "IDP user_id should match Zitadel user id");
 	assert_eq!(
-		idp.provided_user_name, test_email,
-		"IDP provided_user_name should match test_email"
+		idp.user_id().map(String::as_str),
+		Some(test_uid),
+		"IDP provided user id should match plain LDAP uid"
+	);
+	assert_eq!(
+		idp.user_name().map(String::as_str),
+		Some(test_email),
+		"IDP provided user name should match test_email"
 	);
 }
 
@@ -1618,51 +1537,37 @@ async fn test_e2e_migrate_ambiguous_id_as_base64() {
 	// logic should heuristically find out, that the DB has external IDs encoded
 	// with base64 and thus treat the ambiguous ID as base64 even though it can be
 	// both base64 and hex
-	let base_64_user = ImportHumanUserRequest {
-		user_name: "another_test".to_owned(),
-		profile: Some(Profile {
-			first_name: "Test".to_owned(),
-			last_name: "User".to_owned(),
-			display_name: "User, Test".to_owned(),
-			gender: Gender::Unspecified.into(),
-			nick_name: "Z9FmZQ==".to_owned(), // base64 encoded
-			preferred_language: String::default(),
-		}),
-		email: Some(Email {
-			email: "another_test@example.com".to_owned(),
-			is_email_verified: true,
-		}),
-		phone: Some(Phone { phone: "+12345678901".to_owned(), is_phone_verified: true }),
-		password: String::default(),
-		hashed_password: None,
-		password_change_required: false,
-		request_passwordless_registration: false,
-		otp_code: String::default(),
-		idps: vec![],
-	};
-
 	let zitadel = open_zitadel_connection().await;
 	let temp_user = zitadel
-		.create_human_user(&config.zitadel.organization_id, base_64_user)
+		.create_test_human_user(
+			&config.zitadel.organization_id,
+			"another_test",
+			"Test",
+			"User",
+			"User, Test",
+			"Z9FmZQ==", // base64 encoded
+			"another_test@example.com",
+			"+12345678901",
+		)
 		.await
 		.expect("Failed to create user");
 
 	zitadel
 		.set_user_metadata(
-			Some(&config.zitadel.organization_id),
-			temp_user.clone(),
-			"localpart".to_owned(),
+			&temp_user,
+			"localpart",
 			"irrelevant",
+			Some(config.zitadel.organization_id.clone()),
 		)
 		.await
 		.expect("Failed to set user localpart");
 
 	zitadel
 		.set_user_metadata(
-			Some(&config.zitadel.organization_id),
-			temp_user.clone(),
-			"preferred_username".to_owned(),
+			&temp_user,
+			"preferred_username",
 			"irrelevant",
+			Some(config.zitadel.organization_id.clone()),
 		)
 		.await
 		.expect("Failed to set user preferred name");
@@ -1678,7 +1583,7 @@ async fn test_e2e_migrate_ambiguous_id_as_base64() {
 
 	run_migration_test(config, email, user_name, ambiguous_id, expected_id).await;
 
-	zitadel.remove_user(temp_user).await.expect("Failed to delete user");
+	zitadel.delete_user(&temp_user).await.expect("Failed to delete user");
 }
 
 #[test(tokio::test)]
@@ -1721,21 +1626,21 @@ async fn test_e2e_migrate_then_ldap_sync() {
 		.expect("Failed to get user after LDAP sync")
 		.expect("User not found after LDAP sync");
 
-	match user.r#type {
-		Some(UserType::Human(human)) => {
-			let profile = human.profile.expect("User lacks profile after LDAP sync");
-			let expected_hex_id = hex::encode(uid.as_bytes());
-			assert_eq!(
-				profile.nick_name, expected_hex_id,
-				"External ID not in hex encoding after LDAP sync for user '{email}'"
-			);
-			assert_eq!(
-				profile.first_name, "New First Name",
-				"Fist name was not updated by LDAP sync for user '{email}'"
-			);
-		}
-		_ => panic!("User lacks human details after LDAP sync for user '{email}'"),
-	}
+	let human = user
+		.human()
+		.unwrap_or_else(|| panic!("User lacks human details after LDAP sync for user '{email}'"));
+	let profile = human.profile().expect("User lacks profile after LDAP sync");
+	let expected_hex_id = hex::encode(uid.as_bytes());
+	assert_eq!(
+		profile.nick_name().map(String::as_str),
+		Some(expected_hex_id.as_str()),
+		"External ID not in hex encoding after LDAP sync for user '{email}'"
+	);
+	assert_eq!(
+		profile.given_name().map(String::as_str),
+		Some("New First Name"),
+		"Fist name was not updated by LDAP sync for user '{email}'"
+	);
 }
 
 #[test(tokio::test)]
@@ -1777,18 +1682,14 @@ async fn test_e2e_sync_user_already_exists() {
 		.expect("Failed to get user after initial sync")
 		.expect("User not found after initial sync");
 
-	let initial_zitadel_id = user.id.clone();
-	match user.r#type {
-		Some(UserType::Human(human)) => {
-			let profile = human.profile.expect("User lacks profile");
-			assert_eq!(
-				profile.nick_name,
-				hex::encode(initial_external_id.as_bytes()),
-				"Initial external ID not encoded correctly"
-			);
-		}
-		_ => panic!("User is not human type"),
-	}
+	let initial_zitadel_id = user.user_id().expect("user lacks an ID").clone();
+	let human = user.human().expect("User is not human type");
+	let profile = human.profile().expect("User lacks profile");
+	assert_eq!(
+		profile.nick_name().map(String::as_str),
+		Some(hex::encode(initial_external_id.as_bytes()).as_str()),
+		"Initial external ID not encoded correctly"
+	);
 
 	// Now change the external ID in LDAP by deleting and re-creating a new user
 	// with the same email
@@ -1818,28 +1719,36 @@ async fn test_e2e_sync_user_already_exists() {
 
 	// Should be the same user (same Zitadel ID)
 	assert_eq!(
-		recreated_user.id, initial_zitadel_id,
+		recreated_user.user_id(),
+		Some(&initial_zitadel_id),
 		"User ID changed - should be same user updated"
 	);
 
-	match recreated_user.r#type {
-		Some(UserType::Human(human)) => {
-			let profile = human.profile.expect("Updated user lacks profile");
-			assert_eq!(
-				profile.nick_name,
-				hex::encode(recreated_external_id.as_bytes()),
-				"External ID was not updated correctly"
-			);
+	let human = recreated_user.human().expect("Updated user is not human type");
+	let profile = human.profile().expect("Updated user lacks profile");
+	assert_eq!(
+		profile.nick_name().map(String::as_str),
+		Some(hex::encode(recreated_external_id.as_bytes()).as_str()),
+		"External ID was not updated correctly"
+	);
 
-			// Verify other fields are still correct
-			assert_eq!(profile.first_name, "Test", "First name should be preserved");
-			assert_eq!(profile.last_name, "User", "Last name should be preserved");
+	// Verify other fields are still correct
+	assert_eq!(
+		profile.given_name().map(String::as_str),
+		Some("Test"),
+		"First name should be preserved"
+	);
+	assert_eq!(
+		profile.family_name().map(String::as_str),
+		Some("User"),
+		"Last name should be preserved"
+	);
 
-			let phone_obj = human.phone.expect("Updated user lacks phone");
-			assert_eq!(phone_obj.phone, phone, "Phone should be preserved");
-		}
-		_ => panic!("Updated user is not human type"),
-	}
+	assert_eq!(
+		human.phone().and_then(|phone| phone.phone()).map(String::as_str),
+		Some(phone),
+		"Phone should be preserved"
+	);
 }
 
 #[test(tokio::test)]
@@ -1857,38 +1766,27 @@ async fn test_e2e_sync_user_already_exists_error_case() {
 	let phone = "+12015550222";
 
 	// Create user directly in Zitadel without localpart metadata
-	let user = ImportHumanUserRequest {
-		user_name: email.to_owned(),
-		profile: Some(Profile {
-			first_name: "Direct".to_owned(),
-			last_name: "User".to_owned(),
-			display_name: "User, Direct".to_owned(),
-			gender: Gender::Unspecified.into(),
-			nick_name: hex::encode("different_external_id".as_bytes()),
-			preferred_language: String::default(),
-		}),
-		email: Some(Email { email: email.to_owned(), is_email_verified: true }),
-		phone: Some(Phone { phone: phone.to_owned(), is_phone_verified: true }),
-		password: String::default(),
-		hashed_password: None,
-		password_change_required: false,
-		request_passwordless_registration: false,
-		otp_code: String::default(),
-		idps: vec![],
-	};
-
 	let user_id = zitadel
-		.create_human_user(&config.zitadel.organization_id, user)
+		.create_test_human_user(
+			&config.zitadel.organization_id,
+			email,
+			"Direct",
+			"User",
+			"User, Direct",
+			&hex::encode("different_external_id".as_bytes()),
+			email,
+			phone,
+		)
 		.await
 		.expect("Failed to create user directly in Zitadel");
 
 	zitadel
 		.add_user_grant(
 			Some(config.zitadel.organization_id.clone()),
-			user_id,
+			&user_id,
 			config.zitadel.project_id.clone(),
 			None,
-			vec![FAMEDLY_USER_ROLE.to_owned()],
+			Some(vec![FAMEDLY_USER_ROLE.to_owned()]),
 		)
 		.await
 		.expect("Failed to create user grant");
@@ -1918,7 +1816,7 @@ async fn test_e2e_sync_user_already_exists_error_case() {
 /// Open a connection to the configured Zitadel backend
 async fn open_zitadel_connection() -> Zitadel {
 	let zitadel_config = ldap_config().await.zitadel.clone();
-	Zitadel::new(zitadel_config.url, zitadel_config.key_file)
+	Zitadel::new(zitadel_config.url, zitadel_config.key_file, None)
 		.await
 		.expect("failed to set up Zitadel client")
 }
@@ -1935,47 +1833,36 @@ async fn run_migration_test(
 	let zitadel = open_zitadel_connection().await;
 
 	// Create user in Zitadel
-	let user = ImportHumanUserRequest {
-		user_name: user_name.to_owned(),
-		profile: Some(Profile {
-			first_name: "Test".to_owned(),
-			last_name: "User".to_owned(),
-			display_name: "User, Test".to_owned(),
-			gender: Gender::Unspecified.into(),
-			nick_name: initial_nick_name.clone(),
-			preferred_language: String::default(),
-		}),
-		email: Some(Email { email: email.to_owned(), is_email_verified: true }),
-		phone: Some(Phone { phone: "+12345678901".to_owned(), is_phone_verified: true }),
-		password: String::default(),
-		hashed_password: None,
-		password_change_required: false,
-		request_passwordless_registration: false,
-		otp_code: String::default(),
-		idps: vec![],
-	};
-
 	let user_id = zitadel
-		.create_human_user(&config.zitadel.organization_id, user)
+		.create_test_human_user(
+			&config.zitadel.organization_id,
+			user_name,
+			"Test",
+			"User",
+			"User, Test",
+			&initial_nick_name,
+			email,
+			"+12345678901",
+		)
 		.await
 		.expect("Failed to create user");
 
 	zitadel
 		.set_user_metadata(
-			Some(&config.zitadel.organization_id),
-			user_id.clone(),
-			"localpart".to_owned(),
+			&user_id,
+			"localpart",
 			"irrelevant",
+			Some(config.zitadel.organization_id.clone()),
 		)
 		.await
 		.expect("Failed to set user localpart");
 
 	zitadel
 		.set_user_metadata(
-			Some(&config.zitadel.organization_id),
-			user_id.clone(),
-			"preferred_username".to_owned(),
+			&user_id,
+			"preferred_username",
 			"irrelevant",
+			Some(config.zitadel.organization_id.clone()),
 		)
 		.await
 		.expect("Failed to set user preferred name");
@@ -1983,10 +1870,10 @@ async fn run_migration_test(
 	zitadel
 		.add_user_grant(
 			Some(config.zitadel.organization_id.clone()),
-			user_id,
+			&user_id,
 			config.zitadel.project_id.clone(),
 			None,
-			vec![FAMEDLY_USER_ROLE.to_owned()],
+			Some(vec![FAMEDLY_USER_ROLE.to_owned()]),
 		)
 		.await
 		.expect("Failed to create user grant");
@@ -2001,20 +1888,14 @@ async fn run_migration_test(
 		.expect("Failed to get user")
 		.expect("User not found");
 
-	match user.r#type {
-		Some(user_type) => {
-			if let UserType::Human(human) = user_type {
-				let profile = human.profile.expect("User lacks profile");
-				assert_eq!(
-					profile.nick_name, expected_nick_name,
-					"Nickname encoding mismatch for user '{email}'"
-				);
-			} else {
-				panic!("User is not of type Human for user '{email}'");
-			}
-		}
-		None => panic!("User type is None for user '{email}'"),
-	}
+	let human =
+		user.human().unwrap_or_else(|| panic!("User is not of type Human for user '{email}'"));
+	let profile = human.profile().expect("User lacks profile");
+	assert_eq!(
+		profile.nick_name().map(String::as_str),
+		Some(expected_nick_name.as_str()),
+		"Nickname encoding mismatch for user '{email}'"
+	);
 }
 
 /// Helper function to run the migration binary.
diff --git a/tests/install-ids.rs b/tests/install-ids.rs
index 871b4e1..58c6ca2 100644
--- a/tests/install-ids.rs
+++ b/tests/install-ids.rs
@@ -1,5 +1,7 @@
 //! E2E tests for the id installation script
 
+#![cfg(test)]
+
 use test_log::test;
 
 mod common;
@@ -11,6 +13,62 @@ use zitadel_rust_client::v2::{
 	users::{AddHumanUserRequest, Organization, SetHumanEmail, SetHumanProfile},
 };
 
+/// Create a verified Zitadel human user (optionally with a nickname / external
+/// ID) and grant them the `User` role, returning the new Zitadel user ID.
+async fn seed_zitadel_user(
+	zitadel: &Zitadel,
+	org_id: &str,
+	project_id: &str,
+	email: &str,
+	nick_name: Option<&str>,
+) -> String {
+	let mut profile = SetHumanProfile::new("Max".to_owned(), "Mustermann".to_owned())
+		.with_display_name("Mustermann, Max".to_owned());
+	if let Some(nick) = nick_name {
+		profile = profile.with_nick_name(nick.to_owned());
+	}
+
+	let user = AddHumanUserRequest::new(
+		profile,
+		SetHumanEmail::new(email.to_owned()).with_is_verified(true),
+	)
+	.with_organization(Organization::new().with_org_id(org_id.to_owned()));
+
+	let uid = zitadel
+		.create_human_user(user)
+		.await
+		.expect("user must be created")
+		.user_id()
+		.expect("user must have an ID")
+		.clone();
+
+	zitadel
+		.add_user_grant(
+			Some(org_id.to_owned()),
+			&uid,
+			project_id.to_owned(),
+			None,
+			Some(vec!["User".to_owned()]),
+		)
+		.await
+		.expect("user grant must be added");
+
+	uid
+}
+
+/// Fetch a user's nickname (external ID) by Zitadel ID, if set.
+async fn user_nick_name(zitadel: &Zitadel, uid: &str) -> Option<String> {
+	zitadel
+		.get_user_by_id(uid)
+		.await
+		.expect("user must exist")
+		.user()
+		.and_then(|u| u.human())
+		.and_then(|h| h.profile())
+		.and_then(|p| p.nick_name())
+		.cloned()
+}
+
 /// Assert that the missing ID sync works
 #[test(tokio::test)]
 async fn test_e2e_install_missing_ids() {
@@ -19,7 +77,7 @@ async fn test_e2e_install_missing_ids() {
 	cleanup_test_users(config).await;
 
 	let mut ldap = Ldap::new().await;
-	let zitadel = Zitadel::new(config.zitadel.url.clone(), config.zitadel.key_file.clone())
+	let zitadel = Zitadel::new(config.zitadel.url.clone(), config.zitadel.key_file.clone(), None)
 		.await
 		.expect("Zitadel connection must succeed");
 
@@ -89,230 +147,89 @@ async fn test_e2e_install_ids_with_errors() {
 	cleanup_test_users(config).await;
 
 	let mut ldap = Ldap::new().await;
-	let zitadel = Zitadel::new(config.zitadel.url.clone(), config.zitadel.key_file.clone())
+	let zitadel = Zitadel::new(config.zitadel.url.clone(), config.zitadel.key_file.clone(), None)
 		.await
 		.expect("Zitadel connection must succeed");
 
-	// Just a normal user without an ID
-	let missing_id_uid = {
-		let user = AddHumanUserRequest::new(
-			SetHumanProfile::new("Max".to_owned(), "Mustermann".to_owned())
-				// Deliberately don't set a nickname (external UID)
-				.with_display_name("Mustermann, Max".to_owned()),
-			SetHumanEmail::new("max.mustermann@domain.invalid".to_owned()).with_is_verified(true),
-		)
-		.with_organization(Organization::new().with_org_id(config.zitadel.organization_id.clone()));
-
-		let uid = zitadel
-			.create_human_user(user)
-			.await
-			.expect("user must be created")
-			.user_id()
-			.expect("user must have an ID")
-			.clone();
-
-		zitadel
-			.add_user_grant(
-				Some(config.zitadel.organization_id.clone()),
-				&uid,
-				config.zitadel.project_id.clone(),
-				None,
-				Some(vec!["User".to_owned()]),
-			)
-			.await
-			.expect("user grant must be added");
-
-		ldap.create_user(
-			"Max",
-			"Mustermann",
-			"Mustermann, Max",
-			"max.mustermann@domain.invalid",
-			None,
-			"max.mustermann",
-			false,
-		)
-		.await;
-
-		uid
-	};
-
-	// A user who actually does have an ID and doesn't need to be
-	// changed
-	let extant_id_uid = {
-		let id = "max.mustermann2";
+	let org_id = config.zitadel.organization_id.clone();
+	let project_id = config.zitadel.project_id.clone();
 
-		let user = AddHumanUserRequest::new(
-			SetHumanProfile::new("Max".to_owned(), "Mustermann".to_owned())
-				.with_nick_name(hex::encode(id.as_bytes()))
-				.with_display_name("Mustermann, Max".to_owned()),
-			SetHumanEmail::new("max.mustermann2@domain.invalid".to_owned()).with_is_verified(true),
-		)
-		.with_organization(Organization::new().with_org_id(config.zitadel.organization_id.clone()));
-
-		let uid = zitadel
-			.create_human_user(user)
-			.await
-			.expect("user must be created")
-			.user_id()
-			.expect("user must have an ID")
-			.clone();
-
-		zitadel
-			.add_user_grant(
-				Some(config.zitadel.organization_id.clone()),
-				&uid,
-				config.zitadel.project_id.clone(),
-				None,
-				Some(vec!["User".to_owned()]),
-			)
-			.await
-			.expect("user grant must be added");
-
-		ldap.create_user(
-			"Max",
-			"Mustermann",
-			"Mustermann, Max",
-			"max.mustermann2@domain.invalid",
-			None,
-			id,
-			false,
-		)
-		.await;
+	// Just a normal user without an ID
+	let missing_id_uid =
+		seed_zitadel_user(&zitadel, &org_id, &project_id, "max.mustermann@domain.invalid", None)
+			.await;
+	ldap.create_user(
+		"Max",
+		"Mustermann",
+		"Mustermann, Max",
+		"max.mustermann@domain.invalid",
+		None,
+		"max.mustermann",
+		false,
+	)
+	.await;
 
-		uid
-	};
+	// A user who actually does have an ID and doesn't need to be changed
+	let extant_id_uid = seed_zitadel_user(
+		&zitadel,
+		&org_id,
+		&project_id,
+		"max.mustermann2@domain.invalid",
+		Some(&hex::encode("max.mustermann2".as_bytes())),
+	)
+	.await;
+	ldap.create_user(
+		"Max",
+		"Mustermann",
+		"Mustermann, Max",
+		"max.mustermann2@domain.invalid",
+		None,
+		"max.mustermann2",
+		false,
+	)
+	.await;
 
 	// A user who does not have a corresponding LDAP user
-	let missing_ldap_uid = {
-		let user = AddHumanUserRequest::new(
-			SetHumanProfile::new("Max".to_owned(), "Mustermann".to_owned())
-				// Deliberately don't set a nickname (external UID)
-				.with_display_name("Mustermann, Max".to_owned()),
-			SetHumanEmail::new("max.mustermann3@domain.invalid".to_owned()).with_is_verified(true),
-		)
-		.with_organization(Organization::new().with_org_id(config.zitadel.organization_id.clone()));
-
-		let uid = zitadel
-			.create_human_user(user)
-			.await
-			.expect("user must be created")
-			.user_id()
-			.expect("user must have an ID")
-			.clone();
-
-		zitadel
-			.add_user_grant(
-				Some(config.zitadel.organization_id.clone()),
-				&uid,
-				config.zitadel.project_id.clone(),
-				None,
-				Some(vec!["User".to_owned()]),
-			)
-			.await
-			.expect("user grant must be added");
-
-		uid
-	};
+	let missing_ldap_uid =
+		seed_zitadel_user(&zitadel, &org_id, &project_id, "max.mustermann3@domain.invalid", None)
+			.await;
 
 	// A user with an existing link that isn't actually correct
-	let extant_broken_uid = {
-		let user = AddHumanUserRequest::new(
-			SetHumanProfile::new("Max".to_owned(), "Mustermann".to_owned())
-				.with_nick_name(hex::encode("max.mustermann4".as_bytes()))
-				.with_display_name("Mustermann, Max".to_owned()),
-			SetHumanEmail::new("max.mustermann4@domain.invalid".to_owned()).with_is_verified(true),
-		)
-		.with_organization(Organization::new().with_org_id(config.zitadel.organization_id.clone()));
-
-		let uid = zitadel
-			.create_human_user(user)
-			.await
-			.expect("user must be created")
-			.user_id()
-			.expect("user must have an ID")
-			.clone();
-
-		zitadel
-			.add_user_grant(
-				Some(config.zitadel.organization_id.clone()),
-				&uid,
-				config.zitadel.project_id.clone(),
-				None,
-				Some(vec!["User".to_owned()]),
-			)
-			.await
-			.expect("user grant must be added");
-
-		ldap.create_user(
-			"Max",
-			"Mustermann",
-			"Mustermann, Max",
-			"max.mustermann4@domain.invalid",
-			None,
-			"invalid",
-			false,
-		)
-		.await;
-
-		uid
-	};
+	let extant_broken_uid = seed_zitadel_user(
+		&zitadel,
+		&org_id,
+		&project_id,
+		"max.mustermann4@domain.invalid",
+		Some(&hex::encode("max.mustermann4".as_bytes())),
+	)
+	.await;
+	ldap.create_user(
+		"Max",
+		"Mustermann",
+		"Mustermann, Max",
+		"max.mustermann4@domain.invalid",
+		None,
+		"invalid",
+		false,
+	)
+	.await;
 
 	link_user_ids(config.clone(), &skipped_errors).await.expect("Linking should succeed");
 
-	let nick = zitadel
-		.get_user_by_id(&missing_id_uid)
-		.await
-		.expect("user must exist")
-		.user()
-		.and_then(|u| u.human())
-		.and_then(|h| h.profile())
-		.and_then(|p| p.nick_name())
-		.expect("Nickname must be set")
-		.clone();
-
+	let nick = user_nick_name(&zitadel, &missing_id_uid).await.expect("Nickname must be set");
 	assert_eq!(String::from_utf8_lossy(&hex::decode(nick).expect("must decode")), "max.mustermann");
 
-	let nick = zitadel
-		.get_user_by_id(&extant_id_uid)
-		.await
-		.expect("user must exist")
-		.user()
-		.and_then(|u| u.human())
-		.and_then(|h| h.profile())
-		.and_then(|p| p.nick_name())
-		.expect("Nickname must be set")
-		.clone();
-
+	let nick = user_nick_name(&zitadel, &extant_id_uid).await.expect("Nickname must be set");
 	assert_eq!(
 		String::from_utf8_lossy(&hex::decode(nick).expect("must decode")),
 		"max.mustermann2"
 	);
 
-	let nick = zitadel
-		.get_user_by_id(&missing_ldap_uid)
-		.await
-		.expect("user must exist")
-		.user()
-		.and_then(|u| u.human())
-		.and_then(|h| h.profile())
-		.and_then(|p| p.nick_name())
-		.cloned();
-
-	// Unfortunately, Zitadel gives an empty string for a missing
-	// field.
+	// Unfortunately, Zitadel gives an empty string for a missing field.
+	let nick = user_nick_name(&zitadel, &missing_ldap_uid).await;
 	assert_eq!(Some("".to_owned()), nick);
 
-	let nick = zitadel
-		.get_user_by_id(&extant_broken_uid)
-		.await
-		.expect("user must exist")
-		.user()
-		.and_then(|u| u.human())
-		.and_then(|h| h.profile())
-		.and_then(|p| p.nick_name())
-		.expect("Nickname must be set")
-		.clone();
-
+	let nick = user_nick_name(&zitadel, &extant_broken_uid).await.expect("Nickname must be set");
 	// Assert this doesn't change
 	assert_eq!(
 		String::from_utf8_lossy(&hex::decode(&nick).expect("must decode")),