diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 16a4c7ec9..c81004ab6 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,15 +1,53 @@
-name: "test"
+name: "scaffolding-ci"
 
 on:
   # Trigger the workflow on push or pull request,
   # but only for the main branch
   push:
-    branches: [develop, develop-0.1, develop-0.2, develop-0.4]
+    branches: [develop, develop-0.4]
   pull_request:
-    branches: [develop, develop-0.1, develop-0.2, develop-0.4]
+    branches: [develop, develop-0.4]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
 
 jobs:
-  test_fmt_lint:
+  cargo_test:
+    name: cargo_test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.80.0
+      - uses: Swatinem/rust-cache@v2
+      - run: cargo test --no-fail-fast
+
+  rustfmt:
+    name: rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.80.0
+          components: rustfmt
+      - run: cargo fmt --all -- --check
+
+  clippy:
+    name: clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.80.0
+          components: clippy
+      - uses: Swatinem/rust-cache@v2
+      - run: cargo clippy -- -D warnings
+
+  nix_build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -24,31 +62,24 @@ jobs:
           remove-docker-images: "true"
 
       - name: Install nix
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v30
         with:
           install_url: https://releases.nixos.org/nix/nix-2.24.4/install
 
       - uses: cachix/cachix-action@v15
         with:
-          name: holochain-ci
-
-      - name: rustfmt check
-        run: |
-          cd $GITHUB_WORKSPACE
-          nix develop .#ci --command cargo fmt --all --check
-
-      - name: clippy check
-        run: |
-          cd $GITHUB_WORKSPACE
-          nix develop .#ci --command cargo clippy --all-features --all-targets -- -D warnings
+          name: holochain-scaffolding-cli
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          extraPullNames: holochain-ci
 
-      - name: unittests
+      - name: Build
         run: |
           cd $GITHUB_WORKSPACE
-          nix develop .#ci --command cargo test --no-fail-fast
+          nix develop --accept-flake-config .#ci --command echo 'test'
 
   testbuild:
     runs-on: ubuntu-latest
+    needs: [nix_build]
     strategy:
       matrix:
         template: [svelte, vue, lit, react, vanilla]
@@ -65,21 +96,24 @@ jobs:
           remove-docker-images: "true"
 
       - name: Install nix
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v30
         with:
           install_url: https://releases.nixos.org/nix/nix-2.24.4/install
 
       - uses: cachix/cachix-action@v15
         with:
-          name: holochain-ci
+          name: holochain-scaffolding-cli
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          extraPullNames: holochain-ci
 
       - name: Build and test
         run: |
           cd $GITHUB_WORKSPACE
-          nix develop .#ci --command ./run_test.sh -t ${{ matrix.template }}
+          nix develop --accept-flake-config .#ci --command ./run_test.sh -t ${{ matrix.template }}
 
   testbuild_by_scope:
     runs-on: ubuntu-latest
+    needs: [nix_build]
     strategy:
       matrix:
         scope:
@@ -98,15 +132,17 @@ jobs:
           remove-docker-images: "true"
 
       - name: Install nix
-        uses: cachix/install-nix-action@v27
+        uses: cachix/install-nix-action@v30
         with:
           install_url: https://releases.nixos.org/nix/nix-2.24.4/install
 
       - uses: cachix/cachix-action@v15
         with:
-          name: holochain-ci
+          name: holochain-scaffolding-cli
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          extraPullNames: holochain-ci
 
       - name: Build and test
         run: |
           cd $GITHUB_WORKSPACE
-          nix develop .#ci --command ./run_test.sh -s ${{ matrix.scope }}
+          nix develop --accept-flake-config .#ci --command ./run_test.sh -s ${{ matrix.scope }}
diff --git a/Cargo.lock b/Cargo.lock
index 5e41ba717..7229e8aae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,31 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "gimli 0.29.0",
+ "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -39,34 +23,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "ahash"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
-
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom 0.2.15",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -74,7 +30,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if 1.0.0",
- "getrandom 0.2.15",
+ "getrandom",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -89,36 +45,11 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "aitia"
-version = "0.3.0-rc.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa6441219defcb93f3625601a0d3cc715ce1a0acecca9991247aff4fd7a4c1d4"
-dependencies = [
- "anyhow",
- "derive_more",
- "parking_lot 0.12.3",
- "petgraph",
- "regex",
- "serde",
- "serde_json",
- "tracing",
- "tracing-core",
- "tracing-serde",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "aliasable"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
-
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android-tzdata"
@@ -141,14 +72,14 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -161,55 +92,43 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "app_dirs2"
-version = "2.5.5"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e"
-dependencies = [
- "jni",
- "ndk-context",
- "winapi 0.3.9",
- "xdg",
-]
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "approx"
@@ -222,18 +141,18 @@ dependencies = [
 
 [[package]]
 name = "arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 dependencies = [
  "derive_arbitrary",
 ]
 
 [[package]]
 name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -250,245 +169,18 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "async-attributes"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener 2.5.3",
- "futures-core",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand 2.1.1",
- "futures-lite 2.3.0",
- "slab",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
-dependencies = [
- "async-channel 2.3.1",
- "async-executor",
- "async-io 2.3.4",
- "async-lock 3.4.0",
- "blocking",
- "futures-lite 2.3.0",
- "once_cell",
-]
-
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock 2.8.0",
- "autocfg 1.3.0",
- "cfg-if 1.0.0",
- "concurrent-queue",
- "futures-lite 1.13.0",
- "log",
- "parking",
- "polling 2.8.0",
- "rustix 0.37.27",
- "slab",
- "socket2 0.4.10",
- "waker-fn",
-]
-
-[[package]]
-name = "async-io"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
-dependencies = [
- "async-lock 3.4.0",
- "cfg-if 1.0.0",
- "concurrent-queue",
- "futures-io",
- "futures-lite 2.3.0",
- "parking",
- "polling 3.7.3",
- "rustix 0.38.36",
- "slab",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-dependencies = [
- "event-listener 5.3.1",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-once-cell"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb"
-
-[[package]]
-name = "async-process"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
-dependencies = [
- "async-io 1.13.0",
- "async-lock 2.8.0",
- "async-signal",
- "blocking",
- "cfg-if 1.0.0",
- "event-listener 3.1.0",
- "futures-lite 1.13.0",
- "rustix 0.38.36",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "async-signal"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
-dependencies = [
- "async-io 2.3.4",
- "async-lock 3.4.0",
- "atomic-waker",
- "cfg-if 1.0.0",
- "futures-core",
- "futures-io",
- "rustix 0.38.36",
- "signal-hook-registry",
- "slab",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-std"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
-dependencies = [
- "async-attributes",
- "async-channel 1.9.0",
- "async-global-executor",
- "async-io 1.13.0",
- "async-lock 2.8.0",
- "async-process",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite 1.13.0",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22068c0c19514942eefcfd4daf8976ef1aad84e61539f95cd200c35202f80af5"
-dependencies = [
- "async-stream-impl",
- "futures-core",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "syn 2.0.90",
 ]
 
-[[package]]
-name = "async-task"
-version = "4.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
-
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -505,23 +197,14 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
  "hermit-abi 0.1.19",
  "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
-dependencies = [
- "autocfg 1.3.0",
+ "winapi",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "automap"
@@ -535,31 +218,19 @@ dependencies = [
  "shrinkwraprs",
 ]
 
-[[package]]
-name = "backon"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0"
-dependencies = [
- "fastrand 2.1.1",
- "futures-core",
- "pin-project",
- "tokio",
-]
-
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -568,12 +239,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -582,19 +247,13 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "better_scoped_tls"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de"
+checksum = "297b153aa5e573b5863108a6ddc9d5c968bd0b20e75cc614ee9821d2f45679c7"
 dependencies = [
  "scoped-tls",
 ]
 
-[[package]]
-name = "bimap"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -610,7 +269,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
- "bit-vec 0.6.3",
+ "bit-vec",
 ]
 
 [[package]]
@@ -619,21 +278,6 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
-[[package]]
-name = "bit-vec"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bit_field"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -646,18 +290,6 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
 [[package]]
 name = "blake2b_simd"
 version = "1.0.2"
@@ -679,44 +311,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "blocking"
-version = "1.6.1"
+name = "bstr"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
 dependencies = [
- "async-channel 2.3.1",
- "async-task",
- "futures-io",
- "futures-lite 2.3.0",
- "piper",
+ "memchr",
+ "serde",
 ]
 
 [[package]]
-name = "bloomfilter"
-version = "1.0.14"
+name = "build-fs-tree"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0bdbcf2078e0ba8a74e1fe0cf36f54054a04485759b61dfd60b174658e9607"
-dependencies = [
- "bit-vec 0.7.0",
- "getrandom 0.2.15",
- "siphasher 1.0.1",
-]
-
-[[package]]
-name = "bstr"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
-dependencies = [
- "memchr",
- "serde",
-]
-
-[[package]]
-name = "build-fs-tree"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c68339add1d0c864575cd425203adee58c8b64ea1709b35bb90fc0fc07e4286"
+checksum = "4c68339add1d0c864575cd425203adee58c8b64ea1709b35bb90fc0fc07e4286"
 dependencies = [
  "derive_more",
  "pipe-trait",
@@ -734,33 +342,11 @@ dependencies = [
  "allocator-api2",
 ]
 
-[[package]]
-name = "bytecheck"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
-dependencies = [
- "bytecheck_derive",
- "ptr_meta",
- "simdutf8",
-]
-
-[[package]]
-name = "bytecheck_derive"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "bytemuck"
-version = "1.17.1"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
+checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
 
 [[package]]
 name = "byteorder"
@@ -770,48 +356,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bytesize"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "c_linked_list"
-version = "1.1.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "camino"
@@ -842,26 +389,20 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "cc"
-version = "1.1.16"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b"
+checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
 dependencies = [
  "jobserver",
  "libc",
  "shlex",
 ]
 
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -876,9 +417,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -889,16 +430,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
 [[package]]
 name = "clap"
 version = "2.34.0"
@@ -916,9 +447,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.17"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -926,49 +457,39 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.17"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
  "strsim 0.11.1",
- "terminal_size",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags 1.3.2",
-]
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colored"
@@ -980,25 +501,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "combine"
-version = "4.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "console"
 version = "0.15.8"
@@ -1018,22 +520,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
-[[package]]
-name = "contrafact"
-version = "0.2.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bfae7a2ef93841d7e9e5ef69e387b26e70f7b156434b6b95714006cc00e1f9"
-dependencies = [
- "arbitrary",
- "derive_more",
- "either",
- "itertools 0.10.5",
- "num",
- "once_cell",
- "rand 0.7.3",
- "tracing",
-]
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1074,126 +560,15 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "corosensei"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e"
-dependencies = [
- "autocfg 1.3.0",
- "cfg-if 1.0.0",
- "libc",
- "scopeguard",
- "windows-sys 0.33.0",
-]
-
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cranelift-bforest"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115"
-dependencies = [
- "cranelift-entity",
-]
-
-[[package]]
-name = "cranelift-codegen"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc"
-dependencies = [
- "arrayvec",
- "bumpalo",
- "cranelift-bforest",
- "cranelift-codegen-meta",
- "cranelift-codegen-shared",
- "cranelift-egraph",
- "cranelift-entity",
- "cranelift-isle",
- "gimli 0.26.2",
- "log",
- "regalloc2",
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cranelift-codegen-meta"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74"
-dependencies = [
- "cranelift-codegen-shared",
-]
-
-[[package]]
-name = "cranelift-codegen-shared"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7"
-
-[[package]]
-name = "cranelift-egraph"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73"
-dependencies = [
- "cranelift-entity",
- "fxhash",
- "hashbrown 0.12.3",
- "indexmap 1.9.3",
- "log",
- "smallvec",
-]
-
-[[package]]
-name = "cranelift-entity"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c"
-
-[[package]]
-name = "cranelift-frontend"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6"
-dependencies = [
- "cranelift-codegen",
- "log",
- "smallvec",
- "target-lexicon",
-]
-
-[[package]]
-name = "cranelift-isle"
-version = "0.91.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb"
-
-[[package]]
-name = "crc"
-version = "3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-
 [[package]]
 name = "crc32fast"
 version = "1.4.2"
@@ -1203,17 +578,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "cron"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07"
-dependencies = [
- "chrono",
- "nom",
- "once_cell",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.13"
@@ -1242,27 +606,12 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -1285,64 +634,14 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "4.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest",
- "fiat-crypto",
- "rustc_version",
- "subtle",
-]
-
-[[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 2.0.77",
-]
-
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
- "darling_core 0.20.10",
- "darling_macro 0.20.10",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -1356,18 +655,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1376,26 +664,16 @@ version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
- "darling_core 0.20.10",
+ "darling_core",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "dary_heap"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
-
-[[package]]
-name = "dashmap"
-version = "4.0.2"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
-dependencies = [
- "cfg-if 1.0.0",
- "num_cpus",
-]
+checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728"
 
 [[package]]
 name = "dashmap"
@@ -1408,32 +686,20 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
 ]
 
-[[package]]
-name = "data-encoding"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
-
 [[package]]
 name = "data-url"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
-[[package]]
-name = "deflate64"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
-
 [[package]]
 name = "deno_ast"
-version = "0.42.0"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b08d11d9e4086b00d3428650e31153cf5896586411763cb88a6423ce5b18791"
+checksum = "b2b9d03b1bbeeecdac54367f075d572131736d06c5be3bc49037855bc5ab1bbb"
 dependencies = [
  "deno_media_type",
  "deno_terminal",
@@ -1447,7 +713,7 @@ dependencies = [
  "swc_ecma_parser",
  "swc_eq_ignore_macros",
  "text_lines",
- "thiserror",
+ "thiserror 1.0.69",
  "unicode-width",
  "url",
 ]
@@ -1496,75 +762,44 @@ dependencies = [
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "derive_builder"
-version = "0.12.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
 dependencies = [
- "derive_builder_macro 0.12.0",
+ "derive_builder_macro",
 ]
 
 [[package]]
-name = "derive_builder"
-version = "0.20.1"
+name = "derive_builder_core"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
- "derive_builder_macro 0.20.1",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
-dependencies = [
- "darling 0.14.4",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38"
-dependencies = [
- "darling 0.20.10",
+ "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
-dependencies = [
- "derive_builder_core 0.12.0",
- "syn 1.0.109",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "derive_builder_macro"
-version = "0.20.1"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
- "derive_builder_core 0.20.1",
- "syn 2.0.77",
+ "derive_builder_core",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1577,7 +812,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1598,12 +833,6 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
-[[package]]
-name = "difflib"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
-
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1612,7 +841,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
@@ -1644,34 +872,9 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "dns-parser"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea"
-dependencies = [
- "byteorder",
- "quick-error",
-]
-
-[[package]]
-name = "document-features"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
-dependencies = [
- "litrs",
+ "syn 2.0.90",
 ]
 
-[[package]]
-name = "downcast"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
-
 [[package]]
 name = "dprint-core"
 version = "0.66.2"
@@ -1681,7 +884,7 @@ dependencies = [
  "anyhow",
  "bumpalo",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "rustc-hash",
  "serde",
  "unicode-width",
@@ -1735,34 +938,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
-[[package]]
-name = "dyn-clone"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
-
-[[package]]
-name = "ed25519"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
-dependencies = [
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "rand_core 0.6.4",
- "sha2",
- "subtle",
-]
-
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -1777,54 +952,13 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "enum-iterator"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6"
-dependencies = [
- "enum-iterator-derive",
-]
-
-[[package]]
-name = "enum-iterator-derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "enumset"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293"
-dependencies = [
- "enumset_derive",
-]
-
-[[package]]
-name = "enumset_derive"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242"
-dependencies = [
- "darling 0.20.10",
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "env_filter"
 version = "0.1.2"
@@ -1850,88 +984,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
-[[package]]
-name = "err-derive"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
- "synstructure",
-]
-
-[[package]]
-name = "err-derive"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
- "synstructure",
-]
-
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "event-listener"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener 5.3.1",
- "pin-project-lite",
+ "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
 [[package]]
 name = "fallible-iterator"
 version = "0.3.0"
@@ -1946,24 +1008,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
 [[package]]
 name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
-
-[[package]]
-name = "fiat-crypto"
-version = "0.2.9"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "filetime"
@@ -1977,12 +1024,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
 [[package]]
 name = "fixt"
 version = "0.4.0-rc.0"
@@ -1991,10 +1032,10 @@ checksum = "a61c0fd4010d5d20f6383c16c523159aa7e8513c2fb2fd79d6fb319831af7623"
 dependencies = [
  "holochain_serialized_bytes",
  "lazy_static",
- "parking_lot 0.12.3",
+ "parking_lot",
  "paste",
- "rand 0.8.5",
- "rand_core 0.6.4",
+ "rand",
+ "rand_core",
  "serde",
  "strum",
  "strum_macros",
@@ -2002,21 +1043,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
-]
-
-[[package]]
-name = "float-cmp"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-dependencies = [
- "num-traits",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -2025,6 +1057,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -2049,12 +1087,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fragile"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
-
 [[package]]
 name = "from_variant"
 version = "0.1.9"
@@ -2063,26 +1095,14 @@ checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4"
 dependencies = [
  "proc-macro2",
  "swc_macros_common",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2095,9 +1115,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2105,15 +1125,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2122,72 +1142,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
-[[package]]
-name = "futures-lite"
-version = "2.3.0"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
-dependencies = [
- "fastrand 2.1.1",
- "futures-core",
- "futures-io",
- "parking",
- "pin-project-lite",
-]
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2201,21 +1187,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "gcc"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-
 [[package]]
 name = "gcollections"
 version = "1.5.0"
@@ -2238,39 +1209,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "get_if_addrs"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7"
-dependencies = [
- "c_linked_list",
- "get_if_addrs-sys",
- "libc",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "get_if_addrs-sys"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48"
-dependencies = [
- "gcc",
- "libc",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -2278,10 +1216,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if 1.0.0",
- "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
+ "wasi",
 ]
 
 [[package]]
@@ -2291,10 +1227,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a34addaffa7d2c80637807444f171c646cad7549fcdac8019544034678f76d5"
 dependencies = [
  "futures",
- "mockall",
  "must_future",
  "paste",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "tracing-futures",
@@ -2302,20 +1237,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
-dependencies = [
- "fallible-iterator 0.2.0",
- "indexmap 1.9.3",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git2"
@@ -2334,93 +1258,39 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
-name = "gloo-timers"
-version = "0.2.6"
+name = "h2"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
- "futures-channel",
+ "atomic-waker",
+ "bytes",
+ "fnv",
  "futures-core",
- "js-sys",
- "wasm-bindgen",
+ "futures-sink",
+ "http",
+ "indexmap 2.7.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
 ]
 
 [[package]]
-name = "governor"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c5d2f987ee8f6dff3fa1a352058dc59b990e447e4c7846aa7d804971314f7b"
-dependencies = [
- "dashmap 4.0.2",
- "futures",
- "futures-timer",
- "no-std-compat",
- "nonzero_ext",
- "parking_lot 0.11.2",
- "quanta",
- "rand 0.8.5",
- "smallvec",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.5.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http 1.1.0",
- "indexmap 2.5.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "1.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
-
-[[package]]
-name = "handlebars"
-version = "4.5.0"
+name = "handlebars"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
 dependencies = [
@@ -2429,36 +1299,34 @@ dependencies = [
  "pest_derive",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.8.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
-dependencies = [
- "ahash 0.3.8",
- "autocfg 1.3.0",
-]
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.7.8",
+ "ahash",
+ "allocator-api2",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
- "ahash 0.8.11",
  "allocator-api2",
+ "equivalent",
+ "foldhash",
 ]
 
 [[package]]
@@ -2470,33 +1338,6 @@ dependencies = [
  "hashbrown 0.14.5",
 ]
 
-[[package]]
-name = "hc_deepkey_sdk"
-version = "0.7.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cbf754afd67edfa4cdb72394876704668693c78505a2bc054759157f74c29f3"
-dependencies = [
- "arbitrary",
- "hc_deepkey_types",
- "hdk",
- "serde",
- "serde_bytes",
-]
-
-[[package]]
-name = "hc_deepkey_types"
-version = "0.8.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c994a7e2c1e3de03d5915945e4ca81687f1c5dd9ed0f24fc7d9cdb6c4e6acc"
-dependencies = [
- "arbitrary",
- "hdi",
- "holo_hash",
- "holochain_integrity_types",
- "rmpv",
- "serde",
-]
-
 [[package]]
 name = "hc_r2d2_sqlite"
 version = "0.25.0"
@@ -2520,107 +1361,7 @@ dependencies = [
  "rmpv",
  "serde",
  "serde_bytes",
- "sodoken 0.0.11",
-]
-
-[[package]]
-name = "hc_sleuth"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44e729d2a4b4a05f1045ee5ff6f41529e0ae5c4f8d89e8260dcef7b8125c31b0"
-dependencies = [
- "aitia",
- "anyhow",
- "derive_more",
- "holochain_trace",
- "holochain_types",
- "kitsune_p2p",
- "once_cell",
- "parking_lot 0.12.3",
- "petgraph",
- "regex",
- "serde",
- "structopt",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "hdi"
-version = "0.5.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a11b9903154b2f80f0c4523bebe912a331c098a2d44cf0ba123c59dd71b6bbe3"
-dependencies = [
- "getrandom 0.2.15",
- "hdk_derive",
- "holo_hash",
- "holochain_integrity_types",
- "holochain_wasmer_guest",
- "paste",
- "serde",
- "serde_bytes",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "hdk"
-version = "0.4.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "066fd837e5d9ef4d943350b4f45bad4078fe788e50682fb404e2cfc6b713fdcb"
-dependencies = [
- "getrandom 0.2.15",
- "hdi",
- "hdk_derive",
- "holo_hash",
- "holochain_wasmer_guest",
- "holochain_zome_types",
- "paste",
- "serde",
- "serde_bytes",
- "thiserror",
- "tracing",
- "tracing-core",
-]
-
-[[package]]
-name = "hdk_derive"
-version = "0.4.0-rc.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4103bbeaec462f7f0643a418823dad035ed8e108d6d36322d6544f7565b5dbf5"
-dependencies = [
- "darling 0.14.4",
- "heck 0.5.0",
- "holochain_integrity_types",
- "paste",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "headers"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "headers-core",
- "http 0.2.12",
- "httpdate",
- "mime",
- "sha1",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
-dependencies = [
- "http 0.2.12",
+ "sodoken",
 ]
 
 [[package]]
@@ -2665,28 +1406,12 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
-[[package]]
-name = "hex-literal"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
 [[package]]
 name = "holo_hash"
 version = "0.4.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "190c060ed23f60135e8ba0ff08c77a7ca283af35cc4aadf321433bfade7bcf5b"
 dependencies = [
- "arbitrary",
  "base64 0.22.1",
  "blake2b_simd",
  "derive_more",
@@ -2697,337 +1422,75 @@ dependencies = [
  "holochain_wasmer_common",
  "kitsune_p2p_dht_arc",
  "must_future",
- "proptest",
- "proptest-derive 0.5.0",
- "rand 0.8.5",
+ "rand",
  "rusqlite",
  "serde",
  "serde_bytes",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
-name = "holochain"
-version = "0.4.0-rc.2"
+name = "holochain_integrity_types"
+version = "0.4.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc812cc54b84bde5f425e8ac14cfe925f0cb9a7ffdb80e2038dc59044c5043f"
+checksum = "55fd6b8aa759be57a51c6af632d81e50e3200ac10d38dd35e094c1ed957591b9"
 dependencies = [
- "aitia",
- "anyhow",
- "arbitrary",
- "async-once-cell",
- "async-trait",
- "backtrace",
- "base64 0.22.1",
- "cfg-if 1.0.0",
- "chrono",
- "contrafact",
- "derive_more",
- "diff",
- "either",
- "fallible-iterator 0.3.0",
- "fixt",
- "futures",
- "get_if_addrs",
- "getrandom 0.2.15",
- "ghost_actor",
- "hc_deepkey_sdk",
- "hc_sleuth",
- "hdk",
+ "derive_builder",
  "holo_hash",
- "holochain_cascade",
- "holochain_chc",
- "holochain_conductor_api",
- "holochain_conductor_services",
- "holochain_deepkey_dna",
- "holochain_keystore",
- "holochain_metrics",
- "holochain_nonce",
- "holochain_p2p",
  "holochain_secure_primitive",
  "holochain_serialized_bytes",
- "holochain_sqlite",
- "holochain_state",
- "holochain_test_wasm_common",
- "holochain_trace",
- "holochain_types",
  "holochain_util",
- "holochain_wasm_test_utils",
- "holochain_wasmer_host",
- "holochain_websocket",
- "holochain_zome_types",
- "hostname 0.4.0",
- "human-panic",
- "itertools 0.12.1",
- "kitsune_p2p",
- "kitsune_p2p_bin_data",
- "kitsune_p2p_block",
- "kitsune_p2p_bootstrap",
- "kitsune_p2p_types",
- "lair_keystore",
- "matches",
- "mockall",
- "mr_bundle",
- "must_future",
- "nanoid",
- "once_cell",
- "one_err",
- "opentelemetry_api",
- "parking_lot 0.12.3",
- "petgraph",
- "rand 0.8.5",
- "rand-utf8",
- "rand_chacha 0.3.1",
- "rusqlite",
- "sbd-server",
- "sd-notify",
+ "kitsune_p2p_timestamp",
  "serde",
  "serde_bytes",
- "serde_json",
- "serde_yaml",
- "shrinkwraprs",
- "sodoken 0.0.11",
- "structopt",
- "strum",
+ "subtle",
  "subtle-encoding",
- "task-motel",
- "tempfile",
- "thiserror",
- "tiny-keccak",
- "tokio",
- "tokio-stream",
- "toml",
  "tracing",
- "tracing-futures",
- "tracing-subscriber",
- "tx5-go-pion-turn",
- "unwrap_to",
- "url",
- "url2",
- "uuid",
- "wasmer",
- "wasmer-middlewares",
 ]
 
 [[package]]
-name = "holochain_cascade"
+name = "holochain_keystore"
 version = "0.4.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da613d2fb926182cfb7c974db9c5fb5e479c4f685a9bec1b1de5daf5275cf18"
+checksum = "3d8234a44c072aa8a3766e5f2686d9eea9c85507f6582951ddb0a660d6ef1802"
 dependencies = [
- "async-trait",
- "fixt",
+ "base64 0.22.1",
+ "derive_more",
  "futures",
  "holo_hash",
- "holochain_chc",
- "holochain_nonce",
- "holochain_p2p",
+ "holochain_secure_primitive",
  "holochain_serialized_bytes",
- "holochain_sqlite",
- "holochain_state",
- "holochain_trace",
- "holochain_types",
  "holochain_util",
  "holochain_zome_types",
- "kitsune_p2p",
- "mockall",
- "opentelemetry_api",
- "thiserror",
+ "kitsune_p2p_types",
+ "lair_keystore",
+ "must_future",
+ "nanoid",
+ "one_err",
+ "parking_lot",
+ "serde",
+ "serde_bytes",
+ "shrinkwraprs",
+ "sodoken",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
 
 [[package]]
-name = "holochain_chc"
-version = "0.1.0-rc.2"
+name = "holochain_nonce"
+version = "0.4.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0fc0dc7486f058cede7c895daa43056ba429b73273fdb2f2f6458c1b9594f3"
+checksum = "e1e9d716254b6d1eba405b5fc0f09dc8d4260482fa06dbe98a4c610b38fd83de"
 dependencies = [
- "async-trait",
- "derive_more",
- "futures",
- "getrandom 0.2.15",
- "holochain_keystore",
- "holochain_nonce",
- "holochain_serialized_bytes",
- "holochain_types",
- "must_future",
- "one_err",
- "parking_lot 0.12.3",
- "reqwest 0.12.7",
- "serde",
- "serde_bytes",
- "serde_json",
- "thiserror",
- "tracing",
- "url",
+ "getrandom",
+ "holochain_secure_primitive",
+ "kitsune_p2p_timestamp",
 ]
 
 [[package]]
-name = "holochain_conductor_api"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0be8f80ae5531305d48ef868cd5d71e58d9c4f348e7ca90bad072c3f57e503b4"
-dependencies = [
- "cfg-if 1.0.0",
- "derive_more",
- "holo_hash",
- "holochain_keystore",
- "holochain_serialized_bytes",
- "holochain_state_types",
- "holochain_types",
- "holochain_zome_types",
- "kitsune_p2p_bin_data",
- "kitsune_p2p_types",
- "nanoid",
- "serde",
- "serde_yaml",
- "shrinkwraprs",
- "thiserror",
- "tracing",
- "url2",
-]
-
-[[package]]
-name = "holochain_conductor_services"
-version = "0.3.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d16457206d4848a68a661211fc63c9bfb85f46b3192af3f0c445ac6c331cbac"
-dependencies = [
- "anyhow",
- "arbitrary",
- "async-trait",
- "derive_more",
- "futures",
- "hc_deepkey_sdk",
- "holochain_keystore",
- "holochain_types",
- "holochain_util",
- "mockall",
- "must_future",
- "nanoid",
- "serde",
- "serde_bytes",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "holochain_deepkey_dna"
-version = "0.0.8-dev.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0aa773b74c40ef5e4e02f414d8cbfc4e92520a93511055a3fbccc12d2dd045"
-
-[[package]]
-name = "holochain_integrity_types"
-version = "0.4.0-rc.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55fd6b8aa759be57a51c6af632d81e50e3200ac10d38dd35e094c1ed957591b9"
-dependencies = [
- "arbitrary",
- "derive_builder 0.20.1",
- "holo_hash",
- "holochain_secure_primitive",
- "holochain_serialized_bytes",
- "holochain_util",
- "kitsune_p2p_timestamp",
- "proptest",
- "proptest-derive 0.5.0",
- "serde",
- "serde_bytes",
- "subtle",
- "subtle-encoding",
- "tracing",
-]
-
-[[package]]
-name = "holochain_keystore"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d8234a44c072aa8a3766e5f2686d9eea9c85507f6582951ddb0a660d6ef1802"
-dependencies = [
- "base64 0.22.1",
- "derive_more",
- "futures",
- "holo_hash",
- "holochain_secure_primitive",
- "holochain_serialized_bytes",
- "holochain_util",
- "holochain_zome_types",
- "kitsune_p2p_types",
- "lair_keystore",
- "must_future",
- "nanoid",
- "one_err",
- "parking_lot 0.12.3",
- "serde",
- "serde_bytes",
- "shrinkwraprs",
- "sodoken 0.0.11",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "holochain_metrics"
-version = "0.4.0-rc.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e87c8db537e3ab19713d613aacec0c7bc52acc7b0fc6edb15bd5ef37805e40"
-dependencies = [
- "influxive",
- "opentelemetry_api",
- "tracing",
-]
-
-[[package]]
-name = "holochain_nonce"
-version = "0.4.0-rc.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e9d716254b6d1eba405b5fc0f09dc8d4260482fa06dbe98a4c610b38fd83de"
-dependencies = [
- "getrandom 0.2.15",
- "holochain_secure_primitive",
- "kitsune_p2p_timestamp",
-]
-
-[[package]]
-name = "holochain_p2p"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07068cc2c7574d9406d00daa1a8cb271e1e9de04b55955a81a00d9832257e116"
-dependencies = [
- "aitia",
- "async-trait",
- "derive_more",
- "fixt",
- "futures",
- "ghost_actor",
- "hc_sleuth",
- "holo_hash",
- "holochain_chc",
- "holochain_keystore",
- "holochain_nonce",
- "holochain_serialized_bytes",
- "holochain_trace",
- "holochain_types",
- "holochain_zome_types",
- "kitsune_p2p",
- "kitsune_p2p_types",
- "mockall",
- "rand 0.8.5",
- "serde",
- "serde_bytes",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "holochain_scaffolding_cli"
-version = "0.4000.0-rc.3"
+name = "holochain_scaffolding_cli"
+version = "0.4000.0-rc.3"
 dependencies = [
  "anyhow",
  "build-fs-tree",
@@ -3039,9 +1502,7 @@ dependencies = [
  "dprint-plugin-typescript",
  "git2",
  "handlebars",
- "holochain",
  "holochain_types",
- "holochain_util",
  "ignore",
  "include_dir",
  "itertools 0.13.0",
@@ -3058,8 +1519,8 @@ dependencies = [
  "serde_json",
  "serde_yml",
  "structopt",
- "syn 2.0.77",
- "thiserror",
+ "syn 2.0.90",
+ "thiserror 1.0.69",
  "tokio",
  "toml",
 ]
@@ -3081,16 +1542,13 @@ version = "0.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719fa847cf9f772f7e8e1a6f11d801e1383cc5af043292042665da9a6ce5c742"
 dependencies = [
- "arbitrary",
  "holochain_serialized_bytes_derive",
- "proptest",
- "proptest-derive 0.4.0",
  "rmp-serde",
  "serde",
  "serde-transcode",
  "serde_bytes",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3113,9 +1571,9 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "derive_more",
- "fallible-iterator 0.3.0",
+ "fallible-iterator",
  "futures",
- "getrandom 0.2.15",
+ "getrandom",
  "hc_r2d2_sqlite",
  "holo_hash",
  "holochain_nonce",
@@ -3131,7 +1589,7 @@ dependencies = [
  "num_cpus",
  "once_cell",
  "opentelemetry_api",
- "parking_lot 0.12.3",
+ "parking_lot",
  "pretty_assertions",
  "r2d2",
  "rmp-serde",
@@ -3140,73 +1598,14 @@ dependencies = [
  "serde",
  "serde_json",
  "shrinkwraprs",
- "sodoken 0.0.11",
+ "sodoken",
  "sqlformat",
  "tempfile",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "holochain_state"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebccd79c8cdcae836f0ebba4f36d85e0ff4ad92fe63c6ec21ca443b3f87117c6"
-dependencies = [
- "aitia",
- "async-recursion",
- "base64 0.22.1",
- "chrono",
- "contrafact",
- "cron",
- "derive_more",
- "fallible-iterator 0.3.0",
- "hc_sleuth",
- "holo_hash",
- "holochain_chc",
- "holochain_keystore",
- "holochain_nonce",
- "holochain_p2p",
- "holochain_serialized_bytes",
- "holochain_sqlite",
- "holochain_state_types",
- "holochain_types",
- "holochain_zome_types",
- "kitsune_p2p",
- "nanoid",
- "one_err",
- "parking_lot 0.12.3",
- "serde",
- "serde_json",
- "shrinkwraprs",
- "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
 
-[[package]]
-name = "holochain_state_types"
-version = "0.4.0-rc.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00c52e0c3b4c108692f376c67158c2d007253500a67b4fe53fe23177e7b632aa"
-dependencies = [
- "holo_hash",
- "holochain_integrity_types",
- "serde",
-]
-
-[[package]]
-name = "holochain_test_wasm_common"
-version = "0.4.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "750adb191e8506f64496c0c4c582d8c2545c3f9c60f4f4eae51bcc077f3a0508"
-dependencies = [
- "hdk",
- "serde",
-]
-
 [[package]]
 name = "holochain_trace"
 version = "0.4.0-rc.0"
@@ -3218,10 +1617,10 @@ dependencies = [
  "inferno",
  "once_cell",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "tracing-core",
- "tracing-serde",
+ "tracing-serde 0.1.3",
  "tracing-subscriber",
 ]
 
@@ -3232,20 +1631,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91090efe13869808982638d0bec270f5eeee7d2980b7bdd17ca5317853fb71db"
 dependencies = [
  "anyhow",
- "arbitrary",
  "async-trait",
  "automap",
  "backtrace",
  "base64 0.13.1",
  "cfg-if 0.1.10",
  "chrono",
- "contrafact",
- "derive_builder 0.20.1",
+ "derive_builder",
  "derive_more",
  "fixt",
  "flate2",
  "futures",
- "getrandom 0.2.15",
+ "getrandom",
  "holo_hash",
  "holochain_keystore",
  "holochain_nonce",
@@ -3254,17 +1651,14 @@ dependencies = [
  "holochain_trace",
  "holochain_util",
  "holochain_zome_types",
- "isotest",
  "itertools 0.12.1",
  "kitsune_p2p_dht",
  "mr_bundle",
  "must_future",
  "nanoid",
  "one_err",
- "parking_lot 0.12.3",
- "proptest",
- "proptest-derive 0.5.0",
- "rand 0.8.5",
+ "parking_lot",
+ "rand",
  "regex",
  "rusqlite",
  "serde",
@@ -3277,7 +1671,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -3295,24 +1689,10 @@ dependencies = [
  "futures",
  "once_cell",
  "rpassword",
- "sodoken 0.0.11",
+ "sodoken",
  "tokio",
 ]
 
-[[package]]
-name = "holochain_wasm_test_utils"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ddcba0c942540c105ea45e3e2bcd74b9991b1676befafcb75de15979e02ac1"
-dependencies = [
- "holochain_types",
- "holochain_util",
- "strum",
- "strum_macros",
- "toml",
- "walkdir",
-]
-
 [[package]]
 name = "holochain_wasmer_common"
 version = "0.0.96"
@@ -3323,59 +1703,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "test-fuzz",
- "thiserror",
-]
-
-[[package]]
-name = "holochain_wasmer_guest"
-version = "0.0.96"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa3d0105471c4f0fa2d9644c7113e4f7ed5385ed5dbb980eab14eb7c6efaff8a"
-dependencies = [
- "holochain_serialized_bytes",
- "holochain_wasmer_common",
- "parking_lot 0.12.3",
- "paste",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "holochain_wasmer_host"
-version = "0.0.96"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf87b72bbdc589f1859f385b25e3951e2a41cd7cc19ece3a2ad41009e8b1516c"
-dependencies = [
- "bimap",
- "bytes",
- "hex",
- "holochain_serialized_bytes",
- "holochain_wasmer_common",
- "parking_lot 0.12.3",
- "rand 0.8.5",
- "serde",
- "thiserror",
- "tracing",
- "wasmer",
- "wasmer-middlewares",
-]
-
-[[package]]
-name = "holochain_websocket"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279012d7627062833a64c2421c01ab859adea518033c2c6f610418d4a8d28e21"
-dependencies = [
- "async-trait",
- "futures",
- "holochain_serialized_bytes",
- "holochain_types",
- "serde",
- "serde_bytes",
- "thiserror",
- "tokio",
- "tokio-tungstenite",
- "tracing",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3384,11 +1712,8 @@ version = "0.4.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c20154541de3704d11642fd43ad141b88a15ba481ea44b5bfc97831ba9e61fb"
 dependencies = [
- "arbitrary",
- "contrafact",
- "derive_builder 0.20.1",
+ "derive_builder",
  "derive_more",
- "fixt",
  "holo_hash",
  "holochain_integrity_types",
  "holochain_nonce",
@@ -3399,43 +1724,16 @@ dependencies = [
  "kitsune_p2p_timestamp",
  "nanoid",
  "num_enum",
- "once_cell",
- "proptest",
- "proptest-derive 0.5.0",
- "rand 0.8.5",
  "rusqlite",
  "serde",
  "serde_bytes",
  "serde_yaml",
  "shrinkwraprs",
- "strum",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
-[[package]]
-name = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "hostname"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "windows 0.52.0",
-]
-
 [[package]]
 name = "hstr"
 version = "0.2.12"
@@ -3452,9 +1750,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.12"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -3462,114 +1760,46 @@ dependencies = [
 ]
 
 [[package]]
-name = "http"
-version = "1.1.0"
+name = "http-body"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "fnv",
- "itoa",
+ "http",
 ]
 
 [[package]]
-name = "http-body"
-version = "0.4.6"
+name = "http-body-util"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "http 0.2.12",
+ "futures-util",
+ "http",
+ "http-body",
  "pin-project-lite",
 ]
 
 [[package]]
-name = "http-body"
-version = "1.0.1"
+name = "httparse"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http 1.1.0",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "human-panic"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c5a08ed290eac04006e21e63d32e90086b6182c7cd0452d10f4264def1fec9a"
-dependencies = [
- "anstream",
- "anstyle",
- "backtrace",
- "os_info",
- "serde",
- "serde_derive",
- "toml",
- "uuid",
-]
-
-[[package]]
-name = "hyper"
-version = "0.14.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2 0.5.7",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.6",
- "http 1.1.0",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "httparse",
  "itoa",
  "pin-project-lite",
@@ -3578,20 +1808,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.30",
- "rustls 0.21.12",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.27.3"
@@ -3599,13 +1815,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
- "http 1.1.0",
- "hyper 1.4.1",
+ "http",
+ "hyper",
  "hyper-util",
- "rustls 0.23.12",
+ "rustls 0.23.19",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.0",
+ "tokio-rustls",
  "tower-service",
 ]
 
@@ -3617,7 +1833,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -3627,29 +1843,28 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
- "http-body 1.0.1",
- "hyper 1.4.1",
+ "http",
+ "http-body",
+ "hyper",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3669,52 +1884,161 @@ dependencies = [
 ]
 
 [[package]]
-name = "ident_case"
-version = "1.0.1"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_locid"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
 ]
 
 [[package]]
-name = "if-addrs"
-version = "0.7.0"
+name = "icu_locid_transform"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
 dependencies = [
- "libc",
- "winapi 0.3.9",
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
 ]
 
 [[package]]
-name = "if-addrs"
-version = "0.10.2"
+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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
 dependencies = [
- "libc",
- "windows-sys 0.48.0",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "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 2.0.90",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "ignore"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
 dependencies = [
  "crossbeam-deque",
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.7",
+ "regex-automata 0.4.9",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -3745,19 +2069,19 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg",
  "hashbrown 0.12.3",
  "serde",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -3767,13 +2091,13 @@ version = "0.11.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88"
 dependencies = [
- "ahash 0.8.11",
- "clap 4.5.17",
+ "ahash",
+ "clap 4.5.23",
  "crossbeam-channel",
  "crossbeam-utils",
- "dashmap 6.1.0",
+ "dashmap",
  "env_logger",
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "is-terminal",
  "itoa",
  "log",
@@ -3784,127 +2108,6 @@ dependencies = [
  "str_stack",
 ]
 
-[[package]]
-name = "influxdb"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601aa12a5876c044ea2a94a9443d0f086e6fc1f7bb4264bd7120e63c1462d1c8"
-dependencies = [
- "chrono",
- "futures-util",
- "http 0.2.12",
- "lazy_static",
- "regex",
- "reqwest 0.11.27",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "influxive"
-version = "0.0.3-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe7701f6c9924010f4c28425062ddbc1d68beeca97f8e87d8b1d85607f93f22"
-dependencies = [
- "influxive-child-svc",
- "influxive-otel",
- "influxive-writer",
-]
-
-[[package]]
-name = "influxive-child-svc"
-version = "0.0.3-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d944438107445ae8f3a5940465dea2da312e7377487bffebbe9fa85967dbb7b"
-dependencies = [
- "hex-literal",
- "influxive-core",
- "influxive-downloader",
- "influxive-writer",
- "tempfile",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "influxive-core"
-version = "0.0.3-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4d21909d0bab91bb2b028072875ffbfddfbf8ca921ec687f490f88f6575c82d"
-
-[[package]]
-name = "influxive-downloader"
-version = "0.0.3-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b850272f63494200c28fe11a4379d7615faeadc772499fa738042e94b34ec2c6"
-dependencies = [
- "base64 0.22.1",
- "digest",
- "dirs",
- "flate2",
- "futures",
- "hex",
- "hex-literal",
- "influxive-core",
- "reqwest 0.12.7",
- "sha2",
- "tar",
- "tempfile",
- "tokio",
- "zip 2.2.0",
-]
-
-[[package]]
-name = "influxive-otel"
-version = "0.0.3-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "984f10b85715b05a4e29c96e74cb053ce52f689b2889da3fe246aedfcedc1fec"
-dependencies = [
- "influxive-core",
- "opentelemetry_api",
- "tokio",
-]
-
-[[package]]
-name = "influxive-otel-atomic-obs"
-version = "0.0.2-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac0ec101d28862a46c15d6140cec376b02725160dfcf57282952898a94cf35e"
-dependencies = [
- "opentelemetry_api",
-]
-
-[[package]]
-name = "influxive-writer"
-version = "0.0.3-alpha.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9115b0a4fe95360d96b28256357c265e20515c1b7d0614c416f95fd25e4c372"
-dependencies = [
- "influxdb",
- "influxive-core",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
 [[package]]
 name = "intervallum"
 version = "1.4.1"
@@ -3918,33 +2121,22 @@ dependencies = [
  "trilean",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-macro"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1"
+checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4"
 dependencies = [
- "Inflector",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3964,16 +2156,6 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "isotest"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "868ab2c0c71eff3fca21f4ea4673ade85ca0149c45a55c79016147562737aef8"
-dependencies = [
- "futures",
- "paste",
-]
-
 [[package]]
 name = "itertools"
 version = "0.8.2"
@@ -3983,15 +2165,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -4012,93 +2185,27 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
-name = "jni"
-version = "0.21.1"
+name = "jobserver"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
- "cesu8",
- "cfg-if 1.0.0",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
- "windows-sys 0.45.0",
+ "libc",
 ]
 
 [[package]]
-name = "jni-sys"
-version = "0.3.0"
+name = "js-sys"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "kitsune_p2p"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad569db6472637d688f856532f627659597a75ae371c6f05f3f048c761db8b4"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
- "arrayref",
- "base64 0.22.1",
- "blake2b_simd",
- "bloomfilter",
- "bytes",
- "derive_more",
- "fixt",
- "futures",
- "ghost_actor",
- "governor",
- "holochain_trace",
- "kitsune_p2p_bin_data",
- "kitsune_p2p_block",
- "kitsune_p2p_bootstrap_client",
- "kitsune_p2p_fetch",
- "kitsune_p2p_mdns",
- "kitsune_p2p_proxy",
- "kitsune_p2p_timestamp",
- "kitsune_p2p_types",
- "maplit",
- "mockall",
- "must_future",
- "nanoid",
- "num-traits",
  "once_cell",
- "opentelemetry_api",
- "parking_lot 0.12.3",
- "rand 0.8.5",
- "serde",
- "serde_bytes",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tracing",
- "tx5",
- "url2",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -4107,14 +2214,10 @@ version = "0.4.0-rc.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdb7c39b8e0c7c2f37457ab7005903bda9c30d4d2f45d84c61776dc025863559"
 dependencies = [
- "arbitrary",
  "base64 0.22.1",
  "derive_more",
- "fixt",
  "holochain_util",
  "kitsune_p2p_dht_arc",
- "proptest",
- "proptest-derive 0.5.0",
  "serde",
  "serde_bytes",
  "shrinkwraprs",
@@ -4131,41 +2234,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "kitsune_p2p_bootstrap"
-version = "0.3.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80824055058643294b346ce56b33ec088596724bb5088d0002226c6bc355367a"
-dependencies = [
- "clap 4.5.17",
- "futures",
- "kitsune_p2p_bin_data",
- "kitsune_p2p_types",
- "parking_lot 0.12.3",
- "rand 0.8.5",
- "reqwest 0.12.7",
- "serde",
- "serde_bytes",
- "thiserror",
- "tokio",
- "warp",
-]
-
-[[package]]
-name = "kitsune_p2p_bootstrap_client"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e09bec08dec66dfe7dcea37624b2f0591d826372223fbfa2d82ded2702ea954"
-dependencies = [
- "kitsune_p2p_bin_data",
- "kitsune_p2p_bootstrap",
- "kitsune_p2p_types",
- "reqwest 0.12.7",
- "serde",
- "serde_bytes",
- "url2",
-]
-
 [[package]]
 name = "kitsune_p2p_dht"
 version = "0.4.0-rc.0"
@@ -4182,11 +2250,11 @@ dependencies = [
  "must_future",
  "num-traits",
  "proptest",
- "proptest-derive 0.5.0",
- "rand 0.8.5",
+ "proptest-derive",
+ "rand",
  "serde",
  "statrs",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
@@ -4203,57 +2271,11 @@ dependencies = [
  "kitsune_p2p_timestamp",
  "num-traits",
  "proptest",
- "proptest-derive 0.5.0",
+ "proptest-derive",
  "rusqlite",
  "serde",
 ]
 
-[[package]]
-name = "kitsune_p2p_fetch"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0bd85554d9e7da7c6805f61950f4ca374a723ac282d5648947f21ef5dbdcf1"
-dependencies = [
- "backon",
- "derive_more",
- "indexmap 2.5.0",
- "kitsune_p2p_timestamp",
- "kitsune_p2p_types",
- "serde",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "kitsune_p2p_mdns"
-version = "0.4.0-rc.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063b93f20de354d8d42b20cc6dc05e24493ef11ed7edd7e888076a8b46176ed0"
-dependencies = [
- "base64 0.22.1",
- "err-derive 0.3.1",
- "libmdns",
- "mdns",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "kitsune_p2p_proxy"
-version = "0.4.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "085cac6201e8c854044c51458839c9269dd3181c9ec4912d7a6e38e877d98e2e"
-dependencies = [
- "base64 0.22.1",
- "derive_more",
- "futures",
- "holochain_trace",
- "kitsune_p2p_types",
- "serde",
- "serde_bytes",
- "tokio",
-]
-
 [[package]]
 name = "kitsune_p2p_timestamp"
 version = "0.4.0-rc.0"
@@ -4264,8 +2286,8 @@ dependencies = [
  "chrono",
  "once_cell",
  "proptest",
- "proptest-derive 0.5.0",
- "rand 0.8.5",
+ "proptest-derive",
+ "rand",
  "rusqlite",
  "serde",
 ]
@@ -4276,10 +2298,8 @@ version = "0.4.0-rc.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b09bc80d2b76e429470249e0979c0c52cf7db5ae1c9e5718ea836b2b0dff2b72"
 dependencies = [
- "arbitrary",
  "base64 0.22.1",
  "derive_more",
- "fixt",
  "futures",
  "ghost_actor",
  "holochain_trace",
@@ -4288,33 +2308,21 @@ dependencies = [
  "kitsune_p2p_dht_arc",
  "kitsune_p2p_timestamp",
  "lair_keystore_api",
- "mockall",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
  "paste",
- "proptest",
- "proptest-derive 0.5.0",
  "rmp-serde",
  "rustls 0.21.12",
  "serde",
  "serde_bytes",
  "serde_json",
  "sysinfo",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "url2",
 ]
 
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "lair_keystore"
 version = "0.5.3"
@@ -4343,7 +2351,7 @@ dependencies = [
  "lru",
  "nanoid",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
  "rcgen",
  "serde",
  "serde_json",
@@ -4352,7 +2360,7 @@ dependencies = [
  "toml",
  "tracing",
  "url",
- "winapi 0.3.9",
+ "winapi",
  "zeroize",
 ]
 
@@ -4362,17 +2370,11 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "leb128"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
-
 [[package]]
 name = "libc"
-version = "0.2.167"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libflate"
@@ -4411,41 +2413,11 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "libloading"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "libm"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "libmdns"
-version = "0.7.4"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a60d8339ad1ddf68a81335fcafb6c6cf20d5036138a1e4ef86b8ce87f076c92"
-dependencies = [
- "byteorder",
- "futures-util",
- "hostname 0.3.1",
- "if-addrs 0.7.0",
- "log",
- "multimap",
- "nix",
- "rand 0.8.5",
- "socket2 0.4.10",
- "thiserror",
- "tokio",
- "winapi 0.3.9",
-]
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libredox"
@@ -4455,14 +2427,14 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.5.3",
+ "redox_syscall",
 ]
 
 [[package]]
 name = "libsodium-sys-stable"
-version = "1.21.1"
+version = "1.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd1882b85f01cdd4021c0664fd897710a04c5d01b593a5a70e1b0baa999c1f8"
+checksum = "798a1c6d8c3424c0686ca46f2929d81809b371ef61a68c5d1880570584d32b85"
 dependencies = [
  "cc",
  "libc",
@@ -4472,7 +2444,7 @@ dependencies = [
  "tar",
  "ureq",
  "vcpkg",
- "zip 2.2.0",
+ "zip",
 ]
 
 [[package]]
@@ -4482,7 +2454,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
 dependencies = [
  "cc",
- "openssl-sys",
  "pkg-config",
  "vcpkg",
 ]
@@ -4505,12 +2476,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -4518,10 +2483,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
-name = "litrs"
-version = "0.4.1"
+name = "litemap"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lock_api"
@@ -4529,7 +2494,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg",
  "scopeguard",
 ]
 
@@ -4544,44 +2509,16 @@ name = "log"
 version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-dependencies = [
- "value-bag",
-]
 
 [[package]]
 name = "lru"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "lzma-rs"
-version = "0.3.0"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "byteorder",
- "crc",
-]
-
-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
+ "hashbrown 0.15.2",
 ]
 
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
 [[package]]
 name = "markup_fmt"
 version = "0.10.0"
@@ -4596,12 +2533,6 @@ dependencies = [
  "tiny_pretty",
 ]
 
-[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -4611,96 +2542,28 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "matrixmultiply"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg",
  "rawpointer",
 ]
 
-[[package]]
-name = "mdns"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c769962ac75a6ea437f0922b27834bcccd4c013d591383a16ae5731e3ef0f3f3"
-dependencies = [
- "async-std",
- "async-stream",
- "dns-parser",
- "err-derive 0.2.4",
- "futures-core",
- "futures-util",
- "log",
- "net2",
-]
-
 [[package]]
 name = "memchr"
 version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[package]]
-name = "memmap2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memmap2"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg 1.3.0",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg 1.3.0",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -4709,18 +2572,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "minisign-verify"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a05b5d0594e0cb1ad8cee3373018d2b84e25905dc75b2468114cc9a8e86cfc20"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
+checksum = "6367d84fb54d4242af283086402907277715b8fe46976963af5ebf173f8efba3"
 
 [[package]]
 name = "miniz_oxide"
@@ -4733,103 +2587,38 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi 0.3.9",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "mockall"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
-dependencies = [
- "cfg-if 1.0.0",
- "downcast",
- "fragile",
- "lazy_static",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
-dependencies = [
- "cfg-if 1.0.0",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "more-asserts"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
-
 [[package]]
 name = "mr_bundle"
 version = "0.4.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5196c416124a0ee668823722ac5e30f99c2c3269d0c0bab2b476f604ef1f20a7"
 dependencies = [
- "arbitrary",
  "derive_more",
  "flate2",
  "futures",
  "holochain_util",
- "proptest",
- "proptest-derive 0.5.0",
- "reqwest 0.12.7",
+ "reqwest",
  "rmp-serde",
  "serde",
  "serde_bytes",
  "serde_yaml",
- "test-strategy",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
-name = "multer"
-version = "2.1.0"
+name = "must_future"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2"
-dependencies = [
- "bytes",
- "encoding_rs",
- "futures-util",
- "http 0.2.12",
- "httparse",
- "log",
- "memchr",
- "mime",
- "spin 0.9.8",
- "version_check",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "must_future"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a160ffed3c2f98d2906c67a9b6e4e1f09cca7e17e3f780286a349061459eeebe"
+checksum = "a160ffed3c2f98d2906c67a9b6e4e1f09cca7e17e3f780286a349061459eeebe"
 dependencies = [
  "futures",
  "pin-utils",
@@ -4847,7 +2636,7 @@ dependencies = [
  "num-complex",
  "num-rational",
  "num-traits",
- "rand 0.8.5",
+ "rand",
  "rand_distr",
  "simba",
  "typenum",
@@ -4870,7 +2659,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
 dependencies = [
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -4890,51 +2679,12 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "net2"
-version = "0.2.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "nix"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.6.5",
-]
-
-[[package]]
-name = "no-std-compat"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-dependencies = [
- "hashbrown 0.8.2",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -4945,25 +2695,13 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nonzero_ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44a1290799eababa63ea60af0cbc3f03363e328e58f32fb0294798ed3e85f444"
-
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
 [[package]]
 name = "ntapi"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -4973,21 +2711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
  "overload",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
+ "winapi",
 ]
 
 [[package]]
@@ -5035,24 +2759,12 @@ 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 1.3.0",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-rational"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "num-bigint",
  "num-integer",
  "num-traits",
 ]
@@ -5063,7 +2775,7 @@ version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg",
  "libm",
 ]
 
@@ -5095,23 +2807,23 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "one_err"
@@ -5127,9 +2839,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if 1.0.0",
@@ -5148,7 +2860,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5159,18 +2871,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.3.2+3.3.2"
+version = "300.4.1+3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b"
+checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -5191,7 +2903,7 @@ dependencies = [
  "js-sys",
  "once_cell",
  "pin-project-lite",
- "thiserror",
+ "thiserror 1.0.69",
  "urlencoding",
 ]
 
@@ -5201,63 +2913,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
-[[package]]
-name = "os_info"
-version = "3.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
-dependencies = [
- "log",
- "serde",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ouroboros"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db"
-dependencies = [
- "aliasable",
- "ouroboros_macro",
-]
-
-[[package]]
-name = "ouroboros_macro"
-version = "0.15.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7"
-dependencies = [
- "Inflector",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "overload"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -5265,21 +2926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi 0.3.9",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -5290,7 +2937,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall 0.5.3",
+ "redox_syscall",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -5307,16 +2954,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
 
-[[package]]
-name = "pbkdf2"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
-dependencies = [
- "digest",
- "hmac",
-]
-
 [[package]]
 name = "pem"
 version = "1.1.1"
@@ -5334,20 +2971,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.11"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 2.0.6",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.11"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
 dependencies = [
  "pest",
  "pest_generator",
@@ -5355,39 +2992,28 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.11"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.11"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
 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.5.0",
- "quickcheck",
-]
-
 [[package]]
 name = "phf"
 version = "0.11.2"
@@ -5415,7 +3041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
  "phf_shared",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -5428,7 +3054,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5437,34 +3063,34 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
 dependencies = [
- "siphasher 0.3.11",
+ "siphasher",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -5478,22 +3104,11 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1be1ec9e59f0360aefe84efa6f699198b685ab0d5718081e9f72aa2344289e2"
 
-[[package]]
-name = "piper"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
-dependencies = [
- "atomic-waker",
- "fastrand 2.1.1",
- "futures-io",
-]
-
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "pluralizer"
@@ -5505,37 +3120,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg 1.3.0",
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "polling"
-version = "3.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
-dependencies = [
- "cfg-if 1.0.0",
- "concurrent-queue",
- "hermit-abi 0.4.0",
- "pin-project-lite",
- "rustix 0.38.36",
- "tracing",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -5551,41 +3135,11 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "predicates"
-version = "2.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
-dependencies = [
- "difflib",
- "float-cmp",
- "itertools 0.10.5",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
  "yansi",
@@ -5593,12 +3147,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5636,9 +3190,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -5650,30 +3204,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
  "bit-set",
- "bit-vec 0.6.3",
+ "bit-vec",
  "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rand_xorshift 0.3.0",
- "regex-syntax 0.8.4",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax 0.8.5",
  "rusty-fork",
  "tempfile",
  "unarray",
 ]
 
-[[package]]
-name = "proptest-derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "proptest-derive"
 version = "0.5.0"
@@ -5682,14 +3225,14 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "psm"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205"
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
 dependencies = [
  "cc",
 ]
@@ -5714,16 +3257,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "quanta"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98dc777a7a39b76b1a26ae9d3f691f4c1bc0455090aa0b64dfa8cb7fc34c135"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -5739,16 +3272,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "quickcheck"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c35d9c36a562f37eca96e79f66d5fd56eefbc22560dacc4a864cabd2d277456"
-dependencies = [
- "rand 0.6.5",
- "rand_core 0.4.2",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.37"
@@ -5765,283 +3288,103 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
 dependencies = [
  "log",
- "parking_lot 0.12.3",
+ "parking_lot",
  "scheduled-thread-pool",
 ]
 
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
 [[package]]
 name = "rand"
-version = "0.6.5"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "autocfg 0.1.8",
  "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift 0.1.1",
- "winapi 0.3.9",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
-name = "rand"
-version = "0.7.3"
+name = "rand_chacha"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
+ "ppv-lite86",
+ "rand_core",
 ]
 
 [[package]]
-name = "rand"
-version = "0.8.5"
+name = "rand_core"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
+ "getrandom",
 ]
 
 [[package]]
-name = "rand-utf8"
-version = "0.0.1"
+name = "rand_distr"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f2017cdc22f0f49fc0385c036847c03403fa5f95bc36e7f420e8e42446e80f"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
 dependencies = [
- "rand 0.8.5",
+ "num-traits",
+ "rand",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.1.1"
+name = "rand_xorshift"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.3.1",
+ "rand_core",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.2.2"
+name = "rawpointer"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
+checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
-name = "rand_chacha"
-version = "0.3.1"
+name = "rayon"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
+ "either",
+ "rayon-core",
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.3.1"
+name = "rayon-core"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
- "rand_core 0.4.2",
+ "crossbeam-deque",
+ "crossbeam-utils",
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.4.2"
+name = "rcgen"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.15",
-]
-
-[[package]]
-name = "rand_distr"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
-dependencies = [
- "num-traits",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
-dependencies = [
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "rcgen"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
-dependencies = [
- "pem",
- "ring 0.16.20",
- "time",
- "yasna",
- "zeroize",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
+checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
+dependencies = [
+ "pem",
+ "ring 0.16.20",
+ "time",
+ "yasna",
+ "zeroize",
+]
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -6052,33 +3395,21 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
  "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "regalloc2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c"
-dependencies = [
- "fxhash",
- "log",
- "slice-group-by",
- "smallvec",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -6092,13 +3423,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -6109,89 +3440,27 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "region"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "mach2",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rend"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
-dependencies = [
- "bytecheck",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.27"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.30",
- "hyper-rustls 0.24.2",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration 0.5.1",
- "tokio",
- "tokio-rustls 0.24.1",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.25.4",
- "winreg",
-]
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.4.6",
- "http 1.1.0",
- "http-body 1.0.1",
+ "h2",
+ "http",
+ "http-body",
  "http-body-util",
- "hyper 1.4.1",
- "hyper-rustls 0.27.3",
+ "hyper",
+ "hyper-rustls",
  "hyper-tls",
  "hyper-util",
  "ipnet",
@@ -6202,20 +3471,18 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
- "system-configuration 0.6.1",
+ "sync_wrapper",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
- "tokio-util",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
- "wasm-streams",
  "web-sys",
  "windows-registry",
 ]
@@ -6241,7 +3508,7 @@ dependencies = [
  "spin 0.5.2",
  "untrusted 0.7.1",
  "web-sys",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -6252,43 +3519,13 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if 1.0.0",
- "getrandom 0.2.15",
+ "getrandom",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rkyv"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
-dependencies = [
- "bitvec",
- "bytecheck",
- "bytes",
- "hashbrown 0.12.3",
- "indexmap 1.9.3",
- "ptr_meta",
- "rend",
- "rkyv_derive",
- "seahash",
- "tinyvec",
- "uuid",
-]
-
-[[package]]
-name = "rkyv_derive"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "rle-decode-fast"
 version = "1.0.3"
@@ -6357,7 +3594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e"
 dependencies = [
  "bitflags 2.6.0",
- "fallible-iterator 0.3.0",
+ "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
  "libsqlite3-sys",
@@ -6387,29 +3624,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.36"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.14",
- "windows-sys 0.52.0",
+ "linux-raw-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6426,68 +3649,31 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring 0.17.8",
- "rustls-pki-types",
- "rustls-webpki 0.102.7",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.12"
+version = "0.23.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
- "rustls-webpki 0.102.7",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 2.1.3",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64 0.21.7",
-]
-
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
@@ -6501,21 +3687,15 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring 0.17.8",
  "rustls-pki-types",
  "untrusted 0.9.0",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
-
 [[package]]
 name = "rusty-fork"
 version = "0.3.0"
@@ -6553,64 +3733,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "sbd-client"
-version = "0.0.8-alpha"
+name = "schannel"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7af51493c7b0233ad96af18edaace4190d19a1b3b7c231f61b4a0c7f9bf13ef7"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "base64 0.22.1",
- "ed25519-dalek",
- "futures",
- "rand 0.8.5",
- "rustls 0.22.4",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls 0.25.0",
- "tokio-tungstenite",
- "tracing",
- "webpki-roots 0.26.5",
-]
-
-[[package]]
-name = "sbd-e2e-crypto-client"
-version = "0.0.8-alpha"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6213eb9eaa35d0e8e57172e5367f2a9c3cfd6011db268143a14c6324ea15c13b"
-dependencies = [
- "sbd-client",
- "sodoken 0.0.901-alpha",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "sbd-server"
-version = "0.0.8-alpha"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cda36e498d8b8d32fda399807b58c68f939a54777c104287840264725338ce9"
-dependencies = [
- "anstyle",
- "base64 0.22.1",
- "bytes",
- "clap 4.5.17",
- "ed25519-dalek",
- "futures",
- "rand 0.8.5",
- "rustls 0.22.4",
- "rustls-pemfile 2.1.3",
- "slab",
- "tokio",
- "tokio-rustls 0.25.0",
- "tokio-tungstenite",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6619,32 +3747,7 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
 dependencies = [
- "parking_lot 0.12.3",
-]
-
-[[package]]
-name = "schemars"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
-dependencies = [
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
- "url",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn 2.0.77",
+ "parking_lot",
 ]
 
 [[package]]
@@ -6669,18 +3772,6 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
-[[package]]
-name = "sd-notify"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4646d6f919800cd25c50edb49438a1381e2cd4833c027e75e8897981c50b8b5e"
-
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -6696,20 +3787,14 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
 ]
 
-[[package]]
-name = "self_cell"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
-
 [[package]]
 name = "semver"
 version = "1.0.23"
@@ -6737,17 +3822,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde-wasm-bindgen"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf"
-dependencies = [
- "js-sys",
- "serde",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "serde_bytes"
 version = "0.11.15"
@@ -6757,16 +3831,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.203"
@@ -6775,27 +3839,16 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "itoa",
  "memchr",
  "ryu",
@@ -6804,9 +3857,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -6825,15 +3878,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -6843,14 +3896,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
- "darling 0.20.10",
+ "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6859,7 +3912,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "itoa",
  "ryu",
  "serde",
@@ -6872,7 +3925,7 @@ version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ce6afeda22f0b55dde2c34897bce76a629587348480384231205c14b59a01f"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "itoa",
  "libyml",
  "log",
@@ -6914,16 +3967,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "shared-buffer"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6c99835bad52957e7aa241d3975ed17c1e5f8c92026377d117a606f36b84b16"
-dependencies = [
- "bytes",
- "memmap2 0.6.2",
-]
-
 [[package]]
 name = "shell-words"
 version = "1.1.0"
@@ -6958,12 +4001,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "signature"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-
 [[package]]
 name = "simba"
 version = "0.6.0"
@@ -6983,42 +4020,21 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
-[[package]]
-name = "simdutf8"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
-
 [[package]]
 name = "siphasher"
 version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "slab"
 version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg",
 ]
 
-[[package]]
-name = "slice-group-by"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -7031,26 +4047,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg",
  "static_assertions",
  "version_check",
 ]
 
 [[package]]
 name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -7067,20 +4073,10 @@ dependencies = [
  "num_cpus",
  "once_cell",
  "one_err",
- "parking_lot 0.12.3",
+ "parking_lot",
  "tokio",
 ]
 
-[[package]]
-name = "sodoken"
-version = "0.0.901-alpha"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "888b6eb6ff4b987cd894f90d396562c9f332dfa3ab27a00c9cbc798d2f402037"
-dependencies = [
- "libc",
- "libsodium-sys-stable",
-]
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -7138,7 +4134,7 @@ dependencies = [
  "lazy_static",
  "nalgebra",
  "num-traits",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -7156,7 +4152,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7165,41 +4161,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "structmeta"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329"
-dependencies = [
- "proc-macro2",
- "quote",
- "structmeta-derive",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "structmeta-derive"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "structopt"
 version = "0.3.26"
@@ -7259,9 +4226,9 @@ dependencies = [
 
 [[package]]
 name = "swc_allocator"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc8bd3075d1c6964010333fae9ddcd91ad422a4f8eb8b3206a9b2b6afb4209e"
+checksum = "76aa0eb65c0f39f9b6d82a7e5192c30f7ac9a78f084a21f270de1d8c600ca388"
 dependencies = [
  "bumpalo",
  "hashbrown 0.14.5",
@@ -7298,7 +4265,7 @@ dependencies = [
  "once_cell",
  "rustc-hash",
  "serde",
- "siphasher 0.3.11",
+ "siphasher",
  "swc_allocator",
  "swc_atoms",
  "swc_eq_ignore_macros",
@@ -7356,18 +4323,18 @@ checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "swc_macros_common"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847"
+checksum = "27e18fbfe83811ffae2bb23727e45829a0d19c6870bced7c0f545cc99ad248dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7393,9 +4360,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7404,29 +4371,22 @@ dependencies = [
 
 [[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.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "synstructure"
-version = "0.12.6"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
- "unicode-xid",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7440,18 +4400,7 @@ dependencies = [
  "memchr",
  "ntapi",
  "rayon",
- "windows 0.57.0",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys 0.5.0",
+ "windows",
 ]
 
 [[package]]
@@ -7462,17 +4411,7 @@ checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.6.0",
  "core-foundation",
- "system-configuration-sys 0.6.0",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -7485,51 +4424,27 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
 [[package]]
 name = "tar"
-version = "0.4.41"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
 dependencies = [
  "filetime",
  "libc",
  "xattr",
 ]
 
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
-[[package]]
-name = "task-motel"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7228e85537ffb5943539a46bf561786323f6112114005ba055e496192a6f8f41"
-dependencies = [
- "futures",
- "parking_lot 0.12.3",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if 1.0.0",
- "fastrand 2.1.1",
+ "fastrand",
  "once_cell",
- "rustix 0.38.36",
+ "rustix",
  "windows-sys 0.59.0",
 ]
 
@@ -7542,22 +4457,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "terminal_size"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-dependencies = [
- "rustix 0.38.36",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "termtree"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
-
 [[package]]
 name = "test-fuzz"
 version = "6.0.0"
@@ -7587,14 +4486,14 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7e6b4c7391a38f0f026972ec2200bcfd1ec45533aa266fdae5858d011afc500"
 dependencies = [
- "darling 0.20.10",
+ "darling",
  "heck 0.5.0",
  "itertools 0.13.0",
  "once_cell",
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7610,18 +4509,6 @@ dependencies = [
  "test-fuzz-internal",
 ]
 
-[[package]]
-name = "test-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf41af45e3f54cc184831d629d41d5b2bda8297e29c81add7ae4f362ed5e01b"
-dependencies = [
- "proc-macro2",
- "quote",
- "structmeta",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "text-block-macros"
 version = "0.1.1"
@@ -7648,22 +4535,42 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
+dependencies = [
+ "thiserror-impl 2.0.6",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7678,9 +4585,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -7699,23 +4606,14 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
 [[package]]
 name = "tiny_pretty"
 version = "0.2.0"
@@ -7726,34 +4624,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
 ]
 
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "parking_lot 0.12.3",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.7",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.52.0",
 ]
@@ -7766,7 +4659,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7781,131 +4674,61 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.24.1"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
- "rustls 0.21.12",
+ "rustls 0.23.19",
  "tokio",
 ]
 
 [[package]]
-name = "tokio-rustls"
-version = "0.25.0"
+name = "tokio-util"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
  "tokio",
 ]
 
 [[package]]
-name = "tokio-rustls"
-version = "0.26.0"
+name = "toml"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
- "rustls 0.23.12",
- "rustls-pki-types",
- "tokio",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
 ]
 
 [[package]]
-name = "tokio-stream"
-version = "0.1.16"
+name = "toml_datetime"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
-dependencies = [
- "futures-util",
- "log",
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.25.0",
- "tungstenite",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -7914,11 +4737,10 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
- "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -7926,20 +4748,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -7976,11 +4798,21 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-serde"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1"
+dependencies = [
+ "serde",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -7995,7 +4827,7 @@ dependencies = [
  "tracing",
  "tracing-core",
  "tracing-log",
- "tracing-serde",
+ "tracing-serde 0.2.0",
 ]
 
 [[package]]
@@ -8006,9 +4838,9 @@ checksum = "683ba5022fe6dbd7133cad150478ccf51bdb6d861515181e5fc6b4323d4fa424"
 
 [[package]]
 name = "triomphe"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369"
+checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -8020,145 +4852,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 1.1.0",
- "httparse",
- "log",
- "rand 0.8.5",
- "rustls 0.22.4",
- "rustls-pki-types",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "tx5"
-version = "0.1.5-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f994c9c78cd32bdf4fe814f73deb46346a2e3d8b0258a9cc6349f7cffea9532"
-dependencies = [
- "base64 0.22.1",
- "futures",
- "influxive-otel-atomic-obs",
- "serde",
- "slab",
- "tokio",
- "tracing",
- "tx5-connection",
- "tx5-core",
- "url",
-]
-
-[[package]]
-name = "tx5-connection"
-version = "0.1.5-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c768f3c4e732c8f4e5ac8c458eb638c9ee4d5cec9a079aaae3b14bc625027ada"
-dependencies = [
- "bit_field",
- "futures",
- "serde",
- "serde_json",
- "tokio",
- "tracing",
- "tx5-core",
- "tx5-go-pion",
- "tx5-signal",
-]
-
-[[package]]
-name = "tx5-core"
-version = "0.1.5-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa653b3dc7b127c29fca5bd9ba70a31afa1c9df3c796f35efca576b10c2aaa13"
-dependencies = [
- "app_dirs2",
- "base64 0.22.1",
- "once_cell",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "sha2",
- "tempfile",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "tx5-go-pion"
-version = "0.1.5-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a930b75b6baf3bae2090e44fe9ff4566f7ae4d979e6794f82ce0207b2fed7a82"
-dependencies = [
- "futures",
- "parking_lot 0.12.3",
- "tokio",
- "tracing",
- "tx5-go-pion-sys",
- "url",
-]
-
-[[package]]
-name = "tx5-go-pion-sys"
-version = "0.1.5-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d40c7d4bec6f9ca0f379981a99ec8765f01e7812a4dc0a27c021cb988c89a5"
-dependencies = [
- "Inflector",
- "base64 0.22.1",
- "dirs",
- "libc",
- "libloading",
- "once_cell",
- "ouroboros",
- "sha2",
- "tracing",
- "tx5-core",
- "zip 0.6.6",
-]
-
-[[package]]
-name = "tx5-go-pion-turn"
-version = "0.1.5-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80a2648d5eaa7bc0feb2a90be2b84b148d1ae2a254d568f77d3cc41005648f03"
-dependencies = [
- "base64 0.22.1",
- "dirs",
- "dunce",
- "if-addrs 0.10.2",
- "once_cell",
- "sha2",
- "tokio",
- "tracing",
- "tx5-core",
- "zip 0.6.6",
-]
-
-[[package]]
-name = "tx5-signal"
-version = "0.1.5-beta"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d507c5cd6e14fd81cc6d2a6571b1eba35eeda7c11cc00ac56ed7d109cd1265"
-dependencies = [
- "rand 0.8.5",
- "sbd-e2e-crypto-client",
- "tokio",
- "tracing",
- "tx5-core",
-]
-
 [[package]]
 name = "typed-arena"
 version = "2.0.2"
@@ -8173,9 +4866,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "unarray"
@@ -8183,59 +4876,29 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-id-start"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc3882f69607a2ac8cc4de3ee7993d8f68bb06f2974271195065b3bd07f2edea"
+checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.5"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode_categories"
@@ -8261,17 +4924,11 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
-[[package]]
-name = "unwrap_to"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad414b2eed757c1b6f810f8abc814e298a9c89176b21fae092c7a87756fb839"
-
 [[package]]
 name = "ureq"
-version = "2.10.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
  "base64 0.22.1",
  "log",
@@ -8281,9 +4938,9 @@ dependencies = [
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -8308,10 +4965,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
-name = "utf-8"
-version = "0.7.6"
+name = "utf16_iter"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "utf8parse"
@@ -8321,13 +4984,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
- "getrandom 0.2.15",
- "rand 0.8.5",
- "serde",
+ "getrandom",
+ "rand",
 ]
 
 [[package]]
@@ -8336,12 +4998,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "value-bag"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -8355,448 +5011,132 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "wait-timeout"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "waker-fn"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "warp"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "headers",
- "http 0.2.12",
- "hyper 0.14.30",
- "log",
- "mime",
- "mime_guess",
- "multer",
- "percent-encoding",
- "pin-project",
- "scoped-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-tungstenite",
- "tokio-util",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
-dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.77",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
-
-[[package]]
-name = "wasm-encoder"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7"
-dependencies = [
- "leb128",
-]
-
-[[package]]
-name = "wasm-streams"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "wasmer"
-version = "4.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be5fa49d7d97f83e095f090dcc178d923f2970f588443283cd7a94974ab8cbe"
-dependencies = [
- "bytes",
- "cfg-if 1.0.0",
- "derivative",
- "indexmap 1.9.3",
- "js-sys",
- "more-asserts",
- "rustc-demangle",
- "serde",
- "serde-wasm-bindgen",
- "shared-buffer",
- "target-lexicon",
- "thiserror",
- "tracing",
- "wasm-bindgen",
- "wasmer-compiler",
- "wasmer-compiler-cranelift",
- "wasmer-derive",
- "wasmer-types",
- "wasmer-vm",
- "wat",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "wasmer-compiler"
-version = "4.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9696a040f935903db440078cd287c0288ab152394122de442fdd21b3eaa8cd2c"
-dependencies = [
- "backtrace",
- "bytes",
- "cfg-if 1.0.0",
- "enum-iterator",
- "enumset",
- "lazy_static",
- "leb128",
- "libc",
- "memmap2 0.5.10",
- "more-asserts",
- "region",
- "rkyv",
- "self_cell",
- "shared-buffer",
- "smallvec",
- "thiserror",
- "wasmer-types",
- "wasmer-vm",
- "wasmparser",
- "windows-sys 0.59.0",
- "xxhash-rust",
-]
-
-[[package]]
-name = "wasmer-compiler-cranelift"
-version = "4.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5959da148d41a5870d1b18a880e19353add47c0ca95e510061275ea467b6b44"
-dependencies = [
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-frontend",
- "gimli 0.26.2",
- "more-asserts",
- "rayon",
- "smallvec",
- "target-lexicon",
- "tracing",
- "wasmer-compiler",
- "wasmer-types",
-]
-
-[[package]]
-name = "wasmer-config"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b4a632496950fde9ad821e195ef1a301440076f7c7d80de55239a140359bcbd"
-dependencies = [
- "anyhow",
- "bytesize",
- "derive_builder 0.12.0",
- "hex",
- "indexmap 2.5.0",
- "schemars",
- "semver",
- "serde",
- "serde_cbor",
- "serde_json",
- "serde_yaml",
- "thiserror",
- "toml",
- "url",
-]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
-name = "wasmer-derive"
-version = "4.3.6"
+name = "wait-timeout"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f448efbe12d656ba96d997c9e338f15cd80934c81f2286c2730cb9224d4e41d"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
 dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "libc",
 ]
 
 [[package]]
-name = "wasmer-middlewares"
-version = "4.3.6"
+name = "walkdir"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a3c1a7474e5abd75fe6bde4d34fee77c22261b45f157bb769d4a297749463c"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
- "wasmer",
- "wasmer-types",
- "wasmer-vm",
+ "same-file",
+ "winapi-util",
 ]
 
 [[package]]
-name = "wasmer-types"
-version = "4.3.6"
+name = "want"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8b383ef63005176be3bc2056d3b4078ae1497b324f573d79acbf81036f1c9ec"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "bytecheck",
- "enum-iterator",
- "enumset",
- "getrandom 0.2.15",
- "hex",
- "indexmap 1.9.3",
- "more-asserts",
- "rkyv",
- "sha2",
- "target-lexicon",
- "thiserror",
- "webc",
- "xxhash-rust",
+ "try-lock",
 ]
 
 [[package]]
-name = "wasmer-vm"
-version = "4.3.6"
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c371597ec33248e775de641c7a475173fb60f2b5ea085c74d34cee9fad06b83"
-dependencies = [
- "backtrace",
- "cc",
- "cfg-if 1.0.0",
- "corosensei",
- "crossbeam-queue",
- "dashmap 6.1.0",
- "derivative",
- "enum-iterator",
- "fnv",
- "indexmap 1.9.3",
- "lazy_static",
- "libc",
- "mach2",
- "memoffset 0.9.1",
- "more-asserts",
- "region",
- "scopeguard",
- "thiserror",
- "wasmer-types",
- "windows-sys 0.59.0",
-]
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasmparser"
-version = "0.121.2"
+name = "wasm-bindgen"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
- "bitflags 2.6.0",
- "indexmap 2.5.0",
- "semver",
+ "cfg-if 1.0.0",
+ "once_cell",
+ "wasm-bindgen-macro",
 ]
 
 [[package]]
-name = "wast"
-version = "64.0.0"
+name = "wasm-bindgen-backend"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
- "leb128",
- "memchr",
- "unicode-width",
- "wasm-encoder",
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "wat"
-version = "1.0.71"
+name = "wasm-bindgen-futures"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
- "wast",
+ "cfg-if 1.0.0",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
-name = "web-sys"
-version = "0.3.70"
+name = "wasm-bindgen-macro"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
- "js-sys",
- "wasm-bindgen",
+ "quote",
+ "wasm-bindgen-macro-support",
 ]
 
 [[package]]
-name = "webc"
-version = "6.0.0-rc3"
+name = "wasm-bindgen-macro-support"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85ffb11d1fabf0ebfc458a3d1d34ccf6d4d9596ca7576370cae4eab554c63d1"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
- "anyhow",
- "base64 0.22.1",
- "bytes",
- "cfg-if 1.0.0",
- "document-features",
- "flate2",
- "indexmap 1.9.3",
- "libc",
- "once_cell",
- "semver",
- "serde",
- "serde_cbor",
- "serde_json",
- "sha2",
- "shared-buffer",
- "tar",
- "tempfile",
- "thiserror",
- "toml",
- "url",
- "wasmer-config",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "webpki-roots"
-version = "0.25.4"
+name = "wasm-bindgen-shared"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
-name = "webpki-roots"
-version = "0.26.5"
+name = "web-sys"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
- "rustls-pki-types",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.28"
+version = "0.7.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690"
+checksum = "58e6db2670d2be78525979e9a5f9c69d296fd7d670549fe9ebf70f8708cb5019"
 dependencies = [
  "bytemuck",
  "safe_arch",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -8828,16 +5168,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.57.0"
@@ -8877,7 +5207,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8888,7 +5218,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8930,28 +5260,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75"
-dependencies = [
- "windows_aarch64_msvc 0.33.0",
- "windows_i686_gnu 0.33.0",
- "windows_i686_msvc 0.33.0",
- "windows_x86_64_gnu 0.33.0",
- "windows_x86_64_msvc 0.33.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -8979,21 +5287,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -9025,12 +5318,6 @@ dependencies = [
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -9043,18 +5330,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -9067,18 +5342,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -9097,18 +5360,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -9121,18 +5372,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -9145,12 +5384,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -9163,18 +5396,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -9189,31 +5410,24 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "winreg"
-version = "0.50.0"
+name = "write16"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if 1.0.0",
- "windows-sys 0.48.0",
-]
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
 
 [[package]]
-name = "wyz"
-version = "0.5.1"
+name = "writeable"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
 [[package]]
 name = "xattr"
@@ -9222,35 +5436,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
- "linux-raw-sys 0.4.14",
- "rustix 0.38.36",
+ "linux-raw-sys",
+ "rustix",
 ]
 
 [[package]]
-name = "xdg"
-version = "2.5.2"
+name = "yansi"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
 
 [[package]]
-name = "xxhash-rust"
-version = "0.8.12"
+name = "yasna"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "time",
+]
 
 [[package]]
-name = "yansi"
-version = "0.5.1"
+name = "yoke"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
 
 [[package]]
-name = "yasna"
-version = "0.5.2"
+name = "yoke-derive"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
- "time",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure",
 ]
 
 [[package]]
@@ -9271,68 +5497,73 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
-name = "zeroize"
-version = "1.8.1"
+name = "zerofrom"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
 dependencies = [
- "zeroize_derive",
+ "zerofrom-derive",
 ]
 
 [[package]]
-name = "zeroize_derive"
-version = "1.4.2"
+name = "zerofrom-derive"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
+ "synstructure",
 ]
 
 [[package]]
-name = "zip"
-version = "0.6.6"
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
 dependencies = [
- "byteorder",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "zip"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352"
 dependencies = [
- "aes",
  "arbitrary",
- "bzip2",
- "constant_time_eq",
  "crc32fast",
  "crossbeam-utils",
- "deflate64",
  "displaydoc",
  "flate2",
- "hmac",
- "indexmap 2.5.0",
- "lzma-rs",
+ "indexmap 2.7.0",
  "memchr",
- "pbkdf2",
- "rand 0.8.5",
- "sha1",
- "thiserror",
- "time",
- "zeroize",
+ "thiserror 2.0.6",
  "zopfli",
- "zstd",
 ]
 
 [[package]]
@@ -9348,31 +5579,3 @@ dependencies = [
  "once_cell",
  "simd-adler32",
 ]
-
-[[package]]
-name = "zstd"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 9ae67ce93..a4382b32e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,9 +18,7 @@ name = "holochain_scaffolding_cli"
 path = "src/lib.rs"
 
 [dependencies]
-holochain = { features = ["test_utils"], version = "0.4.0-rc.2" }
 holochain_types = "0.4.0-rc.2"
-holochain_util = { features = ["backtrace"], version = "0.4.0-rc.0" }
 mr_bundle = "0.4.0-rc.1"
 
 dirs = "5.0.1"
@@ -51,4 +49,9 @@ itertools = "0.13.0"
 colored = "2.1.0"
 dprint-plugin-typescript = "0.91.1"
 markup_fmt = "0.10.0"
-git2 = { version = "0.19.0", default-features = false, features = ["https", "ssh_key_from_memory", "vendored-libgit2", "vendored-openssl"] }
+git2 = { version = "0.19.0", default-features = false, features = [
+  "https",
+  "ssh_key_from_memory",
+  "vendored-libgit2",
+  "vendored-openssl",
+] }
diff --git a/flake.nix b/flake.nix
index 8c02df547..7ae60a749 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,11 +28,6 @@
     flake-parts.lib.mkFlake { inherit inputs; }
       rec {
         flake = {
-          templates.default = {
-            path = ./templates/custom-template;
-            description = "Custom template for the scaffolding tool";
-          };
-
           lib.wrapCustomTemplate = { system, pkgs, customTemplatePath }:
             let
               scaffolding = inputs.holochain.packages.${system}.hc-scaffold;
@@ -70,9 +65,29 @@
 
               # source filtering to ensure builds using include_str! or include_bytes! succeed
               # https://crane.dev/faq/building-with-non-rust-includes.html
-              nonCargoBuildFiles = path: _type: builtins.match ".*(gitignore|md|hbs)$" path != null;
+              nonCargoBuildFiles = path: _type: builtins.match ".*(gitignore|md|hbs|nix|sh)$" path != null;
               includeFilesFilter = path: type:
                 (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type);
+
+              buildInputs = [ pkgs.openssl pkgs.go ]
+                ++ (lib.optionals pkgs.stdenv.isDarwin
+                (with pkgs.darwin.apple_sdk.frameworks; [
+                  CoreFoundation
+                  SystemConfiguration
+                  Security
+                ]));
+
+              nativeBuildInputs = [ pkgs.perl ];
+
+              cargoArtifacts = craneLib.buildDepsOnly {
+                pname = "hc-scaffold-deps";
+                src = lib.cleanSourceWith {
+                  src = ./.;
+                  filter = includeFilesFilter;
+                  name = "source";
+                };
+                inherit buildInputs nativeBuildInputs;
+              };
             in
             craneLib.buildPackage {
               pname = "hc-scaffold";
@@ -84,22 +99,9 @@
               };
               doCheck = false;
 
-              buildInputs = [ pkgs.openssl pkgs.go ]
-                ++ (lib.optionals pkgs.stdenv.isDarwin
-                (with pkgs.darwin.apple_sdk.frameworks; [
-                  CoreFoundation
-                  SystemConfiguration
-                  Security
-                ]));
-
-              nativeBuildInputs = [ pkgs.perl ];
+              inherit cargoArtifacts buildInputs nativeBuildInputs;
             };
 
-          checks.custom-template = flake.lib.wrapCustomTemplate {
-            inherit pkgs system;
-            customTemplatePath = ./templates/custom-template/custom-template;
-          };
-
           devShells.default = pkgs.mkShell {
             packages = (with inputs'.holonix.packages; [
               holochain
@@ -124,4 +126,10 @@
           };
         };
       };
+
+
+  nixConfig = {
+    extra-substituters = [ "https://holochain-ci.cachix.org" "https://holochain-scaffolding-cli.cachix.org" ];
+    extra-trusted-public-keys = [ "holochain-ci.cachix.org-1:5IUSkZc0aoRS53rfkvH9Kid40NpyjwCMCzwRTXy+QN8=" "holochain-scaffolding-cli.cachix.org-1:DznpFcPqqPqiP05k/0lT6qeQ/N3KOvKQW/EP4Pf3A2E=" ];
+  };
 }
diff --git a/guides/maintenance.md b/guides/maintenance.md
index 3c22c9220..0685a99d9 100644
--- a/guides/maintenance.md
+++ b/guides/maintenance.md
@@ -8,10 +8,10 @@ New development and bug fixes should target the `develop` branch. From there, ch
 
 There need to be some exceptions to this workflow to allow changes on maintenance branches that don't make sense to make on `develop`:
 
-- Bug fixes that are specific to a particular version of Holochain. This should be rare, but if Holochain were to introduce an API change between 0.1.x and 0.1.x+1 but NOT make that change for Holochain 0.2.x then the PR for Scaffolding would target `develop-0.1` directly.
-- Version bumps for `flake.nix`, `flake.lock` and `Cargo.lock` files should target the maintenance branches directly.
-- Version bumps for dependencies of Scaffolding in the `Cargo.toml`. For dependencies that are still on the same version as on `develop` it would be valid to target `develop` and back-port but you'll end up with a tricky lock file merge anyway.
-- Version bumps to Scaffolding itself don't make sense on `develop` so they should be made directly on the maintenance branches.
+-   Bug fixes that are specific to a particular version of Holochain. This should be rare, but if Holochain were to introduce an API change between 0.1.x and 0.1.x+1 but NOT make that change for Holochain 0.2.x then the PR for Scaffolding would target `develop-0.1` directly.
+-   Version bumps for `flake.nix`, `flake.lock`, `Cargo.lock` and [`versions.rs`](../src/versions.rs) files should target the maintenance branches directly.
+-   Version bumps for dependencies (typically holochain dependencies) of Scaffolding in the `Cargo.toml` or to Scaffolded hApps in [`versions.rs`](../src/versions.rs). For dependencies that are still on the same version as on `develop` it would be valid to target `develop` and back-port but you'll end up with a tricky lock file merge anyway.
+-   Version bumps to Scaffolding itself don't make sense on `develop` so they should be made directly on the maintenance branches.
 
 To keep back-porting as simple as possible please try to keep changes that target `develop` for back-port separate from changes that fit into these exceptions.
 
@@ -31,7 +31,7 @@ Releases can be done as needed. This may be a single PR back-port, a batch of ch
 
 1. Submit a PR which bumps the Scaffolding version in the `Cargo.toml` on the relevant maintenance branch. This should be merged before the release.
 2. Perform any testing which needs to be done before releasing the new changes.
-2. Changes on a maintenance branch such as `develop-0.1` are not yet visible to Holonix because there is a tag on the branch with the same version number such as `holochain-0.1`. This is the marker that Holonix will use to fetch the current version of Scaffolding corresponding to its Holochain version. Move this label to the tip of the maintenance branch. Sample commands are given for this below.
+3. Changes on a maintenance branch such as `develop-0.1` are not yet visible to Holonix because there is a tag on the branch with the same version number such as `holochain-0.1`. This is the marker that Holonix will use to fetch the current version of Scaffolding corresponding to its Holochain version. Move this label to the tip of the maintenance branch. Sample commands are given for this below.
 
 Moving a release tag example:
 
diff --git a/src/cli/collection.rs b/src/cli/collection.rs
index 1e932068f..d2f408338 100644
--- a/src/cli/collection.rs
+++ b/src/cli/collection.rs
@@ -63,6 +63,7 @@ impl Collection {
             }
             None => input_with_case(
                 "Collection name (snake_case, eg. \"all_posts\"):",
+                None,
                 Case::Snake,
             )?,
         };
@@ -90,10 +91,10 @@ impl Collection {
             );
         }
 
-        println!("\nCollection {} scaffolded!", name.italic());
+        println!("\nCollection {} scaffolded!\n", name.italic());
 
         if let Some(i) = next_instructions {
-            println!("\n{}", i);
+            println!("{}", i);
         }
 
         Ok(())
diff --git a/templates/custom-template/custom-template/README.md b/src/cli/custom-template/README.md
similarity index 60%
rename from templates/custom-template/custom-template/README.md
rename to src/cli/custom-template/README.md
index f10265231..e5ff89cc3 100644
--- a/templates/custom-template/custom-template/README.md
+++ b/src/cli/custom-template/README.md
@@ -6,24 +6,22 @@ Custom template for the [scaffolding tool](https://github.com/holochain/scaffold
 
 1. To scaffold a new project with this template, run this:
 
-`nix run github:<TODO:REPLACE_ME_WITH_THE_APPROPRIATE_GIT_URL>#hc-scaffold-custom-template -- web-app`
+```bash
+nix run github:<TODO:REPLACE_ME_WITH_CUSTOM_TEMPLATE_GIT_URL>#app -- web-app
+```
 
-2. If you already have an existing project, add the `<TODO:REPLACE_ME_WITH_THE_APPROPRIATE_GIT_URL>` repository as input to your flake, and use it in the packages or your `devShell`:
+2. If you already have an existing project, add the `<TODO:REPLACE_ME_WITH_CUSTOM_TEMPLATE_GIT_URL>` repository as input to your flake, and use it in the packages or your `devShell`:
 
 ```diff
 {
-  description = "Template for Holochain app development";
+  description = "Flake for Holochain app development";
 
   inputs = {
-    versions.url  = "github:holochain/holochain?dir=versions/weekly";
-
-    holochain-flake.url = "github:holochain/holochain";
-    holochain-flake.inputs.versions.follows = "versions";
-
-    nixpkgs.follows = "holochain-flake/nixpkgs";
-    flake-parts.follows = "holochain-flake/flake-parts";
+    holonix.url = "github:holochain/holonix?ref=main";
+    nixpkgs.follows = "holonix/nixpkgs";
+    flake-parts.follows = "holonix/flake-parts";
 
-+   scaffolding.url = "github:<TODO:REPLACE_ME_WITH_THE_APPROPRIATE_GIT_URL>";
++   scaffolding.url = "github:<TODO:REPLACE_ME_WITH_CUSTOM_TEMPLATE_GIT_URL>";
   };
 
   outputs = inputs:
@@ -32,7 +30,7 @@ Custom template for the [scaffolding tool](https://github.com/holochain/scaffold
         inherit inputs;
       }
       {
-        systems = builtins.attrNames inputs.holochain-flake.devShells;
+        systems = builtins.attrNames inputs.holonix.devShells;
         perSystem =
           { inputs'
           , config
@@ -41,24 +39,24 @@ Custom template for the [scaffolding tool](https://github.com/holochain/scaffold
           , ...
           }: {
             devShells.default = pkgs.mkShell {
-              inputsFrom = [ inputs'.holochain-flake.devShells.holonix ];
+              inputsFrom = [ inputs'.holonix.devShells.default ];
               packages = [
                 pkgs.nodejs_20
                 # more packages go here
 +             ] ++ [
-+                inputs'.scaffolding.packages.hc-scaffold-custom-template
++                inputs'.scaffolding.packages.app
               ];
             };
           };
       };
-}  
+}
 ```
 
 ---
 
 After this set up, you will be able to `nix develop` from inside your repository, and use the scaffolding tool as normal:
 
-```
+```bash
 hc scaffold dna
 hc scaffold zome
 ...
@@ -72,4 +70,4 @@ To run the tests for this custom template, simply run the `run_test.sh` script:
 
 ```bash
 sh run_test.sh
-``` 
+```
diff --git a/templates/custom-template/custom-template/flake.nix b/src/cli/custom-template/flake.nix
similarity index 100%
rename from templates/custom-template/custom-template/flake.nix
rename to src/cli/custom-template/flake.nix
diff --git a/templates/custom-template/custom-template/run_test.sh b/src/cli/custom-template/run_test.sh
similarity index 100%
rename from templates/custom-template/custom-template/run_test.sh
rename to src/cli/custom-template/run_test.sh
diff --git a/src/cli/dna.rs b/src/cli/dna.rs
index 7d662ff5b..b2dc5892d 100644
--- a/src/cli/dna.rs
+++ b/src/cli/dna.rs
@@ -30,7 +30,7 @@ impl Dna {
                 check_case(&n, "dna name", Case::Snake)?;
                 n
             }
-            None => input_with_case("DNA name (snake_case):", Case::Snake)?,
+            None => input_with_case("DNA name (snake_case):", None, Case::Snake)?,
         };
 
         let app_file_tree = AppFileTree::get_or_choose(file_tree, self.app.as_deref())?;
@@ -51,7 +51,8 @@ impl Dna {
                 r#"
 Add new zomes to your DNA with:
 
-  hc scaffold zome"#,
+  hc scaffold zome
+                "#,
             );
         }
 
diff --git a/src/cli/entry_type.rs b/src/cli/entry_type.rs
index 42b737afd..11d2d2b0d 100644
--- a/src/cli/entry_type.rs
+++ b/src/cli/entry_type.rs
@@ -69,7 +69,7 @@ impl EntryType {
                 check_case(&n, "entry type name", Case::Snake)?;
                 n
             }
-            None => input_with_case("Entry type name (snake_case):", Case::Snake)?,
+            None => input_with_case("Entry type name (snake_case):", None, Case::Snake)?,
         };
 
         let dna_file_tree = DnaFileTree::get_or_choose(file_tree, self.dna.as_deref())?;
@@ -110,7 +110,8 @@ impl EntryType {
                 r#"
 Add new collections for that entry type with:
 
-  hc scaffold collection"#,
+  hc scaffold collection
+                "#,
             );
         }
 
diff --git a/src/cli/example.rs b/src/cli/example.rs
index 21ca156bf..f2916c0cf 100644
--- a/src/cli/example.rs
+++ b/src/cli/example.rs
@@ -270,11 +270,11 @@ impl Example {
         };
 
         let ScaffoldedTemplate {
-            file_tree,
+            mut file_tree,
             next_instructions,
         } = scaffold_example(file_tree, package_manager, &template_file_tree, &example)?;
 
-        let file_tree = ScaffoldConfig::write_to_package_json(file_tree, template_type)?;
+        ScaffoldConfig::write_to_package_json(&mut file_tree, template_type)?;
 
         build_file_tree(file_tree, &app_dir)?;
 
@@ -296,10 +296,10 @@ impl Example {
 
         setup_git_environment(&app_dir)?;
 
-        println!("\nExample {} scaffolded!", example.to_string().italic());
+        println!("\nExample {} scaffolded!\n", example.to_string().italic());
 
         if let Some(i) = next_instructions {
-            println!("\n{}", i);
+            println!("{}", i);
         }
 
         Ok(())
diff --git a/src/cli/link_type.rs b/src/cli/link_type.rs
index 3174ebdd2..4bf7f0e65 100644
--- a/src/cli/link_type.rs
+++ b/src/cli/link_type.rs
@@ -82,9 +82,9 @@ impl LinkType {
             );
         }
 
-        println!("\nLink type scaffolded!");
+        println!("\nLink type scaffolded!\n");
         if let Some(i) = next_instructions {
-            println!("\n{}", i);
+            println!("{}", i);
         }
 
         Ok(())
diff --git a/src/cli/template.rs b/src/cli/template.rs
index d2c9f0e27..f9318efcc 100644
--- a/src/cli/template.rs
+++ b/src/cli/template.rs
@@ -1,15 +1,16 @@
 use std::{ffi::OsString, path::PathBuf};
 
-use build_fs_tree::{dir, Build, MergeableFileSystemTree};
-use dialoguer::{theme::ColorfulTheme, Input};
+use build_fs_tree::{dir, file, Build, MergeableFileSystemTree};
 use structopt::StructOpt;
 
-use crate::scaffold::web_app::template_type::TemplateType;
+use crate::{scaffold::web_app::template_type::TemplateType, utils::input_with_case};
 
 #[derive(Debug, StructOpt)]
 #[structopt(setting = structopt::clap::AppSettings::InferSubcommands)]
 /// Manage custom templates
 pub enum Template {
+    /// Create a new template from an existing scaffolding template
+    New,
     /// Clone the template in use into a new custom template
     Clone {
         #[structopt(long)]
@@ -20,14 +21,44 @@ pub enum Template {
 
 impl Template {
     pub fn run(self, template_type: &TemplateType) -> anyhow::Result<()> {
-        let target_template = match self.target_template() {
+        match self {
+            Template::New => Template::new_template(template_type),
+            Template::Clone { to_template } => Template::clone_template(to_template, template_type),
+        }
+    }
+
+    fn new_template(from_template: &TemplateType) -> anyhow::Result<()> {
+        let name = input_with_case(
+            "Enter new template name (kebab-case):",
+            Some(&from_template.name()),
+            convert_case::Case::Kebab,
+        )?;
+
+        let template_file_tree = dir! {
+            name.clone() => dir!{
+                "template" =>  from_template.file_tree()?,
+                "README.md" => file!(include_str!("custom-template/README.md")),
+                "flake.nix" => file!(include_str!("custom-template/flake.nix")),
+                "run_test.sh" => file!(include_str!("custom-template/run_test.sh"))
+            },
+        };
+
+        let file_tree = MergeableFileSystemTree::<OsString, String>::from(template_file_tree);
+
+        file_tree.build(&PathBuf::from("."))?;
+
+        println!(r#"Template initialized in path: ./{} "#, name);
+
+        Ok(())
+    }
+
+    fn clone_template(
+        to_template: Option<String>,
+        template_type: &TemplateType,
+    ) -> anyhow::Result<()> {
+        let target_template = match to_template {
             Some(t) => t,
-            None => {
-                // Enter template name
-                Input::with_theme(&ColorfulTheme::default())
-                    .with_prompt("Enter new template name:")
-                    .interact()?
-            }
+            None => input_with_case("Enter new template name:", None, convert_case::Case::Kebab)?,
         };
 
         let template_file_tree = dir! {
@@ -38,20 +69,8 @@ impl Template {
 
         file_tree.build(&PathBuf::from("."))?;
 
-        match self {
-            Template::Clone { .. } => {
-                println!(r#"Template initialized to folder {:?} "#, target_template);
-            }
-        }
-        Ok(())
-    }
+        println!(r#"Template initialized in path: ./{} "#, target_template);
 
-    pub fn target_template(&self) -> Option<String> {
-        match self {
-            Template::Clone {
-                to_template: target_template,
-                ..
-            } => target_template.clone(),
-        }
+        Ok(())
     }
 }
diff --git a/src/cli/web_app.rs b/src/cli/web_app.rs
index 1c71ebfc3..ecc68a06d 100644
--- a/src/cli/web_app.rs
+++ b/src/cli/web_app.rs
@@ -24,9 +24,7 @@ use crate::{
         zome::scaffold_zome_pair,
     },
     templates::ScaffoldedTemplate,
-    utils::{
-        check_no_whitespace, input_no_whitespace, input_with_case_and_initial_text, input_yes_or_no,
-    },
+    utils::{check_no_whitespace, input_no_whitespace, input_with_case, input_yes_or_no},
 };
 
 #[derive(Debug, StructOpt)]
@@ -90,7 +88,7 @@ impl WebApp {
         };
 
         let ScaffoldedTemplate {
-            file_tree,
+            mut file_tree,
             next_instructions,
         } = scaffold_web_app(
             &name,
@@ -101,7 +99,9 @@ impl WebApp {
             self.holo_enabled,
         )?;
 
-        let file_tree = ScaffoldConfig::write_to_package_json(file_tree, template_type)?;
+        if !template_type.is_nixified_custom_template() {
+            ScaffoldConfig::write_to_package_json(&mut file_tree, template_type)?;
+        }
 
         build_file_tree(file_tree, &app_folder)?;
 
@@ -115,7 +115,7 @@ impl WebApp {
             nix_instructions = "\n  nix develop";
         }
 
-        println!("Your Web hApp {} has been scaffolded!", name.italic());
+        println!("Your Web hApp {} has been scaffolded!\n", name.italic());
 
         let mut disable_fast_track = self.disable_fast_track;
 
@@ -130,11 +130,10 @@ impl WebApp {
         setup_git_environment(&app_folder)?;
 
         if let Some(instructions) = next_instructions {
-            println!("\n{instructions}");
+            println!("{instructions}");
         } else {
             let dna_instructions = disable_fast_track.then_some(
                 r#"
-
 - Get your project to compile by adding a DNA and then following the next insturctions to add a zome to that DNA:
 
   hc scaffold dna"#).unwrap_or_default();
@@ -156,7 +155,8 @@ Here's how you can get started with developing your application:
 
 - Then, at any point in time you can start your application with:
 
-  {}"#,
+  {}
+                "#,
                 package_manager.run_command_string(SubCommand::Install, None),
                 package_manager.run_command_string(SubCommand::Run("start".to_string()), None)
             );
@@ -171,10 +171,10 @@ Here's how you can get started with developing your application:
         path: &Path,
     ) -> ScaffoldResult<()> {
         env::set_current_dir(PathBuf::from(&name))?;
-        let dna_name = input_with_case_and_initial_text(
+        let dna_name = input_with_case(
             "Initial DNA name (snake_case):",
+            Some(&name.to_case(Case::Snake)),
             Case::Snake,
-            &name.to_case(Case::Snake),
         )?;
 
         let file_tree = load_directory_into_memory(&path.join(name))?;
diff --git a/src/cli/zome.rs b/src/cli/zome.rs
index e0daf8f56..86ea5876d 100644
--- a/src/cli/zome.rs
+++ b/src/cli/zome.rs
@@ -63,7 +63,7 @@ impl Zome {
 
         let name = match self.name {
             Some(n) => n,
-            None => input_with_case(name_prompt, Case::Snake)?,
+            None => input_with_case(name_prompt, None, Case::Snake)?,
         };
 
         let mut dna_file_tree = DnaFileTree::get_or_choose(file_tree, self.dna.as_deref())?;
@@ -90,7 +90,7 @@ impl Zome {
             zome_next_instructions.0 = next_instructions;
 
             println!(
-                "\nIntegrity zome {} scaffolded!",
+                "Integrity zome {} scaffolded!\n",
                 integrity_zome_name.italic(),
             );
 
@@ -120,7 +120,7 @@ impl Zome {
             )?;
             zome_next_instructions.1 = next_instructions;
 
-            println!("\nCoordinator zome {} scaffolded!", name.italic());
+            println!("Coordinator zome {} scaffolded!\n", name.italic());
 
             dna_file_tree = DnaFileTree::from_dna_manifest_path(file_tree, &dna_manifest_path)?;
         }
diff --git a/src/error.rs b/src/error.rs
index a6ab7c4d0..7611e243a 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,6 +1,5 @@
 use std::{io, path::PathBuf};
 
-use holochain_util::ffs;
 use thiserror;
 
 #[derive(Debug, thiserror::Error)]
@@ -9,9 +8,6 @@ pub enum ScaffoldError {
     #[error("IO error: {0}")]
     StdIoError(#[from] std::io::Error),
 
-    #[error("ffs::IoError: {0}")]
-    FfsIoError(#[from] ffs::IoError),
-
     /// MrBundleError
     #[error(transparent)]
     MrBundleError(#[from] mr_bundle::error::MrBundleError),
diff --git a/src/file_tree.rs b/src/file_tree.rs
index f220c8a1f..21dbff58a 100644
--- a/src/file_tree.rs
+++ b/src/file_tree.rs
@@ -82,8 +82,6 @@ pub fn insert_file(
     let mut folder_path = file_path.to_path_buf();
     folder_path.pop();
 
-    let content = convert_rust_line_to_doc_comments(file_path, content);
-
     insert_file_tree_in_dir(
         file_tree,
         &folder_path,
@@ -232,7 +230,7 @@ pub fn map_rust_files<F: Fn(PathBuf, syn::File) -> ScaffoldResult<syn::File> + C
 /// otherwise returns the original content unchanged.
 fn convert_rust_line_to_doc_comments(file_path: &Path, content: &str) -> String {
     if file_path.extension().and_then(|ext| ext.to_str()) == Some("rs") {
-        let re = Regex::new(r"^\/\/[^\/]|[^\/]\/\/[^\/]").expect("Failed to create regex");
+        let re = Regex::new(r"(?:^|[^:])/(/[^/])").expect("Failed to create regex");
         content
             .lines()
             .map(|line| re.replace_all(line, "/// ").into_owned() + "\n")
diff --git a/src/lib.rs b/src/lib.rs
index a4cd6e8a1..d217d714f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -36,7 +36,7 @@
 //!
 //! # Custom Templates
 //!
-//! The scaffolding tool comes with 4 built-in templates:
+//! The scaffolding tool comes with 6 built-in templates:
 //!
 //! - Vue (with TypeScript)
 //! - Svelte (with TypeScript)
@@ -97,10 +97,19 @@
 //! To create a custom template, execute these steps:
 //!
 //! 1. Run this command:
-//!     `nix flake init -t github:holochain/scaffolding`
-//! 2. A new dir `custom-template` will be created in the current directory. Check this new folder in a version control system like git.
-//! 3. Replace all instances of `<TODO:REPLACE_ME_WITH_THE_APPROPRIATE_GIT_URL>` in its `README.md` file with the appropriate git URL (eg. "github:holochain-open-dev/templates").
-//! 4. Replace all instances of `<TODO:REPLACE_ME_WITH_THE_APPROPRIATE_GIT_URL>` in its `template/web-app/flake.nix.hbs` file with the appropriate git URL (eg. "github:holochain-open-dev/templates").
+//!     - Through holonix:
+//!
+//!     ```bash
+//!     nix run github:holochain/holonix#hc-scaffold -- template new
+//!     ```
+//!     - Outside holonix if the cli was installed via `cargo install holochain_scaffolding_cli`
+//!
+//!     ```bash
+//!     hc-scaffold template new
+//!     ```
+//! 2. A new dir will be created in the current directory. Check this new folder in a version control system like git.
+//! 3. Replace all instances of `<TODO:REPLACE_ME_WITH_CUSTOM_TEMPLATE_GIT_URL>` in its `README.md` file with the appropriate git URL (eg. "github:holochain-open-dev/templates").
+//! 4. Replace all instances of `<TODO:REPLACE_ME_WITH_CUSTOM_TEMPLATE_GIT_URL>` in its `template/web-app/flake.nix.hbs` file with the appropriate git URL (eg. "github:holochain-open-dev/templates").
 //!
 //! That's it! At this point you will have a correctly functioning custom template repository with tests, a `README.md` documenting how to use it, and a `template` folder. That's where your custom template lives.
 //!
diff --git a/src/scaffold/app.rs b/src/scaffold/app.rs
index 20543b82d..79e8ddd04 100644
--- a/src/scaffold/app.rs
+++ b/src/scaffold/app.rs
@@ -1,7 +1,7 @@
 use std::{collections::BTreeMap, path::PathBuf};
 
 use dialoguer::{theme::ColorfulTheme, Select};
-use holochain::prelude::AppManifest;
+use holochain_types::app::AppManifest;
 use mr_bundle::Manifest;
 
 use crate::{
diff --git a/src/scaffold/config.rs b/src/scaffold/config.rs
index 5c5b3de26..9bbff39c6 100644
--- a/src/scaffold/config.rs
+++ b/src/scaffold/config.rs
@@ -33,15 +33,15 @@ impl ScaffoldConfig {
     }
 
     pub fn write_to_package_json(
-        mut web_app_file_tree: FileTree,
+        web_app_file_tree: &mut FileTree,
         template_type: &TemplateType,
-    ) -> ScaffoldResult<FileTree> {
+    ) -> ScaffoldResult<()> {
         let config = ScaffoldConfig {
             template: template_type.clone(),
         };
         let package_json_path = PathBuf::from("package.json");
 
-        map_file(&mut web_app_file_tree, &package_json_path, |c| {
+        map_file(web_app_file_tree, &package_json_path, |c| {
             let original_content = c.clone();
             let json = serde_json::from_str::<Value>(&c)?;
             let json = match json {
@@ -59,6 +59,6 @@ impl ScaffoldConfig {
             Ok(json)
         })?;
 
-        Ok(web_app_file_tree)
+        Ok(())
     }
 }
diff --git a/src/scaffold/entry_type/definitions.rs b/src/scaffold/entry_type/definitions.rs
index 6e946b413..b3ea4be5e 100644
--- a/src/scaffold/entry_type/definitions.rs
+++ b/src/scaffold/entry_type/definitions.rs
@@ -1,7 +1,7 @@
 use anyhow::Context;
 use colored::Colorize;
 use convert_case::{Case, Casing};
-use holochain::test_utils::itertools::Itertools;
+use itertools::Itertools;
 use proc_macro2::TokenStream;
 use quote::{format_ident, quote};
 use regex::Regex;
diff --git a/src/scaffold/entry_type/fields.rs b/src/scaffold/entry_type/fields.rs
index 1e7669d38..3993665ac 100644
--- a/src/scaffold/entry_type/fields.rs
+++ b/src/scaffold/entry_type/fields.rs
@@ -34,6 +34,7 @@ pub fn choose_fields(
             zome_file_tree,
             field_types_templates,
             no_ui,
+            None,
         )?;
         println!();
 
@@ -45,25 +46,99 @@ pub fn choose_fields(
     }
 
     println!(
-        "Chosen fields:\n {}",
+        "Current fields:\n{}\n",
         fields
             .iter()
-            .map(|f| format!("{}: {}", f.field_name.clone(), f.field_type))
+            .map(|f| format!(" {}: {}", f.field_name.clone(), f.field_type))
             .collect::<Vec<String>>()
-            .join(", ")
+            .join("\n")
             .italic()
     );
 
     let selection = Select::with_theme(&ColorfulTheme::default())
-        .with_prompt(
-            "Do you want to proceed with the current entry type or restart from the beginning?",
-        )
-        .item("Confirm")
-        .item("Restart")
+        .with_prompt("Do you want to proceed with the current entry type?")
+        .items(&["Confirm", "Modify", "Restart"])
         .default(0)
         .interact()?;
 
     if selection == 1 {
+        loop {
+            let action = Select::with_theme(&ColorfulTheme::default())
+                .with_prompt("What would you like to do?")
+                .items(&["Change Field", "Add Field", "Remove Field", "Done"])
+                .interact()?;
+
+            match action {
+                0 => {
+                    // Change field
+                    if !fields.is_empty() {
+                        let field_to_change = Select::with_theme(&ColorfulTheme::default())
+                            .with_prompt("Select field to change")
+                            .items(
+                                &fields
+                                    .iter()
+                                    .map(|f| format!("{}: {}", f.field_name, f.field_type).italic())
+                                    .collect::<Vec<_>>(),
+                            )
+                            .interact()?;
+
+                        let new_field = choose_field(
+                            entry_type_name,
+                            zome_file_tree,
+                            field_types_templates,
+                            no_ui,
+                            Some(&fields[field_to_change].field_name),
+                        )?;
+                        fields[field_to_change] = new_field;
+                    } else {
+                        println!("{}", "No fields left to change".yellow())
+                    }
+                }
+                1 => {
+                    // Add field
+                    let new_field = choose_field(
+                        entry_type_name,
+                        zome_file_tree,
+                        field_types_templates,
+                        no_ui,
+                        None,
+                    )?;
+                    fields.push(new_field);
+                }
+                2 => {
+                    // Remove field
+                    if !fields.is_empty() {
+                        let field_to_remove = Select::with_theme(&ColorfulTheme::default())
+                            .with_prompt("Select field to remove")
+                            .items(
+                                &fields
+                                    .iter()
+                                    .map(|f| format!("{}: {}", f.field_name, f.field_type).italic())
+                                    .collect::<Vec<_>>(),
+                            )
+                            .interact()?;
+                        fields.remove(field_to_remove);
+                    } else {
+                        println!("{}", "All fields have been removed".yellow())
+                    }
+                }
+                3 => break, // Done
+                _ => unreachable!(),
+            }
+
+            if !fields.is_empty() {
+                println!(
+                    "\nCurrent fields:\n{}\n",
+                    fields
+                        .iter()
+                        .map(|f| format!(" {}: {}", f.field_name, f.field_type))
+                        .collect::<Vec<String>>()
+                        .join("\n")
+                        .italic()
+                );
+            }
+        }
+    } else if selection == 2 {
         return choose_fields(
             entry_type_name,
             zome_file_tree,
@@ -80,6 +155,7 @@ fn choose_field(
     zome_file_tree: &ZomeFileTree,
     field_types_templates: &FileTree,
     no_ui: bool,
+    initial_field_name: Option<&str>,
 ) -> ScaffoldResult<FieldDefinition> {
     let field_types = FieldType::list();
     let field_type_names: Vec<String> = field_types
@@ -88,15 +164,16 @@ fn choose_field(
         .map(|s| s.to_string())
         .collect();
 
-    let field_name = input_with_custom_validation("Field name:", |input| {
-        if let Err(e) = check_case(&input, "field_name", Case::Snake) {
-            return Err(e.to_string());
-        }
-        if let Err(e) = check_for_reserved_keywords(&input) {
-            return Err(e.to_string());
-        }
-        Ok(())
-    })?;
+    let field_name =
+        input_with_custom_validation("Field name (snake_case):", initial_field_name, |input| {
+            if let Err(e) = check_case(&input, "field_name", Case::Snake) {
+                return Err(e.to_string());
+            }
+            if let Err(e) = check_for_reserved_keywords(&input) {
+                return Err(e.to_string());
+            }
+            Ok(())
+        })?;
 
     let selection = Select::with_theme(&ColorfulTheme::default())
         .with_prompt("Choose field type:")
@@ -129,8 +206,10 @@ fn choose_field(
     };
 
     if let FieldType::Enum { .. } = field_type {
-        let label =
-            input_with_custom_validation("Enter the name of the enum:", |input: String| {
+        let label = input_with_custom_validation(
+            "Enter the name of the enum (PascalCase):",
+            None,
+            |input: String| {
                 if !input.is_case(Case::Pascal) {
                     return Err(format!("Input must be {:?} case.", Case::Pascal));
                 }
@@ -140,14 +219,16 @@ fn choose_field(
                     ));
                 }
                 Ok(())
-            })?;
+            },
+        )?;
 
         let mut variants = Vec::new();
         let mut another_variant = true;
 
         while another_variant {
             let variant = input_with_custom_validation(
-                "Enter the name of the next variant:",
+                "Enter the name of the next variant (PascalCase):",
+                None,
                 |input: String| {
                     if !input.is_case(Case::Pascal) {
                         return Err(format!("Input must be {:?} case.", Case::Pascal));
@@ -190,6 +271,7 @@ fn choose_field(
             if should_link_from_agent_pubkey {
                 let role = input_with_case(
                     "Which role does this agent play in the relationship ? (eg. \"creator\", \"invitee\")",
+                    None,
                     Case::Snake
                 )?;
                 Some(Referenceable::Agent { role })
diff --git a/src/scaffold/entry_type/utils.rs b/src/scaffold/entry_type/utils.rs
index d3c4bdb44..39eb7a126 100644
--- a/src/scaffold/entry_type/utils.rs
+++ b/src/scaffold/entry_type/utils.rs
@@ -131,6 +131,7 @@ fn inner_choose_referenceable(
         "Agent" => {
             let role = input_with_case(
             "Which role does this agent play in the relationship ? (eg. \"creator\", \"invitee\")",
+            None,
             Case::Snake,
         )?;
             check_for_reserved_keywords(&role)?;
@@ -139,6 +140,7 @@ fn inner_choose_referenceable(
         "ExternalHash" => {
             let name = input_with_case(
                 "What name should be given to the link for this hash?",
+                None,
                 Case::Snake,
             )?;
             Ok(Some(Referenceable::ExternalHash { name }))
diff --git a/src/scaffold/link_type.rs b/src/scaffold/link_type.rs
index d06f59bf8..9a2a2bc05 100644
--- a/src/scaffold/link_type.rs
+++ b/src/scaffold/link_type.rs
@@ -59,7 +59,7 @@ pub fn scaffold_link_type(
 
     let link_type = match &to_referenceable {
         Some(to_referenceable) => link_type_name(&from_referenceable, to_referenceable),
-        None => input_with_case("Enter link type name:", Case::Pascal)?,
+        None => input_with_case("Enter link type name:", None, Case::Pascal)?,
     };
 
     let bidirectional = match (&to_referenceable, bidirectional) {
diff --git a/src/scaffold/link_type/integrity.rs b/src/scaffold/link_type/integrity.rs
index d9d86cc95..1118e0fe8 100644
--- a/src/scaffold/link_type/integrity.rs
+++ b/src/scaffold/link_type/integrity.rs
@@ -45,14 +45,12 @@ pub fn add_link_type_to_integrity_zome(
         &|_path, file| {
             file.items.clone().into_iter().find(|i| {
                 if let syn::Item::Enum(item_enum) = i.clone() {
-                    if item_enum.attrs.iter().any(|a| {
+                    return item_enum.attrs.iter().any(|a| {
                         a.path()
                             .segments
                             .iter()
                             .any(|s| s.ident == "hdk_link_types")
-                    }) {
-                        return true;
-                    }
+                    });
                 }
                 false
             })
@@ -101,27 +99,24 @@ pub fn add_link_type_to_integrity_zome(
 
                 for item in &mut file.items {
                     if let syn::Item::Fn(item_fn) = item {
-                        if item_fn.sig.ident.to_string().eq(&String::from("validate")) {
-                            for stmt in &mut item_fn.block.stmts {
-                                if let syn::Stmt::Expr(syn::Expr::Match(match_expr), _) = stmt {
-                                    if let syn::Expr::Try(try_expr) = &mut *match_expr.expr {
-                                        if let syn::Expr::MethodCall(call) = &mut *try_expr.expr {
-                                            if call
-                                                .method
-                                                .to_string()
-                                                .eq(&String::from("flattened"))
-                                            {
-                                                if let Some(turbofish) = &mut call.turbofish {
-                                                    if let Some(last_arg) =
-                                                        turbofish.args.last_mut()
-                                                    {
-                                                        *last_arg = syn::GenericArgument::Type(
-                                                            syn::parse_str::<syn::Type>(
-                                                                "LinkTypes",
-                                                            )?,
-                                                        );
-                                                    }
-                                                }
+                        if item_fn.sig.ident != "validate" {
+                            continue;
+                        }
+                        for stmt in &mut item_fn.block.stmts {
+                            if let syn::Stmt::Expr(syn::Expr::Match(match_expr), _) = stmt {
+                                if let syn::Expr::Try(try_expr) = &mut *match_expr.expr {
+                                    if let syn::Expr::MethodCall(call) = &mut *try_expr.expr {
+                                        if call.method != "flattened" {
+                                            continue;
+                                        }
+                                        if let Some(turbofish) = &mut call.turbofish {
+                                            if let Some(last_arg) = turbofish.args.last_mut() {
+                                                *last_arg =
+                                                    syn::GenericArgument::Type(syn::parse_str::<
+                                                        syn::Type,
+                                                    >(
+                                                        "LinkTypes"
+                                                    )?);
                                             }
                                         }
                                     }
@@ -141,17 +136,17 @@ pub fn add_link_type_to_integrity_zome(
                             a.path()
                                 .segments
                                 .iter()
-                                .any(|s| s.ident.eq("hdk_link_types"))
+                                .any(|s| s.ident == "hdk_link_types")
                         }) {
                             if item_enum
                                 .variants
                                 .iter()
-                                .any(|v| v.ident.to_string().eq(&pascal_case_link_type_name))
+                                .any(|v| v.ident == pascal_case_link_type_name)
                             {
                                 return Err(ScaffoldError::LinkTypeAlreadyExists(
                                     link_type_name.to_owned(),
                                     dna_manifest.name(),
-                                    zome_manifest.name.0.to_string(),
+                                    zome_manifest.name.to_string(),
                                 ));
                             }
 
@@ -184,7 +179,7 @@ pub fn add_link_type_to_integrity_zome(
             .path_mut(&mut v.iter())
             .ok_or(ScaffoldError::PathNotFound(crate_src_path.clone()))?,
         |file_path, mut file| {
-            if file_path.eq(file_to_add_validation_to) {
+            if file_path == file_to_add_validation_to {
                 let validate_create_fn = format_ident!(
                     "validate_create_link_{}",
                     link_type_name.to_case(Case::Snake)
@@ -202,7 +197,7 @@ pub fn add_link_type_to_integrity_zome(
 
                 let validate_delete_result: TokenStream = if delete {
                     quote! {
-                        // TODO: add the appropriate validation rules
+                        /// TODO: add the appropriate validation rules
                         Ok(ValidateCallbackResult::Valid)
                     }
                 } else {
@@ -240,7 +235,7 @@ pub fn add_link_type_to_integrity_zome(
 
                         #validate_create_to
 
-                        // TODO: add the appropriate validation rules
+                        /// TODO: add the appropriate validation rules
                         Ok(ValidateCallbackResult::Valid)
                   }
                 };
@@ -305,7 +300,7 @@ fn validate_referenceable(
 
             if entry_type.reference_entry_hash {
                 quote! {
-                    /// Check the entry type for the given entry hash
+                    // Check the entry type for the given entry hash
                     let entry_hash = #address_ident.into_entry_hash().ok_or(wasm_error!(WasmErrorInner::Guest("No entry hash associated with link".to_string())))?;
                     let entry = must_get_entry(entry_hash)?.content;
 
@@ -313,7 +308,7 @@ fn validate_referenceable(
                 }
             } else {
                 quote! {
-                    /// Check the entry type for the given action hash
+                    // Check the entry type for the given action hash
                     let action_hash = #address_ident.into_action_hash().ok_or(wasm_error!(
                         WasmErrorInner::Guest("No action hash associated with link".to_string())
                     ))?;
@@ -356,12 +351,7 @@ fn add_link_type_signals(
                     }
 
                     if let syn::Item::Fn(item_fn) = item {
-                        if item_fn
-                            .sig
-                            .ident
-                            .to_string()
-                            .eq(&String::from("signal_action"))
-                        {
+                        if item_fn.sig.ident == "signal_action" {
                             if find_ending_match_expr_in_block(&mut item_fn.block).is_none() {
                                 item_fn.block = Box::new(syn::parse_str::<syn::Block>(
                                     "{ match action.hashed.content.clone() { _ => Ok(()) } }",
@@ -391,20 +381,14 @@ fn signal_has_link_types(signal_enum: &syn::ItemEnum) -> bool {
     signal_enum
         .variants
         .iter()
-        .any(|v| v.ident.to_string().eq(&String::from("LinkCreated")))
+        .any(|v| v.ident == "LinkCreated")
 }
 
 fn signal_action_has_link_types(expr_match: &syn::ExprMatch) -> bool {
     expr_match.arms.iter().any(|arm| {
         if let syn::Pat::TupleStruct(tuple_struct_pat) = &arm.pat {
             if let Some(first_segment) = tuple_struct_pat.path.segments.last() {
-                if first_segment
-                    .ident
-                    .to_string()
-                    .eq(&String::from("CreateLink"))
-                {
-                    return true;
-                }
+                return first_segment.ident == "CreateLink";
             }
         }
         false
@@ -471,9 +455,7 @@ fn signal_action_match_arms() -> ScaffoldResult<Vec<syn::Arm>> {
 fn is_create_link(pat: &syn::Pat) -> bool {
     if let syn::Pat::Struct(pat_struct) = pat {
         if let Some(ps) = pat_struct.path.segments.last() {
-            if ps.ident.to_string().eq(&String::from("CreateLink")) {
-                return true;
-            }
+            return ps.ident == "CreateLink";
         }
     }
     false
@@ -482,9 +464,7 @@ fn is_create_link(pat: &syn::Pat) -> bool {
 fn is_delete_link(pat: &syn::Pat) -> bool {
     if let syn::Pat::Struct(pat_struct) = pat {
         if let Some(ps) = pat_struct.path.segments.last() {
-            if ps.ident.to_string().eq(&String::from("DeleteLink")) {
-                return true;
-            }
+            return ps.ident == "DeleteLink";
         }
     }
     false
@@ -495,66 +475,61 @@ fn add_link_type_to_validation_arms(
     link_type_name: &str,
 ) -> ScaffoldResult<()> {
     if let syn::Item::Fn(item_fn) = item {
-        if item_fn.sig.ident.to_string().eq(&String::from("validate")) {
-            for stmt in &mut item_fn.block.stmts {
-                if let syn::Stmt::Expr(syn::Expr::Match(match_expr), _) = stmt {
-                    if let syn::Expr::Try(try_expr) = &mut *match_expr.expr {
-                        if let syn::Expr::MethodCall(call) = &mut *try_expr.expr {
-                            if call.method.to_string().eq(&String::from("flattened")) {
-                                for arm in &mut match_expr.arms {
-                                    if let syn::Pat::TupleStruct(tuple_struct) = &mut arm.pat {
-                                        if let Some(path_segment) =
-                                            tuple_struct.path.segments.last()
-                                        {
-                                            let path_segment_str = path_segment.ident.to_string();
-                                            if path_segment_str.eq(&String::from("StoreRecord")) {
-                                                if let Some(op_entry_match_expr) =
-                                                    find_ending_match_expr(&mut arm.body)
+        if item_fn.sig.ident != "validate" {
+            return Ok(());
+        }
+        for stmt in &mut item_fn.block.stmts {
+            if let syn::Stmt::Expr(syn::Expr::Match(match_expr), _) = stmt {
+                if let syn::Expr::Try(try_expr) = &mut *match_expr.expr {
+                    if let syn::Expr::MethodCall(call) = &mut *try_expr.expr {
+                        if call.method != "flattened" {
+                            continue;
+                        }
+                        for arm in &mut match_expr.arms {
+                            if let syn::Pat::TupleStruct(tuple_struct) = &mut arm.pat {
+                                if let Some(path_segment) = tuple_struct.path.segments.last() {
+                                    if path_segment.ident != "StoreRecord" {
+                                        continue;
+                                    }
+                                    if let Some(op_entry_match_expr) =
+                                        find_ending_match_expr(&mut arm.body)
+                                    {
+                                        for op_record_arm in &mut op_entry_match_expr.arms {
+                                            if is_create_link(&op_record_arm.pat) {
+                                                // Add new link type to match arm
+                                                if find_ending_match_expr(&mut op_record_arm.body)
+                                                    .is_none()
                                                 {
-                                                    for op_record_arm in
-                                                        &mut op_entry_match_expr.arms
-                                                    {
-                                                        if is_create_link(&op_record_arm.pat) {
-                                                            // Add new link type to match arm
-                                                            if find_ending_match_expr(
-                                                                &mut op_record_arm.body,
-                                                            )
-                                                            .is_none()
-                                                            {
-                                                                // Change empty invalid to match on link_type
-                                                                *op_record_arm.body =
-                                                                    syn::parse_str::<syn::Expr>(
-                                                                        "match link_type {}",
-                                                                    )?;
-                                                            }
-
-                                                            // Add new link type to match arm
-                                                            if let Some(link_type_match) =
-                                                                find_ending_match_expr(
-                                                                    &mut op_record_arm.body,
-                                                                )
-                                                            {
-                                                                let new_arm: syn::Arm = syn::parse_str(
+                                                    // Change empty invalid to match on link_type
+                                                    *op_record_arm.body =
+                                                        syn::parse_str::<syn::Expr>(
+                                                            "match link_type {}",
+                                                        )?;
+                                                }
+
+                                                // Add new link type to match arm
+                                                if let Some(link_type_match) =
+                                                    find_ending_match_expr(&mut op_record_arm.body)
+                                                {
+                                                    let new_arm: syn::Arm = syn::parse_str(
                                                                     format!(
     "LinkTypes::{} => validate_create_link_{}(action, base_address, target_address, tag),",
                                                                         link_type_name.to_case(Case::Pascal),
                                                                         link_type_name.to_case(Case::Snake)
                                                                     ).as_str()
                                                                 )?;
-                                                                link_type_match.arms.push(new_arm);
-                                                            }
-                                                        } else if is_delete_link(&op_record_arm.pat)
-                                                        {
-                                                            // Add new link type to match arm
-                                                            if find_ending_match_expr(
-                                                                &mut op_record_arm.body,
-                                                            )
-                                                            .is_none()
-                                                            {
-                                                                // Change empty invalid to match on link_type
-                                                                *op_record_arm.body =
-                                                                    syn::parse_str::<syn::Expr>(
-                                                                        r#"{
+                                                    link_type_match.arms.push(new_arm);
+                                                }
+                                            } else if is_delete_link(&op_record_arm.pat) {
+                                                // Add new link type to match arm
+                                                if find_ending_match_expr(&mut op_record_arm.body)
+                                                    .is_none()
+                                                {
+                                                    // Change empty invalid to match on link_type
+                                                    *op_record_arm.body = syn::parse_str::<
+                                                        syn::Expr,
+                                                    >(
+                                                        r#"{
         let record = must_get_valid_record(original_action_hash)?;
         let create_link = match record.action() {
             Action::CreateLink(create_link) => create_link.clone(),
@@ -570,16 +545,14 @@ fn add_link_type_to_validation_arms(
         };
         match link_type {}
     }"#,
-                                                                    )?;
-                                                            }
-
-                                                            // Add new entry type to match arm
-                                                            if let Some(link_type_match) =
-                                                                find_ending_match_expr(
-                                                                    &mut op_record_arm.body,
-                                                                )
-                                                            {
-                                                                let new_arm: syn::Arm =
+                                                    )?;
+                                                }
+
+                                                // Add new entry type to match arm
+                                                if let Some(link_type_match) =
+                                                    find_ending_match_expr(&mut op_record_arm.body)
+                                                {
+                                                    let new_arm: syn::Arm =
                                                                     syn::parse_str(
                                                                         format!(
 "LinkTypes::{} => validate_delete_link_{}(action, create_link.clone(), base_address, create_link.target_address, create_link.tag),",
@@ -587,69 +560,57 @@ fn add_link_type_to_validation_arms(
                                                                             link_type_name.to_case(Case::Snake),
                                                                         ).as_str()
                                                                     )?;
-                                                                link_type_match.arms.push(new_arm);
-                                                            }
-                                                        }
-                                                    }
+                                                    link_type_match.arms.push(new_arm);
                                                 }
                                             }
                                         }
                                     }
-                                    if let syn::Pat::Struct(pat_struct) = &mut arm.pat {
-                                        if let Some(path_segment) = pat_struct.path.segments.last()
-                                        {
-                                            let path_segment_str = path_segment.ident.to_string();
-
-                                            if path_segment_str
-                                                .eq(&String::from("RegisterCreateLink"))
-                                            {
-                                                // Add new link type to match arm
-                                                if find_ending_match_expr(&mut arm.body).is_none() {
-                                                    // Change empty invalid to match on link_type
-                                                    *arm.body = syn::parse_str::<syn::Expr>(
-                                                        "match link_type {}",
-                                                    )?;
-                                                }
+                                }
+                            }
+                            if let syn::Pat::Struct(pat_struct) = &mut arm.pat {
+                                if let Some(path_segment) = pat_struct.path.segments.last() {
+                                    if path_segment.ident == "RegisterCreateLink" {
+                                        // Add new link type to match arm
+                                        if find_ending_match_expr(&mut arm.body).is_none() {
+                                            // Change empty invalid to match on link_type
+                                            *arm.body =
+                                                syn::parse_str::<syn::Expr>("match link_type {}")?;
+                                        }
 
-                                                // Add new link type to match arm
-                                                if let Some(link_type_match) =
-                                                    find_ending_match_expr(&mut arm.body)
-                                                {
-                                                    let new_arm: syn::Arm = syn::parse_str(
-                                                        format!(
+                                        // Add new link type to match arm
+                                        if let Some(link_type_match) =
+                                            find_ending_match_expr(&mut arm.body)
+                                        {
+                                            let new_arm: syn::Arm = syn::parse_str(
+                                                format!(
     "LinkTypes::{} => validate_create_link_{}(action, base_address, target_address, tag),",
                                                             link_type_name.to_case(Case::Pascal),
                                                             link_type_name.to_case(Case::Snake)
                                                         )
-                                                        .as_str(),
-                                                    )?;
-                                                    link_type_match.arms.push(new_arm);
-                                                }
-                                            } else if path_segment_str
-                                                .eq(&String::from("RegisterDeleteLink"))
-                                            {
-                                                // Add new link type to match arm
-                                                if find_ending_match_expr(&mut arm.body).is_none() {
-                                                    // Change empty invalid to match on link_type
-                                                    *arm.body = syn::parse_str::<syn::Expr>(
-                                                        "match link_type {}",
-                                                    )?;
-                                                }
+                                                .as_str(),
+                                            )?;
+                                            link_type_match.arms.push(new_arm);
+                                        }
+                                    } else if path_segment.ident == "RegisterDeleteLink" {
+                                        // Add new link type to match arm
+                                        if find_ending_match_expr(&mut arm.body).is_none() {
+                                            // Change empty invalid to match on link_type
+                                            *arm.body =
+                                                syn::parse_str::<syn::Expr>("match link_type {}")?;
+                                        }
 
-                                                // Add new link type to match arm
-                                                if let Some(link_type_match) =
-                                                    find_ending_match_expr(&mut arm.body)
-                                                {
-                                                    let new_arm: syn::Arm = syn::parse_str(
+                                        // Add new link type to match arm
+                                        if let Some(link_type_match) =
+                                            find_ending_match_expr(&mut arm.body)
+                                        {
+                                            let new_arm: syn::Arm = syn::parse_str(
                                                         format!(
         "LinkTypes::{} => validate_delete_link_{}(action, original_action, base_address, target_address, tag),",
                                                             link_type_name.to_case(Case::Pascal),
                                                             link_type_name.to_case(Case::Snake)
                                                         ).as_str()
                                                     )?;
-                                                    link_type_match.arms.push(new_arm);
-                                                }
-                                            }
+                                            link_type_match.arms.push(new_arm);
                                         }
                                     }
                                 }
diff --git a/src/scaffold/web_app/template_type.rs b/src/scaffold/web_app/template_type.rs
index 711152b32..cd5de8e39 100644
--- a/src/scaffold/web_app/template_type.rs
+++ b/src/scaffold/web_app/template_type.rs
@@ -123,6 +123,14 @@ impl TemplateType {
             .interact()?;
         Ok(frameworks[selection].clone())
     }
+
+    /// Checks whether the custom template'path is a path to a nix store
+    pub fn is_nixified_custom_template(&self) -> bool {
+        if let TemplateType::Custom(path) = self {
+            return path.starts_with("/nix/store/");
+        }
+        false
+    }
 }
 
 impl From<PathBuf> for TemplateType {
diff --git a/src/scaffold/zome.rs b/src/scaffold/zome.rs
index 57d5cd8a0..7732fc0bf 100644
--- a/src/scaffold/zome.rs
+++ b/src/scaffold/zome.rs
@@ -14,7 +14,7 @@ use crate::{
         coordinator::scaffold_coordinator_zome_templates,
         integrity::scaffold_integrity_zome_templates, ScaffoldedTemplate,
     },
-    utils::{input_with_case_and_initial_text, unparse_pretty},
+    utils::{input_with_case, unparse_pretty},
     versions,
 };
 use build_fs_tree::{dir, file};
@@ -454,7 +454,7 @@ pub fn scaffold_coordinator_zome_in_path(
     let file_tree = add_common_zome_dependencies_to_workspace_cargo(dna_file_tree.file_tree())?;
     let mut file_tree = add_workspace_path_dependency(file_tree, zome_name, &path.join(zome_name))?;
 
-    let initial_lib_rs = &coordinator::initial_lib_rs(dependencies);
+    let initial_lib_rs = coordinator::initial_lib_rs(dependencies);
 
     let zome: FileTree = dir! {
         "Cargo.toml" => file!(coordinator::initial_cargo_toml(zome_name, dependencies)),
@@ -518,10 +518,10 @@ pub fn scaffold_zome_pair(
     let mut dna_file_tree = DnaFileTree::get_or_choose(app_file_tree, Some(dna_name))?;
     let dna_manifest_path = dna_file_tree.dna_manifest_path.clone();
 
-    let zome_name = input_with_case_and_initial_text(
+    let zome_name = input_with_case(
             "Enter coordinator zome name (snake_case):\n(The integrity zome will automatically be named '{name of coordinator zome}_integrity')\n",
+            Some( dna_name ),
             Case::Snake,
-            dna_name
         )?;
 
     let integrity_zome_name = integrity_zome_name(&zome_name);
diff --git a/src/scaffold/zome/coordinator.rs b/src/scaffold/zome/coordinator.rs
index 682f40113..ce5dba526 100644
--- a/src/scaffold/zome/coordinator.rs
+++ b/src/scaffold/zome/coordinator.rs
@@ -74,7 +74,7 @@ pub fn initial_lib_rs(dependencies: Option<&Vec<String>>) -> TokenStream {
         /// Whenever an action is committed, we emit a signal to the UI elements to reactively update them
         #[hdk_extern(infallible)]
         pub fn post_commit(committed_actions: Vec<SignedActionHashed>) {
-            /// Don't modify this loop if you want the scaffolding tool to generate appropriate signals for your entries and links
+            /// Don't modify the for loop if you want the scaffolding tool to generate appropriate signals for your entries and links
             for action in committed_actions {
                 if let Err(err) = signal_action(action) {
                     error!("Error signaling new action: {:?}", err);
diff --git a/src/templates/coordinator.rs b/src/templates/coordinator.rs
index 536c75d8b..7e3f4e07a 100644
--- a/src/templates/coordinator.rs
+++ b/src/templates/coordinator.rs
@@ -1,6 +1,6 @@
 use std::{ffi::OsString, path::PathBuf};
 
-use holochain::prelude::ZomeManifest;
+use holochain_types::dna::ZomeManifest;
 use serde::Serialize;
 
 use crate::{
diff --git a/src/utils.rs b/src/utils.rs
index 78909e906..020ee7178 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -76,20 +76,16 @@ fn get_folder_names(folder: &BTreeMap<OsString, FileTree>) -> Vec<String> {
 #[inline]
 /// "yes" or "no" input dialog, with the option to specify a recommended answer (yes = true, no = false)
 pub fn input_yes_or_no(prompt: &str, recommended: Option<bool>) -> ScaffoldResult<bool> {
-    let yes_recommended = if recommended == Some(true) {
-        " (recommended)"
-    } else {
-        ""
-    };
-    let no_recommended = if recommended == Some(false) {
-        " (recommended)"
-    } else {
-        ""
-    };
+    let yes_recommended = (recommended == Some(true))
+        .then_some("(recommended)")
+        .unwrap_or_default();
+    let no_recommended = (recommended == Some(false))
+        .then_some("(recommended)")
+        .unwrap_or_default();
 
     let items = [
-        format!("Yes{}", yes_recommended),
-        format!("No{}", no_recommended),
+        format!("Yes {}", yes_recommended),
+        format!("No {}", no_recommended),
     ];
 
     let selection = Select::with_theme(&ColorfulTheme::default())
@@ -102,18 +98,24 @@ pub fn input_yes_or_no(prompt: &str, recommended: Option<bool>) -> ScaffoldResul
 }
 
 #[inline]
-pub fn input_with_custom_validation<V>(prompt: &str, validator: V) -> ScaffoldResult<String>
+pub fn input_with_custom_validation<V>(
+    prompt: &str,
+    initial_text: Option<&str>,
+    validator: V,
+) -> ScaffoldResult<String>
 where
     V: Fn(String) -> Result<(), String>,
 {
     let mut input: String = Input::with_theme(&ColorfulTheme::default())
         .with_prompt(prompt)
+        .with_initial_text(initial_text.unwrap_or_default())
         .interact_text()?;
 
     while let Err(e) = validator(input.clone()) {
         println!("{}", e.red());
         input = Input::with_theme(&ColorfulTheme::default())
             .with_prompt(prompt)
+            .with_initial_text(initial_text.unwrap_or_default())
             .interact_text()?;
     }
 
@@ -121,43 +123,39 @@ where
 }
 
 #[inline]
-pub fn input_with_case(prompt: &str, case: Case) -> ScaffoldResult<String> {
-    let input: String = Input::with_theme(&ColorfulTheme::default())
-        .with_prompt(prompt)
-        .validate_with(|input: &String| -> Result<(), String> {
-            check_case(input, "Input", case).map_err(|e| e.to_string())
-        })
-        .interact_text()?;
-
-    Ok(input)
-}
-
-#[inline]
-pub fn input_with_case_and_initial_text(
+pub fn input_with_case(
     prompt: &str,
+    initial_text: Option<&str>,
     case: Case,
-    initial_text: &str,
 ) -> ScaffoldResult<String> {
-    let input: String = Input::with_theme(&ColorfulTheme::default())
+    let mut input: String = Input::with_theme(&ColorfulTheme::default())
         .with_prompt(prompt)
-        .with_initial_text(initial_text)
-        .validate_with(|input: &String| -> Result<(), String> {
-            check_case(input, "Input", case).map_err(|e| e.to_string())
-        })
+        .with_initial_text(initial_text.unwrap_or_default())
         .interact_text()?;
 
+    while let Err(e) = check_case(&input, "Input", case) {
+        println!("{}", e.to_string().red());
+        input = Input::with_theme(&ColorfulTheme::default())
+            .with_prompt(prompt)
+            .interact_text()?;
+    }
+
     Ok(input)
 }
 
 #[inline]
 pub fn input_no_whitespace(prompt: &str) -> ScaffoldResult<String> {
-    let input = Input::with_theme(&ColorfulTheme::default())
+    let mut input: String = Input::with_theme(&ColorfulTheme::default())
         .with_prompt(prompt)
-        .validate_with(|input: &String| -> Result<(), String> {
-            check_no_whitespace(input, "Input").map_err(|e| e.to_string())
-        })
         .interact_text()?;
 
+    while let Err(e) = check_no_whitespace(&input, "Input") {
+        println!("{}", e.to_string().red());
+        input = Input::with_theme(&ColorfulTheme::default())
+            .with_prompt(prompt)
+            .interact_text()?;
+    }
+
     Ok(input)
 }
 
diff --git a/src/versions.rs b/src/versions.rs
index 6c2fca431..ebef2f519 100644
--- a/src/versions.rs
+++ b/src/versions.rs
@@ -10,11 +10,14 @@ pub const HC_SPIN_VERSION: &str = "^0.400.0-dev.3";
 /// npm: <https://www.npmjs.com/package/@holo-host/web-sdk>
 pub const WEB_SDK_VERSION: &str = "^0.6.20-prerelease";
 
-pub const HDI_VERSION: &str = holochain::HDI_VERSION;
+/// crates.io <https://crates.io/crates/hdi/versions>
+pub const HDI_VERSION: &str = "0.5.0-rc.1";
 
-pub const HDK_VERSION: &str = holochain::HDK_VERSION;
+/// crates.io <https://crates.io/crates/hdk/versions>
+pub const HDK_VERSION: &str = "0.4.0-rc.1";
 
-pub const HOLOCHAIN_VERSION: &str = holochain::HOLOCHAIN_VERSION;
+/// crates.io <https://crates.io/crates/holochain/versions>
+pub const HOLOCHAIN_VERSION: &str = "0.4.0-rc.2";
 
 /// source: <https://github.com/darksoil-studio/holochain-playground/tree/main/packages/cli/server>
 ///
diff --git a/templates/custom-template/custom-template/template/collection.instructions.hbs b/templates/custom-template/custom-template/template/collection.instructions.hbs
deleted file mode 100644
index a26ae14af..000000000
--- a/templates/custom-template/custom-template/template/collection.instructions.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if (eq collection_type.type "Global")}}
-At first, the UI for this application is empty. If you want the newly scaffolded collection to be the entry point for its UI, import the element in `ui/src/holochain-app.ts`:
-
-  import './{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}';
-  
-And insert it in the `<div id="content"></div>` like this:
-
-  <div id="content"><{{kebab_case collection_name}}></{{kebab_case collection_name}}></div>
-{{/if}}
diff --git a/templates/custom-template/custom-template/template/collection/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs b/templates/custom-template/custom-template/template/collection/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs
deleted file mode 100644
index 59cd68f89..000000000
--- a/templates/custom-template/custom-template/template/collection/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.test.ts.hbs	
+++ /dev/null
@@ -1,69 +0,0 @@
-import { assert, test } from "vitest";
-
-import { runScenario, dhtSync, CallableCell } from '@holochain/tryorama';
-import { NewEntryAction, ActionHash, Record, Link, AppBundleSource,  fakeActionHash, fakeAgentPubKey, fakeEntryHash } from '@holochain/client';
-import { decode } from '@msgpack/msgpack';
-
-import { create{{pascal_case referenceable.name}} } from './common.js';
-
-test('create a {{pascal_case referenceable.name}} and get {{lower_case collection_name}}', async () => {
-  await runScenario(async scenario => {
-    // Construct proper paths for your app.
-    // This assumes app bundle created by the `hc app pack` command.
-    const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
-
-    // Set up the app to be installed 
-    const appSource = { appBundleSource: { path: testAppPath } };
-
-    // Add 2 players with the test app to the Scenario. The returned players
-    // can be destructured.
-    const [alice, bob] = await scenario.addPlayersWithApps([appSource, appSource]);
-
-    // Shortcut peer discovery through gossip and register all agents in every
-    // conductor of the scenario.
-    await scenario.shareAllAgents();
-
-    // Bob gets {{lower_case collection_name}}
-    let collectionOutput: Link[] = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_{{snake_case collection_name}}",
-      payload: {{#if (eq collection_type.type "Global")}}null{{else}}alice.agentPubKey{{/if}}
-    });
-    assert.equal(collectionOutput.length, 0);
-
-    // Alice creates a {{pascal_case referenceable.name}}
-    const createRecord: Record = await create{{pascal_case referenceable.name}}(alice.cells[0]);
-    assert.ok(createRecord);
-    
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-    
-    // Bob gets {{lower_case collection_name}} again
-    collectionOutput = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_{{snake_case collection_name}}",
-      payload: {{#if (eq collection_type.type "Global")}}null{{else}}alice.agentPubKey{{/if}}
-    });
-    assert.equal(collectionOutput.length, 1);
-    assert.deepEqual({{#if (eq referenceable.hash_type "EntryHash")}}(createRecord.signed_action.hashed.content as NewEntryAction).entry_hash{{else}}createRecord.signed_action.hashed.hash{{/if}}, collectionOutput[0].target);
-{{#if (and deletable (eq referenceable.hash_type "ActionHash"))}}
-
-    // Alice deletes the {{pascal_case referenceable.name}}
-    await alice.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "delete_{{snake_case referenceable.name}}",
-      payload: createRecord.signed_action.hashed.hash
-    });
-
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-
-    // Bob gets {{lower_case collection_name}} again
-    collectionOutput = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_{{snake_case collection_name}}",
-      payload: {{#if (eq collection_type.type "Global")}}null{{else}}alice.agentPubKey{{/if}}
-    });
-    assert.equal(collectionOutput.length, 0);
-{{/if}}
-  });
-});
-
diff --git a/templates/custom-template/custom-template/template/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs b/templates/custom-template/custom-template/template/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs
deleted file mode 100644
index a8dccc205..000000000
--- a/templates/custom-template/custom-template/template/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs	
+++ /dev/null
@@ -1,77 +0,0 @@
-import { LitElement, html } from 'lit';
-import { state, customElement, property } from 'lit/decorators.js';
-import { AppClient, AgentPubKey, Link, EntryHash, ActionHash, Record, NewEntryAction, SignalType } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
-
-import { clientContext } from '../../contexts';
-import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types';
-
-import './{{kebab_case referenceable.name}}-detail';
-
-@customElement('{{kebab_case collection_name}}')
-export class {{pascal_case collection_name}} extends LitElement {
-  @consume({ context: clientContext })
-  client!: AppClient;
-
-{{#if (eq collection_type.type "ByAuthor")}}
-  @property({
-    hasChanged: (newVal: AgentPubKey, oldVal: AgentPubKey) => newVal?.toString() !== oldVal?.toString()
-  })
-  author!: AgentPubKey;
-{{/if}}
-
-  @state()
-  signaledHashes: Array<{{referenceable.hash_type}}> = [];
-
-  _fetch{{pascal_case (plural referenceable.name)}} = new Task(this, ([{{#if (eq collection_type.type "ByAuthor")}}author{{/if}}]) => this.client.callZome({
-      cap_secret: null,
-      role_name: '{{dna_role_name}}',
-      zome_name: '{{coordinator_zome_manifest.name}}',
-      fn_name: 'get_{{snake_case collection_name}}',
-      payload: {{#if (eq collection_type.type "ByAuthor")}}author{{else}}null{{/if}},
-  }) as Promise<Array<Link>>, () => [{{#if (eq collection_type.type "ByAuthor")}}this.author{{/if}}]);
-
-  firstUpdated() {
-{{#if (eq collection_type.type "ByAuthor")}}
-    if (this.author === undefined) {
-      throw new Error(`The author property is required for the {{kebab_case collection_name}} element`);
-    }
-{{/if}}
-
-    this.client.on('signal', signal => {
-      if (!(SignalType.App in signal)) return;
-      if (signal.App.zome_name !== '{{coordinator_zome_manifest.name}}') return;
-      const payload = signal.App.payload as {{pascal_case coordinator_zome_manifest.name}}Signal;
-      if (payload.type !== 'EntryCreated') return;
-      if (payload.app_entry.type !== '{{pascal_case referenceable.name}}') return;
-{{#if (eq collection_type.type "ByAuthor")}}
-      if (this.author.toString() !== this.client.myPubKey.toString()) return;
-{{/if}}
-      this.signaledHashes = [{{#if (eq referenceable.hash_type "ActionHash")}}payload.action.hashed.hash{{else}}(payload.action.hashed.content as NewEntryAction).entry_hash{{/if}}, ...this.signaledHashes];
-    });
-  }
-
-  renderList(hashes: Array<{{referenceable.hash_type}}>) {
-    if (hashes.length === 0) return html`<span>No {{lower_case (plural referenceable.name)}} found{{#if (eq collection_type.type "ByAuthor")}} for this author{{/if}}.</span>`;
-
-    return html`
-
-      <div style="display: flex; flex-direction: column">
-        ${hashes.map(hash =>
-          html`<{{kebab_case referenceable.name}}-detail .{{camel_case referenceable.name}}Hash=${hash} style="margin-bottom: 16px;" @{{kebab_case referenceable.name}}-deleted=${() => { this._fetch{{pascal_case (plural referenceable.name)}}.run(); this.signaledHashes = []; } }></{{kebab_case referenceable.name}}-detail>`
-        )}
-      </div>
-    `;
-  }
-
-  render() {
-    return this._fetch{{pascal_case (plural referenceable.name)}}.render({
-      pending: () => html`<div style="display: flex; flex: 1; align-items: center; justify-content: center">
-        <mwc-circular-progress indeterminate></mwc-circular-progress>
-      </div>`,
-      complete: (links) => this.renderList([...this.signaledHashes, ...links.map(l => l.target)]),
-      error: (e: any) => html`<span>Error fetching the {{lower_case (plural referenceable.name)}}: ${e.message}.</span>`
-    });
-  }
-}
diff --git a/templates/custom-template/custom-template/template/coordinator-zome/tests/src/{{dna_role_name}}/{{zome_manifest.name}}/common.ts.hbs b/templates/custom-template/custom-template/template/coordinator-zome/tests/src/{{dna_role_name}}/{{zome_manifest.name}}/common.ts.hbs
deleted file mode 100644
index e1b810614..000000000
--- a/templates/custom-template/custom-template/template/coordinator-zome/tests/src/{{dna_role_name}}/{{zome_manifest.name}}/common.ts.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-import { CallableCell } from '@holochain/tryorama';
-import { NewEntryAction, ActionHash, Record, AppBundleSource, fakeActionHash, fakeAgentPubKey, fakeEntryHash, fakeDnaHash } from '@holochain/client';
-
diff --git a/templates/custom-template/custom-template/template/coordinator-zome/ui/src/{{dna_role_name}}/{{zome_manifest.name}}/types.ts.hbs b/templates/custom-template/custom-template/template/coordinator-zome/ui/src/{{dna_role_name}}/{{zome_manifest.name}}/types.ts.hbs
deleted file mode 100644
index 1781515ec..000000000
--- a/templates/custom-template/custom-template/template/coordinator-zome/ui/src/{{dna_role_name}}/{{zome_manifest.name}}/types.ts.hbs
+++ /dev/null
@@ -1,38 +0,0 @@
-import { 
-  Record, 
-  ActionHash, 
-  DnaHash,
-  SignedActionHashed,
-  EntryHash, 
-  AgentPubKey,
-  Create,
-  Update,
-  Delete,
-  CreateLink,
-  DeleteLink
-} from '@holochain/client';
-
-export type {{pascal_case zome_manifest.name}}Signal = {
-  type: 'EntryCreated';
-  action: SignedActionHashed<Create>;
-  app_entry: EntryTypes;
-} | {
-  type: 'EntryUpdated';
-  action: SignedActionHashed<Update>;
-  app_entry: EntryTypes;
-  original_app_entry: EntryTypes;
-} | {
-  type: 'EntryDeleted';
-  action: SignedActionHashed<Delete>;
-  original_app_entry: EntryTypes;
-} | {
-  type: 'LinkCreated';
-  action: SignedActionHashed<CreateLink>;
-  link_type: string;
-} | {
-  type: 'LinkDeleted';
-  action: SignedActionHashed<DeleteLink>;
-  link_type: string;
-};
-
-export type EntryTypes = {};
diff --git a/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/common.ts.hbs b/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/common.ts.hbs
deleted file mode 100644
index 6009ec1a2..000000000
--- a/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/common.ts.hbs
+++ /dev/null
@@ -1,53 +0,0 @@
-{{previous_file_content}}
-
-export async function sample{{pascal_case entry_type.name}}(cell: CallableCell, partial{{pascal_case entry_type.name}} = {}) {
-    return {
-        ...{
-{{#each entry_type.fields}}
-  {{#if linked_from}}
-    {{#if (ne linked_from.hash_type "AgentPubKey")}}
-      {{#if (eq cardinality "vector")}}
-        {{#if (eq (pascal_case linked_from.name) (pascal_case ../entry_type.name))}}
-          {{field_name}}: [],
-        {{else}}
-          {{#if (eq linked_from.hash_type "ActionHash")}}
-          {{field_name}}: [(await create{{pascal_case linked_from.name}}(cell)).signed_action.hashed.hash],
-          {{else}}
-          {{field_name}}: [((await create{{pascal_case linked_from.name}}(cell)).signed_action.hashed.content as NewEntryAction).entry_hash],
-          {{/if}}
-        {{/if}}
-      {{else}}
-        {{#if (eq (pascal_case linked_from.name) (pascal_case ../entry_type.name))}}
-          {{field_name}}: null,
-        {{else}}
-	  {{#if (eq linked_from.hash_type "ActionHash")}}
-          {{field_name}}: (await create{{pascal_case linked_from.name}}(cell)).signed_action.hashed.hash,
-          {{else}}
-          {{field_name}}: ((await create{{pascal_case linked_from.name}}(cell)).signed_action.hashed.content as NewEntryAction).entry_hash,
-          {{/if}}
-        {{/if}}
-      {{/if}}
-    {{else}}
-          {{field_name}}: cell.cell_id[1],
-    {{/if}}
-  {{else}}
-      {{#if (eq cardinality "vector")}}
-	  {{field_name}}: [{{> (concat field_type.type "/sample") field_type=field_type}}],
-      {{else}}
-	  {{field_name}}: {{> (concat field_type.type "/sample") field_type=field_type}},
-      {{/if}}
-  {{/if}}
-{{/each}}
-        },
-        ...partial{{pascal_case entry_type.name}}
-    };
-}
-
-export async function create{{pascal_case entry_type.name}}(cell: CallableCell, {{camel_case entry_type.name}} = undefined): Promise<Record> {
-    return cell.callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "create_{{snake_case entry_type.name}}",
-      payload: {{camel_case entry_type.name}} || await sample{{pascal_case entry_type.name}}(cell),
-    });
-}
-
diff --git a/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs b/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs
deleted file mode 100644
index d9e4500d0..000000000
--- a/templates/custom-template/custom-template/template/entry-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}.test.ts.hbs	
+++ /dev/null
@@ -1,267 +0,0 @@
-import { assert, test } from "vitest";
-
-import { runScenario, dhtSync, CallableCell } from '@holochain/tryorama';
-import { Link, NewEntryAction, ActionHash, Record, AppBundleSource, fakeDnaHash, fakeActionHash, fakeAgentPubKey, fakeEntryHash } from '@holochain/client';
-import { decode } from '@msgpack/msgpack';
-
-import { create{{pascal_case entry_type.name}}, sample{{pascal_case entry_type.name}} } from './common.js';
-
-test('create {{pascal_case entry_type.name}}', async () => {
-  await runScenario(async scenario => {
-    // Construct proper paths for your app.
-    // This assumes app bundle created by the `hc app pack` command.
-    const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
-
-    // Set up the app to be installed
-    const appSource = { appBundleSource: { path: testAppPath } };
-
-    // Add 2 players with the test app to the Scenario. The returned players
-    // can be destructured.
-    const [alice, bob] = await scenario.addPlayersWithApps([appSource, appSource]);
-
-    // Shortcut peer discovery through gossip and register all agents in every
-    // conductor of the scenario.
-    await scenario.shareAllAgents();
-
-    // Alice creates a {{pascal_case entry_type.name}}
-    const record: Record = await create{{pascal_case entry_type.name}}(alice.cells[0]);
-    assert.ok(record);
-  });
-});
-
-test('create and read {{pascal_case entry_type.name}}', async () => {
-  await runScenario(async scenario => {
-    // Construct proper paths for your app.
-    // This assumes app bundle created by the `hc app pack` command.
-    const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
-
-    // Set up the app to be installed
-    const appSource = { appBundleSource: { path: testAppPath } };
-
-    // Add 2 players with the test app to the Scenario. The returned players
-    // can be destructured.
-    const [alice, bob] = await scenario.addPlayersWithApps([appSource, appSource]);
-
-    // Shortcut peer discovery through gossip and register all agents in every
-    // conductor of the scenario.
-    await scenario.shareAllAgents();
-
-    const sample = await sample{{pascal_case entry_type.name}}(alice.cells[0]);
-
-    // Alice creates a {{pascal_case entry_type.name}}
-    const record: Record = await create{{pascal_case entry_type.name}}(alice.cells[0], sample);
-    assert.ok(record);
-
-    // Wait for the created entry to be propagated to the other node.
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-
-    // Bob gets the created {{pascal_case entry_type.name}}
-    const createReadOutput: Record = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "{{#if crud.update}}get_original_{{snake_case entry_type.name}}{{else}}get_{{snake_case entry_type.name}}{{/if}}",
-      payload: {{#if entry_type.reference_entry_hash}}(record.signed_action.hashed.content as NewEntryAction).entry_hash{{else}}record.signed_action.hashed.hash{{/if}},
-    });
-    assert.deepEqual(sample, decode((createReadOutput.entry as any).Present.entry) as any);
-
-  {{#each entry_type.fields}}
-    {{#if linked_from}}
-      {{#if (ne (pascal_case linked_from.name) (pascal_case ../entry_type.name))}}
-    // Bob gets the {{pascal_case (plural linked_from.name)}} for the new {{pascal_case ../entry_type.name}}
-    let linksTo{{pascal_case (plural linked_from.name)}}: Link[] = await bob.cells[0].callZome({
-      zome_name: "{{../coordinator_zome_manifest.name}}",
-      fn_name: "get_{{snake_case (plural ../entry_type.name)}}_for_{{snake_case linked_from.name}}",
-      payload: {{#if (eq cardinality "vector")}}sample.{{field_name}}[0]{{else}}sample.{{field_name}}{{/if}}
-    });
-    assert.equal(linksTo{{pascal_case (plural linked_from.name)}}.length, 1);
-    assert.deepEqual(linksTo{{pascal_case (plural linked_from.name)}}[0].target, {{#if ../entry_type.reference_entry_hash}}(record.signed_action.hashed.content as NewEntryAction).entry_hash{{else}}record.signed_action.hashed.hash{{/if}});
-      {{/if}}
-    {{/if}}
-  {{/each}}
-  });
-});
-
-{{#if crud.update}}
-test('create and update {{pascal_case entry_type.name}}', async () => {
-  await runScenario(async scenario => {
-    // Construct proper paths for your app.
-    // This assumes app bundle created by the `hc app pack` command.
-    const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
-
-    // Set up the app to be installed
-    const appSource = { appBundleSource: { path: testAppPath } };
-
-    // Add 2 players with the test app to the Scenario. The returned players
-    // can be destructured.
-    const [alice, bob] = await scenario.addPlayersWithApps([appSource, appSource]);
-
-    // Shortcut peer discovery through gossip and register all agents in every
-    // conductor of the scenario.
-    await scenario.shareAllAgents();
-
-    // Alice creates a {{pascal_case entry_type.name}}
-    const record: Record = await create{{pascal_case entry_type.name}}(alice.cells[0]);
-    assert.ok(record);
-
-    const originalActionHash = record.signed_action.hashed.hash;
-
-    // Alice updates the {{pascal_case entry_type.name}}
-    let contentUpdate: any = await sample{{pascal_case entry_type.name}}(alice.cells[0]);
-    let updateInput = {
-{{#if link_from_original_to_each_update}}
-      original_{{snake_case entry_type.name}}_hash: originalActionHash,
-{{/if}}
-      previous_{{snake_case entry_type.name}}_hash: originalActionHash,
-      updated_{{snake_case entry_type.name}}: contentUpdate,
-    };
-
-    let updatedRecord: Record = await alice.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "update_{{snake_case entry_type.name}}",
-      payload: updateInput,
-    });
-    assert.ok(updatedRecord);
-
-    // Wait for the updated entry to be propagated to the other node.
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-
-    // Bob gets the updated {{pascal_case entry_type.name}}
-    const readUpdatedOutput0: Record = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_latest_{{snake_case entry_type.name}}",
-      payload: updatedRecord.signed_action.hashed.hash,
-    });
-    assert.deepEqual(contentUpdate, decode((readUpdatedOutput0.entry as any).Present.entry) as any);
-
-    // Alice updates the {{pascal_case entry_type.name}} again
-    contentUpdate = await sample{{pascal_case entry_type.name}}(alice.cells[0]);
-    updateInput = {
-{{#if link_from_original_to_each_update}}
-      original_{{snake_case entry_type.name}}_hash: originalActionHash,
-{{/if}}
-      previous_{{snake_case entry_type.name}}_hash: updatedRecord.signed_action.hashed.hash,
-      updated_{{snake_case entry_type.name}}: contentUpdate,
-    };
-
-    updatedRecord = await alice.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "update_{{snake_case entry_type.name}}",
-      payload: updateInput,
-    });
-    assert.ok(updatedRecord);
-
-    // Wait for the updated entry to be propagated to the other node.
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-
-    // Bob gets the updated {{pascal_case entry_type.name}}
-    const readUpdatedOutput1: Record = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_latest_{{snake_case entry_type.name}}",
-      payload: updatedRecord.signed_action.hashed.hash,
-    });
-    assert.deepEqual(contentUpdate, decode((readUpdatedOutput1.entry as any).Present.entry) as any);
-
-    // Bob gets all the revisions for {{pascal_case entry_type.name}}
-    const revisions: Record[] = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_all_revisions_for_{{snake_case entry_type.name}}",
-      payload: originalActionHash,
-    });
-    assert.equal(revisions.length, 3);
-    assert.deepEqual(contentUpdate, decode((revisions[2].entry as any).Present.entry) as any);
-  });
-});
-{{/if}}
-
-{{#if crud.delete}}
-test('create and delete {{pascal_case entry_type.name}}', async () => {
-  await runScenario(async scenario => {
-    // Construct proper paths for your app.
-    // This assumes app bundle created by the `hc app pack` command.
-    const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
-
-    // Set up the app to be installed
-    const appSource = { appBundleSource: { path: testAppPath } };
-
-    // Add 2 players with the test app to the Scenario. The returned players
-    // can be destructured.
-    const [alice, bob] = await scenario.addPlayersWithApps([appSource, appSource]);
-
-    // Shortcut peer discovery through gossip and register all agents in every
-    // conductor of the scenario.
-    await scenario.shareAllAgents();
-
-    const sample = await sample{{pascal_case entry_type.name}}(alice.cells[0]);
-
-    // Alice creates a {{pascal_case entry_type.name}}
-    const record: Record = await create{{pascal_case entry_type.name}}(alice.cells[0], sample);
-    assert.ok(record);
-
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-
-  {{#each entry_type.fields}}
-    {{#if linked_from}}
-      {{#if (ne (pascal_case linked_from.name) (pascal_case ../entry_type.name))}}
-    // Bob gets the {{pascal_case (plural linked_from.name)}} for the new {{pascal_case ../entry_type.name}}
-    let linksTo{{pascal_case (plural linked_from.name)}}: Link[] = await bob.cells[0].callZome({
-      zome_name: "{{../coordinator_zome_manifest.name}}",
-      fn_name: "get_{{snake_case (plural ../entry_type.name)}}_for_{{snake_case linked_from.name}}",
-      payload: {{#if (eq cardinality "vector")}}sample.{{field_name}}[0]{{else}}sample.{{field_name}}{{/if}}
-    });
-    assert.equal(linksTo{{pascal_case (plural linked_from.name)}}.length, 1);
-    assert.deepEqual(linksTo{{pascal_case (plural linked_from.name)}}[0].target, {{#if ../entry_type.reference_entry_hash}}(record.signed_action.hashed.content as NewEntryAction).entry_hash{{else}}record.signed_action.hashed.hash{{/if}});
-      {{/if}}
-    {{/if}}
-  {{/each}}
-
-    // Alice deletes the {{pascal_case entry_type.name}}
-    const deleteActionHash = await alice.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "delete_{{snake_case entry_type.name}}",
-      payload: record.signed_action.hashed.hash,
-    });
-    assert.ok(deleteActionHash);
-
-    // Wait for the entry deletion to be propagated to the other node.
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-
-    // Bob gets the oldest delete for the {{pascal_case entry_type.name}}
-    const oldestDeleteFor{{pascal_case entry_type.name}} = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_oldest_delete_for_{{snake_case entry_type.name}}",
-      payload: record.signed_action.hashed.hash,
-    });
-    assert.ok(oldestDeleteFor{{pascal_case entry_type.name}});
-
-    // Bob gets the deletions for {{pascal_case entry_type.name}}
-    const deletesFor{{pascal_case entry_type.name}} = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_all_deletes_for_{{snake_case entry_type.name}}",
-      payload: record.signed_action.hashed.hash,
-    });
-    assert.equal(deletesFor{{pascal_case entry_type.name}}.length, 1);
-
-  {{#each entry_type.fields}}
-    {{#if linked_from}}
-      {{#if (ne (pascal_case linked_from.name) (pascal_case ../entry_type.name))}}
-    // Bob gets the {{pascal_case (plural linked_from.name)}} for the {{pascal_case ../entry_type.name}} again
-    linksTo{{pascal_case (plural linked_from.name)}} = await bob.cells[0].callZome({
-      zome_name: "{{../coordinator_zome_manifest.name}}",
-      fn_name: "get_{{snake_case (plural ../entry_type.name)}}_for_{{snake_case linked_from.name}}",
-      payload: {{#if (eq cardinality "vector")}}sample.{{field_name}}[0]{{else}}sample.{{field_name}}{{/if}}
-    });
-    assert.equal(linksTo{{pascal_case (plural linked_from.name)}}.length, 0);
-
-    // Bob gets the deleted {{pascal_case (plural linked_from.name)}} for the {{pascal_case ../entry_type.name}}
-    const deletedLinksTo{{pascal_case (plural linked_from.name)}} = await bob.cells[0].callZome({
-      zome_name: "{{../coordinator_zome_manifest.name}}",
-      fn_name: "get_deleted_{{snake_case (plural ../entry_type.name)}}_for_{{snake_case linked_from.name}}",
-      payload: {{#if (eq cardinality "vector")}}sample.{{field_name}}[0]{{else}}sample.{{field_name}}{{/if}}
-    });
-    assert.equal(deletedLinksTo{{pascal_case (plural linked_from.name)}}.length, 1);
-      {{/if}}
-    {{/if}}
-  {{/each}}
-
-  });
-});
-{{/if}}
diff --git a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs
deleted file mode 100644
index 03da7a895..000000000
--- a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs	
+++ /dev/null
@@ -1,137 +0,0 @@
-import { LitElement, html } from 'lit';
-import { state, customElement, property } from 'lit/decorators.js';
-import { InstalledCell, ActionHash, Record, AgentPubKey, EntryHash, AppClient, DnaHash } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import '@material/mwc-button';
-import '@material/mwc-snackbar';
-import { Snackbar } from '@material/mwc-snackbar';
-{{#uniq_lines}}
-  {{#each entry_type.fields}}
-    {{#if widget}}
-{{> (concat field_type.type "/" widget "/edit/imports") }}
-
-    {{/if}}
-  {{/each}}
-{{/uniq_lines}}
-
-import { clientContext } from '../../contexts';
-import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types';
-
-@customElement('create-{{kebab_case entry_type.name}}')
-export class Create{{pascal_case entry_type.name}} extends LitElement {
-  @consume({ context: clientContext })
-  client!: AppClient;
-
-  {{#each entry_type.fields}}
-    {{#if (not widget) }}
-      {{#if (eq cardinality "single")}}
-  @property()
-  {{camel_case field_name}}!: {{> (concat field_type.type "/type") }};
-      {{else}}
-        {{#if (eq cardinality "option")}}
-  @property()
-  {{camel_case field_name}}: {{> (concat field_type.type "/type") }} | undefined;
-        {{else}}
-  @property()
-  {{camel_case field_name}}!: Array<{{> (concat field_type.type "/type") }}>;
-
-        {{/if}}
-      {{/if}}
-    {{/if}}
-  {{/each}}
-
-  {{#each entry_type.fields}}
-    {{#if widget }}
-      {{#if (not (eq cardinality "vector" ) )}}
-  @state()
-  _{{camel_case field_name}}: {{> (concat field_type.type "/type") }}{{#if (eq cardinality "option")}} | undefined{{/if}} = {{> (concat field_type.type "/" widget "/initial-value") field_type=field_type}};
-
-      {{else}}
-  @state()
-  _{{camel_case field_name}}: Array<{{> (concat field_type.type "/type") }}> = [{{> (concat field_type.type "/" widget "/initial-value") field_type=field_type}}];
-
-      {{/if}}
-    {{/if}}
-  {{/each}}
-  
-  firstUpdated() {
-{{#each entry_type.fields}}
-  {{#if (not widget) }}
-    {{#if (ne cardinality "option")}}
-    if (this.{{camel_case field_name}} === undefined) {
-      throw new Error(`The {{camel_case field_name}} input is required for the create-{{kebab_case ../entry_type.name}} element`);
-    }
-    {{/if}}
-  {{/if}}
-{{/each}}
-  }
-
-  is{{pascal_case entry_type.name}}Valid() {
-    return true{{#each entry_type.fields}}{{#if widget}}{{#if (eq cardinality "single")}} && {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate=(concat "this._" (camel_case field_name)) }}{{/if}}{{#if (eq cardinality "vector")}} && this._{{camel_case field_name}}.every(e => {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate="e" }}){{/if}}{{/if}}{{/each}};
-  }
-
-  async create{{pascal_case entry_type.name}}() {
-    const {{camel_case entry_type.name}}: {{pascal_case entry_type.name}} = { 
-    {{#each entry_type.fields}}
-      {{#if widget}}
-        {{snake_case field_name}}: this._{{camel_case field_name}},
-      {{else}}
-        {{snake_case field_name}}: this.{{camel_case field_name}},
-      {{/if}}
-    {{/each}}
-    };
-
-    try {
-      const record: Record = await this.client.callZome({
-        cap_secret: null,
-        role_name: '{{dna_role_name}}',
-        zome_name: '{{coordinator_zome_manifest.name}}',
-        fn_name: 'create_{{snake_case entry_type.name}}',
-        payload: {{camel_case entry_type.name}},
-      });
-
-      this.dispatchEvent(new CustomEvent('{{kebab_case entry_type.name}}-created', {
-        composed: true,
-        bubbles: true,
-        detail: {
-          {{camel_case entry_type.name}}Hash: record.signed_action.hashed.hash
-        }
-      }));
-    } catch (e: any) {
-      const errorSnackbar = this.shadowRoot?.getElementById('create-error') as Snackbar;
-      errorSnackbar.labelText = `Error creating the {{lower_case entry_type.name}}: ${e.message}`;
-      errorSnackbar.show();
-    }
-  }
-
-  render() {
-    return html`
-      <mwc-snackbar id="create-error" leading>
-      </mwc-snackbar>
-
-      <div style="display: flex; flex-direction: column">
-        <span style="font-size: 18px">Create {{title_case entry_type.name}}</span>
-
-{{#each entry_type.fields}}
-  {{#if widget}}
-          <div style="margin-bottom: 16px">
-    {{#if (not (eq cardinality "vector") )}}
-            {{> (concat field_type.type "/" widget "/edit/render") label=(title_case field_name) variable_to_read=(concat "this._" (camel_case field_name) ) variable_to_change=(concat "this._" (camel_case field_name) ) required=(eq cardinality "single") }}
-    {{else}}
-            {{> Vec/edit/render field_name=field_name field_type=field_type widget=widget }}
-    {{/if}}
-          
-          </div>
-            
-  {{/if}}
-{{/each}}
-
-        <mwc-button 
-          raised
-          label="Create {{title_case entry_type.name}}"
-          .disabled=${!this.is{{pascal_case entry_type.name}}Valid()}
-          @click=${() => this.create{{pascal_case entry_type.name}}()}
-        ></mwc-button>
-    </div>`;
-  }
-}
diff --git a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/types.ts.hbs b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/types.ts.hbs
deleted file mode 100644
index 43005be82..000000000
--- a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/types.ts.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-{{#if (includes previous_file_content "export type EntryTypes = {};")}}
-{{replace previous_file_content "export type EntryTypes = {};" (concat "/* dprint-ignore-start */\nexport type EntryTypes =\n | ({  type: '" (pascal_case entry_type.name) "'; } & " (pascal_case entry_type.name) ");" "\n/* dprint-ignore-end */")}}
-{{else}}
-{{replace previous_file_content "/* dprint-ignore-start */\nexport type EntryTypes =" (concat "/* dprint-ignore-start */\nexport type EntryTypes =\n | ({ type: '" (pascal_case entry_type.name) "'; } & " (pascal_case entry_type.name) ")")}}
-{{/if}}
-
-{{entry_type_ts_types}}
\ No newline at end of file
diff --git "a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs" "b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs"
deleted file mode 100644
index 2b2ae89c2..000000000
--- "a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs"	
+++ /dev/null
@@ -1,55 +0,0 @@
-import { LitElement, html } from 'lit';
-import { state, customElement, property } from 'lit/decorators.js';
-import { InstalledCell, Record, Link, AppClient, EntryHash, ActionHash, AgentPubKey } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
-
-import { clientContext } from '../../contexts';
-import './{{kebab_case ../entry_type.name}}-detail';
-
-@customElement('{{kebab_case (plural ../entry_type.name)}}-for-{{kebab_case linked_from.name}}')
-export class {{pascal_case (plural ../entry_type.name)}}For{{pascal_case linked_from.name }} extends LitElement {
-  @consume({ context: clientContext })
-  client!: AppClient;
-
-  @property({
-    hasChanged: (newVal: {{linked_from.hash_type}}, oldVal: {{linked_from.hash_type}}) => newVal.toString() !== oldVal.toString()
-  })
-  {{camel_case linked_from.singular_arg}}!: {{linked_from.hash_type}};
-
-  _fetch{{pascal_case (plural ../entry_type.name)}} = new Task(this, ([{{camel_case linked_from.singular_arg}}]) => this.client.callZome({
-      cap_secret: null,
-      role_name: '{{../dna_role_name}}',
-      zome_name: '{{../coordinator_zome_manifest.name}}',
-      fn_name: 'get_{{snake_case (plural ../entry_type.name)}}_for_{{snake_case linked_from.name}}',
-      payload: {{camel_case linked_from.singular_arg}},
-  }) as Promise<Array<Link>>, () => [this.{{camel_case linked_from.singular_arg}}]);
-
-  firstUpdated() {
-    if (this.{{camel_case linked_from.singular_arg}} === undefined) {
-      throw new Error(`The {{camel_case linked_from.singular_arg}} property is required for the {{kebab_case (plural ../entry_type.name)}}-for-{{kebab_case linked_from.name}} element`);
-    }
-  }
-
-  renderList(links: Array<Link>) {
-    if (links.length === 0) return html`<span>No {{lower_case (plural ../entry_type.name)}} found for this {{lower_case linked_from.name}}.</span>`;
-
-    return html`
-      <div style="display: flex; flex-direction: column">
-        ${links.map(link =>
-          html`<{{kebab_case ../entry_type.name}}-detail .{{camel_case ../entry_type.name}}Hash=${link.target}></{{kebab_case ../entry_type.name}}-detail>`
-        )}
-      </div>
-    `;
-  }
-
-  render() {
-    return this._fetch{{pascal_case (plural ../entry_type.name)}}.render({
-      pending: () => html`<div style="display: flex; flex: 1; align-items: center; justify-content: center">
-        <mwc-circular-progress indeterminate></mwc-circular-progress>
-      </div>`,
-      complete: (links) => this.renderList(links),
-      error: (e: any) => html`<span>Error fetching {{lower_case (plural ../entry_type.name)}}: ${e.message}.</span>`
-    });
-  }
-}
diff --git "a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs" "b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs"
deleted file mode 100644
index 3c1859aac..000000000
--- "a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs"	
+++ /dev/null
@@ -1,172 +0,0 @@
-import { LitElement, html } from 'lit';
-import { state, customElement, property } from 'lit/decorators.js';
-import { ActionHash, EntryHash, AgentPubKey, Record, AppClient, DnaHash } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { decode } from '@msgpack/msgpack';
-import '@material/mwc-button';
-import '@material/mwc-snackbar';
-import { Snackbar } from '@material/mwc-snackbar';
-{{#uniq_lines}}
-  {{#each entry_type.fields}}
-    {{#if widget}}
-{{> (concat field_type.type "/" widget "/edit/imports") }}
-
-    {{/if}}
-  {{/each}}
-{{/uniq_lines}}
-
-import { clientContext } from '../../contexts';
-import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types';
-
-@customElement('edit-{{kebab_case entry_type.name}}')
-export class Edit{{pascal_case entry_type.name}} extends LitElement {
-
-  @consume({ context: clientContext })
-  client!: AppClient;
-  
-  {{#if link_from_original_to_each_update}}
-  @property({
-      hasChanged: (newVal: ActionHash, oldVal: ActionHash) => newVal?.toString() !== oldVal?.toString()
-  })
-  original{{pascal_case entry_type.name}}Hash!: ActionHash;
-
-  {{/if}}
-  
-  @property()
-  currentRecord!: Record;
- 
-  get current{{pascal_case entry_type.name}}() {
-    return decode((this.currentRecord.entry as any).Present.entry) as {{pascal_case entry_type.name}};
-  }
- 
-  {{#each entry_type.fields}}
-    {{#if widget }}
-      {{#if (not (eq cardinality "vector" ) )}}
-  @state()
-  _{{camel_case field_name}}{{#if (eq cardinality "single")}}!{{/if}}: {{> (concat field_type.type "/type") }}{{#if (eq cardinality "option")}} | undefined{{/if}};
-
-      {{else}}
-  @state()
-  _{{camel_case field_name}}: Array<{{> (concat field_type.type "/type") }}> = this.current{{pascal_case ../entry_type.name}}.{{snake_case field_name}};
-
-      {{/if}}
-    {{/if}}
-  {{/each}}
-
-  is{{pascal_case entry_type.name}}Valid() {
-    return true{{#each entry_type.fields}}{{#if widget}}{{#if (eq cardinality "single")}} && {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate=(concat "this._" (camel_case field_name)) }}{{/if}}{{#if (eq cardinality "vector")}} && this._{{camel_case field_name}}.every(e => {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate="e" }}){{/if}}{{/if}}{{/each}};
-  }
-  
-  connectedCallback() {
-    super.connectedCallback();
-    if (this.currentRecord === undefined) {
-      throw new Error(`The currentRecord property is required for the edit-{{kebab_case entry_type.name}} element`);
-    }
-{{#if link_from_original_to_each_update}}
-
-    if (this.original{{pascal_case entry_type.name}}Hash === undefined) {
-      throw new Error(`The original{{pascal_case entry_type.name}}Hash property is required for the edit-{{kebab_case entry_type.name}} element`);
-    }
-{{/if}}
-    
-{{#each entry_type.fields}}
-  {{#if widget}}
-    this._{{camel_case field_name}} = this.current{{pascal_case ../entry_type.name}}.{{snake_case field_name}};
-  {{/if}}
-{{/each}}
-  }
-
-  async update{{pascal_case entry_type.name}}() {
-    const {{camel_case entry_type.name}}: {{pascal_case entry_type.name}} = { 
-    {{#each entry_type.fields}}
-      {{#if widget}}
-        {{#if (eq cardinality "single") }}
-      {{snake_case field_name}}: this._{{camel_case field_name}}!,
-        {{else}}
-      {{snake_case field_name}}: this._{{camel_case field_name}},
-        {{/if}}
-      {{/if}}
-    {{/each}}
-    {{#each entry_type.fields}}
-      {{#if (not widget)}}
-      {{snake_case field_name}}: this.current{{pascal_case ../entry_type.name}}.{{snake_case field_name}},
-      {{/if}}
-    {{/each}}
-    };
-
-    try {
-      const updateRecord: Record = await this.client.callZome({
-        cap_secret: null,
-        role_name: '{{dna_role_name}}',
-        zome_name: '{{coordinator_zome_manifest.name}}',
-        fn_name: 'update_{{snake_case entry_type.name}}',
-        payload: {
-          {{#if link_from_original_to_each_update}}
-          original_{{snake_case entry_type.name}}_hash: this.original{{pascal_case entry_type.name}}Hash,
-          {{/if}}
-          previous_{{snake_case entry_type.name}}_hash: this.currentRecord.signed_action.hashed.hash,
-          updated_{{snake_case entry_type.name}}: {{camel_case entry_type.name}}
-        },
-      });
-  
-      this.dispatchEvent(new CustomEvent('{{kebab_case entry_type.name}}-updated', {
-        composed: true,
-        bubbles: true,
-        detail: {
-          {{#if link_from_original_to_each_update}}
-          original{{pascal_case entry_type.name}}Hash: this.original{{pascal_case entry_type.name}}Hash,
-          {{/if}}
-          previous{{pascal_case entry_type.name}}Hash: this.currentRecord.signed_action.hashed.hash,
-          updated{{pascal_case entry_type.name}}Hash: updateRecord.signed_action.hashed.hash
-        }
-      }));
-    } catch (e: any) {
-      const errorSnackbar = this.shadowRoot?.getElementById('update-error') as Snackbar;
-      errorSnackbar.labelText = `Error updating the {{lower_case entry_type.name}}: ${e.message}`;
-      errorSnackbar.show();
-    }
-  }
-
-  render() {
-    return html`
-      <mwc-snackbar id="update-error" leading>
-      </mwc-snackbar>
-
-      <div style="display: flex; flex-direction: column">
-        <span style="font-size: 18px">Edit {{title_case entry_type.name}}</span>
-{{#each entry_type.fields}}
-  {{#if widget}}
-          <div style="margin-bottom: 16px">
-    {{#if (not (eq cardinality "vector") )}}
-          {{> (concat field_type.type "/" widget "/edit/render") label=(title_case field_name) variable_to_read=(concat "this._" (camel_case field_name) ) variable_to_change=(concat "this._" (camel_case field_name) ) required=(eq cardinality "single") }}
-    {{else}}
-        {{> Vec/edit/render field_name=field_name field_type=field_type widget=widget }}
-    {{/if}}
-    
-          </div>
-
-  {{/if}}
-{{/each}}
-
-
-        <div style="display: flex; flex-direction: row">
-          <mwc-button
-            outlined
-            label="Cancel"
-            @click=${() => this.dispatchEvent(new CustomEvent('edit-canceled', {
-              bubbles: true,
-              composed: true
-            }))}
-            style="flex: 1; margin-right: 16px"
-          ></mwc-button>
-          <mwc-button 
-            raised
-            label="Save"
-            .disabled=${!this.is{{pascal_case entry_type.name}}Valid()}
-            @click=${() => this.update{{pascal_case entry_type.name}}()}
-            style="flex: 1;"
-          ></mwc-button>
-        </div>
-      </div>`;
-  }
-}
diff --git a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs b/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs
deleted file mode 100644
index 4889e0111..000000000
--- a/templates/custom-template/custom-template/template/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs	
+++ /dev/null
@@ -1,150 +0,0 @@
-import { LitElement, html } from 'lit';
-import { state, customElement, property } from 'lit/decorators.js';
-import { EntryHash, Record, ActionHash, AppClient, DnaHash } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
-import { decode } from '@msgpack/msgpack';
-import '@material/mwc-icon-button';
-import '@material/mwc-snackbar';
-import { Snackbar } from '@material/mwc-snackbar';
-{{#uniq_lines}}
-  {{#each entry_type.fields}}
-    {{#if widget}}
-{{> (concat field_type.type "/" widget "/detail/imports") }}
-
-    {{/if}}
-  {{/each}}
-{{/uniq_lines}}
-
-{{#if crud.update}}
-import './edit-{{kebab_case entry_type.name}}';
-{{/if}}
-
-import { clientContext } from '../../contexts';
-import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types';
-
-@customElement('{{kebab_case entry_type.name}}-detail')
-export class {{pascal_case entry_type.name}}Detail extends LitElement {
-  @consume({ context: clientContext })
-  client!: AppClient;
-
-  @property({
-    hasChanged: (newVal: {{#if entry_type.reference_entry_hash}}EntryHash{{else}}ActionHash{{/if}}, oldVal: {{#if entry_type.reference_entry_hash}}EntryHash{{else}}ActionHash{{/if}}) => newVal?.toString() !== oldVal?.toString()
-  })
-  {{camel_case entry_type.name}}Hash!: {{#if entry_type.reference_entry_hash}}EntryHash{{else}}ActionHash{{/if}};
-
-  _fetchRecord = new Task(this, ([{{camel_case entry_type.name}}Hash]) => this.client.callZome({
-      cap_secret: null,
-      role_name: '{{dna_role_name}}',
-      zome_name: '{{coordinator_zome_manifest.name}}',
-      fn_name: '{{#if crud.update}}get_latest_{{snake_case entry_type.name}}{{else}}get_{{snake_case entry_type.name}}{{/if}}',
-      payload: {{camel_case entry_type.name}}Hash,
-  }) as Promise<Record | undefined>, () => [this.{{camel_case entry_type.name}}Hash]);
-
-  {{#if crud.update}}
-  @state()
-  _editing = false;
-  {{/if}}
-
-  firstUpdated() {
-    if (this.{{camel_case entry_type.name}}Hash === undefined) {
-      throw new Error(`The {{camel_case entry_type.name}}Hash property is required for the {{kebab_case entry_type.name}}-detail element`);
-    }
-  }
-
-  {{#if crud.delete}}
-  async delete{{pascal_case entry_type.name}}() {
-    try {
-      await this.client.callZome({
-        cap_secret: null,
-        role_name: '{{dna_role_name}}',
-        zome_name: '{{coordinator_zome_manifest.name}}',
-        fn_name: 'delete_{{snake_case entry_type.name}}',
-        payload: this.{{camel_case entry_type.name}}Hash,
-      });
-      this.dispatchEvent(new CustomEvent('{{kebab_case entry_type.name}}-deleted', {
-        bubbles: true,
-        composed: true,
-        detail: {
-          {{camel_case entry_type.name}}Hash: this.{{camel_case entry_type.name}}Hash
-        }
-      }));
-      this._fetchRecord.run();
-    } catch (e: any) {
-      const errorSnackbar = this.shadowRoot?.getElementById('delete-error') as Snackbar;
-      errorSnackbar.labelText = `Error deleting the {{lower_case entry_type.name}}: ${e.message}`;
-      errorSnackbar.show();
-    }
-  }
-  {{/if}}
-
-  renderDetail(record: Record) {
-    const {{camel_case entry_type.name}} = decode((record.entry as any).Present.entry) as {{pascal_case entry_type.name}};
-
-    return html`{{#if crud.delete}}
-      <mwc-snackbar id="delete-error" leading>
-      </mwc-snackbar>
-      {{/if}}
-
-      <div style="display: flex; flex-direction: column">
-      	<div style="display: flex; flex-direction: row">
-      	  <span style="flex: 1"></span>
-
-          {{#if crud.update}}
-          <mwc-icon-button style="margin-left: 8px" icon="edit" @click=${() => { this._editing = true; } }></mwc-icon-button>
-          {{/if}}
-          {{#if crud.delete}}
-          <mwc-icon-button style="margin-left: 8px" icon="delete" @click=${() => this.delete{{pascal_case entry_type.name}}()}></mwc-icon-button>
-          {{/if}}
-        </div>
-
-{{#each entry_type.fields}}
-  {{#if widget}}
-    {{#if (not (eq cardinality "vector") )}}
-        <div style="display: flex; flex-direction: row; margin-bottom: 16px">
-	  <span style="margin-right: 4px"><strong>{{title_case field_name}}: </strong></span>
- 	  <span style="white-space: pre-line">{{> (concat field_type.type "/" widget "/detail/render") variable_to_read=(concat (camel_case ../entry_type.name) "." (snake_case field_name) ) }}</span>
-        </div>
-    {{else}}
-        {{> Vec/detail/render variable_to_read=(concat (camel_case ../entry_type.name) "." (snake_case field_name) ) field_name=field_name field_type=field_type widget=widget }}
-    {{/if}}
-
-  {{/if}}
-{{/each}}
-      </div>
-    `;
-  }
-
-  render{{pascal_case entry_type.name}}(record: Record | undefined) {
-    if (!record) return html`<span>The requested {{lower_case entry_type.name}} was not found.</span>`;
-
-    {{#if crud.update}}
-    if (this._editing) {
-    	return html`<edit-{{kebab_case entry_type.name}}
-          {{#if link_from_original_to_each_update}}
-    	  .original{{pascal_case entry_type.name}}Hash=${this.{{camel_case entry_type.name}}Hash}
-    	  {{/if}}
-    	  .currentRecord=${record}
-    	  @{{kebab_case entry_type.name}}-updated=${async () => {
-    	    this._editing = false;
-    	    await this._fetchRecord.run();
-    	  } }
-    	  @edit-canceled=${() => { this._editing = false; } }
-    	  style="display: flex; flex: 1;"
-    	></edit-{{kebab_case entry_type.name}}>`;
-    }
-
-    {{/if}}
-    return this.renderDetail(record);
-  }
-
-  render() {
-    return this._fetchRecord.render({
-      pending: () => html`<div style="display: flex; flex: 1; align-items: center; justify-content: center">
-        <mwc-circular-progress indeterminate></mwc-circular-progress>
-      </div>`,
-      complete: (record) => this.render{{pascal_case entry_type.name}}(record),
-      error: (e: any) => html`<span>Error fetching the {{lower_case entry_type.name}}: ${e.message}</span>`
-    });
-  }
-}
diff --git a/templates/custom-template/custom-template/template/example.instructions.hbs b/templates/custom-template/custom-template/template/example.instructions.hbs
deleted file mode 100644
index 3ac12f06d..000000000
--- a/templates/custom-template/custom-template/template/example.instructions.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-Run the example app with:
-
-  cd {{example}}
-  nix develop 
-  npm install
-  npm start
diff --git a/templates/custom-template/custom-template/template/example/ui/src/holochain-app.ts.hbs b/templates/custom-template/custom-template/template/example/ui/src/holochain-app.ts.hbs
deleted file mode 100644
index fb9c9c9b4..000000000
--- a/templates/custom-template/custom-template/template/example/ui/src/holochain-app.ts.hbs
+++ /dev/null
@@ -1,75 +0,0 @@
-import { LitElement, css, html } from 'lit';
-import { customElement, property, state } from 'lit/decorators.js';
-import { AppClient, AppWebsocket } from '@holochain/client';
-import { provide } from '@lit-labs/context';
-
-import { clientContext } from './contexts';
-
-import './forum/posts/all-posts';
-import { AllPosts } from './forum/posts/all-posts';
-import './forum/posts/create-post';
-
-@customElement('holochain-app')
-export class HolochainApp extends LitElement {
-  @state() loading = true;
-
-  @state() result: string | undefined;
-
-  @provide({ context: clientContext })
-  @property({ type: Object })
-  client!: AppClient;
-
-  async firstUpdated() {
-    this.client = await AppWebsocket.connect();
-
-    this.loading = false;
-  }
-
-  render() {
-    if (this.loading)
-      return html`
-        <mwc-circular-progress indeterminate></mwc-circular-progress>
-      `;
-
-    return html`
-      <main>
-        <h1>Forum</h1>
-
-        <div id="content">
-          <h2>All Posts</h2>
-          <all-posts id="all-posts" style="margin-bottom: 16px"></all-posts>
-          <create-post></create-post>
-        </div>
-      </main>
-    `;
-  }
-
-  static styles = css`
-    :host {
-      min-height: 100vh;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: flex-start;
-      font-size: calc(10px + 2vmin);
-      color: #1a2b42;
-      max-width: 960px;
-      margin: 0 auto;
-      text-align: center;
-      background-color: var(--lit-element-background-color);
-    }
-
-    main {
-      flex-grow: 1;
-    }
-
-    .app-footer {
-      font-size: calc(12px + 0.5vmin);
-      align-items: center;
-    }
-
-    .app-footer a {
-      margin-left: 5px;
-    }
-  `;
-}
diff --git a/templates/custom-template/custom-template/template/field-types/ActionHash/sample.hbs b/templates/custom-template/custom-template/template/field-types/ActionHash/sample.hbs
deleted file mode 100644
index 62bb9db14..000000000
--- a/templates/custom-template/custom-template/template/field-types/ActionHash/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-(await fakeActionHash())
diff --git a/templates/custom-template/custom-template/template/field-types/ActionHash/type.hbs b/templates/custom-template/custom-template/template/field-types/ActionHash/type.hbs
deleted file mode 100644
index a00d2d429..000000000
--- a/templates/custom-template/custom-template/template/field-types/ActionHash/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-ActionHash
diff --git a/templates/custom-template/custom-template/template/field-types/AgentPubKey/sample.hbs b/templates/custom-template/custom-template/template/field-types/AgentPubKey/sample.hbs
deleted file mode 100644
index 98a2ed787..000000000
--- a/templates/custom-template/custom-template/template/field-types/AgentPubKey/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-(await fakeAgentPubKey())
diff --git a/templates/custom-template/custom-template/template/field-types/AgentPubKey/type.hbs b/templates/custom-template/custom-template/template/field-types/AgentPubKey/type.hbs
deleted file mode 100644
index f25075ccb..000000000
--- a/templates/custom-template/custom-template/template/field-types/AgentPubKey/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-AgentPubKey
diff --git a/templates/custom-template/custom-template/template/field-types/DnaHash/sample.hbs b/templates/custom-template/custom-template/template/field-types/DnaHash/sample.hbs
deleted file mode 100644
index 9369d2e2b..000000000
--- a/templates/custom-template/custom-template/template/field-types/DnaHash/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-(await fakeDnaHash())
diff --git a/templates/custom-template/custom-template/template/field-types/DnaHash/type.hbs b/templates/custom-template/custom-template/template/field-types/DnaHash/type.hbs
deleted file mode 100644
index c0e9d7168..000000000
--- a/templates/custom-template/custom-template/template/field-types/DnaHash/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-DnaHash
diff --git a/templates/custom-template/custom-template/template/field-types/EntryHash/sample.hbs b/templates/custom-template/custom-template/template/field-types/EntryHash/sample.hbs
deleted file mode 100644
index 5f7895b86..000000000
--- a/templates/custom-template/custom-template/template/field-types/EntryHash/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-(await fakeEntryHash())
diff --git a/templates/custom-template/custom-template/template/field-types/EntryHash/type.hbs b/templates/custom-template/custom-template/template/field-types/EntryHash/type.hbs
deleted file mode 100644
index b97d6b80e..000000000
--- a/templates/custom-template/custom-template/template/field-types/EntryHash/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-EntryHash
diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/detail/render.hbs
deleted file mode 100644
index bfaf687c2..000000000
--- a/templates/custom-template/custom-template/template/field-types/Enum/Select/detail/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-${ {{#each field_type.variants}}{{#unless @last}} {{../variable_to_read}}.type === '{{pascal_case this}}' ?{{/unless}} `{{title_case this}}`{{#unless @last}} :{{/unless}} {{/each}} }
diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/imports.hbs
deleted file mode 100644
index 171161339..000000000
--- a/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/imports.hbs
+++ /dev/null
@@ -1 +0,0 @@
-import '@material/mwc-select';
diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/render.hbs
deleted file mode 100644
index c1f8d52f4..000000000
--- a/templates/custom-template/custom-template/template/field-types/Enum/Select/edit/render.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<mwc-select outlined helper="{{label}}" {{#if required}}required{{/if}}>
-{{#each field_type.variants}}
-  <mwc-list-item .selected=${ {{../variable_to_read}}.type === '{{pascal_case this}}' } @request-selected=${() => { {{../variable_to_change}} = { type: '{{pascal_case this}}' }; } }>{{title_case this}}</mwc-list-item>
-{{/each}}
-</mwc-select>
diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/initial-value.hbs
deleted file mode 100644
index 560b9ff7e..000000000
--- a/templates/custom-template/custom-template/template/field-types/Enum/Select/initial-value.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{ type: '{{lookup field_type.variants 0}}' }
diff --git a/templates/custom-template/custom-template/template/field-types/Enum/Select/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/Enum/Select/is-valid.hbs
deleted file mode 100644
index 27ba77dda..000000000
--- a/templates/custom-template/custom-template/template/field-types/Enum/Select/is-valid.hbs
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/templates/custom-template/custom-template/template/field-types/Enum/sample.hbs b/templates/custom-template/custom-template/template/field-types/Enum/sample.hbs
deleted file mode 100644
index 560b9ff7e..000000000
--- a/templates/custom-template/custom-template/template/field-types/Enum/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{ type: '{{lookup field_type.variants 0}}' }
diff --git a/templates/custom-template/custom-template/template/field-types/Enum/type.hbs b/templates/custom-template/custom-template/template/field-types/Enum/type.hbs
deleted file mode 100644
index e9b80fff9..000000000
--- a/templates/custom-template/custom-template/template/field-types/Enum/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{pascal_case field_type.label}}
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/detail/render.hbs
deleted file mode 100644
index 433f42b69..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextArea/detail/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-${ {{variable_to_read}} }
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/imports.hbs
deleted file mode 100644
index 01d0786c1..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/imports.hbs
+++ /dev/null
@@ -1 +0,0 @@
-import '@material/mwc-textarea';
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/render.hbs
deleted file mode 100644
index cd25d12f4..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextArea/edit/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<mwc-textarea outlined label="{{label}}" .value=${ {{variable_to_read}} } @input=${(e: CustomEvent) => { {{variable_to_change}} = (e.target as any).value;} } {{#if required}}required{{/if}}></mwc-textarea>
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/initial-value.hbs
deleted file mode 100644
index a614936fa..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextArea/initial-value.hbs
+++ /dev/null
@@ -1 +0,0 @@
-''
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextArea/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/String/TextArea/is-valid.hbs
deleted file mode 100644
index a9e6c9814..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextArea/is-valid.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{variable_to_validate}} !== ''
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/detail/render.hbs
deleted file mode 100644
index 433f42b69..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextField/detail/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-${ {{variable_to_read}} }
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/edit/imports.hbs
deleted file mode 100644
index 0572528d4..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextField/edit/imports.hbs
+++ /dev/null
@@ -1 +0,0 @@
-import '@material/mwc-textfield';
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/edit/render.hbs
deleted file mode 100644
index 38869aa15..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextField/edit/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<mwc-textfield outlined label="{{label}}" {{#if variable_to_read}}.value=${ {{variable_to_read}}{{#if (not required)}} || ''{{/if}} }{{/if}} @input=${(e: CustomEvent) => { {{variable_to_change}} = (e.target as any).value; } } {{#if required}}required{{/if}}></mwc-textfield>
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/initial-value.hbs
deleted file mode 100644
index a614936fa..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextField/initial-value.hbs
+++ /dev/null
@@ -1 +0,0 @@
-''
diff --git a/templates/custom-template/custom-template/template/field-types/String/TextField/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/String/TextField/is-valid.hbs
deleted file mode 100644
index a9e6c9814..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/TextField/is-valid.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{variable_to_validate}} !== ''
diff --git a/templates/custom-template/custom-template/template/field-types/String/sample.hbs b/templates/custom-template/custom-template/template/field-types/String/sample.hbs
deleted file mode 100644
index 56b4c51a6..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit."
diff --git a/templates/custom-template/custom-template/template/field-types/String/type.hbs b/templates/custom-template/custom-template/template/field-types/String/type.hbs
deleted file mode 100644
index ee8a39c38..000000000
--- a/templates/custom-template/custom-template/template/field-types/String/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-string
diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/detail/render.hbs
deleted file mode 100644
index 537195405..000000000
--- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/detail/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-${new Date({{variable_to_read}} / 1000).toLocaleString() }
diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/imports.hbs
deleted file mode 100644
index f8705a0ed..000000000
--- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/imports.hbs
+++ /dev/null
@@ -1 +0,0 @@
-import '@vaadin/date-time-picker/theme/material/vaadin-date-time-picker.js';
diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/render.hbs
deleted file mode 100644
index 6197e2383..000000000
--- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/edit/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-<vaadin-date-time-picker label="{{label}}" {{#if variable_to_read}}.value=${new Date({{variable_to_read}} / 1000).toISOString()}{{/if}} @change=${(e: CustomEvent) => { {{variable_to_change}} = new Date((e.target as any).value).valueOf() * 1000;} } {{#if required}}required{{/if}}></vaadin-date-time-picker>
\ No newline at end of file
diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/initial-value.hbs
deleted file mode 100644
index 56bfef5d4..000000000
--- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/initial-value.hbs
+++ /dev/null
@@ -1 +0,0 @@
-Date.now()
diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/is-valid.hbs
deleted file mode 100644
index 27ba77dda..000000000
--- a/templates/custom-template/custom-template/template/field-types/Timestamp/DateTimePicker/is-valid.hbs
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/sample.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/sample.hbs
deleted file mode 100644
index ed20776b5..000000000
--- a/templates/custom-template/custom-template/template/field-types/Timestamp/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-1674053334548000
diff --git a/templates/custom-template/custom-template/template/field-types/Timestamp/type.hbs b/templates/custom-template/custom-template/template/field-types/Timestamp/type.hbs
deleted file mode 100644
index b67e17aeb..000000000
--- a/templates/custom-template/custom-template/template/field-types/Timestamp/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-number
diff --git a/templates/custom-template/custom-template/template/field-types/Vec/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/Vec/detail/render.hbs
deleted file mode 100644
index 6b1b24b2b..000000000
--- a/templates/custom-template/custom-template/template/field-types/Vec/detail/render.hbs
+++ /dev/null
@@ -1,4 +0,0 @@
-<div style="display: flex; flex-direction: column; margin-bottom: 16px">
-  <span><strong>{{title_case field_name}}</strong></span>
-  ${ {{variable_to_read}}.map(el => html`<span style="white-space: pre-line">{{> (concat field_type.type "/" widget "/detail/render") variable_to_read="el"}}</span>`)}
-</div>
diff --git a/templates/custom-template/custom-template/template/field-types/Vec/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/Vec/edit/render.hbs
deleted file mode 100644
index 96ec1f455..000000000
--- a/templates/custom-template/custom-template/template/field-types/Vec/edit/render.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<div style="display: flex; flex-direction: column" @input=${() => this.requestUpdate()} @change=${() => this.requestUpdate()}>
-  <span>{{title_case field_name}}</span>
-
-  ${this._{{camel_case field_name}}.map((el, i) => html`{{> (concat field_type.type "/" widget "/edit/render") label="" variable_to_read="el" variable_to_change=(concat "this._" (camel_case field_name) "[i]" ) }} }`)}
-  <mwc-button icon="add" label="Add {{title_case field_name}}" @click=${() => { this._{{camel_case field_name}} = [...this._{{camel_case field_name}}, {{> (concat field_type.type "/" widget "/initial-value") field_type=field_type}}]; } }></mwc-button>
-</div>
\ No newline at end of file
diff --git a/templates/custom-template/custom-template/template/field-types/Vec/type.hbs b/templates/custom-template/custom-template/template/field-types/Vec/type.hbs
deleted file mode 100644
index 1f1899cec..000000000
--- a/templates/custom-template/custom-template/template/field-types/Vec/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-Array<{{field_type.type}}>
diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/detail/render.hbs
deleted file mode 100644
index 725742854..000000000
--- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/detail/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-${ {{variable_to_read}} ? 'Yes' : 'No' }
diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/imports.hbs
deleted file mode 100644
index a8312f198..000000000
--- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/imports.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-import '@material/mwc-checkbox';
-import '@material/mwc-formfield';
diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/render.hbs
deleted file mode 100644
index c1a1625fe..000000000
--- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/edit/render.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<mwc-formfield label="{{label}}">
-  <mwc-checkbox .checked=${ {{variable_to_read}} } @change=${(e: CustomEvent) => { {{variable_to_change}} = (e.target as any).checked;} }></mwc-checkbox>
-</mwc-formfield>
\ No newline at end of file
diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/initial-value.hbs
deleted file mode 100644
index 27ba77dda..000000000
--- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/initial-value.hbs
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/bool/Checkbox/is-valid.hbs
deleted file mode 100644
index 27ba77dda..000000000
--- a/templates/custom-template/custom-template/template/field-types/bool/Checkbox/is-valid.hbs
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/templates/custom-template/custom-template/template/field-types/bool/sample.hbs b/templates/custom-template/custom-template/template/field-types/bool/sample.hbs
deleted file mode 100644
index 27ba77dda..000000000
--- a/templates/custom-template/custom-template/template/field-types/bool/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/templates/custom-template/custom-template/template/field-types/bool/type.hbs b/templates/custom-template/custom-template/template/field-types/bool/type.hbs
deleted file mode 100644
index 7b19ee8df..000000000
--- a/templates/custom-template/custom-template/template/field-types/bool/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-boolean
diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/detail/render.hbs
deleted file mode 100644
index 433f42b69..000000000
--- a/templates/custom-template/custom-template/template/field-types/f32/Slider/detail/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-${ {{variable_to_read}} }
diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/imports.hbs
deleted file mode 100644
index 9c37e9323..000000000
--- a/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/imports.hbs
+++ /dev/null
@@ -1 +0,0 @@
-import '@material/mwc-slider';
diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/render.hbs
deleted file mode 100644
index 364300128..000000000
--- a/templates/custom-template/custom-template/template/field-types/f32/Slider/edit/render.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<div style="display: flex; flex-direction: row">
-  <span style="margin-right: 4px">{{label}}</span>
-
-  <mwc-slider .value=${ {{variable_to_read}} } @input=${(e: CustomEvent) => { {{variable_to_change}} = e.detail.value; } }></mwc-slider>
-</div>
diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/initial-value.hbs
deleted file mode 100644
index ba66466c2..000000000
--- a/templates/custom-template/custom-template/template/field-types/f32/Slider/initial-value.hbs
+++ /dev/null
@@ -1 +0,0 @@
-0.0
diff --git a/templates/custom-template/custom-template/template/field-types/f32/Slider/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/f32/Slider/is-valid.hbs
deleted file mode 100644
index 27ba77dda..000000000
--- a/templates/custom-template/custom-template/template/field-types/f32/Slider/is-valid.hbs
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/templates/custom-template/custom-template/template/field-types/f32/sample.hbs b/templates/custom-template/custom-template/template/field-types/f32/sample.hbs
deleted file mode 100644
index 2eb3c4fe4..000000000
--- a/templates/custom-template/custom-template/template/field-types/f32/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-0.5
diff --git a/templates/custom-template/custom-template/template/field-types/f32/type.hbs b/templates/custom-template/custom-template/template/field-types/f32/type.hbs
deleted file mode 100644
index b67e17aeb..000000000
--- a/templates/custom-template/custom-template/template/field-types/f32/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-number
diff --git a/templates/custom-template/custom-template/template/field-types/i32/Slider/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/i32/Slider/detail/render.hbs
deleted file mode 100644
index 433f42b69..000000000
--- a/templates/custom-template/custom-template/template/field-types/i32/Slider/detail/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-${ {{variable_to_read}} }
diff --git a/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/imports.hbs
deleted file mode 100644
index 9c37e9323..000000000
--- a/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/imports.hbs
+++ /dev/null
@@ -1 +0,0 @@
-import '@material/mwc-slider';
diff --git a/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/render.hbs
deleted file mode 100644
index 136a70331..000000000
--- a/templates/custom-template/custom-template/template/field-types/i32/Slider/edit/render.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<div style="display: flex; flex-direction: row">
-  <span style="margin-right: 4px">{{label}}</span>
-
-  <mwc-slider {{#if variable_to_read}}.value=${ {{variable_to_read}} }{{/if}} @input=${(e: CustomEvent) => { {{variable_to_change}} = e.detail.value; } } discrete></mwc-slider>
-</div>
diff --git a/templates/custom-template/custom-template/template/field-types/i32/Slider/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/i32/Slider/initial-value.hbs
deleted file mode 100644
index 573541ac9..000000000
--- a/templates/custom-template/custom-template/template/field-types/i32/Slider/initial-value.hbs
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/templates/custom-template/custom-template/template/field-types/i32/Slider/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/i32/Slider/is-valid.hbs
deleted file mode 100644
index 27ba77dda..000000000
--- a/templates/custom-template/custom-template/template/field-types/i32/Slider/is-valid.hbs
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/templates/custom-template/custom-template/template/field-types/i32/sample.hbs b/templates/custom-template/custom-template/template/field-types/i32/sample.hbs
deleted file mode 100644
index 291670352..000000000
--- a/templates/custom-template/custom-template/template/field-types/i32/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
--10
diff --git a/templates/custom-template/custom-template/template/field-types/i32/type.hbs b/templates/custom-template/custom-template/template/field-types/i32/type.hbs
deleted file mode 100644
index b67e17aeb..000000000
--- a/templates/custom-template/custom-template/template/field-types/i32/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-number
diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/detail/render.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/detail/render.hbs
deleted file mode 100644
index 433f42b69..000000000
--- a/templates/custom-template/custom-template/template/field-types/u32/Slider/detail/render.hbs
+++ /dev/null
@@ -1 +0,0 @@
-${ {{variable_to_read}} }
diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/imports.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/imports.hbs
deleted file mode 100644
index 9c37e9323..000000000
--- a/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/imports.hbs
+++ /dev/null
@@ -1 +0,0 @@
-import '@material/mwc-slider';
diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/render.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/render.hbs
deleted file mode 100644
index 136a70331..000000000
--- a/templates/custom-template/custom-template/template/field-types/u32/Slider/edit/render.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<div style="display: flex; flex-direction: row">
-  <span style="margin-right: 4px">{{label}}</span>
-
-  <mwc-slider {{#if variable_to_read}}.value=${ {{variable_to_read}} }{{/if}} @input=${(e: CustomEvent) => { {{variable_to_change}} = e.detail.value; } } discrete></mwc-slider>
-</div>
diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/initial-value.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/initial-value.hbs
deleted file mode 100644
index 573541ac9..000000000
--- a/templates/custom-template/custom-template/template/field-types/u32/Slider/initial-value.hbs
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/templates/custom-template/custom-template/template/field-types/u32/Slider/is-valid.hbs b/templates/custom-template/custom-template/template/field-types/u32/Slider/is-valid.hbs
deleted file mode 100644
index 27ba77dda..000000000
--- a/templates/custom-template/custom-template/template/field-types/u32/Slider/is-valid.hbs
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/templates/custom-template/custom-template/template/field-types/u32/sample.hbs b/templates/custom-template/custom-template/template/field-types/u32/sample.hbs
deleted file mode 100644
index f599e28b8..000000000
--- a/templates/custom-template/custom-template/template/field-types/u32/sample.hbs
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/templates/custom-template/custom-template/template/field-types/u32/type.hbs b/templates/custom-template/custom-template/template/field-types/u32/type.hbs
deleted file mode 100644
index b67e17aeb..000000000
--- a/templates/custom-template/custom-template/template/field-types/u32/type.hbs
+++ /dev/null
@@ -1 +0,0 @@
-number
diff --git "a/templates/custom-template/custom-template/template/link-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if to_referenceable}}{{kebab_case from_referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{\302\241if}}.hbs" "b/templates/custom-template/custom-template/template/link-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if to_referenceable}}{{kebab_case from_referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{\302\241if}}.hbs"
deleted file mode 100644
index 902aebe29..000000000
--- "a/templates/custom-template/custom-template/template/link-type/tests/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if to_referenceable}}{{kebab_case from_referenceable.name}}-to-{{kebab_case (plural to_referenceable.name)}}.test.ts{{\302\241if}}.hbs"	
+++ /dev/null
@@ -1,145 +0,0 @@
-import { assert, test } from "vitest";
-
-import { runScenario, dhtSync, CallableCell } from '@holochain/tryorama';
-import { NewEntryAction, ActionHash, Record, Link, SignedActionHashed, CreateLink,  DeleteLink, AppBundleSource, fakeActionHash, fakeAgentPubKey, fakeEntryHash } from '@holochain/client';
-import { decode } from '@msgpack/msgpack';
-
-{{#if (ne from_referenceable.hash_type "AgentPubKey")}}
-import { create{{pascal_case from_referenceable.name}} } from './common.js';
-{{/if}}
-{{#if (ne to_referenceable.hash_type "AgentPubKey")}}
-import { create{{pascal_case to_referenceable.name}} } from './common.js';
-{{/if}}
-
-test('link a {{pascal_case from_referenceable.name}} to a {{pascal_case to_referenceable.name}}', async () => {
-  await runScenario(async scenario => {
-    // Construct proper paths for your app.
-    // This assumes app bundle created by the `hc app pack` command.
-    const testAppPath = process.cwd() + '/../workdir/{{app_name}}.happ';
-
-    // Set up the app to be installed
-    const appSource = { appBundleSource: { path: testAppPath } };
-
-    // Add 2 players with the test app to the Scenario. The returned players
-    // can be destructured.
-    const [alice, bob] = await scenario.addPlayersWithApps([appSource, appSource]);
-
-    // Shortcut peer discovery through gossip and register all agents in every
-    // conductor of the scenario.
-    await scenario.shareAllAgents();
-
-{{#if (eq from_referenceable.hash_type "AgentPubKey")}}
-    const baseAddress = alice.agentPubKey;
-{{else}}
-    const baseRecord = await create{{pascal_case from_referenceable.name}}(alice.cells[0]);
-  {{#if (eq from_referenceable.hash_type "EntryHash")}}
-    const baseAddress = (baseRecord.signed_action.hashed.content as NewEntryAction).entry_hash;
-  {{else}}
-    const baseAddress = baseRecord.signed_action.hashed.hash;
-  {{/if}}
-{{/if}}
-{{#if (eq to_referenceable.hash_type "AgentPubKey")}}
-    const targetAddress = alice.agentPubKey;
-{{else}}
-    const targetRecord = await create{{pascal_case to_referenceable.name}}(alice.cells[0]);
-  {{#if (eq to_referenceable.hash_type "EntryHash")}}
-    const targetAddress = (targetRecord.signed_action.hashed.content as NewEntryAction).entry_hash;
-  {{else}}
-    const targetAddress = targetRecord.signed_action.hashed.hash;
-  {{/if}}
-{{/if}}
-
-    // Bob gets the links, should be empty
-    let linksOutput: Link[] = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_{{plural (snake_case to_referenceable.name)}}_for_{{snake_case from_referenceable.name}}",
-      payload: baseAddress
-    });
-    assert.equal(linksOutput.length, 0);
-
-    // Alice creates a link from {{pascal_case from_referenceable.name}} to {{pascal_case to_referenceable.name}}
-    await alice.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "add_{{snake_case to_referenceable.name}}_for_{{snake_case from_referenceable.name}}",
-      payload: {
-        base_{{snake_case from_referenceable.singular_arg}}: baseAddress,
-        target_{{snake_case to_referenceable.singular_arg}}: targetAddress
-      }
-    });
-
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-
-    // Bob gets the links again
-    linksOutput = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_{{plural (snake_case to_referenceable.name)}}_for_{{snake_case from_referenceable.name}}",
-      payload: baseAddress
-    });
-    assert.equal(linksOutput.length, 1);
-{{#if (ne to_referenceable.hash_type "AgentPubKey")}}
-    assert.deepEqual(targetAddress, linksOutput[0].target);
-{{/if}}
-
-{{#if bidirectional}}
-
-    // Bob gets the links in the inverse direction
-    linksOutput = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_{{plural (snake_case from_referenceable.name)}}_for_{{snake_case to_referenceable.name}}",
-      payload: targetAddress
-    });
-    assert.equal(linksOutput.length, 1);
-  {{#if (ne from_referenceable.hash_type "AgentPubKey")}}
-    assert.deepEqual(baseAddress, linksOutput[0].target);
-  {{/if}}
-{{/if}}
-
-{{#if delete}}
-    await alice.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "delete_{{snake_case to_referenceable.name}}_for_{{snake_case from_referenceable.name}}",
-      payload: {
-        base_{{snake_case from_referenceable.singular_arg}}: baseAddress,
-        target_{{snake_case to_referenceable.singular_arg}}: targetAddress
-      }
-    });
-
-    await dhtSync([alice, bob], alice.cells[0].cell_id[0]);
-
-    // Bob gets the links again
-    linksOutput = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_{{plural (snake_case to_referenceable.name)}}_for_{{snake_case from_referenceable.name}}",
-      payload: baseAddress
-    });
-    assert.equal(linksOutput.length, 0);
-
-    // Bob gets the deleted links
-    let deletedLinksOutput: Array<[SignedActionHashed<CreateLink>, SignedActionHashed<DeleteLink>[]]> = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_deleted_{{plural (snake_case to_referenceable.name)}}_for_{{snake_case from_referenceable.name}}",
-      payload: baseAddress
-    });
-    assert.equal(deletedLinksOutput.length, 1);
-
-  {{#if bidirectional}}
-    // Bob gets the links in the inverse direction
-    linksOutput = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_{{plural (snake_case from_referenceable.name)}}_for_{{snake_case to_referenceable.name}}",
-      payload: targetAddress
-    });
-    assert.equal(linksOutput.length, 0);
-
-    // Bob gets the deleted links in the inverse direction
-    deletedLinksOutput = await bob.cells[0].callZome({
-      zome_name: "{{coordinator_zome_manifest.name}}",
-      fn_name: "get_deleted_{{plural (snake_case from_referenceable.name)}}_for_{{snake_case to_referenceable.name}}",
-      payload: targetAddress
-    });
-    assert.equal(deletedLinksOutput.length, 1);
-  {{/if}}
-
-{{/if}}
-  });
-});
diff --git "a/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs" "b/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs"
deleted file mode 100644
index 6341cf723..000000000
--- "a/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs"	
+++ /dev/null
@@ -1,69 +0,0 @@
-import { LitElement, html } from 'lit';
-import { state, property, customElement } from 'lit/decorators.js';
-import { AgentPubKey, Link, EntryHash, ActionHash, Record, AppClient, NewEntryAction, SignalType } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
-import { clientContext } from '../../contexts';
-import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types';
-
-import './{{kebab_case from_referenceable.name}}-detail';
-
-@customElement('{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}')
-export class {{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}} extends LitElement {
-  @consume({ context: clientContext })
-  client!: AppClient;
-
-  @property({
-    hasChanged: (newVal: {{to_referenceable.hash_type}}, oldVal: {{to_referenceable.hash_type}}) => newVal?.toString() !== oldVal?.toString()
-  })
-  {{camel_case to_referenceable.singular_arg}}!: {{to_referenceable.hash_type}};
-
-  _fetch{{pascal_case (plural from_referenceable.name)}} = new Task(this, ([{{camel_case to_referenceable.singular_arg}}]) => this.client.callZome({
-      cap_secret: null,
-      role_name: '{{dna_role_name}}',
-      zome_name: '{{coordinator_zome_manifest.name}}',
-      fn_name: 'get_{{snake_case (plural from_referenceable.name)}}_for_{{snake_case to_referenceable.name}}',
-      payload: {{camel_case to_referenceable.singular_arg}},
-  }) as Promise<Array<Link>>, () => [this.{{camel_case to_referenceable.singular_arg}}]);
-
-  @state()
-  signaledHashes: Array<{{from_referenceable.hash_type}}> = [];
-
-  firstUpdated() {
-    if (this.{{camel_case to_referenceable.singular_arg}} === undefined) {
-      throw new Error(`The {{camel_case to_referenceable.singular_arg}} property is required for the {{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}} element`);
-    }
-
-    this.client.on('signal', signal => {
-      if (!(SignalType.App in signal)) return
-      if (signal.App.zome_name !== '{{coordinator_zome_manifest.name}}') return;
-      const payload = signal.App.payload as {{pascal_case coordinator_zome_manifest.name}}Signal;
-      if (payload.type !== 'LinkCreated') return;
-      if (payload.link_type !== '{{pascal_case bidirectional}}') return;
-
-      this.signaledHashes = [payload.action.hashed.content.target_address, ...this.signaledHashes];
-    });
-  }
-
-  renderList(hashes: Array<{{to_referenceable.hash_type}}>) {
-    if (hashes.length === 0) return html`<span>No {{lower_case (plural from_referenceable.name)}} found for this {{lower_case to_referenceable.name}}</span>`;
-
-    return html`
-      <div style="display: flex; flex-direction: column">
-        ${hashes.map(hash =>
-          html`<{{kebab_case from_referenceable.name}}-detail .{{camel_case from_referenceable.name}}Hash=${hash} style="margin-bottom: 16px;"></{{kebab_case from_referenceable.name}}-detail>`
-        )}
-      </div>
-    `;
-  }
-
-  render() {
-    return this._fetch{{pascal_case (plural from_referenceable.name)}}.render({
-      pending: () => html`<div style="display: flex; flex: 1; align-items: center; justify-content: center">
-        <mwc-circular-progress indeterminate></mwc-circular-progress>
-      </div>`,
-      complete: (links) => this.renderList([...this.signaledHashes, ...links.map(l => l.target)]),
-      error: (e: any) => html`<span>Error fetching the {{lower_case (plural from_referenceable.name)}}: ${e.message}.</span>`
-    });
-  }
-}
diff --git "a/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs" "b/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs"
deleted file mode 100644
index c943123ce..000000000
--- "a/templates/custom-template/custom-template/template/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs"	
+++ /dev/null
@@ -1,69 +0,0 @@
-import { LitElement, html } from 'lit';
-import { state, property, customElement } from 'lit/decorators.js';
-import { AgentPubKey, Link, EntryHash, ActionHash, Record, AppClient, NewEntryAction, SignalType } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
-
-import { clientContext } from '../../contexts';
-import './{{kebab_case to_referenceable.name}}-detail';
-import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types';
-
-@customElement('{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}')
-export class {{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}} extends LitElement {
-  @consume({ context: clientContext })
-  client!: AppClient;
-
-  @property({
-    hasChanged: (newVal: {{from_referenceable.hash_type}}, oldVal: {{from_referenceable.hash_type}}) => newVal?.toString() !== oldVal?.toString()
-  })
-  {{camel_case from_referenceable.singular_arg}}!: {{from_referenceable.hash_type}};
-
-  @state()
-  signaledHashes: Array<{{to_referenceable.hash_type}}> = [];
-
-  _fetch{{pascal_case (plural to_referenceable.name)}} = new Task(this, ([{{camel_case from_referenceable.singular_arg}}]) => this.client.callZome({
-      cap_secret: null,
-      role_name: '{{dna_role_name}}',
-      zome_name: '{{coordinator_zome_manifest.name}}',
-      fn_name: 'get_{{snake_case (plural to_referenceable.name)}}_for_{{snake_case from_referenceable.name}}',
-      payload: {{camel_case from_referenceable.singular_arg}},
-  }) as Promise<Array<Link>>, () => [this.{{camel_case from_referenceable.singular_arg}}]);
-
-  firstUpdated() {
-    if (this.{{camel_case from_referenceable.singular_arg}} === undefined) {
-      throw new Error(`The {{camel_case from_referenceable.singular_arg}} property is required for the {{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}} element`);
-    }
-
-    this.client.on('signal', signal => {
-      if (!(SignalType.App in signal)) return;
-      if (signal.App.zome_name !== '{{coordinator_zome_manifest.name}}') return;
-      const payload = signal.App.payload as {{pascal_case coordinator_zome_manifest.name}}Signal;
-      if (payload.type !== 'LinkCreated') return;
-      if (payload.link_type !== '{{pascal_case link_type_name}}') return;
-
-      this.signaledHashes = [payload.action.hashed.content.target_address, ...this.signaledHashes];
-    });
-  }
-
-  renderList(hashes: Array<{{to_referenceable.hash_type}}>) {
-    if (hashes.length === 0) return html`<span>No {{lower_case (plural to_referenceable.name)}} found for this {{lower_case from_referenceable.name}}</span>`;
-
-    return html`
-      <div style="display: flex; flex-direction: column">
-        ${hashes.map(hash =>
-          html`<{{kebab_case to_referenceable.name}}-detail .{{camel_case to_referenceable.name}}Hash=${hash} style="margin-bottom: 16px;"></{{kebab_case to_referenceable.name}}-detail>`
-        )}
-      </div>
-    `;
-  }
-
-  render() {
-    return this._fetch{{pascal_case (plural to_referenceable.name)}}.render({
-      pending: () => html`<div style="display: flex; flex: 1; align-items: center; justify-content: center">
-        <mwc-circular-progress indeterminate></mwc-circular-progress>
-      </div>`,
-      complete: (links) => this.renderList([...this.signaledHashes, ...links.map(l => l.target)]),
-      error: (e: any) => html`<span>Error fetching the {{lower_case (plural to_referenceable.name)}}: ${e.message}.</span>`
-    });
-  }
-}
diff --git a/templates/custom-template/custom-template/template/web-app/.github/workflows/test.yaml.hbs b/templates/custom-template/custom-template/template/web-app/.github/workflows/test.yaml.hbs
deleted file mode 100644
index 5c88e3c50..000000000
--- a/templates/custom-template/custom-template/template/web-app/.github/workflows/test.yaml.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-name: "test"
-on:
-  push: 
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  testbuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install nix
-        uses: cachix/install-nix-action@v27
-        with:
-          install_url: https://releases.nixos.org/nix/nix-2.23.2/install
-
-      - uses: cachix/cachix-action@v15
-        with:
-          name: holochain-ci
-
-      - name: Install and test
-        run: |
-          nix develop --command bash -c "npm i && npm t"
diff --git a/templates/custom-template/custom-template/template/web-app/README.md.hbs b/templates/custom-template/custom-template/template/web-app/README.md.hbs
deleted file mode 100644
index 5274b8049..000000000
--- a/templates/custom-template/custom-template/template/web-app/README.md.hbs
+++ /dev/null
@@ -1,59 +0,0 @@
-# {{title_case app_name}}
-
-## Environment Setup
-
-> PREREQUISITE: set up the [holochain development environment](https://developer.holochain.org/docs/install/).
-
-Enter the nix shell by running this in the root folder of the repository: 
-
-```bash
-nix develop
-npm install
-```
-
-**Run all the other instructions in this README from inside this nix shell, otherwise they won't work**.
-
-## Running 2 agents
- 
-```bash
-npm start
-```
-
-This will create a network of 2 nodes connected to each other and their respective UIs.
-It will also bring up the Holochain Playground for advanced introspection of the conductors.
-
-## Running the backend tests
-
-```bash
-npm test
-```
-
-## Bootstrapping a network
-
-Create a custom network of nodes connected to each other and their respective UIs with:
-
-```bash
-AGENTS=3 npm run network
-```
-
-Substitute the "3" for the number of nodes that you want to bootstrap in your network.
-This will also bring up the Holochain Playground for advanced introspection of the conductors.
-
-## Packaging
-
-To package the web happ:
-``` bash
-npm run package
-```
-
-You'll have the `{{app_name}}.webhapp` in `workdir`. This is what you should distribute so that the Holochain Launcher can install it.
-You will also have its subcomponent `{{app_name}}.happ` in the same folder`.
-
-## Documentation
-
-This repository is using these tools:
-- [NPM Workspaces](https://docs.npmjs.com/cli/v7/using-npm/workspaces/): npm v7's built-in monorepo capabilities.
-- [hc](https://github.com/holochain/holochain/tree/develop/crates/hc): Holochain CLI to easily manage Holochain development instances.
-- [@holochain/tryorama](https://www.npmjs.com/package/@holochain/tryorama): test framework.
-- [@holochain/client](https://www.npmjs.com/package/@holochain/client): client library to connect to Holochain from the UI.
-- [@holochain-playground/cli](https://www.npmjs.com/package/@holochain-playground/cli): introspection tooling to understand what's going on in the Holochain nodes.
diff --git a/templates/custom-template/custom-template/template/web-app/flake.nix.hbs b/templates/custom-template/custom-template/template/web-app/flake.nix.hbs
deleted file mode 100644
index 155c7c0ff..000000000
--- a/templates/custom-template/custom-template/template/web-app/flake.nix.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-{{#merge previous_file_content}}
-  {{#match_scope "inputs = {"}}
-    {{previous_scope_content}}
-
-    scaffolding.url = "github:<TODO:REPLACE_ME_WITH_THE_APPROPRIATE_GIT_URL>";
-  {{/match_scope}}
-  {{#match_scope "devShells.default = pkgs.mkShell {"}}
-
-              inputsFrom = [ inputs'.holochain-flake.devShells.holonix ];
-
-              packages = with pkgs; [
-                nodejs_20
-              ] ++ [
-                inputs'.scaffolding.packages.hc-scaffold-custom-template
-              ];
-  {{/match_scope}}
-{{/merge}}
diff --git a/templates/custom-template/custom-template/template/web-app/package.json.hbs b/templates/custom-template/custom-template/template/web-app/package.json.hbs
deleted file mode 100644
index 8503102b0..000000000
--- a/templates/custom-template/custom-template/template/web-app/package.json.hbs
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "name": "{{app_name}}-dev",
-  "private": true,
-  "workspaces": [
-    "ui",
-    "tests"
-  ],
-  "scripts": {
-    "start": "AGENTS=2 BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) npm run network",
-    "network": "hc sandbox clean && npm run build:happ && UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run launch:happ\" \"holochain-playground\"",
-    "test": "npm run build:zomes && hc app pack workdir --recursive && npm t -w tests",
-    "launch:happ": "hc-spin -n $AGENTS --ui-port $UI_PORT workdir/{{app_name}}.happ",
-    "start:tauri": "AGENTS=2 BOOTSTRAP_PORT=$(port) SIGNAL_PORT=$(port) npm run network:tauri",
-    "network:tauri": "hc sandbox clean && npm run build:happ && UI_PORT=8888 concurrently \"npm start -w ui\" \"npm run launch:tauri\" \"holochain-playground\"",
-    "launch:tauri": "concurrently \"hc run-local-services --bootstrap-port $BOOTSTRAP_PORT --signal-port $SIGNAL_PORT\" \"echo pass | RUST_LOG=warn hc launch --piped -n $AGENTS workdir/{{app_name}}.happ --ui-port $UI_PORT network --bootstrap http://127.0.0.1:\"$BOOTSTRAP_PORT\" webrtc ws://127.0.0.1:\"$SIGNAL_PORT\"\"",
-  {{#if holo_enabled}}
-    "start:holo": "AGENTS=2 npm run network:holo",
-    "network:holo": "npm run build:happ && UI_PORT=8888 concurrently \"npm run launch:holo-dev-server\" \"holochain-playground ws://localhost:4444\" \"concurrently-repeat 'VITE_APP_CHAPERONE_URL=http://localhost:24274 VITE_APP_IS_HOLO=true npm start -w ui' $AGENTS\"",
-    "launch:holo-dev-server": "holo-dev-server workdir/{{app_name}}.happ",
-  {{/if}}
-    "package": "npm run build:happ && npm run package -w ui && hc web-app pack workdir --recursive",
-    "build:happ": "npm run build:zomes && hc app pack workdir --recursive",
-    "build:zomes": "RUSTFLAGS='' CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown"
-  },
-  "devDependencies": {
-    "@holochain-playground/cli": "{{holochain_playground_cli_version}}",
-    "@holochain/hc-spin": "{{hc_spin_version}}",
-    "concurrently": "^6.2.1",
-    "rimraf": "^5.0.7",
-  {{#if holo_enabled}}
-    "concurrently-repeat": "^0.0.1",
-  {{/if}}
-    "new-port-cli": "^1.0.0"
-  },
-  "engines": {
-    "npm": ">=7.0.0"
-  }
-}
diff --git a/templates/custom-template/custom-template/template/web-app/tests/package.json.hbs b/templates/custom-template/custom-template/template/web-app/tests/package.json.hbs
deleted file mode 100644
index 8821314bc..000000000
--- a/templates/custom-template/custom-template/template/web-app/tests/package.json.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "tests",
-  "private": true,
-  "scripts": {
-    "test": "vitest run"
-  },
-  "dependencies": {
-    "@msgpack/msgpack": "^2.8.0",
-    "@holochain/client": "{{holochain_client_version}}",
-    "@holochain/tryorama": "{{tryorama_version}}",
-    "typescript": "^4.9.4",
-    "vitest": "^0.28.4"
-  },
-  "type": "module"
-}
diff --git a/templates/custom-template/custom-template/template/web-app/tests/tsconfig.json.hbs b/templates/custom-template/custom-template/template/web-app/tests/tsconfig.json.hbs
deleted file mode 100644
index 88643849d..000000000
--- a/templates/custom-template/custom-template/template/web-app/tests/tsconfig.json.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2017",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true
-  }
-}
diff --git a/templates/custom-template/custom-template/template/web-app/tests/vitest.config.ts.hbs b/templates/custom-template/custom-template/template/web-app/tests/vitest.config.ts.hbs
deleted file mode 100644
index 7737dbd2a..000000000
--- a/templates/custom-template/custom-template/template/web-app/tests/vitest.config.ts.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-import { defineConfig } from 'vitest/config'
-
-export default defineConfig({
-  test: {
-    threads: false,
-    testTimeout: 60*1000*3 // 3  mins
-  },
-})
-
diff --git a/templates/custom-template/custom-template/template/web-app/ui/.gitignore.hbs b/templates/custom-template/custom-template/template/web-app/ui/.gitignore.hbs
deleted file mode 100644
index 23452c88c..000000000
--- a/templates/custom-template/custom-template/template/web-app/ui/.gitignore.hbs
+++ /dev/null
@@ -1,25 +0,0 @@
-## editors
-/.idea
-/.vscode
-
-## system files
-.DS_Store
-
-## npm
-/node_modules/
-/npm-debug.log
-
-## testing
-/coverage/
-
-## temp folders
-/.tmp/
-
-# build
-/_site/
-/dist/
-/out-tsc/
-
-storybook-static
-.rollup.cache
-*.tsbuildinfo
\ No newline at end of file
diff --git a/templates/custom-template/custom-template/template/web-app/ui/index.html.hbs b/templates/custom-template/custom-template/template/web-app/ui/index.html.hbs
deleted file mode 100644
index dc24b0de7..000000000
--- a/templates/custom-template/custom-template/template/web-app/ui/index.html.hbs
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0, viewport-fit=cover"
-    />
-    <meta name="Description" content="Put your description here." />
-    <base href="/" />
-
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons"
-      rel="stylesheet">
-
-    <style>
-      html,
-      body {
-        margin: 0;
-        padding: 0;
-        font-family: sans-serif;
-        background-color: #ededed;
-      }
-      
-      :root {
-        --mdc-theme-primary: #7B1FA2;
-        --mdc-theme-secondary: #FF5722;
-      }
-    </style>
-    <title>{{title_case app_name}}</title>
-  </head>
-
-  <body>
-    <holochain-app></holochain-app>
-
-    <script type="module" src="./src/holochain-app.ts"></script>
-  </body>
-</html>
diff --git a/templates/custom-template/custom-template/template/web-app/ui/package.json.hbs b/templates/custom-template/custom-template/template/web-app/ui/package.json.hbs
deleted file mode 100644
index 4696d4658..000000000
--- a/templates/custom-template/custom-template/template/web-app/ui/package.json.hbs
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "name": "ui",
-  "version": "0.1.0",
-  "scripts": {
-    "start": "vite --port $UI_PORT --clearScreen false",
-    "build": "vite build",
-  {{#if holo_enabled}}
-    "build:holo": "VITE_APP_IS_HOLO=true vite build",
-    "package:holo": "npm run build:holo && rimraf dist.zip && cd dist && bestzip ../dist.zip *",
-  {{/if}}
-    "lint": "eslint --ext .ts,.html . --ignore-path .gitignore && prettier \"**/*.ts\" --check --ignore-path .gitignore",
-    "format": "eslint --ext .ts,.html . --fix --ignore-path .gitignore && prettier \"**/*.ts\" --write --ignore-path .gitignore",
-    "package": "npm run build && rimraf dist.zip && cd dist && bestzip ../dist.zip *"
-  },
-  "dependencies": {
-    "@holochain/client": "{{holochain_client_version}}",
-  {{#if holo_enabled}}
-    "@holo-host/web-sdk": "{{holo_web_sdk_version}}",
-  {{/if}}
-    "@lit-labs/context": "^0.2.0",
-    "@lit-labs/task": "^2.0.0",
-    "@material/mwc-circular-progress": "^0.27.0",
-    "@material/mwc-button": "^0.27.0",
-    "@material/mwc-textfield": "^0.27.0",
-    "@material/mwc-textarea": "^0.27.0",
-    "@material/mwc-checkbox": "^0.27.0",
-    "@material/mwc-slider": "^0.27.0",
-    "@material/mwc-icon-button": "^0.27.0",
-    "@material/mwc-select": "^0.27.0",
-    "@material/mwc-snackbar": "^0.27.0",
-    "@material/mwc-formfield": "^0.27.0",
-    "@msgpack/msgpack": "^2.8.0",
-    "@vaadin/date-time-picker": "^23.2.8",
-    "lit": "^2.6.1"
-  },
-  "devDependencies": {
-    "@open-wc/eslint-config": "^4.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
-    "bestzip": "^2.2.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "prettier": "^2.3.2",
-    "rimraf": "^5.0.7",
-    "vite": "^4.0.0",
-    "vite-plugin-checker": "^0.5.3",
-    "typescript": "^4.5.5"
-  },
-  "eslintConfig": {
-    "parser": "@typescript-eslint/parser",
-    "extends": [
-      "@open-wc",
-      "prettier"
-    ],
-    "plugins": [
-      "@typescript-eslint"
-    ],
-    "rules": {
-      "wc/guard-super-call": "off",
-      "prefer-destructuring": "off",
-      "no-useless-constructor": "off",
-      "no-empty-function": "off",
-      "no-empty-pattern": "off",
-      "camelcase": "off",
-      "import/no-duplicates": "off",
-      "no-unused-vars": "off",
-      "class-methods-use-this": "off",
-      "@typescript-eslint/no-unused-vars": "off",
-      "import/no-unresolved": "off",
-      "import/extensions": "off",
-      "no-use-before-define": "off",
-      "lines-between-class-members": "off"
-    }
-  },
-  "prettier": {
-    "singleQuote": true,
-    "arrowParens": "avoid"
-  },
-  "type": "module"
-}
diff --git a/templates/custom-template/custom-template/template/web-app/ui/src/contexts.ts.hbs b/templates/custom-template/custom-template/template/web-app/ui/src/contexts.ts.hbs
deleted file mode 100644
index 1722ea941..000000000
--- a/templates/custom-template/custom-template/template/web-app/ui/src/contexts.ts.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-import { createContext } from '@lit-labs/context';
-import { AppClient } from '@holochain/client';
-
-export const clientContext = createContext<AppClient>('AppClient');
-
diff --git a/templates/custom-template/custom-template/template/web-app/ui/src/holochain-app.ts.hbs b/templates/custom-template/custom-template/template/web-app/ui/src/holochain-app.ts.hbs
deleted file mode 100644
index f49bf140e..000000000
--- a/templates/custom-template/custom-template/template/web-app/ui/src/holochain-app.ts.hbs
+++ /dev/null
@@ -1,135 +0,0 @@
-import { LitElement, css, html } from 'lit';
-import { customElement, property, state } from 'lit/decorators.js';
-import {
-  AppWebsocket,
-  ActionHash,
-  AppClient,
-} from '@holochain/client';
-{{#if holo_enabled}}
-import WebSdk from '@holo-host/web-sdk'
-import type { AgentState } from '@holo-host/web-sdk';
-{{/if}}
-import { provide } from '@lit-labs/context';
-{{#if holo_enabled}}
-import '@material/mwc-button';
-{{/if}}
-
-import { clientContext } from './contexts';
-
-{{#if holo_enabled}}
-const IS_HOLO = ['true', '1', 't'].includes(import.meta.env.VITE_APP_IS_HOLO?.toLowerCase())
-{{/if}}
-
-@customElement('holochain-app')
-export class HolochainApp extends LitElement {
-  @state() loading = true;
-
-  @provide({ context: clientContext })
-  @property({ type: Object })
-  client!: AppClient;
-
-  async firstUpdated() {
-  {{#if holo_enabled}}
-    if (IS_HOLO) {
-      const client = await WebSdk.connect({
-        chaperoneUrl: import.meta.env.VITE_APP_CHAPERONE_URL,
-        authFormCustomization: {
-          appName: '{{app_name}}',
-        }
-      });
-
-    client.on('agent-state', (agent_state: AgentState) => {
-      this.loading = !agent_state.isAvailable || agent_state.isAnonymous;
-    });
-
-    client.signUp({ cancellable: false });
-    this.client = client;
-
-    } else {
-      this.client = await AppWebsocket.connect();
-      this.loading = false;
-    }
-  {{else}}
-    this.client = await AppWebsocket.connect();
-    this.loading = false;
-  {{/if}}
-  }
-
-{{#if holo_enabled}}
-  async logout() {
-    await (this.client as WebSdk).signOut();
-    await (this.client as WebSdk).signIn({ cancellable: false });
-  }
-{{/if}}
-
-  render() {
-    if (this.loading)
-      return html`
-        <mwc-circular-progress indeterminate></mwc-circular-progress>
-      `;
-
-    return html`
-      <main>
-        <h1>{{title_case app_name}}</h1>
-
-        <div id="content" style="display: flex; flex-direction: column; flex: 1;">
-          <h2>EDIT ME! Add the components of your app here.</h2>
-
-          <span>Look in the <code>ui/src/DNA/ZOME</code> folders for UI elements that are generated with <code>hc scaffold entry-type</code>, <code>hc scaffold collection</code> and <code>hc scaffold link-type</code> and add them here as appropriate.</span>
-
-          <span>For example, if you have scaffolded a "todos" dna, a "todos" zome, a "todo_item" entry type, and a collection called "all_todos", you might want to add an element here to create and list your todo items, with the generated <code>ui/src/todos/todos/all-todos.ts</code> and <code>ui/src/todos/todos/create-todo.ts</code> elements.</span>
-
-          <span>So, to use those elements here:</span>
-          <ol>
-            <li>Import the elements with:
-              <pre>
-import './todos/todos/all-todos';
-import './todos/todos/create-todo';
-              </pre>
-            </li>
-            <li>Replace this "EDIT ME!" section with <code>&lt;create-todo&gt;&lt;/create-todo&gt;&lt;all-todos&gt;&lt;/all-todos&gt;</code>.</li>
-          </ol>
-        </div>
-      {{#if holo_enabled}}
-      ${IS_HOLO ? html`
-        <mwc-button
-          style="margin-top: 16px;"
-          raised
-          label="Logout"
-          @click=${() => this.logout()}
-        ></mwc-button>
-        `: ''}
-      {{/if}}
-      </main>
-    `;
-  }
-
-  static styles = css`
-    :host {
-      min-height: 100vh;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: flex-start;
-      font-size: calc(10px + 2vmin);
-      color: #1a2b42;
-      max-width: 960px;
-      margin: 0 auto;
-      text-align: center;
-      background-color: var(--lit-element-background-color);
-    }
-
-    main {
-      flex-grow: 1;
-    }
-
-    .app-footer {
-      font-size: calc(12px + 0.5vmin);
-      align-items: center;
-    }
-
-    .app-footer a {
-      margin-left: 5px;
-    }
-  `;
-}
diff --git a/templates/custom-template/custom-template/template/web-app/ui/tsconfig.json.hbs b/templates/custom-template/custom-template/template/web-app/ui/tsconfig.json.hbs
deleted file mode 100644
index 89a6f6466..000000000
--- a/templates/custom-template/custom-template/template/web-app/ui/tsconfig.json.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2018",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "useDefineForClassFields": false,
-    "lib": ["es2017", "dom"],
-    "strict": true,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
-    "outDir": "dist",
-    "sourceMap": true,
-    "inlineSources": true,
-    "incremental": true,
-  {{#if holo_enabled}}
-    "types": ["vite/client"],
-  {{/if}}
-    "skipLibCheck": true
-  },
-  "include": ["src/**/*.ts", "src/**/*.d.ts"]
-}
diff --git a/templates/custom-template/custom-template/template/web-app/ui/vite.config.ts.hbs b/templates/custom-template/custom-template/template/web-app/ui/vite.config.ts.hbs
deleted file mode 100644
index 51c6f7ccc..000000000
--- a/templates/custom-template/custom-template/template/web-app/ui/vite.config.ts.hbs
+++ /dev/null
@@ -1,14 +0,0 @@
-import { defineConfig } from 'vite';
-import checker from 'vite-plugin-checker';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [
-    checker({
-      typescript: true,
-      eslint: {
-        lintCommand: 'eslint --ext .ts,.html . --ignore-path .gitignore',
-      },
-    }),
-  ]
-});
diff --git a/templates/generic/web-app/package.json.hbs b/templates/generic/web-app/package.json.hbs
index 19ec6e52f..d18d7433d 100644
--- a/templates/generic/web-app/package.json.hbs
+++ b/templates/generic/web-app/package.json.hbs
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@holochain-playground/cli": "{{holochain_playground_cli_version}}",
     "@holochain/hc-spin": "{{hc_spin_version}}",
-    "concurrently": "^6.2.1",
+    "concurrently": "^6.5.1",
   {{#if holo_enabled}}
     "concurrently-repeat": "^0.0.1",
   {{/if}}
@@ -37,4 +37,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/templates/generic/web-app/tests/vitest.config.ts.hbs b/templates/generic/web-app/tests/vitest.config.ts.hbs
index ed926ca6b..67497b42f 100644
--- a/templates/generic/web-app/tests/vitest.config.ts.hbs
+++ b/templates/generic/web-app/tests/vitest.config.ts.hbs
@@ -3,6 +3,6 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     threads: false,
-    testTimeout: 60*1000*3 // 3  mins
+    testTimeout: 60*1000*4 // 4  mins
   },
-})
+})
\ No newline at end of file
diff --git a/templates/ui-frameworks/lit/collection.instructions.hbs b/templates/ui-frameworks/lit/collection.instructions.hbs
index 51ad54b6f..c9350ccb4 100644
--- a/templates/ui-frameworks/lit/collection.instructions.hbs
+++ b/templates/ui-frameworks/lit/collection.instructions.hbs
@@ -1,2 +1,2 @@
 If you want the newly scaffolded collection's component to be the entry point for its UI, import the
-generated <{{kebab_case collection_name}}></{{kebab_case collection_name}}> component.
\ No newline at end of file
+generated <{{kebab_case collection_name}}></{{kebab_case collection_name}}> component.
diff --git a/templates/ui-frameworks/lit/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs b/templates/ui-frameworks/lit/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs
index 8a7a87967..5c052c13a 100644
--- a/templates/ui-frameworks/lit/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs	
+++ b/templates/ui-frameworks/lit/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case collection_name}}.ts.hbs	
@@ -1,8 +1,8 @@
 import { LitElement, html } from 'lit';
 import { state, customElement, property } from 'lit/decorators.js';
 import { AppClient, AgentPubKey, Link, EntryHash, ActionHash, Record, NewEntryAction, SignalType } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
+import { consume } from '@lit/context';
+import { Task } from '@lit/task';
 
 import { sharedStyles } from '../../shared-styles';
 import { clientContext } from '../../contexts';
@@ -77,4 +77,4 @@ export class {{pascal_case collection_name}} extends LitElement {
   }
 
   static styles = sharedStyles;
-}
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs b/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs
index 36cfdf8fe..7ef1c70b7 100644
--- a/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs	
+++ b/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/create-{{kebab_case entry_type.name}}.ts.hbs	
@@ -1,7 +1,7 @@
 import { LitElement, html } from 'lit';
 import { state, customElement, property } from 'lit/decorators.js';
 import { InstalledCell, ActionHash, Record, AgentPubKey, EntryHash, AppClient, DnaHash, HolochainError } from '@holochain/client';
-import { consume } from '@lit-labs/context';
+import { consume } from '@lit/context';
 {{#uniq_lines}}
   {{#each entry_type.fields}}
     {{#if widget}}
diff --git "a/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs" "b/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs"
index fae604da5..e0413636d 100644
--- "a/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs"	
+++ "b/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{kebab_case (plural ..\302\241entry_type.name)}}-for-{{kebab_case linked_from.name}}.ts{{\302\241if}}{{\302\241each}}.hbs"	
@@ -1,8 +1,8 @@
 import { LitElement, html } from 'lit';
 import { state, customElement, property } from 'lit/decorators.js';
 import { InstalledCell, Record, Link, AppClient, EntryHash, ActionHash, AgentPubKey, SignalType } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
+import { consume } from '@lit/context';
+import { Task } from '@lit/task';
 
 import { sharedStyles } from '../../shared-styles';
 import { clientContext } from '../../contexts';
diff --git "a/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs" "b/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs"
index a4a1a7b01..e36cc741a 100644
--- "a/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs"	
+++ "b/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}edit-{{kebab_case entry_type.name}}.ts{{\302\241if}}.hbs"	
@@ -1,7 +1,7 @@
 import { LitElement, html } from 'lit';
 import { state, customElement, property } from 'lit/decorators.js';
 import { ActionHash, EntryHash, AgentPubKey, Record, AppClient, DnaHash, HolochainError } from '@holochain/client';
-import { consume } from '@lit-labs/context';
+import { consume } from '@lit/context';
 import { decode } from '@msgpack/msgpack';
 {{#uniq_lines}}
   {{#each entry_type.fields}}
@@ -157,4 +157,4 @@ export class Edit{{pascal_case entry_type.name}} extends LitElement {
   }
 
   static styles = sharedStyles;
-}
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs b/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs
index d7eedc360..53ae8a7d0 100644
--- a/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs	
+++ b/templates/ui-frameworks/lit/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{kebab_case entry_type.name}}-detail.ts.hbs	
@@ -1,8 +1,8 @@
 import { LitElement, html } from 'lit';
 import { state, customElement, property } from 'lit/decorators.js';
 import { EntryHash, Record, ActionHash, AppClient, DnaHash, HolochainError } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
+import { consume } from '@lit/context';
+import { Task } from '@lit/task';
 import { decode } from '@msgpack/msgpack';
 {{#uniq_lines}}
   {{#each entry_type.fields}}
diff --git a/templates/ui-frameworks/lit/example.instructions.hbs b/templates/ui-frameworks/lit/example.instructions.hbs
index cfdf10efd..dd398fe79 100644
--- a/templates/ui-frameworks/lit/example.instructions.hbs
+++ b/templates/ui-frameworks/lit/example.instructions.hbs
@@ -7,4 +7,4 @@ Run the example app with:
 
 Generated ui code might also need to be reformatted:
 
-  {{(package_manager_command package_manager "format" "ui")}}
\ No newline at end of file
+  {{(package_manager_command package_manager "format" "ui")}}
diff --git a/templates/ui-frameworks/lit/example/ui/src/holochain-app.ts.hbs b/templates/ui-frameworks/lit/example/ui/src/holochain-app.ts.hbs
index 58eee306c..2b62b35df 100644
--- a/templates/ui-frameworks/lit/example/ui/src/holochain-app.ts.hbs
+++ b/templates/ui-frameworks/lit/example/ui/src/holochain-app.ts.hbs
@@ -1,9 +1,9 @@
-import { LitElement, html, css, unsafeCSS } from 'lit';
+import { LitElement, html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { AppClient, AppWebsocket } from '@holochain/client';
-import { provide } from '@lit-labs/context';
+import { provide } from '@lit/context';
 
-import sharedStyles from './index.css';
+import { sharedStyles } from './shared-styles';
 import { clientContext } from './contexts';
 
 import './forum/posts/all-posts';
@@ -39,5 +39,5 @@ export class HolochainApp extends LitElement {
     `;
   }
 
-  static styles = css`${unsafeCSS(sharedStyles)}`;
+  static styles = sharedStyles;
 }
\ No newline at end of file
diff --git "a/templates/ui-frameworks/lit/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs" "b/templates/ui-frameworks/lit/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs"
index 1ddb2555a..6196a6c49 100644
--- "a/templates/ui-frameworks/lit/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs"	
+++ "b/templates/ui-frameworks/lit/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{kebab_case (plural from_referenceable.name)}}-for-{{kebab_case to_referenceable.name}}.ts{{\302\241if}}.hbs"	
@@ -1,8 +1,8 @@
 import { LitElement, html } from 'lit';
 import { state, property, customElement } from 'lit/decorators.js';
 import { AgentPubKey, Link, EntryHash, ActionHash, Record, AppClient, NewEntryAction, SignalType } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
+import { consume } from '@lit/context';
+import { Task } from '@lit/task';
 
 import { sharedStyles } from '../../shared-styles';
 import { clientContext } from '../../contexts';
@@ -68,4 +68,4 @@ export class {{pascal_case (plural from_referenceable.name)}}For{{pascal_case to
   }
 
   static styles = sharedStyles;
-}
+}
\ No newline at end of file
diff --git "a/templates/ui-frameworks/lit/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs" "b/templates/ui-frameworks/lit/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs"
index b751dbd6a..e068a7944 100644
--- "a/templates/ui-frameworks/lit/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs"	
+++ "b/templates/ui-frameworks/lit/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{kebab_case (plural to_referenceable.name)}}-for-{{kebab_case from_referenceable.name}}.ts{{\302\241if}}.hbs"	
@@ -1,8 +1,8 @@
 import { LitElement, html } from 'lit';
 import { state, property, customElement } from 'lit/decorators.js';
 import { AgentPubKey, Link, EntryHash, ActionHash, Record, AppClient, NewEntryAction, SignalType } from '@holochain/client';
-import { consume } from '@lit-labs/context';
-import { Task } from '@lit-labs/task';
+import { consume } from '@lit/context';
+import { Task } from '@lit/task';
 
 import { sharedStyles } from '../../shared-styles';
 import { clientContext } from '../../contexts';
diff --git a/templates/ui-frameworks/lit/web-app/ui/index.html.hbs b/templates/ui-frameworks/lit/web-app/ui/index.html.hbs
index f38b7af12..6b7467347 100644
--- a/templates/ui-frameworks/lit/web-app/ui/index.html.hbs
+++ b/templates/ui-frameworks/lit/web-app/ui/index.html.hbs
@@ -9,9 +9,10 @@
     <meta name="Description" content="Put your description here." />
     <base href="/" />
     <title>{{title_case app_name}}</title>
+    <link rel="stylesheet" href="./src/index.css" />
   </head>
   <body>
     <holochain-app></holochain-app>
     <script type="module" src="./src/holochain-app.ts"></script>
   </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/templates/ui-frameworks/lit/web-app/ui/package.json.hbs b/templates/ui-frameworks/lit/web-app/ui/package.json.hbs
index 61c0fcf8f..5bf4278b5 100644
--- a/templates/ui-frameworks/lit/web-app/ui/package.json.hbs
+++ b/templates/ui-frameworks/lit/web-app/ui/package.json.hbs
@@ -8,8 +8,7 @@
     "build:holo": "VITE_APP_IS_HOLO=true vite build",
     "package:holo": "{{(package_manager_command package_manager "build:holo" null)}} && rimraf dist.zip && cd dist && bestzip ../dist.zip *",
   {{/if}}
-    "lint": "eslint --ext .ts,.html . --ignore-path .gitignore && prettier \"**/*.ts\" --check --ignore-path .gitignore",
-    "format": "eslint --ext .ts,.html . --fix --ignore-path .gitignore && prettier \"**/*.ts\" --write --ignore-path .gitignore",
+    "format": "prettier \"**/*.ts\" --write --ignore-path .gitignore",
     "package": "{{(package_manager_command package_manager "build" null)}} && rimraf dist.zip && cd dist && bestzip ../dist.zip *"
   },
   "dependencies": {
@@ -17,58 +16,23 @@
   {{#if holo_enabled}}
     "@holo-host/web-sdk": "{{holo_web_sdk_version}}",
   {{/if}}
-    "@lit-labs/context": "^0.2.0",
-    "@lit-labs/task": "^2.0.0",
+    "@lit/context": "^1.1.3",
+    "@lit/task": "^1.0.1",
     "@msgpack/msgpack": "^2.8.0",
-    "lit": "^2.6.1"
+    "lit": "^3.2.1"
   },
   "devDependencies": {
-    "@open-wc/eslint-config": "^4.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
-    "bestzip": "^2.2.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "prettier": "^2.3.2",
-    "rimraf": "^5.0.7",
-    "vite": "^4.0.0",
-    "vite-plugin-checker": "^0.5.3",
-    "typescript": "^4.5.5",
-    "tslib": "^2.6.3"
-  },
-  "eslintConfig": {
-    "parser": "@typescript-eslint/parser",
-    "extends": [
-      "@open-wc",
-      "prettier"
-    ],
-    "plugins": [
-      "@typescript-eslint"
-    ],
-    "rules": {
-      "wc/guard-super-call": "off",
-      "prefer-destructuring": "off",
-      "no-useless-constructor": "off",
-      "no-empty-function": "off",
-      "no-nested-ternary": "off",
-      "no-empty-pattern": "off",
-      "no-console": "off",
-      "no-alert": "off",
-      "no-param-reassign": "off",
-      "camelcase": "off",
-      "import/no-duplicates": "off",
-      "no-unused-vars": "off",
-      "class-methods-use-this": "off",
-      "@typescript-eslint/no-unused-vars": "off",
-      "import/no-unresolved": "off",
-      "import/extensions": "off",
-      "no-use-before-define": "off",
-      "lines-between-class-members": "off"
-    }
+    "bestzip": "^2.2.1",
+    "prettier": "^2.8.8",
+    "rimraf": "^5.0.10",
+    "tslib": "^2.8.0",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.10",
+    "vite-plugin-checker": "^0.5.6"
   },
   "prettier": {
     "singleQuote": true,
     "arrowParens": "avoid"
   },
   "type": "module"
-}
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/lit/web-app/ui/src/contexts.ts.hbs b/templates/ui-frameworks/lit/web-app/ui/src/contexts.ts.hbs
index e947aaaf0..55ef62cb0 100644
--- a/templates/ui-frameworks/lit/web-app/ui/src/contexts.ts.hbs
+++ b/templates/ui-frameworks/lit/web-app/ui/src/contexts.ts.hbs
@@ -1,4 +1,4 @@
-import { createContext } from '@lit-labs/context';
+import { createContext } from '@lit/context';
 import { AppClient } from '@holochain/client';
 
 export const clientContext = createContext<AppClient>('AppClient');
\ No newline at end of file
diff --git a/templates/ui-frameworks/lit/web-app/ui/src/declarations.d.ts.hbs b/templates/ui-frameworks/lit/web-app/ui/src/declarations.d.ts.hbs
index bf581f294..356018b39 100644
--- a/templates/ui-frameworks/lit/web-app/ui/src/declarations.d.ts.hbs
+++ b/templates/ui-frameworks/lit/web-app/ui/src/declarations.d.ts.hbs
@@ -3,7 +3,7 @@ declare module '*.svg' {
   export default content;
 }
 
-declare module '*.css' {
+declare module '*.css?inline' {
   const content: string;
   export default content;
 }
\ No newline at end of file
diff --git a/templates/ui-frameworks/lit/web-app/ui/src/holochain-app.ts.hbs b/templates/ui-frameworks/lit/web-app/ui/src/holochain-app.ts.hbs
index 59a6ffcba..76c192546 100644
--- a/templates/ui-frameworks/lit/web-app/ui/src/holochain-app.ts.hbs
+++ b/templates/ui-frameworks/lit/web-app/ui/src/holochain-app.ts.hbs
@@ -5,7 +5,7 @@ import { AppWebsocket, ActionHash, AppClient, HolochainError } from '@holochain/
 import WebSdk from '@holo-host/web-sdk'
 import type { AgentState } from '@holo-host/web-sdk';
 {{/if}}
-import { provide } from '@lit-labs/context';
+import { provide } from '@lit/context';
 
 import { sharedStyles } from './shared-styles';
 import HolochainLogo from "./assets/holochainLogo.svg";
diff --git a/templates/ui-frameworks/lit/web-app/ui/src/shared-styles.ts.hbs b/templates/ui-frameworks/lit/web-app/ui/src/shared-styles.ts.hbs
index 5080ba072..a2251d80c 100644
--- a/templates/ui-frameworks/lit/web-app/ui/src/shared-styles.ts.hbs
+++ b/templates/ui-frameworks/lit/web-app/ui/src/shared-styles.ts.hbs
@@ -1,4 +1,4 @@
 import { css, unsafeCSS } from 'lit';
-import styles from './index.css';
+import styles from './index.css?inline';
 
 export const sharedStyles = css`${unsafeCSS(styles)}`;
\ No newline at end of file
diff --git a/templates/ui-frameworks/lit/web-app/ui/vite.config.ts.hbs b/templates/ui-frameworks/lit/web-app/ui/vite.config.ts.hbs
index b8181d30d..52844b059 100644
--- a/templates/ui-frameworks/lit/web-app/ui/vite.config.ts.hbs
+++ b/templates/ui-frameworks/lit/web-app/ui/vite.config.ts.hbs
@@ -3,11 +3,6 @@ import checker from 'vite-plugin-checker';
 
 export default defineConfig({
   plugins: [
-    checker({
-      typescript: true,
-      eslint: {
-        lintCommand: 'eslint --ext .ts,.html . --ignore-path .gitignore',
-      },
-    }),
+    checker({ typescript: true }),
   ]
-});
+});
\ No newline at end of file
diff --git a/templates/ui-frameworks/react/collection.instructions.hbs b/templates/ui-frameworks/react/collection.instructions.hbs
index b76a0611d..273fbc940 100644
--- a/templates/ui-frameworks/react/collection.instructions.hbs
+++ b/templates/ui-frameworks/react/collection.instructions.hbs
@@ -1,2 +1,2 @@
 If you want the newly scaffolded collection's component to be the entry point for its UI, import the
-generated <{{pascal_case collection_name}} /> component.
\ No newline at end of file
+generated <{{pascal_case collection_name}} /> component.
diff --git a/templates/ui-frameworks/react/example.instructions.hbs b/templates/ui-frameworks/react/example.instructions.hbs
index a260319d9..fa1e1ac26 100644
--- a/templates/ui-frameworks/react/example.instructions.hbs
+++ b/templates/ui-frameworks/react/example.instructions.hbs
@@ -1,6 +1,6 @@
 Run the example app with:
 
   cd {{example}}
-  nix develop 
+  nix develop
   {{(package_manager_command package_manager "install" null)}}
-  {{(package_manager_command package_manager "start" null)}}
\ No newline at end of file
+  {{(package_manager_command package_manager "start" null)}}
diff --git a/templates/ui-frameworks/react/web-app/ui/package.json.hbs b/templates/ui-frameworks/react/web-app/ui/package.json.hbs
index 66dce5631..45e6b2399 100644
--- a/templates/ui-frameworks/react/web-app/ui/package.json.hbs
+++ b/templates/ui-frameworks/react/web-app/ui/package.json.hbs
@@ -16,17 +16,17 @@
     "@holo-host/web-sdk": "{{web_sdk_version}}",
 {{/if}}
     "@msgpack/msgpack": "^2.8.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@types/react": "^18.2.66",
-    "@types/react-dom": "^18.2.22",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "@vitejs/plugin-react": "^4.3.3",
     "bestzip": "^2.2.1",
-    "typescript": "^5.2.2",
-    "rimraf": "^5.0.7",
-    "vite": "^5.2.0"
+    "rimraf": "^5.0.10",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.10"
   },
   "type": "module"
-}
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/svelte/collection.instructions.hbs b/templates/ui-frameworks/svelte/collection.instructions.hbs
index b76a0611d..273fbc940 100644
--- a/templates/ui-frameworks/svelte/collection.instructions.hbs
+++ b/templates/ui-frameworks/svelte/collection.instructions.hbs
@@ -1,2 +1,2 @@
 If you want the newly scaffolded collection's component to be the entry point for its UI, import the
-generated <{{pascal_case collection_name}} /> component.
\ No newline at end of file
+generated <{{pascal_case collection_name}} /> component.
diff --git a/templates/ui-frameworks/svelte/example.instructions.hbs b/templates/ui-frameworks/svelte/example.instructions.hbs
index a260319d9..fa1e1ac26 100644
--- a/templates/ui-frameworks/svelte/example.instructions.hbs
+++ b/templates/ui-frameworks/svelte/example.instructions.hbs
@@ -1,6 +1,6 @@
 Run the example app with:
 
   cd {{example}}
-  nix develop 
+  nix develop
   {{(package_manager_command package_manager "install" null)}}
-  {{(package_manager_command package_manager "start" null)}}
\ No newline at end of file
+  {{(package_manager_command package_manager "start" null)}}
diff --git a/templates/ui-frameworks/svelte/web-app/ui/package.json.hbs b/templates/ui-frameworks/svelte/web-app/ui/package.json.hbs
index 4c6ee864f..a401f4047 100644
--- a/templates/ui-frameworks/svelte/web-app/ui/package.json.hbs
+++ b/templates/ui-frameworks/svelte/web-app/ui/package.json.hbs
@@ -18,14 +18,14 @@
     "@msgpack/msgpack": "^2.8.0"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^2.0.2",
+    "@sveltejs/vite-plugin-svelte": "^3.1.2",
     "@tsconfig/svelte": "^3.0.0",
-    "bestzip": "^2.2.0",
-    "rimraf": "^5.0.7",
-    "svelte": "^3.55.1",
-    "tslib": "^2.4.1",
-    "typescript": "^4.9.3",
-    "vite": "^4.0.4"
+    "bestzip": "^2.2.1",
+    "rimraf": "^5.0.10",
+    "svelte": "^4.0.0",
+    "tslib": "^2.8.0",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.10"
   },
   "type": "module"
 }
\ No newline at end of file
diff --git a/templates/ui-frameworks/vanilla/example.instructions.hbs b/templates/ui-frameworks/vanilla/example.instructions.hbs
index a260319d9..fa1e1ac26 100644
--- a/templates/ui-frameworks/vanilla/example.instructions.hbs
+++ b/templates/ui-frameworks/vanilla/example.instructions.hbs
@@ -1,6 +1,6 @@
 Run the example app with:
 
   cd {{example}}
-  nix develop 
+  nix develop
   {{(package_manager_command package_manager "install" null)}}
-  {{(package_manager_command package_manager "start" null)}}
\ No newline at end of file
+  {{(package_manager_command package_manager "start" null)}}
diff --git a/templates/ui-frameworks/vanilla/web-app/ui/package.json.hbs b/templates/ui-frameworks/vanilla/web-app/ui/package.json.hbs
index ba68dc36d..9da86c75e 100644
--- a/templates/ui-frameworks/vanilla/web-app/ui/package.json.hbs
+++ b/templates/ui-frameworks/vanilla/web-app/ui/package.json.hbs
@@ -13,8 +13,8 @@
     "@msgpack/msgpack": "^2.8.0"
   },
   "devDependencies": {
-    "bestzip": "^2.2.0",
-    "rimraf": "^5.0.7",
-    "vite": "^4.0.4"
+    "bestzip": "^2.2.1",
+    "rimraf": "^5.0.10",
+    "vite": "^5.4.10"
   }
-}
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/collection.instructions.hbs b/templates/ui-frameworks/vue/collection.instructions.hbs
index b76a0611d..273fbc940 100644
--- a/templates/ui-frameworks/vue/collection.instructions.hbs
+++ b/templates/ui-frameworks/vue/collection.instructions.hbs
@@ -1,2 +1,2 @@
 If you want the newly scaffolded collection's component to be the entry point for its UI, import the
-generated <{{pascal_case collection_name}} /> component.
\ No newline at end of file
+generated <{{pascal_case collection_name}} /> component.
diff --git a/templates/ui-frameworks/vue/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.vue.hbs b/templates/ui-frameworks/vue/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.vue.hbs
index c9460ad79..98ee2ad69 100644
--- a/templates/ui-frameworks/vue/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.vue.hbs	
+++ b/templates/ui-frameworks/vue/collection/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case collection_name}}.vue.hbs	
@@ -16,13 +16,13 @@
 </template>
 
 <script lang="ts">
-import { inject, toRaw, ComputedRef } from 'vue';
+import { inject, toRaw, ComputedRef, defineComponent } from 'vue';
 import { decode } from '@msgpack/msgpack';
 import { AppClient, NewEntryAction, Link, Record, AgentPubKey, EntryHash, ActionHash, HolochainError, SignalType } from '@holochain/client';
 import {{pascal_case referenceable.name}}Detail from './{{pascal_case referenceable.name}}Detail.vue';
 import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types';
 
-export default {
+export default defineComponent({
   components: {
     {{pascal_case referenceable.name}}Detail,
   },
@@ -84,5 +84,5 @@ export default {
     const client = (inject('client') as ComputedRef<AppClient>).value;
     return { client };
   },
-};
-</script>
+});
+</script>
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.vue.hbs b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.vue.hbs
index 92818dddd..fd09891c3 100644
--- a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.vue.hbs	
+++ b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.vue.hbs	
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts">
-import { inject, ComputedRef } from 'vue';
+import { inject, ComputedRef, defineComponent } from 'vue';
 import { AppClient, Record, AgentPubKey, EntryHash, ActionHash, DnaHash } from '@holochain/client';
 import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types';
 {{#uniq_lines}}
@@ -33,7 +33,7 @@ import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq fie
   {{/each}}
 {{/uniq_lines}}
 
-export default {
+export default defineComponent({
   data(): {
 {{#each entry_type.fields}}
   {{#if widget}}
@@ -126,5 +126,5 @@ export default {
     const client = (inject('client') as ComputedRef<AppClient>).value;
     return { client };
   },
-};
-</script>
+});
+</script>
\ No newline at end of file
diff --git "a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.vue{{\302\241if}}{{\302\241each}}.hbs" "b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.vue{{\302\241if}}{{\302\241each}}.hbs"
index c46170a5a..266242163 100644
--- "a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.vue{{\302\241if}}{{\302\241each}}.hbs"	
+++ "b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#each entry_type.fields}}{{#if (and linked_from (not (eq linked_from.hash_type 'AgentPubKey') ) )}}{{pascal_case (plural ..\302\241entry_type.name)}}For{{pascal_case linked_from.name}}.vue{{\302\241if}}{{\302\241each}}.hbs"	
@@ -14,13 +14,13 @@
 </template>
 
 <script lang="ts">
-import { inject, ComputedRef, toRaw } from 'vue';
+import { inject, ComputedRef, toRaw, defineComponent } from 'vue';
 import { decode } from '@msgpack/msgpack';
 import { AppClient, Link, Record, ActionHash, AgentPubKey, HolochainError, SignalType } from '@holochain/client';
 import {{pascal_case ../entry_type.name}}Detail from './{{pascal_case ../entry_type.name}}Detail.vue';
 import { {{pascal_case ../coordinator_zome_manifest.name}}Signal } from './types';
 
-export default {
+export default defineComponent({
   components: {
     {{pascal_case ../entry_type.name}}Detail,
   },
@@ -74,5 +74,5 @@ export default {
     const client = (inject('client') as ComputedRef<AppClient>).value;
     return { client };
   },
-};
-</script>
+});
+</script>
\ No newline at end of file
diff --git "a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.vue{{\302\241if}}.hbs" "b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.vue{{\302\241if}}.hbs"
index f85f5bd2d..cca770035 100644
--- "a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.vue{{\302\241if}}.hbs"	
+++ "b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.vue{{\302\241if}}.hbs"	
@@ -23,7 +23,7 @@
 </template>
 
 <script lang="ts">
-import { inject, ComputedRef } from 'vue';
+import { inject, ComputedRef, defineComponent } from 'vue';
 import { AppClient, Record, AgentPubKey, EntryHash, ActionHash, DnaHash, HolochainError } from '@holochain/client';
 import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types';
 import { decode } from '@msgpack/msgpack';
@@ -36,7 +36,7 @@ import { decode } from '@msgpack/msgpack';
   {{/each}}
 {{/uniq_lines}}
 
-export default {
+export default defineComponent({
   data(): {
 {{#each entry_type.fields}}
   {{#if widget}}
@@ -128,5 +128,5 @@ export default {
     const client = (inject('client') as ComputedRef<AppClient>).value;
     return { client };
   },
-};
-</script>
+});
+</script>
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case entry_type.name}}Detail.vue.hbs b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case entry_type.name}}Detail.vue.hbs
index 680759b7e..375337bd1 100644
--- a/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case entry_type.name}}Detail.vue.hbs	
+++ b/templates/ui-frameworks/vue/entry-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{pascal_case entry_type.name}}Detail.vue.hbs	
@@ -42,7 +42,7 @@
 </template>
 
 <script lang="ts">
-import { inject, ComputedRef } from 'vue';
+import { inject, ComputedRef, defineComponent } from 'vue';
 import { decode } from '@msgpack/msgpack';
 import { AppClient, Record, AgentPubKey, EntryHash, ActionHash, DnaHash, HolochainError } from '@holochain/client';
 import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types';
@@ -58,7 +58,7 @@ import { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq fie
 import Edit{{pascal_case entry_type.name}} from './Edit{{pascal_case entry_type.name}}.vue';
 {{/if}}
 
-export default {
+export default defineComponent({
 {{#if crud.update}}
   components: {
     Edit{{pascal_case entry_type.name}},
@@ -141,5 +141,5 @@ export default {
     const client = (inject('client') as ComputedRef<AppClient>).value;
     return { client };
   },
-};
-</script>
+});
+</script>
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/example.instructions.hbs b/templates/ui-frameworks/vue/example.instructions.hbs
index a260319d9..fa1e1ac26 100644
--- a/templates/ui-frameworks/vue/example.instructions.hbs
+++ b/templates/ui-frameworks/vue/example.instructions.hbs
@@ -1,6 +1,6 @@
 Run the example app with:
 
   cd {{example}}
-  nix develop 
+  nix develop
   {{(package_manager_command package_manager "install" null)}}
-  {{(package_manager_command package_manager "start" null)}}
\ No newline at end of file
+  {{(package_manager_command package_manager "start" null)}}
diff --git a/templates/ui-frameworks/vue/example/ui/src/App.vue.hbs b/templates/ui-frameworks/vue/example/ui/src/App.vue.hbs
index 895ad9d6f..68d6255b5 100644
--- a/templates/ui-frameworks/vue/example/ui/src/App.vue.hbs
+++ b/templates/ui-frameworks/vue/example/ui/src/App.vue.hbs
@@ -15,7 +15,7 @@ import { AppWebsocket, AppClient } from '@holochain/client';
 import AllPosts from './forum/posts/AllPosts.vue';
 import CreatePost from './forum/posts/CreatePost.vue';
 
-export default {
+export default defineComponent({
   components: {
     AllPosts,
     CreatePost
@@ -44,5 +44,5 @@ export default {
       client: computed(() => this.client),
     };
   },
-};
-</script>
+});
+</script>
\ No newline at end of file
diff --git "a/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.vue{{\302\241if}}.hbs" "b/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.vue{{\302\241if}}.hbs"
index 74f6bbf6c..53600e07b 100644
--- "a/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.vue{{\302\241if}}.hbs"	
+++ "b/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and bidireccional (and to_referenceable (ne from_referenceable.hash_type 'AgentPubKey')))}}{{pascal_case (plural from_referenceable.name)}}For{{pascal_case to_referenceable.name}}.vue{{\302\241if}}.hbs"	
@@ -15,13 +15,13 @@
 </template>
 
 <script lang="ts">
-import { toRaw, inject, ComputedRef } from 'vue';
+import { toRaw, inject, ComputedRef, defineComponent } from 'vue';
 import { decode } from '@msgpack/msgpack';
 import { Link, AppClient, Record, AgentPubKey, EntryHash, ActionHash, NewEntryAction, HolochainError, SignalType } from '@holochain/client';
 import {{pascal_case from_referenceable.name}}Detail from './{{pascal_case from_referenceable.name}}Detail.vue';
 import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types';
 
-export default {
+export default defineComponent({
   components: {
     {{pascal_case from_referenceable.name}}Detail,
   },
@@ -73,5 +73,5 @@ export default {
     const client = (inject('client') as ComputedRef<AppClient>).value;
     return { client };
   },
-};
-</script>
+});
+</script>
\ No newline at end of file
diff --git "a/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.vue{{\302\241if}}.hbs" "b/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.vue{{\302\241if}}.hbs"
index 581ee24cb..e92bd6b88 100644
--- "a/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.vue{{\302\241if}}.hbs"	
+++ "b/templates/ui-frameworks/vue/link-type/ui/src/{{dna_role_name}}/{{coordinator_zome_manifest.name}}/{{#if (and to_referenceable (ne to_referenceable.hash_type 'AgentPubKey'))}}{{pascal_case (plural to_referenceable.name)}}For{{pascal_case from_referenceable.name}}.vue{{\302\241if}}.hbs"	
@@ -15,13 +15,13 @@
 </template>
 
 <script lang="ts">
-import { toRaw, inject, ComputedRef } from 'vue';
+import { toRaw, inject, ComputedRef, defineComponent } from 'vue';
 import { decode } from '@msgpack/msgpack';
 import { AppClient, Record, Link, AgentPubKey, EntryHash, ActionHash, NewEntryAction, HolochainError, SignalType } from '@holochain/client';
 import {{pascal_case to_referenceable.name}}Detail from './{{pascal_case to_referenceable.name}}Detail.vue';
 import { {{pascal_case coordinator_zome_manifest.name}}Signal } from './types';
 
-export default {
+export default defineComponent({
   components: {
     {{pascal_case to_referenceable.name}}Detail,
   },
@@ -73,5 +73,5 @@ export default {
     const client = (inject('client') as ComputedRef<AppClient>).value;
     return { client };
   },
-};
-</script>
+});
+</script>
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/web-app/ui/package.json.hbs b/templates/ui-frameworks/vue/web-app/ui/package.json.hbs
index 70968d923..4d575fcda 100644
--- a/templates/ui-frameworks/vue/web-app/ui/package.json.hbs
+++ b/templates/ui-frameworks/vue/web-app/ui/package.json.hbs
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "scripts": {
     "start": "vite --port $UI_PORT --clearScreen false",
-    "build": "npm run check && vite build",
+    "build": "{{(package_manager_command package_manager "check" null)}} && vite build",
   {{#if holo_enabled}}
     "build:holo": "VITE_APP_IS_HOLO=true vite build",
     "package:holo": "{{(package_manager_command package_manager "build:holo" null)}} && rimraf dist.zip && cd dist && bestzip ../dist.zip *",
@@ -18,16 +18,15 @@
     "@holo-host/web-sdk": "{{holo_web_sdk_version}}",
   {{/if}}
     "@msgpack/msgpack": "^2.8.0",
-    "vue": "^3.2.25"
+    "vue": "^3.5.12"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^4.0.0",
-    "bestzip": "^2.2.0",
-    "rimraf": "^5.0.7",
-    "typescript": "^4.9.3",
-    "vite": "^4.0.4",
-    "vite-plugin-checker": "^0.5.1",
-    "vue-tsc": "^1.0.24"
+    "@vitejs/plugin-vue": "^5.1.4",
+    "bestzip": "^2.2.1",
+    "rimraf": "^5.0.10",
+    "typescript": "5.6.3",
+    "vite": "^5.4.10",
+    "vue-tsc": "^2.1.8"
   },
   "type": "module"
-}
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/web-app/ui/src/App.vue.hbs b/templates/ui-frameworks/vue/web-app/ui/src/App.vue.hbs
index 64738cdbb..c7945af30 100644
--- a/templates/ui-frameworks/vue/web-app/ui/src/App.vue.hbs
+++ b/templates/ui-frameworks/vue/web-app/ui/src/App.vue.hbs
@@ -19,14 +19,14 @@
 </template>
 
 <script lang="ts">
-import { computed } from 'vue';
+import { computed, defineComponent } from 'vue';
 import { AppClient, AppWebsocket, HolochainError } from '@holochain/client';
 {{#if holo_enabled}}
 import WebSdk from '@holo-host/web-sdk';
 import type { AgentState } from '@holo-host/web-sdk';
 {{/if}}
 
-export default {
+export default defineComponent({
   components: {},
   data(): {
     client: AppClient | undefined;
@@ -93,7 +93,7 @@ export default {
       client: computed(() => this.client),
     };
   },
-};
+});
 </script>
 
 <style scoped>
diff --git a/templates/ui-frameworks/vue/web-app/ui/src/vite-env.d.ts.hbs b/templates/ui-frameworks/vue/web-app/ui/src/vite-env.d.ts.hbs
index 11f02fe2a..2dbae3e7f 100644
--- a/templates/ui-frameworks/vue/web-app/ui/src/vite-env.d.ts.hbs
+++ b/templates/ui-frameworks/vue/web-app/ui/src/vite-env.d.ts.hbs
@@ -1 +1,6 @@
 /// <reference types="vite/client" />
+declare module "*.vue" {
+  import type { DefineComponent } from "vue";
+  const component: DefineComponent<{}, {}, any>;
+  export default component;
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/web-app/ui/tsconfig.app.json.hbs b/templates/ui-frameworks/vue/web-app/ui/tsconfig.app.json.hbs
new file mode 100644
index 000000000..4af22929a
--- /dev/null
+++ b/templates/ui-frameworks/vue/web-app/ui/tsconfig.app.json.hbs
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "preserve",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"]
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/web-app/ui/tsconfig.json.hbs b/templates/ui-frameworks/vue/web-app/ui/tsconfig.json.hbs
index f9be3438f..c452f432c 100644
--- a/templates/ui-frameworks/vue/web-app/ui/tsconfig.json.hbs
+++ b/templates/ui-frameworks/vue/web-app/ui/tsconfig.json.hbs
@@ -1,19 +1,7 @@
 {
-  "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "strict": true,
-    "jsx": "preserve",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "esModuleInterop": true,
-    "lib": ["ESNext", "DOM"],
-    "skipLibCheck": true,
-    "noEmit": true
-  },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],
-  "references": [{ "path": "./tsconfig.node.json" }]
-}
-
+  "files": [],
+  "references": [
+    { "path": "./tsconfig.app.json" },
+    { "path": "./tsconfig.node.json" }
+  ]
+}
\ No newline at end of file
diff --git a/templates/ui-frameworks/vue/web-app/ui/tsconfig.node.json.hbs b/templates/ui-frameworks/vue/web-app/ui/tsconfig.node.json.hbs
index 7a4667ed0..abcd7f0da 100644
--- a/templates/ui-frameworks/vue/web-app/ui/tsconfig.node.json.hbs
+++ b/templates/ui-frameworks/vue/web-app/ui/tsconfig.node.json.hbs
@@ -1,10 +1,24 @@
 {
   "compilerOptions": {
-    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "target": "ES2022",
+    "lib": ["ES2023"],
     "module": "ESNext",
-    "moduleResolution": "Node",
-    "allowSyntheticDefaultImports": true
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "Bundler",
+    "allowImportingTsExtensions": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true
   },
   "include": ["vite.config.ts"]
 }
-
diff --git a/templates/ui-frameworks/vue/web-app/ui/vite.config.ts.hbs b/templates/ui-frameworks/vue/web-app/ui/vite.config.ts.hbs
index d6ae6a76d..176cbe4a3 100644
--- a/templates/ui-frameworks/vue/web-app/ui/vite.config.ts.hbs
+++ b/templates/ui-frameworks/vue/web-app/ui/vite.config.ts.hbs
@@ -1,6 +1,5 @@
 import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
-import checker from 'vite-plugin-checker';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -13,8 +12,5 @@ export default defineConfig({
         },
       },
     }),
-    checker({
-      vueTsc: true,
-    }),
   ]
-});
+});
\ No newline at end of file