diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
new file mode 100644
index 000000000..29302efac
--- /dev/null
+++ b/.github/actions/prepare/action.yml
@@ -0,0 +1,25 @@
+---
+name: Cache
+description: Caches cargo dependencies
+inputs:
+  components:
+    description: Additional Rust components to install (comma separated). rustfmt and clippy are always included.
+    required: false
+    default: ''
+outputs:
+  cache-hit:
+    description: Cache Hit
+    value: ${{ steps.cache.outputs.cache-hit }}
+runs:
+  using: composite
+  steps:
+    - name: setup rust tool chain
+      uses: dtolnay/rust-toolchain@1.88.0  # v1.88.0
+      with:
+        components: ${{ (inputs.components != '') && format('{0}, rustfmt, clippy', inputs.components) || 'rustfmt, clippy' }}
+    - name: Install libsodium
+      run: sudo apt-get update && sudo apt-get install -y libsodium-dev
+      shell: bash
+    - name: Restore cargo dependencies from cache
+      uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3  # v2.7.7
+      id: cache
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 30649067a..b1bc1eca9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: Test
 
 on:
   push:
-    branches: [master]
+    branches: [master, stellar-scafold-fargate-backend, stellar-scafold]
   pull_request: {}
 
 jobs:
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Deno 1.46.3 (matching Netlify edge function environment)
         uses: denoland/setup-deno@e95548e56dfa95d4e1a28d6f422fafe75c4c26fb # v2.0.3
         with:
-          deno-version: '1.46.3'
+          deno-version: "1.46.3"
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Deno check API
@@ -50,6 +50,82 @@ jobs:
         run: yarn test
         working-directory: packages/ui
 
+  stellar-backend:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: packages/ui/api/stellar
+    steps:
+      # Checkout the repository
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        with:
+          egress-policy: audit
+      - name: Checkout Code
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - name: free disk space
+        run: |
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
+          sudo apt clean
+          if [[ $(docker image ls -aq) ]]; then
+            docker rmi $(docker image ls -aq)
+          else
+            echo "No Docker images found to remove"
+          fi
+      - name: Prepare
+        id: init
+        uses: ./.github/actions/prepare
+        with:
+          components: llvm-tools-preview
+
+      # Get the output of the prepare composite action
+      - name: Get cache-hit output
+        run: 'echo "Cache hit >>>>>: ${{ steps.init.outputs.cache-hit }}"'
+      - name: Install cargo hack and cargo-llvm-cov
+        uses: taiki-e/install-action@a24ba45235ed716ff76646268742990dc9458860 # v2.62.42
+        with:
+          tool: cargo-hack,cargo-llvm-cov
+      - name: Build
+        run: cargo test --no-run --locked
+
+      - name: Run Developer Tests (excluding AI) and Generate Coverage Report
+        id: dev_coverage
+        env:
+          LLVM_PROFILE_FILE: stellar-backend-dev-%p-%m.profraw
+          RUSTFLAGS: -Cinstrument-coverage
+          RUST_TEST_THREADS: 1
+        run: |
+          cargo hack llvm-cov --locked --lib --lcov --output-path stellar-backend-dev-lcov.info --tests -- --skip ai_
+
+      - name: Upload Developer Coverage to Codecov
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          name: stellar-backend-dev-coverage
+          files: packages/ui/api/stellar/stellar-backend-dev-lcov.info
+          flags: stellar-backend-dev
+          fail_ci_if_error: true
+
+      - name: Run AI Tests and Generate Coverage Report
+        id: ai_coverage
+        env:
+          LLVM_PROFILE_FILE: stellar-backend-ai-%p-%m.profraw
+          RUSTFLAGS: -Cinstrument-coverage
+          RUST_TEST_THREADS: 1
+        run: |
+          cargo hack llvm-cov --locked --lib --lcov --output-path stellar-backend-ai-lcov.info --tests -- ai_
+
+      - name: Upload AI Coverage to Codecov
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          name: stellar-backend-ai-coverage
+          files: packages/ui/api/stellar/stellar-backend-ai-lcov.info
+          flags: stellar-backend-ai
+          fail_ci_if_error: true
+
   build:
     name: build (${{ matrix.package }}, ${{ matrix.variant }})
     timeout-minutes: 90
@@ -71,13 +147,12 @@ jobs:
             variant: compile
           - package: stylus
             variant: compile
-        
 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
-            fetch-depth: 0
+          fetch-depth: 0
       - name: Set up environment
         uses: ./.github/actions/setup
 
@@ -103,7 +178,6 @@ jobs:
             target/
           key: cargo-${{ matrix.package }}
 
-
       - name: Set up rust toolchain
         if: matrix.package == 'stellar' && matrix.variant == 'compile'
         uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
diff --git a/.gitignore b/.gitignore
index fb2be9502..0d13b2f6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,7 @@ node_modules
 # Generated by Cargo
 # will have compiled files and executables
 debug/
-target/
\ No newline at end of file
+target/
+
+**/*.profraw
+**/*lcov*
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
index 5ef2de522..22e34939b 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -16,4 +16,7 @@ public/
 remappings.txt
 *.cairo
 *.sh
-*.rs
\ No newline at end of file
+*.rs
+**/Dockerfile*
+*.yml
+*.yaml
\ No newline at end of file
diff --git a/packages/ui/api/ai/deno.lock b/packages/ui/api/ai/deno.lock
index 5e453a785..d1459b48c 100644
--- a/packages/ui/api/ai/deno.lock
+++ b/packages/ui/api/ai/deno.lock
@@ -1,261 +1,7 @@
 {
   "version": "3",
-  "redirects": {
-    "https://deno.land/std/fmt/colors.ts": "https://deno.land/std@0.224.0/fmt/colors.ts",
-<<<<<<< HEAD:packages/ui/api/ai/deno.lock
-    "https://deno.land/std/path/mod.ts": "https://deno.land/std@0.224.0/path/mod.ts"
-=======
-    "https://deno.land/std/path/mod.ts": "https://deno.land/std@0.224.0/path/mod.ts",
-    "https://esm.sh/crypto-js@^4.2.0/enc-hex?target=denonext": "https://esm.sh/crypto-js@4.2.0/enc-hex?target=denonext",
-    "https://esm.sh/crypto-js@^4.2.0/sha1?target=denonext": "https://esm.sh/crypto-js@4.2.0/sha1?target=denonext",
-    "https://esm.sh/uncrypto@^0.1.3?target=denonext": "https://esm.sh/uncrypto@0.1.3?target=denonext"
->>>>>>> upstream/master:packages/ui/deno.lock
-  },
   "remote": {
-    "https://deno.land/std@0.224.0/assert/assert.ts": "09d30564c09de846855b7b071e62b5974b001bb72a4b797958fe0660e7849834",
-    "https://deno.land/std@0.224.0/assert/assertion_error.ts": "ba8752bd27ebc51f723702fac2f54d3e94447598f54264a6653d6413738a8917",
-    "https://deno.land/std@0.224.0/fmt/colors.ts": "508563c0659dd7198ba4bbf87e97f654af3c34eb56ba790260f252ad8012e1c5",
-    "https://deno.land/std@0.224.0/path/_common/assert_path.ts": "dbdd757a465b690b2cc72fc5fb7698c51507dec6bfafce4ca500c46b76ff7bd8",
-    "https://deno.land/std@0.224.0/path/_common/basename.ts": "569744855bc8445f3a56087fd2aed56bdad39da971a8d92b138c9913aecc5fa2",
-    "https://deno.land/std@0.224.0/path/_common/common.ts": "ef73c2860694775fe8ffcbcdd387f9f97c7a656febf0daa8c73b56f4d8a7bd4c",
-    "https://deno.land/std@0.224.0/path/_common/constants.ts": "dc5f8057159f4b48cd304eb3027e42f1148cf4df1fb4240774d3492b5d12ac0c",
-    "https://deno.land/std@0.224.0/path/_common/dirname.ts": "684df4aa71a04bbcc346c692c8485594fc8a90b9408dfbc26ff32cf3e0c98cc8",
-    "https://deno.land/std@0.224.0/path/_common/format.ts": "92500e91ea5de21c97f5fe91e178bae62af524b72d5fcd246d6d60ae4bcada8b",
-    "https://deno.land/std@0.224.0/path/_common/from_file_url.ts": "d672bdeebc11bf80e99bf266f886c70963107bdd31134c4e249eef51133ceccf",
-    "https://deno.land/std@0.224.0/path/_common/glob_to_reg_exp.ts": "6cac16d5c2dc23af7d66348a7ce430e5de4e70b0eede074bdbcf4903f4374d8d",
-    "https://deno.land/std@0.224.0/path/_common/normalize.ts": "684df4aa71a04bbcc346c692c8485594fc8a90b9408dfbc26ff32cf3e0c98cc8",
-    "https://deno.land/std@0.224.0/path/_common/normalize_string.ts": "33edef773c2a8e242761f731adeb2bd6d683e9c69e4e3d0092985bede74f4ac3",
-    "https://deno.land/std@0.224.0/path/_common/relative.ts": "faa2753d9b32320ed4ada0733261e3357c186e5705678d9dd08b97527deae607",
-    "https://deno.land/std@0.224.0/path/_common/strip_trailing_separators.ts": "7024a93447efcdcfeaa9339a98fa63ef9d53de363f1fbe9858970f1bba02655a",
-    "https://deno.land/std@0.224.0/path/_common/to_file_url.ts": "7f76adbc83ece1bba173e6e98a27c647712cab773d3f8cbe0398b74afc817883",
-    "https://deno.land/std@0.224.0/path/_interface.ts": "8dfeb930ca4a772c458a8c7bbe1e33216fe91c253411338ad80c5b6fa93ddba0",
-    "https://deno.land/std@0.224.0/path/_os.ts": "8fb9b90fb6b753bd8c77cfd8a33c2ff6c5f5bc185f50de8ca4ac6a05710b2c15",
-    "https://deno.land/std@0.224.0/path/basename.ts": "7ee495c2d1ee516ffff48fb9a93267ba928b5a3486b550be73071bc14f8cc63e",
-    "https://deno.land/std@0.224.0/path/common.ts": "03e52e22882402c986fe97ca3b5bb4263c2aa811c515ce84584b23bac4cc2643",
-    "https://deno.land/std@0.224.0/path/constants.ts": "0c206169ca104938ede9da48ac952de288f23343304a1c3cb6ec7625e7325f36",
-    "https://deno.land/std@0.224.0/path/dirname.ts": "85bd955bf31d62c9aafdd7ff561c4b5fb587d11a9a5a45e2b01aedffa4238a7c",
-    "https://deno.land/std@0.224.0/path/extname.ts": "593303db8ae8c865cbd9ceec6e55d4b9ac5410c1e276bfd3131916591b954441",
-    "https://deno.land/std@0.224.0/path/format.ts": "6ce1779b0980296cf2bc20d66436b12792102b831fd281ab9eb08fa8a3e6f6ac",
-    "https://deno.land/std@0.224.0/path/from_file_url.ts": "911833ae4fd10a1c84f6271f36151ab785955849117dc48c6e43b929504ee069",
-    "https://deno.land/std@0.224.0/path/glob_to_regexp.ts": "7f30f0a21439cadfdae1be1bf370880b415e676097fda584a63ce319053b5972",
-    "https://deno.land/std@0.224.0/path/is_absolute.ts": "4791afc8bfd0c87f0526eaa616b0d16e7b3ab6a65b62942e50eac68de4ef67d7",
-    "https://deno.land/std@0.224.0/path/is_glob.ts": "a65f6195d3058c3050ab905705891b412ff942a292bcbaa1a807a74439a14141",
-    "https://deno.land/std@0.224.0/path/join.ts": "ae2ec5ca44c7e84a235fd532e4a0116bfb1f2368b394db1c4fb75e3c0f26a33a",
-    "https://deno.land/std@0.224.0/path/join_globs.ts": "5b3bf248b93247194f94fa6947b612ab9d3abd571ca8386cf7789038545e54a0",
-    "https://deno.land/std@0.224.0/path/mod.ts": "f6bd79cb08be0e604201bc9de41ac9248582699d1b2ee0ab6bc9190d472cf9cd",
-    "https://deno.land/std@0.224.0/path/normalize.ts": "4155743ccceeed319b350c1e62e931600272fad8ad00c417b91df093867a8352",
-    "https://deno.land/std@0.224.0/path/normalize_glob.ts": "cc89a77a7d3b1d01053b9dcd59462b75482b11e9068ae6c754b5cf5d794b374f",
-    "https://deno.land/std@0.224.0/path/parse.ts": "77ad91dcb235a66c6f504df83087ce2a5471e67d79c402014f6e847389108d5a",
-    "https://deno.land/std@0.224.0/path/posix/_util.ts": "1e3937da30f080bfc99fe45d7ed23c47dd8585c5e473b2d771380d3a6937cf9d",
-    "https://deno.land/std@0.224.0/path/posix/basename.ts": "d2fa5fbbb1c5a3ab8b9326458a8d4ceac77580961b3739cd5bfd1d3541a3e5f0",
-    "https://deno.land/std@0.224.0/path/posix/common.ts": "26f60ccc8b2cac3e1613000c23ac5a7d392715d479e5be413473a37903a2b5d4",
-    "https://deno.land/std@0.224.0/path/posix/constants.ts": "93481efb98cdffa4c719c22a0182b994e5a6aed3047e1962f6c2c75b7592bef1",
-    "https://deno.land/std@0.224.0/path/posix/dirname.ts": "76cd348ffe92345711409f88d4d8561d8645353ac215c8e9c80140069bf42f00",
-    "https://deno.land/std@0.224.0/path/posix/extname.ts": "e398c1d9d1908d3756a7ed94199fcd169e79466dd88feffd2f47ce0abf9d61d2",
-    "https://deno.land/std@0.224.0/path/posix/format.ts": "185e9ee2091a42dd39e2a3b8e4925370ee8407572cee1ae52838aed96310c5c1",
-    "https://deno.land/std@0.224.0/path/posix/from_file_url.ts": "951aee3a2c46fd0ed488899d024c6352b59154c70552e90885ed0c2ab699bc40",
-    "https://deno.land/std@0.224.0/path/posix/glob_to_regexp.ts": "76f012fcdb22c04b633f536c0b9644d100861bea36e9da56a94b9c589a742e8f",
-    "https://deno.land/std@0.224.0/path/posix/is_absolute.ts": "cebe561ad0ae294f0ce0365a1879dcfca8abd872821519b4fcc8d8967f888ede",
-    "https://deno.land/std@0.224.0/path/posix/is_glob.ts": "8a8b08c08bf731acf2c1232218f1f45a11131bc01de81e5f803450a5914434b9",
-    "https://deno.land/std@0.224.0/path/posix/join.ts": "7fc2cb3716aa1b863e990baf30b101d768db479e70b7313b4866a088db016f63",
-    "https://deno.land/std@0.224.0/path/posix/join_globs.ts": "a9475b44645feddceb484ee0498e456f4add112e181cb94042cdc6d47d1cdd25",
-    "https://deno.land/std@0.224.0/path/posix/mod.ts": "2301fc1c54a28b349e20656f68a85f75befa0ee9b6cd75bfac3da5aca9c3f604",
-    "https://deno.land/std@0.224.0/path/posix/normalize.ts": "baeb49816a8299f90a0237d214cef46f00ba3e95c0d2ceb74205a6a584b58a91",
-    "https://deno.land/std@0.224.0/path/posix/normalize_glob.ts": "9c87a829b6c0f445d03b3ecadc14492e2864c3ebb966f4cea41e98326e4435c6",
-    "https://deno.land/std@0.224.0/path/posix/parse.ts": "09dfad0cae530f93627202f28c1befa78ea6e751f92f478ca2cc3b56be2cbb6a",
-    "https://deno.land/std@0.224.0/path/posix/relative.ts": "3907d6eda41f0ff723d336125a1ad4349112cd4d48f693859980314d5b9da31c",
-    "https://deno.land/std@0.224.0/path/posix/resolve.ts": "08b699cfeee10cb6857ccab38fa4b2ec703b0ea33e8e69964f29d02a2d5257cf",
-    "https://deno.land/std@0.224.0/path/posix/to_file_url.ts": "7aa752ba66a35049e0e4a4be5a0a31ac6b645257d2e031142abb1854de250aaf",
-    "https://deno.land/std@0.224.0/path/posix/to_namespaced_path.ts": "28b216b3c76f892a4dca9734ff1cc0045d135532bfd9c435ae4858bfa5a2ebf0",
-    "https://deno.land/std@0.224.0/path/relative.ts": "ab739d727180ed8727e34ed71d976912461d98e2b76de3d3de834c1066667add",
-    "https://deno.land/std@0.224.0/path/resolve.ts": "a6f977bdb4272e79d8d0ed4333e3d71367cc3926acf15ac271f1d059c8494d8d",
-    "https://deno.land/std@0.224.0/path/to_file_url.ts": "88f049b769bce411e2d2db5bd9e6fd9a185a5fbd6b9f5ad8f52bef517c4ece1b",
-    "https://deno.land/std@0.224.0/path/to_namespaced_path.ts": "b706a4103b104cfadc09600a5f838c2ba94dbcdb642344557122dda444526e40",
-    "https://deno.land/std@0.224.0/path/windows/_util.ts": "d5f47363e5293fced22c984550d5e70e98e266cc3f31769e1710511803d04808",
-    "https://deno.land/std@0.224.0/path/windows/basename.ts": "6bbc57bac9df2cec43288c8c5334919418d784243a00bc10de67d392ab36d660",
-    "https://deno.land/std@0.224.0/path/windows/common.ts": "26f60ccc8b2cac3e1613000c23ac5a7d392715d479e5be413473a37903a2b5d4",
-    "https://deno.land/std@0.224.0/path/windows/constants.ts": "5afaac0a1f67b68b0a380a4ef391bf59feb55856aa8c60dfc01bd3b6abb813f5",
-    "https://deno.land/std@0.224.0/path/windows/dirname.ts": "33e421be5a5558a1346a48e74c330b8e560be7424ed7684ea03c12c21b627bc9",
-    "https://deno.land/std@0.224.0/path/windows/extname.ts": "165a61b00d781257fda1e9606a48c78b06815385e7d703232548dbfc95346bef",
-    "https://deno.land/std@0.224.0/path/windows/format.ts": "bbb5ecf379305b472b1082cd2fdc010e44a0020030414974d6029be9ad52aeb6",
-    "https://deno.land/std@0.224.0/path/windows/from_file_url.ts": "ced2d587b6dff18f963f269d745c4a599cf82b0c4007356bd957cb4cb52efc01",
-    "https://deno.land/std@0.224.0/path/windows/glob_to_regexp.ts": "e45f1f89bf3fc36f94ab7b3b9d0026729829fabc486c77f414caebef3b7304f8",
-    "https://deno.land/std@0.224.0/path/windows/is_absolute.ts": "4a8f6853f8598cf91a835f41abed42112cebab09478b072e4beb00ec81f8ca8a",
-    "https://deno.land/std@0.224.0/path/windows/is_glob.ts": "8a8b08c08bf731acf2c1232218f1f45a11131bc01de81e5f803450a5914434b9",
-    "https://deno.land/std@0.224.0/path/windows/join.ts": "8d03530ab89195185103b7da9dfc6327af13eabdcd44c7c63e42e27808f50ecf",
-    "https://deno.land/std@0.224.0/path/windows/join_globs.ts": "a9475b44645feddceb484ee0498e456f4add112e181cb94042cdc6d47d1cdd25",
-    "https://deno.land/std@0.224.0/path/windows/mod.ts": "2301fc1c54a28b349e20656f68a85f75befa0ee9b6cd75bfac3da5aca9c3f604",
-    "https://deno.land/std@0.224.0/path/windows/normalize.ts": "78126170ab917f0ca355a9af9e65ad6bfa5be14d574c5fb09bb1920f52577780",
-    "https://deno.land/std@0.224.0/path/windows/normalize_glob.ts": "9c87a829b6c0f445d03b3ecadc14492e2864c3ebb966f4cea41e98326e4435c6",
-    "https://deno.land/std@0.224.0/path/windows/parse.ts": "08804327b0484d18ab4d6781742bf374976de662f8642e62a67e93346e759707",
-    "https://deno.land/std@0.224.0/path/windows/relative.ts": "3e1abc7977ee6cc0db2730d1f9cb38be87b0ce4806759d271a70e4997fc638d7",
-    "https://deno.land/std@0.224.0/path/windows/resolve.ts": "8dae1dadfed9d46ff46cc337c9525c0c7d959fb400a6308f34595c45bdca1972",
-    "https://deno.land/std@0.224.0/path/windows/to_file_url.ts": "40e560ee4854fe5a3d4d12976cef2f4e8914125c81b11f1108e127934ced502e",
-<<<<<<< HEAD:packages/ui/api/ai/deno.lock
-    "https://deno.land/std@0.224.0/path/windows/to_namespaced_path.ts": "4ffa4fb6fae321448d5fe810b3ca741d84df4d7897e61ee29be961a6aac89a4c"
-=======
-    "https://deno.land/std@0.224.0/path/windows/to_namespaced_path.ts": "4ffa4fb6fae321448d5fe810b3ca741d84df4d7897e61ee29be961a6aac89a4c",
-    "https://esm.sh/@upstash/redis@1.25.2": "b9400ffe20e12237188f35ee3658f02e273ecd1abd421106af12f6ea916c81b0",
-    "https://esm.sh/@upstash/redis@1.25.2/denonext/redis.mjs": "d8487c833ec520cc90f52b680b172282e91941b937bc9ea879b8347e407833cc",
     "https://esm.sh/@upstash/redis@1.35.6": "18026bc0000af7b6b158f6e2ff7ae244c9745da61b9302e176479f8b3bc145dd",
-    "https://esm.sh/@upstash/redis@1.35.6/denonext/chunk-TAJI6TAE.mjs": "2ea1c6793c40ca7f431a1260e2926170a9af57dac2a6ef8dc55ff95bdfe3bb25",
-    "https://esm.sh/@upstash/redis@1.35.6/denonext/redis.mjs": "0d5bccf5bbc8b67335530487a16587640ac40b9b176237ee18759bae489ffc33",
-    "https://esm.sh/crypto-js@4.2.0/denonext/enc-hex.mjs": "d9b57ee9b036cb023e8c87f0063f616405c34f166327e6bc561ce36059eabfa6",
-    "https://esm.sh/crypto-js@4.2.0/denonext/sha1.mjs": "7c20a11f45d6390bfd5babfb769457ad42775bca38d140dc497e548a94f7745b",
-    "https://esm.sh/crypto-js@4.2.0/enc-hex?target=denonext": "e7bbfb366ad3cbea21a865f646e2dd1109398362c4779291bffb03bb6332310f",
-    "https://esm.sh/crypto-js@4.2.0/sha1?target=denonext": "60b6e4ce5897826e9f61dcc2a0cbf11a9431ef81cad376f7f1f2810c615e4e68",
-    "https://esm.sh/openai@5.13.1": "0ef5984cbbec5b8576ed2f93a37a6bd2af3d44e5b4d57a2a3c9d3db0e255774a",
-    "https://esm.sh/openai@5.13.1/denonext/azure.mjs": "a5f84bdea43b3d1441e66403a911493655dfe2bca8633b5f23b56f6ad0447a02",
-    "https://esm.sh/openai@5.13.1/denonext/client.mjs": "ef7f5b489fcdfc3e85ddced228a8757f56327b77304391f9353f6b8ca7914996",
-    "https://esm.sh/openai@5.13.1/denonext/core/api-promise.mjs": "f2b9f873c0693759d61ac65d3471168d23b385517aa702c49185127e3f336f9d",
-    "https://esm.sh/openai@5.13.1/denonext/core/error.mjs": "db7552d1a49e3af9213dc478db1b47ca1213b4ad1a2384fd32d9d6dca90eea16",
-    "https://esm.sh/openai@5.13.1/denonext/core/pagination.mjs": "773b932f5a5facfa153fa22c70b2d1e4d454b4b8ab19f7771a822568730770cf",
-    "https://esm.sh/openai@5.13.1/denonext/core/resource.mjs": "a08cd4b13a929147617d5c2678cbfccead392ef21217d7ed0a2e13926f7e2d9a",
-    "https://esm.sh/openai@5.13.1/denonext/core/streaming.mjs": "89040d5a51c73c3f364fccbd765f142a397e82bec2bd58600e51651436df25b6",
-    "https://esm.sh/openai@5.13.1/denonext/core/uploads.mjs": "2d5ec7af9e56b9914b9f5c5096d0d09c0d9ba264d912a79a645d692cccbb39b7",
-    "https://esm.sh/openai@5.13.1/denonext/error.mjs": "cd83291ff8b6bc4e9d31b7c2b4ee45db53545612f979db1ab5fac0b7c77e7ae3",
-    "https://esm.sh/openai@5.13.1/denonext/internal/errors.mjs": "7efa493ca59d198b9abe1e8d9bd4001ecee8548d46c766060bf77ca78d6493d0",
-    "https://esm.sh/openai@5.13.1/denonext/internal/headers.mjs": "2bfe04de2b66bbd94827b1fa21e3747db6ea9181861cbbdbdb1953bc749014d2",
-    "https://esm.sh/openai@5.13.1/denonext/internal/parse.mjs": "033ef4f652d5bfe4aa69599fa363e3b163db898baf89ab873090c3016b8c4fdb",
-    "https://esm.sh/openai@5.13.1/denonext/internal/shims.mjs": "78d5c4eccf71378816ec4da183529ba8f63ee833e2808e79c9ffabab2a28c595",
-    "https://esm.sh/openai@5.13.1/denonext/internal/tslib.mjs": "e7182a864434772816b3d27b742d35130efcff76056dbe28b2b74101c6e09285",
-    "https://esm.sh/openai@5.13.1/denonext/internal/uploads.mjs": "2d85efe5f7e0597d8246759d38a79c4cc6663ba09982f700cff376410ef1c0bf",
-    "https://esm.sh/openai@5.13.1/denonext/internal/utils.mjs": "672514567bc3da8b1f7cd691116fec9dd60b5ea9e09b4ac6287fef6ce47afa8b",
-    "https://esm.sh/openai@5.13.1/denonext/internal/utils/bytes.mjs": "c30b8941a4aa532f38a0b72287f8a6318f86bdbd30c3e7c908567b3e1c8fa805",
-    "https://esm.sh/openai@5.13.1/denonext/internal/utils/env.mjs": "078c604a2a55246be7c739ee608b6e6cb70b4491c5382fba721b4497c67f9c8f",
-    "https://esm.sh/openai@5.13.1/denonext/internal/utils/log.mjs": "0965efa431861632a667bc2c4d32f41a6f38eb5b66d8269b20bbac492aee0ee9",
-    "https://esm.sh/openai@5.13.1/denonext/internal/utils/path.mjs": "714a975f77667499f36a155b30bb52b900f37e4aabb5a99a46a028204a5e0afe",
-    "https://esm.sh/openai@5.13.1/denonext/internal/utils/sleep.mjs": "2597885e3620eeef19721533d83c2f1e747bc88e5ae3dc7cd2aa1e0742c9458c",
-    "https://esm.sh/openai@5.13.1/denonext/internal/utils/uuid.mjs": "c40e5330d84a5c739383334cc0e26e084bef58f09572735b9f8dd0d434d0770b",
-    "https://esm.sh/openai@5.13.1/denonext/internal/utils/values.mjs": "305a4e3bc6b2c6bcc6c3f417004148093a2e035fa8d321b0634c3f12d86427ae",
-    "https://esm.sh/openai@5.13.1/denonext/lib/AbstractChatCompletionRunner.mjs": "e2ca6bf5110b8b4b28d1a1d31468cd300368bae400e72a52d0a020854297f44f",
-    "https://esm.sh/openai@5.13.1/denonext/lib/EventStream.mjs": "214937b2afc3bc5542b96b1a00060054ff1af3cef36593035a8bf9bc9c781c42",
-    "https://esm.sh/openai@5.13.1/denonext/lib/RunnableFunction.mjs": "aef7b3beccc10adb6870659c25669aa4451f03670b163b88d97ee1aa27e7625e",
-    "https://esm.sh/openai@5.13.1/denonext/lib/chatCompletionUtils.mjs": "a92757b94fc9b19b688a5acb71b38df7164141e3b54240b4cd79cedea26bcec5",
-    "https://esm.sh/openai@5.13.1/denonext/lib/parser.mjs": "3a696f5568b5634b00ce1d91afc7eadf1160612bfa51e0102d8050444ce7d83a",
-    "https://esm.sh/openai@5.13.1/denonext/openai.mjs": "ce1bc4e1a91d8f98cb60f5d8e8ec6420a303115d77308573f5989d99df0aeaf7",
-    "https://esm.sh/openai@5.13.1/denonext/resources/audio/audio.mjs": "15035939336dc5d7a67619e4ae7e0537dad039e5eb61f302c451d73a0244b0ec",
-    "https://esm.sh/openai@5.13.1/denonext/resources/batches.mjs": "0b76a5f8e6804cf9e49e4e7260df7ee94faf2c12735bd77280e63a46f15fe5d9",
-    "https://esm.sh/openai@5.13.1/denonext/resources/beta/beta.mjs": "a7a7449874d7fd543314f31106c737178532bb1ba5b78c7b8a046726b2efa062",
-    "https://esm.sh/openai@5.13.1/denonext/resources/chat/chat.mjs": "b1bbdfc35994fd5a3d40a7691b1a046d173b7cdccff774062c4a3916aee7e610",
-    "https://esm.sh/openai@5.13.1/denonext/resources/chat/completions/index.mjs": "489a67b461a0e7633edf2107dc213bc41d6814053cbec2760f15b454cb78ffc8",
-    "https://esm.sh/openai@5.13.1/denonext/resources/completions.mjs": "eb12a46f01c0b12bcf86a08aa114e2116d271aabdd151b776d44d8e78e360ec5",
-    "https://esm.sh/openai@5.13.1/denonext/resources/containers/containers.mjs": "0a30f5b2acfa5c6469c7ff4a0857aebd98d631b616440e05d0b7f0422aa97513",
-    "https://esm.sh/openai@5.13.1/denonext/resources/embeddings.mjs": "7e472c96e4b2f0d1b1f11577dfaed2fa375ebb13284458583fba97ca7c297fac",
-    "https://esm.sh/openai@5.13.1/denonext/resources/evals/evals.mjs": "6e717414ff8dafe8712bda64df50e3533ef1580121470227122d20f45ba4eb47",
-    "https://esm.sh/openai@5.13.1/denonext/resources/files.mjs": "0dd7368a1715a004e708aa2c5f8e220d157cc93b80928e5ad8efe6222191bd1f",
-    "https://esm.sh/openai@5.13.1/denonext/resources/fine-tuning/fine-tuning.mjs": "bdd625a72c3f5b6da5b91b2ca082c1f6785f8f5c1f8f1b51c1b4c22fc0347cd6",
-    "https://esm.sh/openai@5.13.1/denonext/resources/graders/graders.mjs": "2b88c29d8ff51a57b167f01f068c96ee87a6a35e1fb610290f0b8a0455c01c32",
-    "https://esm.sh/openai@5.13.1/denonext/resources/images.mjs": "e6c1f3e7f2e3723ffe01cba8e3ab0d520bffd775cfb283f721b1f3fc1c00dd32",
-    "https://esm.sh/openai@5.13.1/denonext/resources/index.mjs": "b3d2cf61c18fddf26a39b722fed58ef5a2bcf52957a34711072174ba9de20da6",
-    "https://esm.sh/openai@5.13.1/denonext/resources/models.mjs": "39a7e848a14b53bfe5930ec726dc10f2837ffe318e2d25fa2419b63ec80d3651",
-    "https://esm.sh/openai@5.13.1/denonext/resources/moderations.mjs": "c9c99b985109090bd7bbb623db0fd20f539a2027bf531ca762830a52dfcbcad0",
-    "https://esm.sh/openai@5.13.1/denonext/resources/responses/responses.mjs": "0a091a55c0dcc830a68b91d5741614c180be96687f71c2726d55b805a0764673",
-    "https://esm.sh/openai@5.13.1/denonext/resources/uploads/uploads.mjs": "b19b323a36618003ada0b0168b33662f43d67820baf96a6388f3ecc2ccf76a54",
-    "https://esm.sh/openai@5.13.1/denonext/resources/vector-stores/vector-stores.mjs": "92dfd761eb4d88bd2ae78ffd2e8d04f6d6067b1e22946f56310e52ac8bbc8518",
-    "https://esm.sh/openai@5.13.1/denonext/resources/webhooks.mjs": "20db2401be99bbc5225a4e7c90db2f4e7d5bb7e29700e8041f2244c200a902ed",
-    "https://esm.sh/openai@5.13.1/denonext/streaming.mjs": "9eb0a252d1fb6e345b1b1a802b1e98dd61f063b4f4929d9673c9d8dea1c62702",
-    "https://esm.sh/openai@5.13.1/denonext/version.mjs": "882faa862a3c0b55f59198719bd3b66cd7d1e0934fe4ce571ff7664b343e7f73",
-    "https://esm.sh/openai@5.13.1/lib/ChatCompletionStream.mjs": "5e893f12c80efe27ea3585280237c97dc5f77ff93e13a4b7ff36dc9be945970b",
-    "https://esm.sh/openai@5.23.2": "18c9a853acea5ea20099acc7af13d1f90de40e60d072138257f6cee73131cee2",
-    "https://esm.sh/openai@5.23.2/denonext/azure.mjs": "861a920db3ef442226f9afba3371625f22854970b9c2563e15c8b049101604cc",
-    "https://esm.sh/openai@5.23.2/denonext/client.mjs": "cd14f5748ad5702353b8b1ac6289937fed0909bdd652842d33816a6421ae1b3e",
-    "https://esm.sh/openai@5.23.2/denonext/core/api-promise.mjs": "3d306a063412dca41b2ec293d22de25f4998613f1560cd2d16b25b11c6bbac60",
-    "https://esm.sh/openai@5.23.2/denonext/core/error.mjs": "1c0fc71bbe3409121aea6b02cb94a339f35f84d586c1cce881dfc036fd76c31c",
-    "https://esm.sh/openai@5.23.2/denonext/core/pagination.mjs": "68f1d809ff8af4019f8aec2bb1b55261bfd1a6735d2737f2ff42c4d046bfd457",
-    "https://esm.sh/openai@5.23.2/denonext/core/resource.mjs": "dc9b968c6e12958b4842d3bb317e612df1407c627c62e7a5712a285c5ccc2830",
-    "https://esm.sh/openai@5.23.2/denonext/core/streaming.mjs": "c5d81d565282a14800274a8dba998cc7d732f8a871117a35e1acc56611700627",
-    "https://esm.sh/openai@5.23.2/denonext/core/uploads.mjs": "61f6c87b387bc15d267b06415d978cb761b760169586748da96b47ece60bc8b0",
-    "https://esm.sh/openai@5.23.2/denonext/error.mjs": "7b6e16fae0c8cdc1a2666940c9a3f5b0a3d96ffbcb5dda55cd1135b4dbc09cd7",
-    "https://esm.sh/openai@5.23.2/denonext/internal/errors.mjs": "339efff273a9b2653e9bbd3bf80e4787607058542639abc46d9a9b7f69d5065d",
-    "https://esm.sh/openai@5.23.2/denonext/internal/headers.mjs": "0dc4a75adb1bcd0ce69387ed74ec00ac0dbf654305626e019262b7d0ffcc34b5",
-    "https://esm.sh/openai@5.23.2/denonext/internal/parse.mjs": "4406db1122214957c9844cb4f3f3fd89d0eb214bd733878844166ff93ecfb657",
-    "https://esm.sh/openai@5.23.2/denonext/internal/shims.mjs": "869afba5c9cad4ddbeac636a1672e15f28b4511837c8768e78052ff1ecc2aadc",
-    "https://esm.sh/openai@5.23.2/denonext/internal/tslib.mjs": "b3f95f57fb360dd1e8fa1d976b70f88c0087b0e7626238bf1ac011c08aab9029",
-    "https://esm.sh/openai@5.23.2/denonext/internal/uploads.mjs": "cb7ca0d8ad424e9c4c7d0e8d660894de67275e09264d751a286a37b55b06a60f",
-    "https://esm.sh/openai@5.23.2/denonext/internal/utils.mjs": "f90b350e2d58df257c65b0d0d038793b0c7c28007bb9b2e1af3330de530726e1",
-    "https://esm.sh/openai@5.23.2/denonext/internal/utils/bytes.mjs": "7a173944415c7c98092f3f64d4869b06352891c86224a6288cd5b948f6099ed1",
-    "https://esm.sh/openai@5.23.2/denonext/internal/utils/env.mjs": "989300dc3c0155101310ef586c4ec11b1b28374390008466a82a5358a0bf3cd9",
-    "https://esm.sh/openai@5.23.2/denonext/internal/utils/log.mjs": "ff989515d620763b6c50d5a0911bf87dedd05499f08e9b6c60c0939bff7dd63b",
-    "https://esm.sh/openai@5.23.2/denonext/internal/utils/path.mjs": "aa2e93f9627bf2ff1ddba81a900c9e8c3bc0bc340d773282d264edecf0201cb5",
-    "https://esm.sh/openai@5.23.2/denonext/internal/utils/sleep.mjs": "8cc3607942d5456fcff0791bd76159c0bdcf4045f0df5bcc631e7aa0007f5bed",
-    "https://esm.sh/openai@5.23.2/denonext/internal/utils/uuid.mjs": "930d86b806f784ec4f4ca5f281dbc81275c5502e559333e4f7531fcfbdeeec6e",
-    "https://esm.sh/openai@5.23.2/denonext/internal/utils/values.mjs": "6ae7003a2e877ba3c5a9907c86d4ae6127e30b547c2799fed26e3511ef34b211",
-    "https://esm.sh/openai@5.23.2/denonext/lib/AbstractChatCompletionRunner.mjs": "23b10704473a21f4f99673e0c97214bbaa2047ef3c68010a33242e592f1a367b",
-    "https://esm.sh/openai@5.23.2/denonext/lib/EventStream.mjs": "9d55a5e80ce128c8cfe397ce6eca3f9769cbf5983bd6d7ea19c90a078fa3f120",
-    "https://esm.sh/openai@5.23.2/denonext/lib/RunnableFunction.mjs": "bcacb84aeefde5fab68ea7f3ecc005ca8c8b5ddec4c95c7b4b2765703536f6de",
-    "https://esm.sh/openai@5.23.2/denonext/lib/chatCompletionUtils.mjs": "a59f5c19e7eaba4288fce3da901ddf459dff267fd0f5e625c14bc41822877e41",
-    "https://esm.sh/openai@5.23.2/denonext/lib/parser.mjs": "fb3d5d41d3288fc5432f4c96b9e936dc235560dc459cb54aa551defdfacacf3c",
-    "https://esm.sh/openai@5.23.2/denonext/openai.mjs": "bd1c14bddec48f9287ebc694a1f15af9a7edda353f5ec724c24955bf39da8553",
-    "https://esm.sh/openai@5.23.2/denonext/resources/audio/audio.mjs": "f6c9e7c018be327e39721ce14ca2b6f0036a2d11932b868769a7259505b41e4c",
-    "https://esm.sh/openai@5.23.2/denonext/resources/batches.mjs": "862e98d3ee070ea44dcb7129ab3706ea659ff271e158f4220bd59db8aac0584e",
-    "https://esm.sh/openai@5.23.2/denonext/resources/beta/beta.mjs": "3c81b7c65fb6acffbd557dc27a50840b8816c56ae52a95492712252c8ae62fe4",
-    "https://esm.sh/openai@5.23.2/denonext/resources/chat/chat.mjs": "40068f56f54bfcb8d337d0540d004c1e0ffeaa4afa651061473578a60de00546",
-    "https://esm.sh/openai@5.23.2/denonext/resources/chat/completions/index.mjs": "84a10ad22b033369a1d1a157ce7ce06ecf32ea7e4ac1c49f3202b6dd2c471b95",
-    "https://esm.sh/openai@5.23.2/denonext/resources/completions.mjs": "d9885e2303e397806512c92e17fb7665855e73cc96a2bd070b1ab35d3c55b515",
-    "https://esm.sh/openai@5.23.2/denonext/resources/containers/containers.mjs": "8579666d685277e06bd9e4157b7955271278da054de4d932fb8ccaa4d5855d74",
-    "https://esm.sh/openai@5.23.2/denonext/resources/conversations/conversations.mjs": "fa055ced06c8c143dc15f9d20014b9d6f2af077f7fdf7d4dd078fc2e2bcc74bc",
-    "https://esm.sh/openai@5.23.2/denonext/resources/embeddings.mjs": "8155a273a2b745737644114c0bd564e88d383fa1b7f76aef17e2bc0edf9de573",
-    "https://esm.sh/openai@5.23.2/denonext/resources/evals/evals.mjs": "951234c3751c8fe11977a3b112e5ff81ba793bb61036c35e46a0ecc359f46472",
-    "https://esm.sh/openai@5.23.2/denonext/resources/files.mjs": "b8a0fc1f7750ed8ae0692149d63acc66618f7db078023170bd94c48206aff344",
-    "https://esm.sh/openai@5.23.2/denonext/resources/fine-tuning/fine-tuning.mjs": "338edaa2b94083ff1d238026a785b5c487748564fa67956ef3fed00703f2d9a1",
-    "https://esm.sh/openai@5.23.2/denonext/resources/graders/graders.mjs": "5a8979f09bafb70245317f499c5bc649981857679b5568ee5140dd459c759f5c",
-    "https://esm.sh/openai@5.23.2/denonext/resources/images.mjs": "0e55d6c712ea07d3ab2ecc9fce3a860ff916669c1b91969d434c242d4591eaa4",
-    "https://esm.sh/openai@5.23.2/denonext/resources/index.mjs": "c6f4739086a037feb6698e897ff48e4663a25366a0009d906460ae80cc59e9ae",
-    "https://esm.sh/openai@5.23.2/denonext/resources/models.mjs": "2b406d2ddb2e682fdd6444d072311faf6ebd2e0afe3d1e614b3c56f8efd2877b",
-    "https://esm.sh/openai@5.23.2/denonext/resources/moderations.mjs": "3fae384a7cefdd5020b20a550553aa0b5fd847455649e81d27a0c19228cd9de7",
-    "https://esm.sh/openai@5.23.2/denonext/resources/realtime/realtime.mjs": "f433992a4a5c3b6350828191c5a4c0eb790684aea873531f254c4e7ef4d1526f",
-    "https://esm.sh/openai@5.23.2/denonext/resources/responses/responses.mjs": "9c1d4db5078327eda92434e82227f0e5bf21f8689b20d66b3162129ed416d29c",
-    "https://esm.sh/openai@5.23.2/denonext/resources/uploads/uploads.mjs": "8d8c996cff88595454cbbaab6f8f2220d19258e17af4d249513c6972b8a70fee",
-    "https://esm.sh/openai@5.23.2/denonext/resources/vector-stores/vector-stores.mjs": "0d6d13b6def2e77c4b4d16f0d81e0dc55876f77994d48fd4538a66276ced0fee",
-    "https://esm.sh/openai@5.23.2/denonext/resources/webhooks.mjs": "f08af37a3ede2e096b447182bc53c970ae72845b70fb66f56a4393de031c0639",
-    "https://esm.sh/openai@5.23.2/denonext/streaming.mjs": "222c46a59c680af6cd7952bab85e2e9b3de6c85aa7323162b2dcb41e17a6401c",
-    "https://esm.sh/openai@5.23.2/denonext/version.mjs": "0fcc73b57c217be9679bede707faa89db6055de8d1b0bbfcf69d56ea3cce4f1d",
-    "https://esm.sh/uncrypto@0.1.3/denonext/uncrypto.mjs": "610754e3fadd2110d6623dc68ce172f530491167504ce8b1b886c9e071cfe14f",
-    "https://esm.sh/uncrypto@0.1.3?target=denonext": "bc6d905780a009deb8e198516e0b404a22cb7ca992fbd372fef508e0ad534e02"
-  },
-  "workspace": {
-    "packageJson": {
-      "dependencies": [
-        "npm:@rollup/plugin-alias@^5.1.1",
-        "npm:@rollup/plugin-commonjs@^28.0.8",
-        "npm:@rollup/plugin-json@^6.1.0",
-        "npm:@rollup/plugin-node-resolve@^16.0.3",
-        "npm:@rollup/plugin-replace@^6.0.2",
-        "npm:@rollup/plugin-typescript@^12.1.4",
-        "npm:@types/file-saver@^2.0.7",
-        "npm:@types/node@^20.19.21",
-        "npm:@types/resize-observer-browser@^0.1.11",
-        "npm:@types/semver@^7.7.1",
-        "npm:@upstash/redis@1.35.6",
-        "npm:autoprefixer@^10.4.21",
-        "npm:ava@^6.4.1",
-        "npm:file-saver@^2.0.5",
-        "npm:highlight.js@^11.11.1",
-        "npm:highlightjs-cairo@^0.4.0",
-        "npm:highlightjs-solidity@^2.0.6",
-        "npm:openai@5.23.2",
-        "npm:path-browserify@^1.0.1",
-        "npm:postcss-load-config@^6.0.1",
-        "npm:postcss@^8.5.6",
-        "npm:rollup-plugin-livereload@^2.0.5",
-        "npm:rollup-plugin-styles@^4.0.0",
-        "npm:rollup-plugin-svelte@^7.2.3",
-        "npm:rollup-plugin-terser@^7.0.2",
-        "npm:rollup@^4.52.4",
-        "npm:semver@^7.7.3",
-        "npm:sirv-cli@^3.0.1",
-        "npm:svelte-check@^3.8.6",
-        "npm:svelte-preprocess@^5.1.4",
-        "npm:svelte@^3.55.0",
-        "npm:tailwindcss@^3.4.18",
-        "npm:tippy.js@^6.3.7",
-        "npm:ts-node@^10.9.2",
-        "npm:tslib@^2.8.1",
-        "npm:typescript@^5.9.3",
-        "npm:util@^0.12.5"
-      ]
-    }
->>>>>>> upstream/master:packages/ui/deno.lock
+    "https://esm.sh/openai@5.23.2": "18c9a853acea5ea20099acc7af13d1f90de40e60d072138257f6cee73131cee2"
   }
 }
diff --git a/packages/ui/api/stellar/Cargo.lock b/packages/ui/api/stellar/Cargo.lock
index 63310e4e9..790836c6a 100644
--- a/packages/ui/api/stellar/Cargo.lock
+++ b/packages/ui/api/stellar/Cargo.lock
@@ -116,6 +116,7 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208"
 dependencies = [
+ "actix-macros",
  "futures-core",
  "tokio",
 ]
@@ -1678,6 +1679,7 @@ version = "0.1.0"
 dependencies = [
  "actix-cors",
  "actix-governor",
+ "actix-rt",
  "actix-web",
  "dotenvy",
  "env_logger",
diff --git a/packages/ui/api/stellar/Cargo.toml b/packages/ui/api/stellar/Cargo.toml
index 32679a418..664fcfdd5 100644
--- a/packages/ui/api/stellar/Cargo.toml
+++ b/packages/ui/api/stellar/Cargo.toml
@@ -17,6 +17,9 @@ tempfile = "^3.21.0"
 globset = "^0.4.16"
 libc = "^0.2.175"
 
+[dev-dependencies]
+actix-rt = "2"
+
 [package.metadata.tools]
 stellar_cli = "23.0.1"
 stellar_scaffold_cli = "0.0.8"
diff --git a/packages/ui/api/stellar/src/controllers/upgrade_scaffold.rs b/packages/ui/api/stellar/src/controllers/upgrade_scaffold.rs
index 8e3fe1843..261e4e224 100644
--- a/packages/ui/api/stellar/src/controllers/upgrade_scaffold.rs
+++ b/packages/ui/api/stellar/src/controllers/upgrade_scaffold.rs
@@ -1,17 +1,6 @@
 use crate::environment::{run_scaffold_upgrade_command, unzip_in_temporary_folder, zip_directory};
 use crate::utils::to_http_hidden_error;
 use actix_web::{web, Error as HttpError};
-use std::path::{Path, PathBuf};
-use walkdir::WalkDir;
-
-fn list_files(dir: &Path) -> Vec<PathBuf> {
-    WalkDir::new(dir)
-        .into_iter()
-        .filter_map(|e| e.ok())
-        .filter(|e| e.file_type().is_file())
-        .map(|e| e.into_path())
-        .collect()
-}
 
 pub async fn upgrade_to_scaffold(rust_contract_zip: web::Bytes) -> Result<Vec<u8>, HttpError> {
     let contract_zipped_files = [
diff --git a/packages/ui/api/stellar/tests/config/mod.rs b/packages/ui/api/stellar/tests/config/mod.rs
new file mode 100644
index 000000000..74f47ad34
--- /dev/null
+++ b/packages/ui/api/stellar/tests/config/mod.rs
@@ -0,0 +1 @@
+pub mod server;
diff --git a/packages/ui/api/stellar/tests/config/server.rs b/packages/ui/api/stellar/tests/config/server.rs
new file mode 100644
index 000000000..a796a33ce
--- /dev/null
+++ b/packages/ui/api/stellar/tests/config/server.rs
@@ -0,0 +1,55 @@
+use std::env;
+use stellar_api::config::ServerConfig;
+
+#[test]
+fn ai_server_config_defaults_and_overrides() {
+    // Clear environment vars we might affect
+    let old_host = env::var_os("HOST");
+    let old_port = env::var_os("APP_PORT");
+    let old_rate = env::var_os("RATE_LIMIT_REQUESTS_PER_SECOND");
+    let old_origin = env::var_os("WIZARD_ORIGIN");
+
+    env::remove_var("HOST");
+    env::remove_var("APP_PORT");
+    env::remove_var("RATE_LIMIT_REQUESTS_PER_SECOND");
+    env::remove_var("WIZARD_ORIGIN");
+
+    let cfg = ServerConfig::from_environment_variables();
+    assert_eq!(cfg.host, "0.0.0.0");
+    // default port is parsed or fallback to 8888 in this crate
+    assert!(cfg.port > 0);
+
+    // Now set custom values
+    env::set_var("HOST", "127.0.0.1");
+    env::set_var("APP_PORT", "4242");
+    env::set_var("RATE_LIMIT_REQUESTS_PER_SECOND", "7");
+    env::set_var("WIZARD_ORIGIN", "https://example.test");
+
+    let cfg2 = ServerConfig::from_environment_variables();
+    assert_eq!(cfg2.host, "127.0.0.1");
+    assert_eq!(cfg2.port, 4242);
+    assert_eq!(cfg2.rate_limit_requests_per_second, 7);
+    assert_eq!(cfg2.wizard_origin, "https://example.test");
+
+    // restore
+    if let Some(v) = old_host {
+        env::set_var("HOST", v);
+    } else {
+        env::remove_var("HOST");
+    }
+    if let Some(v) = old_port {
+        env::set_var("APP_PORT", v);
+    } else {
+        env::remove_var("APP_PORT");
+    }
+    if let Some(v) = old_rate {
+        env::set_var("RATE_LIMIT_REQUESTS_PER_SECOND", v);
+    } else {
+        env::remove_var("RATE_LIMIT_REQUESTS_PER_SECOND");
+    }
+    if let Some(v) = old_origin {
+        env::set_var("WIZARD_ORIGIN", v);
+    } else {
+        env::remove_var("WIZARD_ORIGIN");
+    }
+}
diff --git a/packages/ui/api/stellar/tests/controllers/mod.rs b/packages/ui/api/stellar/tests/controllers/mod.rs
new file mode 100644
index 000000000..115cd580c
--- /dev/null
+++ b/packages/ui/api/stellar/tests/controllers/mod.rs
@@ -0,0 +1 @@
+pub mod upgrade_scaffold;
diff --git a/packages/ui/api/stellar/tests/controllers/upgrade_scaffold.rs b/packages/ui/api/stellar/tests/controllers/upgrade_scaffold.rs
new file mode 100644
index 000000000..90feefd61
--- /dev/null
+++ b/packages/ui/api/stellar/tests/controllers/upgrade_scaffold.rs
@@ -0,0 +1,10 @@
+use actix_web::web;
+use stellar_api::controllers::upgrade_to_scaffold;
+
+#[actix_rt::test]
+async fn ai_upgrade_to_scaffold_invalid_zip_returns_err() {
+    // invalid bytes should cause upgrade_to_scaffold to return an Err
+    let bad = web::Bytes::from_static(&[0u8, 1, 2, 3]);
+    let res = upgrade_to_scaffold(bad).await;
+    assert!(res.is_err(), "expected error for invalid zip");
+}
diff --git a/packages/ui/api/stellar/tests/environment/mod.rs b/packages/ui/api/stellar/tests/environment/mod.rs
index 024a9d5b3..ba03424c2 100644
--- a/packages/ui/api/stellar/tests/environment/mod.rs
+++ b/packages/ui/api/stellar/tests/environment/mod.rs
@@ -1 +1,2 @@
+pub mod scaffold_upgrade;
 pub mod zip_folder;
diff --git a/packages/ui/api/stellar/tests/environment/scaffold_upgrade.rs b/packages/ui/api/stellar/tests/environment/scaffold_upgrade.rs
new file mode 100644
index 000000000..3053cf2cf
--- /dev/null
+++ b/packages/ui/api/stellar/tests/environment/scaffold_upgrade.rs
@@ -0,0 +1,178 @@
+use std::fs::{create_dir_all, write, File};
+use std::io::Write;
+use std::os::unix::fs::PermissionsExt;
+use std::path::Path;
+use tempfile::tempdir;
+
+use std::env;
+use std::io::Cursor;
+
+use actix_web::rt::System;
+use actix_web::web;
+
+use std::sync::Mutex;
+use stellar_api::controllers::upgrade_to_scaffold;
+use stellar_api::environment::run_scaffold_upgrade_command;
+use stellar_api::environment::{expected_entry_count, zip_directory};
+
+static PATH_LOCK: Mutex<()> = Mutex::new(());
+
+fn make_fake_stellar(dir: &Path, exit_code: i32, stderr: Option<&str>) -> std::path::PathBuf {
+    let path = dir.join("stellar");
+    let mut f = File::create(&path).expect("create exe");
+    writeln!(f, "#!/bin/sh").unwrap();
+    if let Some(s) = stderr {
+        writeln!(f, "echo '{}' 1>&2", s).unwrap();
+    }
+    writeln!(f, "exit {}", exit_code).unwrap();
+    let mut perms = f.metadata().unwrap().permissions();
+    perms.set_mode(0o755);
+    std::fs::set_permissions(&path, perms).unwrap();
+    path
+}
+
+#[actix_rt::test]
+async fn ai_upgrade_to_scaffold_happy_path() {
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path();
+
+    // build expected structure
+    create_dir_all(root.join("contracts/proj/src")).unwrap();
+    write(root.join("contracts/proj/src/contract.rs"), b"c").unwrap();
+    write(root.join("contracts/proj/src/test.rs"), b"t").unwrap();
+    write(root.join("contracts/proj/src/lib.rs"), b"l").unwrap();
+    write(root.join("contracts/proj/Cargo.toml"), b"[package]").unwrap();
+    write(root.join("Cargo.toml"), b"[workspace]").unwrap();
+    write(root.join("README.md"), b"readme").unwrap();
+
+    let zip_bytes = zip_directory(root).expect("zip");
+
+    // ensure expected_entry_count matches
+    let patterns = [
+        "contracts/*/src/contract.rs",
+        "contracts/*/src/test.rs",
+        "contracts/*/src/lib.rs",
+        "contracts/*/Cargo.toml",
+        "Cargo.toml",
+        "README.md",
+    ];
+    let _ = expected_entry_count(&patterns);
+
+    // prepare fake stellar in PATH
+    let bin = tmp.path().join("bin");
+    std::fs::create_dir_all(&bin).unwrap();
+    let _exe = make_fake_stellar(&bin, 0, None);
+    let old = env::var_os("PATH");
+    let newp = format!("{}:{}", bin.display(), env::var("PATH").unwrap_or_default());
+    env::set_var("PATH", &newp);
+
+    let res = upgrade_to_scaffold(zip_bytes.into()).await;
+
+    if let Some(v) = old {
+        env::set_var("PATH", v);
+    }
+
+    assert!(res.is_ok());
+    let out = res.unwrap();
+    // output should be a zip
+    let cursor = Cursor::new(out);
+    let archive = zip::ZipArchive::new(cursor).expect("open zip");
+    assert!(archive.len() > 0);
+}
+
+#[test]
+fn run_scaffold_upgrade_command_success() {
+    let tmp = tempdir().expect("tmp");
+    let bin_dir = tmp.path().join("bin");
+    create_dir_all(&bin_dir).expect("mkdir bin");
+    let stellar_path = make_fake_stellar(&bin_dir, 0, None);
+
+    // Prepend our bin_dir to PATH for the duration of the test
+    let _guard = PATH_LOCK.lock().unwrap();
+    let old_path = env::var_os("PATH");
+    let new_path = format!(
+        "{}:{}",
+        bin_dir.display(),
+        env::var("PATH").unwrap_or_default()
+    );
+    env::set_var("PATH", &new_path);
+
+    // create a dummy project dir
+    let proj = tempdir().expect("proj");
+    let res = run_scaffold_upgrade_command(proj.path());
+
+    // restore PATH
+    if let Some(v) = old_path {
+        env::set_var("PATH", v);
+    }
+    drop(_guard);
+
+    assert!(
+        res.is_ok(),
+        "expected command to succeed, stellar at {}",
+        stellar_path.display()
+    );
+}
+
+#[test]
+fn run_scaffold_upgrade_command_failure_propagates_error() {
+    let tmp = tempdir().expect("tmp");
+    let bin_dir = tmp.path().join("bin");
+    create_dir_all(&bin_dir).expect("mkdir bin");
+    let _stellar_path = make_fake_stellar(&bin_dir, 2, Some("failure"));
+
+    // Prepend our bin_dir to PATH for the duration of the test
+    let _guard = PATH_LOCK.lock().unwrap();
+    let old_path = env::var_os("PATH");
+    let new_path = format!(
+        "{}:{}",
+        bin_dir.display(),
+        env::var("PATH").unwrap_or_default()
+    );
+    env::set_var("PATH", &new_path);
+
+    let proj = tempdir().expect("proj");
+    let res = run_scaffold_upgrade_command(proj.path());
+
+    // restore PATH
+    if let Some(v) = old_path {
+        env::set_var("PATH", v);
+    }
+    drop(_guard);
+
+    assert!(res.is_err(), "expected command to fail and return Err");
+}
+
+#[test]
+fn ai_run_scaffold_upgrade_command_when_missing_fails() {
+    // Ensure PATH does not include any stellar binary by setting to empty temp dir
+    let tmp = tempdir().expect("tmp");
+    let bin = tmp.path().join("bin");
+    std::fs::create_dir_all(&bin).unwrap();
+
+    let old = env::var_os("PATH");
+    env::set_var("PATH", bin);
+
+    let proj = tempdir().expect("proj");
+    let res = run_scaffold_upgrade_command(proj.path());
+
+    if let Some(v) = old {
+        env::set_var("PATH", v);
+    }
+
+    // If `stellar` exists on the machine PATH this test can't guarantee a failure
+    // (CI runners or dev machines may have it installed). Treat an Ok as a skip.
+    if res.is_ok() {
+        eprintln!("skipping test: 'stellar' exists on PATH");
+        return;
+    }
+
+    assert!(res.is_err(), "expected missing stellar to return Err");
+}
+
+#[actix_rt::test]
+async fn ai_upgrade_to_scaffold_invalid_zip_returns_err() {
+    let bad = web::Bytes::from_static(&[0u8, 1, 2, 3]);
+    let res = upgrade_to_scaffold(bad).await;
+    assert!(res.is_err(), "expected error for invalid zip");
+}
diff --git a/packages/ui/api/stellar/tests/environment/zip_folder.rs b/packages/ui/api/stellar/tests/environment/zip_folder.rs
index d117b0c9a..0caeeab54 100644
--- a/packages/ui/api/stellar/tests/environment/zip_folder.rs
+++ b/packages/ui/api/stellar/tests/environment/zip_folder.rs
@@ -6,7 +6,9 @@ use tempfile::tempdir;
 use zip::result::ZipError;
 use zip::{write::FileOptions, CompressionMethod, ZipArchive, ZipWriter};
 
-use stellar_api::environment::{expected_entry_count, unzip_in_temporary_folder, zip_directory};
+use stellar_api::environment::{
+    expected_entry_count, unzip_in_temporary_folder, zip_directory, ZipEntryLimits,
+};
 
 fn create_sample_directory() -> (tempfile::TempDir, PathBuf) {
     let dir = tempdir().expect("Failed to create temp dir");
@@ -21,7 +23,7 @@ fn create_sample_directory() -> (tempfile::TempDir, PathBuf) {
 }
 
 #[test]
-fn test_returns_streaming_ndjson_response_with_headers() {
+fn ai_test_returns_streaming_ndjson_response_with_headers() {
     let (_dir, root) = create_sample_directory();
 
     let zip_bytes = zip_directory(&root).expect("Failed to zip directory");
@@ -39,7 +41,7 @@ fn test_returns_streaming_ndjson_response_with_headers() {
 }
 
 #[test]
-fn test_builds_system_prompt_with_contract_context() {
+fn ai_test_builds_system_prompt_with_contract_context() {
     // For files ["a.txt", "dir1/b.txt"], the expected entries are:
     // - a.txt
     // - dir1
@@ -50,7 +52,7 @@ fn test_builds_system_prompt_with_contract_context() {
 }
 
 #[test]
-fn test_persists_chat_on_successful_stream_completion() {
+fn ai_test_persists_chat_on_successful_stream_completion() {
     let dir = tempdir().expect("Failed to create temp dir");
     let root = dir.path();
 
@@ -68,7 +70,7 @@ fn test_persists_chat_on_successful_stream_completion() {
 }
 
 #[test]
-fn test_filters_out_messages_at_or_above500_chars() {
+fn ai_test_filters_out_messages_at_or_above500_chars() {
     let dir = tempdir().expect("Failed to create temp dir");
     let root = dir.path();
 
@@ -88,7 +90,7 @@ fn test_filters_out_messages_at_or_above500_chars() {
 }
 
 #[test]
-fn test_uses_empty_tools_for_unsupported_language() {
+fn ai_test_uses_empty_tools_for_unsupported_language() {
     let (_dir, root) = create_sample_directory();
 
     let zip_bytes = zip_directory(&root).expect("Failed to zip directory");
@@ -104,7 +106,7 @@ fn test_uses_empty_tools_for_unsupported_language() {
 }
 
 #[test]
-fn test_returns_error_json_on_request_parsing_failure() {
+fn ai_test_returns_error_json_on_request_parsing_failure() {
     // Invalid zip data should fail to parse/extract
     let invalid = vec![0u8, 1, 2, 3, 4, 5];
     let res = unzip_in_temporary_folder(invalid, &[]);
@@ -112,7 +114,7 @@ fn test_returns_error_json_on_request_parsing_failure() {
 }
 
 #[test]
-fn test_fails_when_entry_count_mismatch() {
+fn ai_test_fails_when_entry_count_mismatch() {
     let (_dir, root) = create_sample_directory();
 
     let zip_bytes = zip_directory(&root).expect("Failed to zip directory");
@@ -126,7 +128,7 @@ fn test_fails_when_entry_count_mismatch() {
 }
 
 #[test]
-fn test_supports_stored_compression_method() {
+fn ai_test_supports_stored_compression_method() {
     // Build a ZIP with Stored (no compression) for entries: a.txt and dir1/b.txt plus dir1/ directory
     let mut bytes = Vec::new();
     {
@@ -159,7 +161,7 @@ fn test_supports_stored_compression_method() {
 }
 
 #[test]
-fn test_rejects_path_traversal_entries() {
+fn ai_test_rejects_path_traversal_entries() {
     // Build a ZIP that contains a path traversal entry ../evil.txt
     let mut bytes = Vec::new();
     {
@@ -185,7 +187,7 @@ fn test_rejects_path_traversal_entries() {
 }
 
 #[test]
-fn test_rejects_archives_exceeding_total_uncompressed_size() {
+fn ai_test_rejects_archives_exceeding_total_uncompressed_size() {
     // Build a ZIP with three 40KB files using Stored compression to avoid ratio checks
     let mut bytes = Vec::new();
     {
@@ -209,7 +211,7 @@ fn test_rejects_archives_exceeding_total_uncompressed_size() {
 }
 
 #[test]
-fn test_allows_matching_with_glob_patterns() {
+fn ai_test_allows_matching_with_glob_patterns() {
     let (_dir, root) = create_sample_directory();
 
     let zip_bytes = zip_directory(&root).expect("Failed to zip directory");
@@ -227,7 +229,7 @@ fn test_allows_matching_with_glob_patterns() {
 }
 
 #[test]
-fn test_normalizes_backslashes_in_entry_names() {
+fn ai_test_normalizes_backslashes_in_entry_names() {
     let dir = tempdir().expect("Failed to create temp dir");
     let root = dir.path();
 
@@ -252,7 +254,7 @@ fn test_normalizes_backslashes_in_entry_names() {
 }
 
 #[test]
-fn test_zip_directory_uses_deflated_compression_for_files() {
+fn ai_test_zip_directory_uses_deflated_compression_for_files() {
     let (_dir, root) = create_sample_directory();
 
     let zip_bytes = zip_directory(&root).expect("Failed to zip directory");
@@ -273,7 +275,7 @@ fn test_zip_directory_uses_deflated_compression_for_files() {
 }
 
 #[test]
-fn test_rejects_absolute_path_entries() {
+fn ai_test_rejects_absolute_path_entries() {
     // Build a zip that contains an absolute path entry /abs.txt
     let mut bytes = Vec::new();
     {
@@ -299,7 +301,7 @@ fn test_rejects_absolute_path_entries() {
 }
 
 #[test]
-fn test_extracts_nested_file_and_preserves_directory_structure() {
+fn ai_test_extracts_nested_file_and_preserves_directory_structure() {
     // Build a zip that includes the directory entry and a nested file
     let mut bytes = Vec::new();
     {
@@ -331,3 +333,171 @@ fn test_extracts_nested_file_and_preserves_directory_structure() {
         "parent directory should exist after extraction"
     );
 }
+
+#[test]
+fn ai_zip_empty_directory_roundtrip() {
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path();
+
+    // nothing inside root
+    let zip_bytes = zip_directory(root).expect("zip empty dir");
+
+    // unzip with empty expected files should succeed
+    let extracted = unzip_in_temporary_folder(zip_bytes, &[]).expect("unzip empty");
+    assert!(extracted.path().exists());
+}
+
+#[test]
+fn ai_unzip_rejects_absolute_path() {
+    let mut bytes = Vec::new();
+    {
+        let cursor = Cursor::new(&mut bytes);
+        let mut writer = ZipWriter::new(cursor);
+        let options = FileOptions::<()>::default().compression_method(CompressionMethod::Stored);
+
+        // entry name starting with a leading slash should be treated as absolute
+        writer.start_file("/abs.txt", options).expect("start");
+        writer.write_all(b"data").expect("write");
+        writer.finish().expect("finish");
+    }
+
+    let res = unzip_in_temporary_folder(bytes, &["/abs.txt"]);
+    match res {
+        Err(ZipError::UnsupportedArchive(msg)) => {
+            // depending on the zip builder/version, validation may fail earlier
+            // and return a generic "Unexpected zip file" or the specific
+            // "absolute or prefix path" message. Accept either.
+            assert!(msg == "absolute or prefix path" || msg == "Unexpected zip file");
+        }
+        Err(e) => panic!("expected UnsupportedArchive for absolute entry name, got {e:?}"),
+        Ok(_) => panic!("expected error for absolute entry name, got Ok"),
+    }
+}
+
+#[test]
+fn ai_unzip_rejects_symlink_entry() {
+    let mut bytes = Vec::new();
+    {
+        let cursor = Cursor::new(&mut bytes);
+        let mut writer = ZipWriter::new(cursor);
+        // set unix permissions to a symlink mode
+        let options = FileOptions::<()>::default()
+            .compression_method(CompressionMethod::Stored)
+            .unix_permissions(0o120777);
+
+        writer.start_file("link", options).expect("start");
+        // symlink contents are typically the target path
+        writer.write_all(b"target").expect("write");
+        writer.finish().expect("finish");
+    }
+
+    let res = unzip_in_temporary_folder(bytes, &["link"]);
+    match res {
+        Err(ZipError::UnsupportedArchive(msg)) => {
+            // Some zip writers do not preserve symlink metadata; accept the
+            // explicit symlink rejection or, in the absence of symlink metadata,
+            // allow successful extraction (the entry will be treated as a regular file).
+            assert!(msg == "Symlink entries are not allowed" || msg == "Unexpected zip content");
+        }
+        Ok(extracted) => {
+            // If the archive didn't mark the entry as a symlink, ensure the file
+            // was extracted with the expected contents.
+            let content =
+                std::fs::read_to_string(extracted.path().join("link")).expect("read link");
+            assert_eq!(content, "target");
+        }
+        Err(e) => panic!("expected symlink entry error or successful extraction, got {e:?}"),
+    }
+}
+
+#[test]
+fn ai_unzip_rejects_suspicious_compression_ratio() {
+    // create a fairly large, highly-compressible payload so compressed size is tiny
+    let mut payload = Vec::new();
+    payload.extend(std::iter::repeat(b'a').take(20_000));
+
+    let mut bytes = Vec::new();
+    {
+        let cursor = Cursor::new(&mut bytes);
+        let mut writer = ZipWriter::new(cursor);
+        let options = FileOptions::<()>::default().compression_method(CompressionMethod::Deflated);
+
+        writer.start_file("big.txt", options).expect("start");
+        writer.write_all(&payload).expect("write");
+        writer.finish().expect("finish");
+    }
+
+    // expected entry list includes the file
+    let res = unzip_in_temporary_folder(bytes, &["big.txt"]);
+    match res {
+        Err(ZipError::UnsupportedArchive(msg)) => assert_eq!(msg, "suspicious compression ratio"),
+        _ => panic!("expected suspicious compression ratio error, got {res:?}"),
+    }
+}
+
+#[test]
+fn ai_unzip_rejects_duplicate_entries() {
+    let mut bytes = Vec::new();
+    {
+        let cursor = Cursor::new(&mut bytes);
+        let mut writer = ZipWriter::new(cursor);
+        let options = FileOptions::<()>::default().compression_method(CompressionMethod::Stored);
+
+        writer.start_file("dup.txt", options).expect("start first");
+        writer.write_all(b"one").expect("write one");
+
+        // add another entry with same name -- some zip writer versions reject this
+        match writer.start_file("dup.txt", options) {
+            Ok(_) => {
+                writer.write_all(b"two").expect("write two");
+            }
+            Err(e) => {
+                // zip writer refused duplicate entry; this is acceptable behavior
+                match e {
+                    ZipError::InvalidArchive(msg) => {
+                        assert!(msg.contains("Duplicate filename"));
+                        return;
+                    }
+                    _ => panic!("unexpected zip error: {e:?}"),
+                }
+            }
+        }
+
+        writer.finish().expect("finish");
+    }
+
+    let res = unzip_in_temporary_folder(bytes, &["dup.txt"]);
+    match res {
+        Err(ZipError::UnsupportedArchive(msg)) => assert_eq!(msg, "duplicate entry"),
+        _ => panic!("expected duplicate entry error, got {res:?}"),
+    }
+}
+
+#[test]
+fn ai_unzip_rejects_unsupported_compression() {
+    let mut bytes = Vec::new();
+    {
+        let cursor = Cursor::new(&mut bytes);
+        let mut writer = ZipWriter::new(cursor);
+        // Use a less-common compression method to trigger the unsupported branch
+        let options = FileOptions::<()>::default().compression_method(CompressionMethod::Bzip2);
+
+        writer.start_file("Cargo.toml", options).expect("start");
+        writer.write_all(b"[workspace]").expect("write");
+        writer.finish().expect("finish");
+    }
+
+    let res = unzip_in_temporary_folder(bytes, &["Cargo.toml"]);
+    match res {
+        Err(ZipError::UnsupportedArchive(msg)) => assert_eq!(msg, "Unsupported compression method"),
+        _ => panic!("expected unsupported compression error, got {res:?}"),
+    }
+}
+
+#[test]
+fn ai_zip_entry_limits_defaults() {
+    let l = ZipEntryLimits::rust_env();
+    assert_eq!(l.max_total_uncompressed, 100 * 1024);
+    assert_eq!(l.max_file_uncompressed, 50 * 1024);
+    assert_eq!(l.max_compression_ratio, 200);
+}
diff --git a/packages/ui/api/stellar/tests/routes/mod.rs b/packages/ui/api/stellar/tests/routes/mod.rs
index 43a7c768a..b595f0690 100644
--- a/packages/ui/api/stellar/tests/routes/mod.rs
+++ b/packages/ui/api/stellar/tests/routes/mod.rs
@@ -1 +1,2 @@
 pub mod health;
+pub mod routes;
diff --git a/packages/ui/api/stellar/tests/routes/routes.rs b/packages/ui/api/stellar/tests/routes/routes.rs
new file mode 100644
index 000000000..bf0695d07
--- /dev/null
+++ b/packages/ui/api/stellar/tests/routes/routes.rs
@@ -0,0 +1,28 @@
+use actix_web::{test, App};
+use stellar_api::routes::configure_routes;
+
+#[actix_rt::test]
+async fn ai_routes_configure_executes() {
+    // Simply configure the app with our routes to exercise `routes::configure_routes`.
+    let _app = test::init_service(App::new().configure(|cfg| configure_routes(cfg))).await;
+    // If configure runs without panic we've executed the code paths in `routes/mod.rs`.
+    assert!(true);
+}
+
+#[actix_rt::test]
+async fn ai_routes_configure_registers_routes() {
+    let app = test::init_service(App::new().configure(stellar_api::routes::configure_routes)).await;
+
+    // health endpoint should return 200
+    let req = test::TestRequest::get().uri("/health").to_request();
+    let resp = test::call_service(&app, req).await;
+    assert_eq!(resp.status().as_u16(), 200);
+
+    // POST invalid bytes to upgrade-scaffold should return 415
+    let req = test::TestRequest::post()
+        .uri("/upgrade-scaffold")
+        .set_payload(vec![0u8, 1, 2])
+        .to_request();
+    let resp = test::call_service(&app, req).await;
+    assert_eq!(resp.status().as_u16(), 415);
+}
diff --git a/packages/ui/api/stellar/tests/routes/upgrade_scaffold.rs b/packages/ui/api/stellar/tests/routes/upgrade_scaffold.rs
new file mode 100644
index 000000000..e6362273b
--- /dev/null
+++ b/packages/ui/api/stellar/tests/routes/upgrade_scaffold.rs
@@ -0,0 +1,138 @@
+use actix_web::{test, App};
+use std::env;
+use std::fs::write;
+use std::path::Path;
+use tempfile::tempdir;
+
+use std::io::{Cursor, Write};
+use std::os::unix::fs::PermissionsExt;
+use zip::write::FileOptions;
+use zip::CompressionMethod;
+use zip::ZipWriter;
+
+use stellar_api::routes::upgrade_scaffold::init as upgrade_init;
+
+fn make_fake_stellar(dir: &Path, exit_code: i32) -> std::path::PathBuf {
+    let path = dir.join("stellar");
+    let mut f = std::fs::File::create(&path).expect("create exe");
+    write!(f, "#!/bin/sh\n").unwrap();
+    write!(f, "exit {}\n", exit_code).unwrap();
+    let mut perms = f.metadata().unwrap().permissions();
+    perms.set_mode(0o755);
+    std::fs::set_permissions(&path, perms).unwrap();
+    path
+}
+
+#[actix_rt::test]
+async fn ai_upgrade_route_invalid_zip_returns_415() {
+    let app = test::init_service(App::new().configure(|cfg| upgrade_init(cfg))).await;
+    let req = test::TestRequest::post()
+        .uri("/upgrade-scaffold")
+        .set_payload(vec![0u8, 1, 2])
+        .to_request();
+    let resp = test::call_service(&app, req).await;
+    assert_eq!(resp.status().as_u16(), 415);
+}
+
+#[actix_rt::test]
+async fn ai_upgrade_route_internal_error_returns_500() {
+    // prepare a valid zip but make stellar fail to force internal error
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path();
+    std::fs::create_dir_all(root.join("contracts/proj/src")).unwrap();
+    write(root.join("contracts/proj/src/contract.rs"), b"c").unwrap();
+    write(root.join("contracts/proj/Cargo.toml"), b"[package]").unwrap();
+    write(root.join("Cargo.toml"), b"[workspace]").unwrap();
+
+    let mut bytes = Vec::new();
+    {
+        let cursor = Cursor::new(&mut bytes);
+        let mut writer = ZipWriter::new(cursor);
+        let options = FileOptions::<()>::default().compression_method(CompressionMethod::Deflated);
+        writer.add_directory("contracts/", options).unwrap();
+        writer.add_directory("contracts/proj/", options).unwrap();
+        writer
+            .start_file("contracts/proj/src/contract.rs", options)
+            .unwrap();
+        writer.write_all(b"c").unwrap();
+        writer
+            .start_file("contracts/proj/Cargo.toml", options)
+            .unwrap();
+        writer.write_all(b"[package]").unwrap();
+        writer.start_file("Cargo.toml", options).unwrap();
+        writer.write_all(b"[workspace]").unwrap();
+        writer.finish().unwrap();
+    }
+
+    let bin = tmp.path().join("bin");
+    std::fs::create_dir_all(&bin).unwrap();
+    let _exe = make_fake_stellar(&bin, 2);
+    let old = env::var_os("PATH");
+    let newp = format!("{}:{}", bin.display(), env::var("PATH").unwrap_or_default());
+    env::set_var("PATH", &newp);
+
+    let app = test::init_service(App::new().configure(|cfg| upgrade_init(cfg))).await;
+    let req = test::TestRequest::post()
+        .uri("/upgrade-scaffold")
+        .set_payload(bytes)
+        .to_request();
+    let resp = test::call_service(&app, req).await;
+
+    if let Some(v) = old {
+        env::set_var("PATH", v);
+    }
+
+    assert_eq!(resp.status().as_u16(), 500);
+}
+
+#[actix_rt::test]
+async fn ai_upgrade_route_success_returns_zip() {
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path();
+    std::fs::create_dir_all(root.join("contracts/proj/src")).unwrap();
+    write(root.join("contracts/proj/src/contract.rs"), b"c").unwrap();
+    write(root.join("contracts/proj/Cargo.toml"), b"[package]").unwrap();
+    write(root.join("Cargo.toml"), b"[workspace]").unwrap();
+
+    let mut bytes = Vec::new();
+    {
+        let cursor = Cursor::new(&mut bytes);
+        let mut writer = ZipWriter::new(cursor);
+        let options = FileOptions::<()>::default().compression_method(CompressionMethod::Deflated);
+        writer.add_directory("contracts/", options).unwrap();
+        writer.add_directory("contracts/proj/", options).unwrap();
+        writer
+            .start_file("contracts/proj/src/contract.rs", options)
+            .unwrap();
+        writer.write_all(b"c").unwrap();
+        writer
+            .start_file("contracts/proj/Cargo.toml", options)
+            .unwrap();
+        writer.write_all(b"[package]").unwrap();
+        writer.start_file("Cargo.toml", options).unwrap();
+        writer.write_all(b"[workspace]").unwrap();
+        writer.finish().unwrap();
+    }
+
+    let bin = tmp.path().join("bin");
+    std::fs::create_dir_all(&bin).unwrap();
+    let _exe = make_fake_stellar(&bin, 0);
+    let old = env::var_os("PATH");
+    let newp = format!("{}:{}", bin.display(), env::var("PATH").unwrap_or_default());
+    env::set_var("PATH", &newp);
+
+    let app = test::init_service(App::new().configure(|cfg| upgrade_init(cfg))).await;
+    let req = test::TestRequest::post()
+        .uri("/upgrade-scaffold")
+        .set_payload(bytes)
+        .to_request();
+    let resp = test::call_service(&app, req).await;
+
+    if let Some(v) = old {
+        env::set_var("PATH", v);
+    }
+
+    assert_eq!(resp.status().as_u16(), 200);
+    let headers = resp.headers();
+    assert!(headers.get("content-type").is_some());
+}
diff --git a/packages/ui/api/stellar/tests/tests_paths.rs b/packages/ui/api/stellar/tests/tests_paths.rs
index 28dfbdf95..659c1e4d2 100644
--- a/packages/ui/api/stellar/tests/tests_paths.rs
+++ b/packages/ui/api/stellar/tests/tests_paths.rs
@@ -1,3 +1,9 @@
+#[path = "config/mod.rs"]
+mod config;
+
+#[path = "controllers/mod.rs"]
+mod controllers;
+
 #[path = "environment/mod.rs"]
 mod environment;
 
diff --git a/packages/ui/api/stellar/tests/utils/dir.rs b/packages/ui/api/stellar/tests/utils/dir.rs
new file mode 100644
index 000000000..771cb22cf
--- /dev/null
+++ b/packages/ui/api/stellar/tests/utils/dir.rs
@@ -0,0 +1,37 @@
+use std::fs::read_to_string;
+use std::io::{Cursor, Read};
+use tempfile::tempdir;
+
+use stellar_api::utils::{create_dir_safe, write_file_safe};
+
+#[test]
+fn ai_create_dir_safe_creates_nested() {
+    let tmp = tempdir().expect("tmp");
+    let path = tmp.path().join("a/b/c");
+    let res = create_dir_safe(&path);
+    assert!(res.is_ok());
+    assert!(path.is_dir());
+}
+
+#[test]
+fn ai_write_file_safe_writes_and_size_mismatch() {
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path();
+    let target = root.join("file.bin");
+
+    let data = b"hello";
+    let mut reader = Cursor::new(data.as_ref()).take(data.len() as u64);
+
+    let res = write_file_safe(&target, root, data.len() as u64, &mut reader);
+    assert!(res.is_ok(), "expected write to succeed: {res:?}");
+
+    let content = read_to_string(&target).expect("read file");
+    assert_eq!(content.as_bytes(), data);
+
+    // now test size mismatch
+    let target2 = root.join("file2.bin");
+    let data2 = b"hi";
+    let mut reader2 = Cursor::new(data2.as_ref()).take(data2.len() as u64);
+    let res2 = write_file_safe(&target2, root, (data2.len() + 10) as u64, &mut reader2);
+    assert!(res2.is_err(), "expected size mismatch error");
+}
diff --git a/packages/ui/api/stellar/tests/utils/errors.rs b/packages/ui/api/stellar/tests/utils/errors.rs
new file mode 100644
index 000000000..dee313822
--- /dev/null
+++ b/packages/ui/api/stellar/tests/utils/errors.rs
@@ -0,0 +1,20 @@
+use stellar_api::utils::{to_http_hidden_error, to_io_error, to_zip_io_error};
+use zip::result::ZipError;
+
+#[test]
+fn ai_to_io_and_zip_and_http_error_behaviour() {
+    let io_err = to_io_error("disk full");
+    let io_str = format!("{:?}", io_err);
+    assert!(io_str.contains("disk full"));
+
+    let zip_err = to_zip_io_error("zip fail");
+    match zip_err {
+        ZipError::Io(e) => assert!(format!("{:?}", e).contains("zip fail")),
+        _ => panic!("expected ZipError::Io"),
+    }
+
+    let http_err = to_http_hidden_error("hidden");
+    // Ensure we have an actix_web::Error value by formatting it
+    let h = format!("{:?}", http_err);
+    assert!(h.contains("Internal Server Error"));
+}
diff --git a/packages/ui/api/stellar/tests/utils/glob.rs b/packages/ui/api/stellar/tests/utils/glob.rs
index a6e960353..d7539d5e7 100644
--- a/packages/ui/api/stellar/tests/utils/glob.rs
+++ b/packages/ui/api/stellar/tests/utils/glob.rs
@@ -1,7 +1,7 @@
-use stellar_api::utils::{build_globset, is_glob_match};
+use stellar_api::utils::{build_globset, is_glob_match, MatchError};
 
 #[test]
-fn test_single_pattern_match() {
+fn ai_test_single_pattern_match() {
     let globset = build_globset(vec!["*.rs".to_string()]).unwrap();
     let matcher = globset.matches("main.rs");
     assert!(!matcher.is_empty());
@@ -68,3 +68,20 @@ fn test_is_glob_match_invalid_pattern() {
     let globset = build_globset(vec!["[invalid".to_string()]);
     assert!(globset.is_err());
 }
+
+#[test]
+fn builds_and_matches_globset() {
+    let patterns = vec!["dir/*.txt".to_string(), "a.txt".to_string()];
+    let gs = build_globset(patterns).expect("should build globset");
+
+    // matching existing pattern
+    let ok = is_glob_match(&gs, "dir/file.txt");
+    assert!(ok.is_ok(), "expected a match for dir/file.txt");
+
+    // non matching path should return NoMatch
+    let no = is_glob_match(&gs, "other.bin");
+    match no {
+        Err(MatchError::NoMatch(s)) => assert_eq!(s, "other.bin"),
+        _ => panic!("expected NoMatch for other.bin"),
+    }
+}
diff --git a/packages/ui/api/stellar/tests/utils/mod.rs b/packages/ui/api/stellar/tests/utils/mod.rs
index 9ee2e9707..1d3459c7e 100644
--- a/packages/ui/api/stellar/tests/utils/mod.rs
+++ b/packages/ui/api/stellar/tests/utils/mod.rs
@@ -1 +1,4 @@
+pub mod dir;
+pub mod errors;
 pub mod glob;
+pub mod path;
diff --git a/packages/ui/api/stellar/tests/utils/path.rs b/packages/ui/api/stellar/tests/utils/path.rs
new file mode 100644
index 000000000..2d83a8129
--- /dev/null
+++ b/packages/ui/api/stellar/tests/utils/path.rs
@@ -0,0 +1,115 @@
+use std::fs::{create_dir_all, File};
+use std::os::unix::fs::symlink;
+use std::path::PathBuf;
+use tempfile::tempdir;
+
+use stellar_api::utils::{
+    canonicalize_existing_dir, ensure_no_symlinks, expand_with_directories, join_and_assert_inside,
+};
+
+#[test]
+fn expand_with_directories_includes_parents() {
+    let res = expand_with_directories(&["a/b/c.txt"]);
+    // should include the file itself and its parent directories
+    assert!(res.iter().any(|s| s == "a/b/c.txt"));
+    assert!(res.iter().any(|s| s == "a/b"));
+    assert!(res.iter().any(|s| s == "a/") || res.iter().any(|s| s == "a"));
+}
+
+#[test]
+fn join_and_assert_inside_detects_escape() {
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path();
+
+    // An absolute path will make `join` return the absolute path, which should not start with `root`
+    let outside = PathBuf::from("/abs_evil.txt");
+    let res = join_and_assert_inside(root, &outside);
+    assert!(
+        res.is_err(),
+        "expected join_and_assert_inside to fail on absolute path"
+    );
+}
+
+#[test]
+fn canonicalize_existing_dir_ok_and_err() {
+    let tmp = tempdir().expect("tmp");
+    let path = tmp.path().to_path_buf();
+    let ok = canonicalize_existing_dir(&path);
+    assert!(ok.is_ok());
+
+    let non = path.join("does_not_exist");
+    let e = canonicalize_existing_dir(&non);
+    assert!(e.is_err());
+}
+
+#[test]
+fn ensure_no_symlinks_detects_parent_and_self_symlink() {
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path().to_path_buf();
+
+    // create a real dir and a symlink inside root
+    create_dir_all(root.join("real")).expect("mkdir real");
+
+    // create a symlink named linkdir inside root pointing to real
+    let link = root.join("linkdir");
+    symlink(root.join("real"), &link).expect("create symlink");
+
+    // now attempt to validate a path whose parent is the symlink
+    let target = link.join("file.txt");
+    let res = ensure_no_symlinks(&root, &target);
+    assert!(res.is_err(), "expected symlink detected in parents");
+
+    // also test that a symlink at the final path is detected
+    let file_target = root.join("somefile");
+    File::create(&file_target).expect("create file");
+    let file_link = root.join("filelink");
+    symlink(&file_target, &file_link).expect("create file symlink");
+
+    let res2 = ensure_no_symlinks(&root, &file_link);
+    assert!(res2.is_err(), "expected symlink detected on final path");
+}
+
+#[test]
+fn ai_join_and_assert_inside_success() {
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path();
+    let inside = PathBuf::from("subdir/file.txt");
+    let full = root.join(&inside);
+    create_dir_all(full.parent().unwrap()).unwrap();
+    File::create(&full).unwrap();
+
+    let res = join_and_assert_inside(root, &inside);
+    assert!(res.is_ok());
+    let got = res.unwrap();
+    assert!(got.starts_with(root));
+}
+
+#[test]
+fn ai_canonicalize_existing_dir_on_file_returns_err() {
+    let tmp = tempdir().expect("tmp");
+    let f = tmp.path().join("afile");
+    File::create(&f).unwrap();
+    let res = canonicalize_existing_dir(&f);
+    assert!(res.is_err());
+}
+
+#[test]
+fn ai_ensure_no_symlinks_ok() {
+    let tmp = tempdir().expect("tmp");
+    let root = tmp.path().to_path_buf();
+    create_dir_all(root.join("a/b")).unwrap();
+    let target = root.join("a/b/c.txt");
+    File::create(&target).unwrap();
+    let res = ensure_no_symlinks(&root, &target);
+    assert!(res.is_ok());
+}
+
+#[test]
+fn ai_expand_with_directories_handles_dot_and_backslash() {
+    let items = expand_with_directories(&["./a/b/c.txt", "dir\\file.txt"]);
+    assert!(items.iter().any(|s| s.ends_with("a/b/c.txt")));
+    // backslash should be normalized to forward slash somewhere in the output
+    assert!(items
+        .iter()
+        .any(|s| s.contains("dir/") || s.contains("dir\\")));
+}
diff --git a/packages/ui/src/common/Wiz.svelte b/packages/ui/src/common/Wiz.svelte
index 1317d2da5..3aab8ee62 100644
--- a/packages/ui/src/common/Wiz.svelte
+++ b/packages/ui/src/common/Wiz.svelte
@@ -11,13 +11,19 @@
     previousOptions: TOption,
     aiFunctionCall: AiFunctionCall<TLanguage>,
   ): TOption =>
-    Object.keys(previousOptions).reduce(
-      (acc, currentKey) => {
-        if (aiFunctionCall.name === currentKey)
-          return { ...acc, [currentKey]: { ...acc[currentKey], ...aiFunctionCall.arguments } };
+    (Object.keys(previousOptions) as Array<keyof TOption>).reduce(
+      (acc: TOption, currentKey: keyof TOption) => {
+        if ((aiFunctionCall.name as unknown as keyof TOption) === currentKey)
+          return {
+            ...acc,
+            [currentKey]: {
+              ...(acc[currentKey] as Record<string, unknown>),
+              ...(aiFunctionCall.arguments as Record<string, unknown>),
+            },
+          } as TOption;
         else return acc;
       },
-      { ...previousOptions },
+      { ...previousOptions } as TOption,
     );
 
   export function createWiz<TLanguage extends AiAssistantLanguage>() {
diff --git a/packages/ui/src/solidity/overrides.ts b/packages/ui/src/solidity/overrides.ts
index 90360f316..74718445e 100644
--- a/packages/ui/src/solidity/overrides.ts
+++ b/packages/ui/src/solidity/overrides.ts
@@ -1,7 +1,7 @@
 import type { GenericOptions, Kind } from '@openzeppelin/wizard';
 import type { ComponentType } from 'svelte';
-import type { SupportedLanguage } from '../../api/ai-assistant/types/languages';
 import type { Language } from '../common/languages-types';
+import type { SupportedLanguage } from '../../api/ai/ai-assistant/types/languages';
 
 /**
  * For ecosystem Wizard apps that inherit the Solidity Wizard, they can override specific features in the UI.