Resolve merge conflicts

Merge branch 'feat-sites' of github.com:appwrite/appwrite into feat-sites
Upgrade Console
2026-05-26 13:51:13 +00:00 · 2025-03-26 15:59:25 +05:30 · 2025-03-26 10:34:57 +01:00 · 2025-03-26 10:22:58 +01:00 · 2025-03-26 10:14:51 +01:00 · 2025-03-25 23:55:33 +01:00
17391 changed files with 65835 additions and 193972 deletions
@@ -0,0 +1,7 @@
+reviews:
+  auto_review:
+    base_branches:
+      - main
+      - 1.6.x
+      - 1.7.x
+      - feat-sites # temporary until merged to 1.7.x
@@ -15,15 +15,15 @@ _APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
 _APP_EMAIL_SECURITY=security@appwrite.io
 _APP_EMAIL_CERTIFICATES=certificates@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
-_APP_CUSTOM_DOMAIN_DENY_LIST=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
+_APP_OPTIONS_COMPUTE_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
 _APP_DOMAIN=traefik
 _APP_DOMAIN_FUNCTIONS=functions.localhost
-_APP_DOMAIN_TARGET=localhost
+_APP_DOMAIN_SITES=sites.localhost
+_APP_DOMAIN_TARGET=test.appwrite.io
 _APP_RULES_FORMAT=md5
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
@@ -70,24 +70,24 @@ _APP_SMS_FROM=+123456789
 _APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_APP_FUNCTIONS_SIZE_LIMIT=30000000
-_APP_FUNCTIONS_TIMEOUT=900
-_APP_FUNCTIONS_BUILD_TIMEOUT=900
-_APP_FUNCTIONS_CPUS=8
-_APP_FUNCTIONS_MEMORY=8192
-_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
-_APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
-_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
+_APP_COMPUTE_SIZE_LIMIT=30000000
+_APP_COMPUTE_TIMEOUT=900
+_APP_COMPUTE_BUILD_TIMEOUT=900
+_APP_COMPUTE_CPUS=8
+_APP_COMPUTE_MEMORY=8192
+_APP_COMPUTE_INACTIVE_THRESHOLD=600
+_APP_COMPUTE_MAINTENANCE_INTERVAL=600
+_APP_COMPUTE_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://proxy/v1
+_APP_EXECUTOR_HOST=http://exc1/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
+_APP_SITES_RUNTIMES=static-1,node-22,flutter-3.29
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_STATS_RESOURCES_INTERVAL=3600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
@@ -0,0 +1,16 @@
+name: "Static code analysis"
+
+on: [pull_request]
+jobs:
+  lint:
+    name: CodeQL
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v2
+
+    - name: Run CodeQL
+      run: |
+        docker run --rm -v $PWD:/app composer:2.6 sh -c \
+        "composer install --profile --ignore-platform-reqs && composer check"
@@ -90,6 +90,9 @@ jobs:
          docker compose up -d
          sleep 10

+      - name: Logs
+        run: docker compose logs appwrite
+
      - name: Doctor
        run: docker compose exec -T appwrite doctor

@@ -119,6 +122,14 @@ jobs:
          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose up -d
          sleep 10
+          
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done

      - name: Run General Tests
        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/General --debug
@@ -142,6 +153,8 @@ jobs:
          Locale,
          Projects,
          Realtime,
+          Sites,
+          Proxy,
          Storage,
          Teams,
          Users,
@@ -167,6 +180,14 @@ jobs:
          docker compose up -d
          sleep 30

+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
+
      - name: Run ${{ matrix.service }} tests with Project table mode
        run: |
          echo "Using project tables"
@@ -199,6 +220,8 @@ jobs:
            Locale,
            Projects,
            Realtime,
+            Sites,
+            Proxy,
            Storage,
            Teams,
            Users,
@@ -229,6 +252,14 @@ jobs:
          docker compose up -d
          sleep 30

+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
+
      - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
        run: |
          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
@@ -240,7 +271,7 @@ jobs:
            export _APP_DATABASE_SHARED_TABLES=database_db_main
            export _APP_DATABASE_SHARED_TABLES_V1=
          fi
-          
+      
          docker compose exec -T \
            -e _APP_DATABASE_SHARED_TABLES \
            -e _APP_DATABASE_SHARED_TABLES_V1 \
@@ -3,6 +3,7 @@
 /node_modules/
 /tests/resources/storage/
 /tests/resources/functions/**/code.tar.gz
+/tests/resources/sites/**/code.tar.gz
 /app/sdks/*
 /.idea/
 !/.idea/workspace.xml
@@ -7,7 +7,6 @@ tasks:
      docker pull composer
    command: |
      docker run --rm --interactive --tty \
-      --user "$(id -u):$(id -g)" \
      --volume $PWD:/app \
      composer install \
      --ignore-platform-reqs \
@@ -24,3 +23,11 @@ vscode:
  extensions:
    - ms-azuretools.vscode-docker
    - zobo.php-intellisense
+
+github:
+  # https://www.gitpod.io/docs/prebuilds#github-specific-configuration
+  prebuilds:
+    # enable for pull requests coming from forks (defaults to false)
+    pullRequestsFromForks: true
+    # add a check to pull requests (defaults to true)
+    addCheck: false
@@ -1,267 +1,3 @@
-# Version 1.6.2
-
-## What's Changed
-
-### Notable changes
-
-* Delete git folder to reduce build size in [9076](https://github.com/appwrite/appwrite/pull/9076)
-* Upgrade assistant in [9100](https://github.com/appwrite/appwrite/pull/9100)
-* Use redis adapter for abuse in [9121](https://github.com/appwrite/appwrite/pull/9121)
-* Set base specification CPUs to 0.5 again in [9146](https://github.com/appwrite/appwrite/pull/9146)
-* Add new push message parameters in [9060](https://github.com/appwrite/appwrite/pull/9060)
-* Update audits to include user type in [9211](https://github.com/appwrite/appwrite/pull/9211)
-* Enable HEIC in [9251](https://github.com/appwrite/appwrite/pull/9251)
-* Added teamName to membership redirect url in [9269](https://github.com/appwrite/appwrite/pull/9269)
-* Add support endpoint url for S3 in [9303](https://github.com/appwrite/appwrite/pull/9303)
-* Added RuPay Credit Card Icon in Avatars Service in [5046](https://github.com/appwrite/appwrite/pull/5046)
-* Add figma oauth provider in [9623](https://github.com/appwrite/appwrite/pull/9623)
-* Update console to version 5.2.58 in [9637](https://github.com/appwrite/appwrite/pull/9637)
-
-### Fixes
-
-* Remove failed attribute in [9032](https://github.com/appwrite/appwrite/pull/9032)
-* Fix delete notFound attribute in [9038](https://github.com/appwrite/appwrite/pull/9038)
-* 🇮🇸 Added missing Icelandic translations for email strings. in [4848](https://github.com/appwrite/appwrite/pull/4848)
-* fix doc comment for filter method in [5769](https://github.com/appwrite/appwrite/pull/5769)
-* Delete attribute No throwing Exception on not found in [9157](https://github.com/appwrite/appwrite/pull/9157)
-* Fix VCS identity collision in [9138](https://github.com/appwrite/appwrite/pull/9138)
-* Fix disabling of email-otp when user wants to in [9200](https://github.com/appwrite/appwrite/pull/9200)
-* Ensure user can delete session in [9209](https://github.com/appwrite/appwrite/pull/9209)
-* Fix resend invitation in [9218](https://github.com/appwrite/appwrite/pull/9218)
-* Fix phone number parsing exception handling in [9246](https://github.com/appwrite/appwrite/pull/9246)
-* Fix amazon oauth in [9253](https://github.com/appwrite/appwrite/pull/9253)
-* Fix slack oauth scopes, and updated to v2 in [9228](https://github.com/appwrite/appwrite/pull/9228)
-* Fix forwarded user agent in [9271](https://github.com/appwrite/appwrite/pull/9271)
-* Fix WEBP File Preview Rendering Issue in [9321](https://github.com/appwrite/appwrite/pull/9321)
-* Fix build memory specifications in [9360](https://github.com/appwrite/appwrite/pull/9360)
-* Fix Self Hosting functions by adding missed config in [9373](https://github.com/appwrite/appwrite/pull/9373)
-* Fix resend team invite if already accepted in [9348](https://github.com/appwrite/appwrite/pull/9348)
-* Fix null errors on team invite in [9391](https://github.com/appwrite/appwrite/pull/9391)
-* Fix email (smtp) to multiple recipients in [9243](https://github.com/appwrite/appwrite/pull/9243)
-* Fix stats timing by using receivedAt date when available in [9428](https://github.com/appwrite/appwrite/pull/9428)
-* Make min/max params optional for attribute update in [9387](https://github.com/appwrite/appwrite/pull/9387)
-* Fix blocking of phone sessions when disabled on console in [9447](https://github.com/appwrite/appwrite/pull/9447)
-* Fix logging config in [9467](https://github.com/appwrite/appwrite/pull/9467)
-* Update audit timestamp origin in [9481](https://github.com/appwrite/appwrite/pull/9481)
-* Fix certificates in deletes worker in [9466](https://github.com/appwrite/appwrite/pull/9466)
-* Fix console audits delete in [9547](https://github.com/appwrite/appwrite/pull/9547)
-* Fix migrations in [9633](https://github.com/appwrite/appwrite/pull/9633)
-* Ensure all 4xx errors in OAuth redirect lead to the failure URL in [9679](https://github.com/appwrite/appwrite/pull/9679)
-* Treat 0 as unlimited for CPUs and memory in [9638](https://github.com/appwrite/appwrite/pull/9638)
-* Add contextual dispatch logic to fix high CPU usage in [9687](https://github.com/appwrite/appwrite/pull/9687)
-
-### Miscellaneous
-
-* Merge 1.6.x into feat-custom-cf-hostnames in [8904](https://github.com/appwrite/appwrite/pull/8904)
-* Improve compression param checks in [8922](https://github.com/appwrite/appwrite/pull/8922)
-* upgrade utopia storage in [8930](https://github.com/appwrite/appwrite/pull/8930)
-* Feat migration in [8797](https://github.com/appwrite/appwrite/pull/8797)
-* feat fix web routes in [8962](https://github.com/appwrite/appwrite/pull/8962)
-* Fix no pool access in [9027](https://github.com/appwrite/appwrite/pull/9027)
-* feat: use environment variable to check rules format in [9039](https://github.com/appwrite/appwrite/pull/9039)
-* Update storage.php in [9037](https://github.com/appwrite/appwrite/pull/9037)
-* Upgrade db 0.53.200 in [9050](https://github.com/appwrite/appwrite/pull/9050)
-* Chore: upgrade utopia storage in [9066](https://github.com/appwrite/appwrite/pull/9066)
-* Update usage-dump payload in [9085](https://github.com/appwrite/appwrite/pull/9085)
-* GitHub Workflows security hardening in [3728](https://github.com/appwrite/appwrite/pull/3728)
-* Update add-oauth2-provider.md in [4313](https://github.com/appwrite/appwrite/pull/4313)
-* update readme-cn some doc in [5278](https://github.com/appwrite/appwrite/pull/5278)
-* Add accessibility features in [7042](https://github.com/appwrite/appwrite/pull/7042)
-* Add Appwrite Cloud to read me. in [5445](https://github.com/appwrite/appwrite/pull/5445)
-* Migration throw error in [9092](https://github.com/appwrite/appwrite/pull/9092)
-* Fix usage payload bug in [9097](https://github.com/appwrite/appwrite/pull/9097)
-* chore: replace occurrences of dbForConsole to dbForPlatform in [9096](https://github.com/appwrite/appwrite/pull/9096)
-* fix(realtime): decrement connectionCounter only if connection is known in [9055](https://github.com/appwrite/appwrite/pull/9055)
-* payload bug fix in [9098](https://github.com/appwrite/appwrite/pull/9098)
-* Fix usage payload bug in [9099](https://github.com/appwrite/appwrite/pull/9099)
-* Usage payload debug in [9101](https://github.com/appwrite/appwrite/pull/9101)
-* Usage payload debug in [9103](https://github.com/appwrite/appwrite/pull/9103)
-* Usage payload debug in [9104](https://github.com/appwrite/appwrite/pull/9104)
-* Feat: createFunction abuse labels in [9102](https://github.com/appwrite/appwrite/pull/9102)
-* Docs-create-document in [9105](https://github.com/appwrite/appwrite/pull/9105)
-* Docs: Create document and unknown attribute error messages. in [5427](https://github.com/appwrite/appwrite/pull/5427)
-* Fix: update project accessed at from router and schedulers in [9109](https://github.com/appwrite/appwrite/pull/9109)
-* chore: initial commit in [9111](https://github.com/appwrite/appwrite/pull/9111)
-* chore: optimise webhooks payload in [9115](https://github.com/appwrite/appwrite/pull/9115)
-* Revert "chore: initial commit" in [9117](https://github.com/appwrite/appwrite/pull/9117)
-* chore: fix attribute name in [9118](https://github.com/appwrite/appwrite/pull/9118)
-* Migrate to redis abuse in [9124](https://github.com/appwrite/appwrite/pull/9124)
-* Added webhooks usage stats in [9125](https://github.com/appwrite/appwrite/pull/9125)
-* chore remove abuse cleanup in [9137](https://github.com/appwrite/appwrite/pull/9137)
-* fix: remove abuse delete trigger in [9139](https://github.com/appwrite/appwrite/pull/9139)
-* Remove firebase OAuth API endpoints in [9144](https://github.com/appwrite/appwrite/pull/9144)
-* chore: release client sdks in [9112](https://github.com/appwrite/appwrite/pull/9112)
-* Update general.php in [9155](https://github.com/appwrite/appwrite/pull/9155)
-* feat(swoole): allow configuration override of available cpus in [9177](https://github.com/appwrite/appwrite/pull/9177)
-* Usage databases api read writes addition in [9142](https://github.com/appwrite/appwrite/pull/9142)
-* Fix dead connections in [9190](https://github.com/appwrite/appwrite/pull/9190)
-* Add hostname to audits in [9165](https://github.com/appwrite/appwrite/pull/9165)
-* chore: shifted authphone usage tracking to api calls in [9191](https://github.com/appwrite/appwrite/pull/9191)
-* Revert "Fix dead connections" in [9201](https://github.com/appwrite/appwrite/pull/9201)
-* Add assertEventually to messaging provider logs test in [9192](https://github.com/appwrite/appwrite/pull/9192)
-* feat project sms usage in [9198](https://github.com/appwrite/appwrite/pull/9198)
-* chore: add audit labels to project resources in [9056](https://github.com/appwrite/appwrite/pull/9056)
-* fix sms usage in [9207](https://github.com/appwrite/appwrite/pull/9207)
-* Update database in [9202](https://github.com/appwrite/appwrite/pull/9202)
-* Fix dead connections in [9213](https://github.com/appwrite/appwrite/pull/9213)
-* Revert "Fix dead connections" in [9214](https://github.com/appwrite/appwrite/pull/9214)
-* Add logs db init for consistency in [9163](https://github.com/appwrite/appwrite/pull/9163)
-* Split the collection definitions in [9153](https://github.com/appwrite/appwrite/pull/9153)
-* Log path with populated parameters in [9220](https://github.com/appwrite/appwrite/pull/9220)
-* Add missing scope on function template in [9208](https://github.com/appwrite/appwrite/pull/9208)
-* Add relatedCollection default in [9225](https://github.com/appwrite/appwrite/pull/9225)
-* fix: function usage in [9235](https://github.com/appwrite/appwrite/pull/9235)
-* feat: optimise events payloads in [9232](https://github.com/appwrite/appwrite/pull/9232)
-* Optimise webhook events in [9168](https://github.com/appwrite/appwrite/pull/9168)
-* fix: maintenance job missing type in [9238](https://github.com/appwrite/appwrite/pull/9238)
-* Update Fetch to 0.3.0 in [9245](https://github.com/appwrite/appwrite/pull/9245)
-* Fix maintenance job in [9247](https://github.com/appwrite/appwrite/pull/9247)
-* chore: add missing case for executions in [9248](https://github.com/appwrite/appwrite/pull/9248)
-* Add index dependency exception in [9226](https://github.com/appwrite/appwrite/pull/9226)
-* chore: fix benchmarking test when made from fork in [9233](https://github.com/appwrite/appwrite/pull/9233)
-* Update SDK Generator versions in [9188](https://github.com/appwrite/appwrite/pull/9188)
-* chore: skipped job instead of throwing error in [9250](https://github.com/appwrite/appwrite/pull/9250)
-* Implement new SDK Class on 1.6.x in [9237](https://github.com/appwrite/appwrite/pull/9237)
-* Delete collection before Appwrite's attributes in [9256](https://github.com/appwrite/appwrite/pull/9256)
-* Feat batch usage dump in [9255](https://github.com/appwrite/appwrite/pull/9255)
-* Fix cloud tests in [9261](https://github.com/appwrite/appwrite/pull/9261)
-* Usage: Databases reads writes in [9260](https://github.com/appwrite/appwrite/pull/9260)
-* Update: Latest sdk specs in [9274](https://github.com/appwrite/appwrite/pull/9274)
-* Revert "Feat batch usage dump" in [9276](https://github.com/appwrite/appwrite/pull/9276)
-* feat: add fast2SMS adapter in [9263](https://github.com/appwrite/appwrite/pull/9263)
-* Update Sdk Generator dependency in [9280](https://github.com/appwrite/appwrite/pull/9280)
-* Transformed at addition in [9281](https://github.com/appwrite/appwrite/pull/9281)
-* Docs: clarify update endpoints only work on draft messages in [9236](https://github.com/appwrite/appwrite/pull/9236)
-* Update sdk generator dependency in [9282](https://github.com/appwrite/appwrite/pull/9282)
-* Revert "Transformed at addition" in [9284](https://github.com/appwrite/appwrite/pull/9284)
-* replaced init for cloud link in [9285](https://github.com/appwrite/appwrite/pull/9285)
-* Add transformed at in [9289](https://github.com/appwrite/appwrite/pull/9289)
-* Make migrations use Dynamic keys for destination in [9291](https://github.com/appwrite/appwrite/pull/9291)
-* Make sessions limit tests assert eventually in [9298](https://github.com/appwrite/appwrite/pull/9298)
-* Chore update database in [9306](https://github.com/appwrite/appwrite/pull/9306)
-* feat: add AMQP queues in [9287](https://github.com/appwrite/appwrite/pull/9287)
-* fix(test): use assertEventually instead of while(true) in [9308](https://github.com/appwrite/appwrite/pull/9308)
-* fix(certificate worker): events are published without queue name in [9309](https://github.com/appwrite/appwrite/pull/9309)
-* chore: update utopia-php/queue to 0.8.1 in [9311](https://github.com/appwrite/appwrite/pull/9311)
-* chore: update utopia-php/queue to 0.8.2 in [9312](https://github.com/appwrite/appwrite/pull/9312)
-* fix(schedule-tasks): revert back to direct pool usage in [9313](https://github.com/appwrite/appwrite/pull/9313)
-* feat: custom app schemes in [9262](https://github.com/appwrite/appwrite/pull/9262)
-* Revert "feat: custom app schemes" in [9319](https://github.com/appwrite/appwrite/pull/9319)
-* Restore "feat: custom app schemes"" in [9320](https://github.com/appwrite/appwrite/pull/9320)
-* Revert "Restore "feat: custom app schemes""" in [9323](https://github.com/appwrite/appwrite/pull/9323)
-* chore: update dependencies in [9330](https://github.com/appwrite/appwrite/pull/9330)
-* Feat: logs DB in [9272](https://github.com/appwrite/appwrite/pull/9272)
-* Catch invalid index in [9329](https://github.com/appwrite/appwrite/pull/9329)
-* Fix: missing call for image transformations counting in [9342](https://github.com/appwrite/appwrite/pull/9342)
-* Fix drop abuse on shared table project delete in [9346](https://github.com/appwrite/appwrite/pull/9346)
-* Only run all table mode tests on db update in [9338](https://github.com/appwrite/appwrite/pull/9338)
-* Fix: missing periodic metric in [9350](https://github.com/appwrite/appwrite/pull/9350)
-* feat(builds): check if function is blocked before building in [9332](https://github.com/appwrite/appwrite/pull/9332)
-* feat: batch create audit logs in [9347](https://github.com/appwrite/appwrite/pull/9347)
-* Chore: Update migrations in [9355](https://github.com/appwrite/appwrite/pull/9355)
-* Fix: metric time was not being written to DB in [9354](https://github.com/appwrite/appwrite/pull/9354)
-* Fix patch index validation in [9356](https://github.com/appwrite/appwrite/pull/9356)
-* Fix image trnasformation metrics in [9370](https://github.com/appwrite/appwrite/pull/9370)
-* Use batch delete in worker in [9375](https://github.com/appwrite/appwrite/pull/9375)
-* Fix Model Platform is missing response key: store  in [9361](https://github.com/appwrite/appwrite/pull/9361)
-* Feat key segmented usage in [9336](https://github.com/appwrite/appwrite/pull/9336)
-* Feat messaging metrics in [9353](https://github.com/appwrite/appwrite/pull/9353)
-* Fix removed audits for shared v2 in [9388](https://github.com/appwrite/appwrite/pull/9388)
-* chore: bump utopia-php/image to 0.8.0 in [9390](https://github.com/appwrite/appwrite/pull/9390)
-* Fix outdated CLI commands in documentation in [9122](https://github.com/appwrite/appwrite/pull/9122)
-* disable logs display in [9398](https://github.com/appwrite/appwrite/pull/9398)
-* Log batches per project in [9403](https://github.com/appwrite/appwrite/pull/9403)
-* Batch per project in [9410](https://github.com/appwrite/appwrite/pull/9410)
-* Fix: stats resources only queue projects accessed in last 3 hours in [9411](https://github.com/appwrite/appwrite/pull/9411)
-* Track options requests in [9397](https://github.com/appwrite/appwrite/pull/9397)
-* chore: bump docker-base in [9406](https://github.com/appwrite/appwrite/pull/9406)
-* refactor: migrate Realtime::send calls to queueForRealtime in [9325](https://github.com/appwrite/appwrite/pull/9325)
-* Revert "Fix: stats resources only queue projects accessed in last 3 hours" in [9424](https://github.com/appwrite/appwrite/pull/9424)
-* Remove usage and usage dump in favor of stats-usage and stats-usage-dump in [9339](https://github.com/appwrite/appwrite/pull/9339)
-* Fix: disable dual writing in [9429](https://github.com/appwrite/appwrite/pull/9429)
-* Disable transformedAt update for console users in [9425](https://github.com/appwrite/appwrite/pull/9425)
-* chore: add image transformation stats to usage endpoint in [9393](https://github.com/appwrite/appwrite/pull/9393)
-* chore: added timeout to deployment builds in tests in [9426](https://github.com/appwrite/appwrite/pull/9426)
-* fix: model for image transformations in usage project in [9442](https://github.com/appwrite/appwrite/pull/9442)
-* Feat: calculate database storage in stats-resources in [9443](https://github.com/appwrite/appwrite/pull/9443)
-* Activities batch writes in [9438](https://github.com/appwrite/appwrite/pull/9438)
-* chore: bump cache 0.12.x in [9412](https://github.com/appwrite/appwrite/pull/9412)
-* chore: queue console project for maintenance delete in [9479](https://github.com/appwrite/appwrite/pull/9479)
-* chore: added logsdb for deletes worker in [9462](https://github.com/appwrite/appwrite/pull/9462)
-* Feat: calculate and log time taken for each project in [9491](https://github.com/appwrite/appwrite/pull/9491)
-* chore: update initializing dbForLogs in [9494](https://github.com/appwrite/appwrite/pull/9494)
-* Feat bulk audit delete in [9487](https://github.com/appwrite/appwrite/pull/9487)
-* Prepare 1.6.2 release in [9499](https://github.com/appwrite/appwrite/pull/9499)
-* Regenerate specs in [9497](https://github.com/appwrite/appwrite/pull/9497)
-* Regenerate examples in [9498](https://github.com/appwrite/appwrite/pull/9498)
-* chore: bump sdk in [9414](https://github.com/appwrite/appwrite/pull/9414)
-* update queue to 0.9.* in [9505](https://github.com/appwrite/appwrite/pull/9505)
-* Feat improve delete queries in [9507](https://github.com/appwrite/appwrite/pull/9507)
-* Feat: Add rule attributes in [9508](https://github.com/appwrite/appwrite/pull/9508)
-* Sync main into 1.6.x in [9496](https://github.com/appwrite/appwrite/pull/9496)
-* Bump console to version 5.2.53 in [9495](https://github.com/appwrite/appwrite/pull/9495)
-* Prepare 1.6.1 release in [9294](https://github.com/appwrite/appwrite/pull/9294)
-* Improve delete ordering in [9512](https://github.com/appwrite/appwrite/pull/9512)
-* Cleanups in [9511](https://github.com/appwrite/appwrite/pull/9511)
-* Feat dynamic regions in [9408](https://github.com/appwrite/appwrite/pull/9408)
-* Feat env vars to system lib in [9515](https://github.com/appwrite/appwrite/pull/9515)
-* Feat: domains count in [9514](https://github.com/appwrite/appwrite/pull/9514)
-* Migration read from db in [9529](https://github.com/appwrite/appwrite/pull/9529)
-* feat: add pool telemetry in [9530](https://github.com/appwrite/appwrite/pull/9530)
-* Disable PDO persistence since we manage our own pool in [9526](https://github.com/appwrite/appwrite/pull/9526)
-* chore: set min operations to 1 for reads and writes in [9536](https://github.com/appwrite/appwrite/pull/9536)
-* Remove default region in [9430](https://github.com/appwrite/appwrite/pull/9430)
-* Use cursor pagination with bigger limit for maintenance project loop in [9546](https://github.com/appwrite/appwrite/pull/9546)
-* chore: stop tests on failure in [9525](https://github.com/appwrite/appwrite/pull/9525)
-* chore: only update total count for privileged users in [9554](https://github.com/appwrite/appwrite/pull/9554)
-* refactor: initialization of audit retention in [9563](https://github.com/appwrite/appwrite/pull/9563)
-* Delete worker queries fixes in [9523](https://github.com/appwrite/appwrite/pull/9523)
-* Bump database 0.62.x in [9568](https://github.com/appwrite/appwrite/pull/9568)
-* Fix: schedules region filtering in [9577](https://github.com/appwrite/appwrite/pull/9577)
-* Deletes worker fix selects for pagination in [9578](https://github.com/appwrite/appwrite/pull/9578)
-* Add $permissions for delete documents selects in [9579](https://github.com/appwrite/appwrite/pull/9579)
-* chore(audits): return queue pre-fetch results in [9533](https://github.com/appwrite/appwrite/pull/9533)
-* Revert "chore(audits): return queue pre-fetch results" in [9586](https://github.com/appwrite/appwrite/pull/9586)
-* Feat multi tenant insert in [9573](https://github.com/appwrite/appwrite/pull/9573)
-* Add order by for cursor in [9588](https://github.com/appwrite/appwrite/pull/9588)
-* Feat update fetch in [9592](https://github.com/appwrite/appwrite/pull/9592)
-* Fix tenant casting in [9598](https://github.com/appwrite/appwrite/pull/9598)
-* Feat update ws in [9602](https://github.com/appwrite/appwrite/pull/9602)
-* Update database in [9603](https://github.com/appwrite/appwrite/pull/9603)
-* Fix: image transformation cache in [9608](https://github.com/appwrite/appwrite/pull/9608)
-* Remove audit payload in [9610](https://github.com/appwrite/appwrite/pull/9610)
-* Sample rate from DSN in [9559](https://github.com/appwrite/appwrite/pull/9559)
-* Restrict role change for sole org owner in [9615](https://github.com/appwrite/appwrite/pull/9615)
-* chore: update php image to 0.8.1 in [9616](https://github.com/appwrite/appwrite/pull/9616)
-* feat: refactor executor setup in [9420](https://github.com/appwrite/appwrite/pull/9420)
-* chore: update gitpod.yml config in [9561](https://github.com/appwrite/appwrite/pull/9561)
-* chore: update dependencies in [9625](https://github.com/appwrite/appwrite/pull/9625)
-* Update migrations lib in [9628](https://github.com/appwrite/appwrite/pull/9628)
-* feat: cache telemetry in [9624](https://github.com/appwrite/appwrite/pull/9624)
-* Bump console to version 5.2.56 in [9631](https://github.com/appwrite/appwrite/pull/9631)
-* Multi region support in [8667](https://github.com/appwrite/appwrite/pull/8667)
-* Revert "Multi region support" in [9632](https://github.com/appwrite/appwrite/pull/9632)
-* Revert "Revert "Multi region support"" in [9636](https://github.com/appwrite/appwrite/pull/9636)
-* Fix tasks in [9644](https://github.com/appwrite/appwrite/pull/9644)
-* chore: updated the migration version to 8.6 in [9646](https://github.com/appwrite/appwrite/pull/9646)
-* Fix: merge the working of StatsUsage and StatsUsageDump in [9585](https://github.com/appwrite/appwrite/pull/9585)
-* Update database in [9643](https://github.com/appwrite/appwrite/pull/9643)
-* chore: fix error logging for CLI tasks in [9651](https://github.com/appwrite/appwrite/pull/9651)
-* fix: usage test assertion in [9653](https://github.com/appwrite/appwrite/pull/9653)
-* Fix keys in [9656](https://github.com/appwrite/appwrite/pull/9656)
-* Feat: multi tenant dual writing in [9583](https://github.com/appwrite/appwrite/pull/9583)
-* Fix/throwing 400 for null order attributes  in [9657](https://github.com/appwrite/appwrite/pull/9657)
-* feat: sdk group attribute in [9596](https://github.com/appwrite/appwrite/pull/9596)
-* Add configurable function and build size in [9648](https://github.com/appwrite/appwrite/pull/9648)
-* feat: update API endpoint in the code examples in [8933](https://github.com/appwrite/appwrite/pull/8933)
-* chore: abstract token secret hiding to response model in [9574](https://github.com/appwrite/appwrite/pull/9574)
-* chore: update sdks in [9655](https://github.com/appwrite/appwrite/pull/9655)
-* feat: allow non-critical events to ignore exceptions when enqueuing the event in [9680](https://github.com/appwrite/appwrite/pull/9680)
-* Revert "Add configurable function and build size" in [9681](https://github.com/appwrite/appwrite/pull/9681)
-* core: introduce endpoint.docs in specs in [9685](https://github.com/appwrite/appwrite/pull/9685)
-* fix: remove content-type header from get request specs in [9666](https://github.com/appwrite/appwrite/pull/9666)
-* chore: update flutter sdk in [9691](https://github.com/appwrite/appwrite/pull/9691)
-
 # Version 1.6.1

 ## What's Changed
@@ -163,6 +163,28 @@ Other containes should be named the same as their service, for example `redis` s
 - [Encryption](https://medium.com/searchencrypt/what-is-encryption-how-does-it-work-e8f20e340537#:~:text=Encryption%20is%20a%20process%20that,%2C%20or%20decrypt%2C%20the%20information.)
 - [Hashing](https://searchsqlserver.techtarget.com/definition/hashing#:~:text=Hashing%20is%20the%20transformation%20of,it%20using%20the%20original%20value.)

+## Modules
+
+As Appwrite grows, we noticed approach of having all service endpoints in `app/controllers/api/[service].php` is not maintainable. Not only it creates massive files, it also doesnt contain all product's features such as workers or tasks. While there might still be some occurances of those controller files, we avoid it in all new development, and gradually migrate existing controllers to **HTTP modules**.
+
+### HTTP Endpoints
+
+Every endpoint file follows below structure, making it consistent with HTTP REST endpoint path:
+
+```
+src/Appwrite/Platform/Modules/[service]/Http/[resource]/[action].php
+```
+
+Tips and tricks:
+
+1. If endpoint doesn't have resource, use service name as resource name too
+> Example: `Modules/Sites/Http/Sites/Get.php`
+
+2. If there are multiple resources, use then all in folder structure
+> Example: `Modules/Sites/Http/Deployments/Builds/Create.php`
+
+3. Action can only be `Get`, `Create`, `Update`, `Delete` or `XList`
+
 ## Architecture

 Appwrite's current structure is a combination of both [Monolithic](https://en.wikipedia.org/wiki/Monolithic_application) and [Microservice](https://en.wikipedia.org/wiki/Microservices) architectures.
@@ -68,6 +68,7 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/sdks && \
    chmod +x /usr/local/bin/specs && \
    chmod +x /usr/local/bin/ssl && \
+    chmod +x /usr/local/bin/screenshot && \
    chmod +x /usr/local/bin/test && \
    chmod +x /usr/local/bin/upgrade && \
    chmod +x /usr/local/bin/vars && \
@@ -86,6 +87,7 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/worker-migrations && \
    chmod +x /usr/local/bin/worker-webhooks && \
    chmod +x /usr/local/bin/worker-stats-usage && \
+    chmod +x /usr/local/bin/worker-stats-usage-dump && \
    chmod +x /usr/local/bin/stats-resources && \
    chmod +x /usr/local/bin/worker-stats-resources

@@ -9,7 +9,6 @@ use Appwrite\Event\StatsResources;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
-use Executor\Executor;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
@@ -26,8 +25,8 @@ use Utopia\Queue\Publisher;
 use Utopia\Registry\Registry;
 use Utopia\System\System;

-// Overwriting runtimes to be architecture agnostic for CLI
-Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));
+// overwriting runtimes to be architecture agnostic for CLI
+Config::setParam('runtimes', (new Runtimes('v5'))->getAll(supported: false));

 // require controllers after overwriting runtimes
 require_once __DIR__ . '/controllers/general.php';
@@ -219,13 +218,6 @@ CLI::setResource('queueForCertificates', function (Publisher $publisher) {
 }, ['publisher']);
 CLI::setResource('logError', function (Registry $register) {
    return function (Throwable $error, string $namespace, string $action) use ($register) {
-        Console::error('[Error] Timestamp: ' . date('c', time()));
-        Console::error('[Error] Type: ' . get_class($error));
-        Console::error('[Error] Message: ' . $error->getMessage());
-        Console::error('[Error] File: ' . $error->getFile());
-        Console::error('[Error] Line: ' . $error->getLine());
-        Console::error('[Error] Trace: ' . $error->getTraceAsString());
-
        $logger = $register->get('logger');

        if ($logger) {
@@ -244,7 +236,6 @@ CLI::setResource('logError', function (Registry $register) {
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());

            $log->setAction($action);

@@ -258,34 +249,22 @@ CLI::setResource('logError', function (Registry $register) {
                Console::error('Error pushing log: ' . $th->getMessage());
            }
        }
+
+        Console::warning("Failed: {$error->getMessage()}");
+        Console::warning($error->getTraceAsString());
    };
 }, ['register']);

-CLI::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
-
 $platform = new Appwrite();
-$args = $platform->getEnv('argv');
-
-if (!isset($args[0])) {
-    Console::error('Missing task name');
-    Console::exit(1);
-}
-
-\array_shift($args);
-$taskName = $args[0];
 $platform->init(Service::TYPE_TASK);
+
 $cli = $platform->getCli();

 $cli
    ->error()
    ->inject('error')
-    ->inject('logError')
-    ->action(function (Throwable $error, callable $logError) use ($taskName) {
-        call_user_func_array($logError, [
-            $error,
-            'Task',
-            $taskName,
-        ]);
+    ->action(function (Throwable $error) {
+        Console::error($error->getMessage());
    });

 $cli->run();
@@ -1038,7 +1038,7 @@ return [
                '$id' => ID::custom('providerUid'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 2048, // Decrease to 128 as in index length?
+                'size' => 2048,
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -1107,14 +1107,14 @@ return [
                '$id' => ID::custom('_key_userInternalId_provider_providerUid'),
                'type' => Database::INDEX_UNIQUE,
                'attributes' => ['userInternalId', 'provider', 'providerUid'],
-                'lengths' => [11, 128, 128], // providerUid is length 2000!
+                'lengths' => [11, 128, 128],
                'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
            ],
            [
                '$id' => ID::custom('_key_provider_providerUid'),
                'type' => Database::INDEX_UNIQUE,
                'attributes' => ['provider', 'providerUid'],
-                'lengths' => [128, 128], // providerUid is length 2000!
+                'lengths' => [128, 128],
                'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
            ],
            [
@@ -1013,10 +1013,10 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('resourceType'),
+                '$id' => ID::custom('type'), // 'api', 'redirect', 'deployment' (site or function)
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 100,
+                'size' => 32,
                'signed' => true,
                'required' => true,
                'default' => null,
@@ -1024,10 +1024,32 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('resourceInternalId'),
+                '$id' => ID::custom('trigger'), // 'manual', 'deployment', '' (empty)
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => Database::LENGTH_KEY,
+                'size' => 32,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('redirectUrl'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 2048,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('redirectStatusCode'),
+                'type' => Database::VAR_INTEGER,
+                'format' => '',
+                'size' => 0,
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -1035,13 +1057,68 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('resourceId'),
+                '$id' => ID::custom('deploymentResourceType'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 32,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('deploymentId'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
                'signed' => true,
                'required' => false,
-                'default' => null,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('deploymentInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('deploymentResourceId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('deploymentResourceInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('deploymentVcsProviderBranch'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
                'array' => false,
                'filters' => [],
            ],
@@ -1067,6 +1144,17 @@ return [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('search'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16384,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('owner'),
                'type' => Database::VAR_STRING,
@@ -1091,6 +1179,13 @@ return [
            ],
        ],
        'indexes' => [
+            [
+                '$id' => ID::custom('_key_search'),
+                'type' => Database::INDEX_FULLTEXT,
+                'attributes' => ['search'],
+                'lengths' => [],
+                'orders' => [],
+            ],
            [
                '$id' => ID::custom('_key_domain'),
                'type' => Database::INDEX_UNIQUE,
@@ -1113,24 +1208,59 @@ return [
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => '_key_resourceInternalId',
+                '$id' => '_key_type',
                'type' => Database::INDEX_KEY,
-                'attributes' => ['resourceInternalId'],
+                'attributes' => ['type'],
+                'lengths' => [32],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => '_key_trigger',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['trigger'],
+                'lengths' => [32],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => '_key_deploymentResourceType',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['deploymentResourceType'],
+                'lengths' => [32],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => '_key_deploymentResourceId',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['deploymentResourceId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => '_key_resourceId',
+                '$id' => '_key_deploymentResourceInternalId',
                'type' => Database::INDEX_KEY,
-                'attributes' => ['resourceId'],
+                'attributes' => ['deploymentResourceInternalId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => '_key_resourceType',
+                '$id' => '_key_deploymentId',
                'type' => Database::INDEX_KEY,
-                'attributes' => ['resourceType'],
-                'lengths' => [],
+                'attributes' => ['deploymentId'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => '_key_deploymentInternalId',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['deploymentInternalId'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => '_key_deploymentVcsProviderBranch',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['deploymentVcsProviderBranch'],
+                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
            [
@@ -375,6 +375,13 @@ return [
        'code' => 409,
    ],

+    /** Console */
+    Exception::RESOURCE_ALREADY_EXISTS => [
+        'name' => Exception::RESOURCE_ALREADY_EXISTS,
+        'description' => 'Resource with the requested ID already exists. Please choose a different ID and try again.',
+        'code' => 409,
+    ],
+
    /** Membership */
    Exception::MEMBERSHIP_NOT_FOUND => [
        'name' => Exception::MEMBERSHIP_NOT_FOUND,
@@ -520,7 +527,7 @@ return [
        'code' => 404,
    ],
    Exception::FUNCTION_ENTRYPOINT_MISSING => [
-        'name' => Exception::FUNCTION_RUNTIME_UNSUPPORTED,
+        'name' => Exception::FUNCTION_ENTRYPOINT_MISSING,
        'description' => 'Entrypoint for your Appwrite Function is missing. Please specify it when making deployment or update the entrypoint under your function\'s "Settings" > "Configuration" > "Entrypoint".',
        'code' => 404,
    ],
@@ -534,6 +541,23 @@ return [
        'description' => 'Function Template with the requested ID could not be found.',
        'code' => 404,
    ],
+    Exception::FUNCTION_RUNTIME_NOT_DETECTED => [
+        'name' => Exception::FUNCTION_RUNTIME_NOT_DETECTED,
+        'description' => 'Function runtime could not be detected.',
+        'code' => 400,
+    ],
+
+    /** Sites */
+    Exception::SITE_NOT_FOUND => [
+        'name' => Exception::SITE_NOT_FOUND,
+        'description' => 'Site with the requested ID could not be found.',
+        'code' => 404,
+    ],
+    Exception::SITE_TEMPLATE_NOT_FOUND => [
+        'name' => Exception::SITE_TEMPLATE_NOT_FOUND,
+        'description' => 'Site Template with the requested ID could not be found.',
+        'code' => 404,
+    ],

    /** Builds  */
    Exception::BUILD_NOT_FOUND => [
@@ -577,6 +601,13 @@ return [
        'code' => 400,
    ],

+    /** Logs */
+    Exception::LOG_NOT_FOUND => [
+        'name' => Exception::LOG_NOT_FOUND,
+        'description' => 'Log with the requested ID could not be found.',
+        'code' => 404,
+    ],
+
    /** Databases */
    Exception::DATABASE_NOT_FOUND => [
        'name' => Exception::DATABASE_NOT_FOUND,
@@ -593,11 +624,6 @@ return [
        'description' => 'Database timed out. Try adjusting your queries or adding an index.',
        'code' => 408
    ],
-    Exception::DATABASE_QUERY_ORDER_NULL => [
-        'name' => Exception::DATABASE_QUERY_ORDER_NULL,
-        'description' => 'The order attribute had a null value. Cursor pagination requires all documents order attribute values are non-null.',
-        'code' => 400,
-    ],

    /** Collections */
    Exception::COLLECTION_NOT_FOUND => [
@@ -849,6 +875,11 @@ return [
        'description' => 'Variable with the same ID already exists in this project. Try again with a different ID.',
        'code' => 409,
    ],
+    Exception::VARIABLE_CANNOT_UNSET_SECRET => [
+        'name' => Exception::VARIABLE_CANNOT_UNSET_SECRET,
+        'description' => 'Secret variables cannot be marked as non-secret. Please re-create the variable if this is your intention.',
+        'code' => 400,
+    ],
    Exception::GRAPHQL_NO_QUERY => [
        'name' => Exception::GRAPHQL_NO_QUERY,
        'description' => 'Param "query" is not optional.',
@@ -217,6 +217,34 @@ return [
            ],
        ]
    ],
+    'sites' => [
+        '$model' => Response::MODEL_SITE,
+        '$resource' => true,
+        '$description' => 'This event triggers on any sites event.',
+        'deployments' => [
+            '$model' => Response::MODEL_DEPLOYMENT,
+            '$resource' => true,
+            '$description' => 'This event triggers on any deployments event.',
+            'create' => [
+                '$description' => 'This event triggers when a deployment is created.',
+            ],
+            'delete' => [
+                '$description' => 'This event triggers when a deployment is deleted.'
+            ],
+            'update' => [
+                '$description' => 'This event triggers when a deployment is updated.'
+            ],
+        ],
+        'create' => [
+            '$description' => 'This event triggers when a site is created.'
+        ],
+        'delete' => [
+            '$description' => 'This event triggers when a site is deleted.',
+        ],
+        'update' => [
+            '$description' => 'This event triggers when a site is updated.',
+        ]
+    ],
    'functions' => [
        '$model' => Response::MODEL_FUNCTION,
        '$resource' => true,
@@ -0,0 +1,278 @@
+<?php
+
+/**
+ * List of Appwrite Sites supported frameworks
+ */
+
+use Utopia\Config\Config;
+
+$templateRuntimes = Config::getParam('template-runtimes');
+
+function getVersions(array $versions, string $prefix)
+{
+    return array_map(function ($version) use ($prefix) {
+        return $prefix . '-' . $version;
+    }, $versions);
+}
+
+return [
+    'analog' => [
+        'key' => 'analog',
+        'name' => 'Analog',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/analog/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/analog/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist/analog',
+                'startCommand' => 'bash helpers/analog/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist/analog/public',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
+    'angular' => [
+        'key' => 'angular',
+        'name' => 'Angular',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/angular/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/angular/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist/angular',
+                'startCommand' => 'bash helpers/angular/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist/angular/browser',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.csr.html'
+            ]
+        ]
+    ],
+    'nextjs' => [
+        'key' => 'nextjs',
+        'name' => 'Next.js',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/next-js/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/next-js/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './.next',
+                'startCommand' => 'bash helpers/next-js/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './out',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'react' => [
+        'key' => 'react',
+        'name' => 'React',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
+    'nuxt' => [
+        'key' => 'nuxt',
+        'name' => 'Nuxt',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/nuxt/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/nuxt/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './.output',
+                'startCommand' => 'bash helpers/nuxt/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run generate',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './output/public',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'vue' => [
+        'key' => 'vue',
+        'name' => 'Vue.js',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+                'fallbackFile' => 'index.html'
+            ]
+        ]
+    ],
+    'sveltekit' => [
+        'key' => 'sveltekit',
+        'name' => 'SvelteKit',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/sveltekit/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/sveltekit/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './build',
+                'startCommand' => 'bash helpers/sveltekit/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './build',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'astro' => [
+        'key' => 'astro',
+        'name' => 'Astro',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/astro/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/astro/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/astro/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'remix' => [
+        'key' => 'remix',
+        'name' => 'Remix',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'bundleCommand' => 'bash /usr/local/server/helpers/remix/bundle.sh',
+        'envCommand' => 'source /usr/local/server/helpers/remix/env.sh',
+        'adapters' => [
+            'ssr' => [
+                'key' => 'ssr',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './build',
+                'startCommand' => 'bash helpers/remix/server.sh',
+            ],
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './build/client',
+                'startCommand' => 'bash helpers/server.sh',
+            ]
+        ]
+    ],
+    'flutter' => [
+        'key' => 'flutter',
+        'name' => 'Flutter',
+        'screenshotSleep' => 5000,
+        'buildRuntime' => 'flutter-3.29',
+        'runtimes' => getVersions($templateRuntimes['FLUTTER']['versions'], 'flutter'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'flutter build web',
+                'installCommand' => '',
+                'outputDirectory' => './build/web',
+                'startCommand' => 'bash helpers/server.sh',
+            ],
+        ],
+    ],
+    'vite' => [
+        'key' => 'vite',
+        'name' => 'Vite',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => 'npm run build',
+                'installCommand' => 'npm install',
+                'outputDirectory' => './dist',
+                'startCommand' => 'bash helpers/server.sh',
+            ],
+        ]
+    ],
+    'other' => [
+        'key' => 'other',
+        'name' => 'Other',
+        'screenshotSleep' => 3000,
+        'buildRuntime' => 'node-22',
+        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'adapters' => [
+            'static' => [
+                'key' => 'static',
+                'buildCommand' => '',
+                'installCommand' => '',
+                'outputDirectory' => './',
+                'startCommand' => 'bash helpers/server.sh',
+            ],
+        ]
+    ],
+];
@@ -142,16 +142,6 @@ return [
        'beta' => false,
        'mock' => false,
    ],
-    'figma' => [
-        'name' => 'Figma',
-        'developers' => 'https://www.figma.com/developers/api#oauth2',
-        'icon' => 'icon-figma',
-        'enabled' => true,
-        'sandbox' => false,
-        'form' => false,
-        'beta' => false,
-        'mock' => false,
-    ],
    'github' => [
        'name' => 'GitHub',
        'developers' => 'https://developer.github.com/',
@@ -11,7 +11,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Web',
-                'version' => '17.0.2',
+                'version' => '17.0.1',
                'url' => 'https://github.com/appwrite/sdk-for-web',
                'package' => 'https://www.npmjs.com/package/appwrite',
                'enabled' => true,
@@ -59,7 +59,7 @@ return [
            [
                'key' => 'flutter',
                'name' => 'Flutter',
-                'version' => '15.0.2',
+                'version' => '15.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-flutter',
                'package' => 'https://pub.dev/packages/appwrite',
                'enabled' => true,
@@ -77,7 +77,7 @@ return [
            [
                'key' => 'apple',
                'name' => 'Apple',
-                'version' => '9.0.1',
+                'version' => '9.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-apple',
                'package' => 'https://github.com/appwrite/sdk-for-apple',
                'enabled' => true,
@@ -112,7 +112,7 @@ return [
            [
                'key' => 'android',
                'name' => 'Android',
-                'version' => '7.0.1',
+                'version' => '6.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-android',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                'enabled' => true,
@@ -134,7 +134,7 @@ return [
            [
                'key' => 'react-native',
                'name' => 'React Native',
-                'version' => '0.7.3',
+                'version' => '0.7.1',
                'url' => 'https://github.com/appwrite/sdk-for-react-native',
                'package' => 'https://npmjs.com/package/react-native-appwrite',
                'enabled' => true,
@@ -217,7 +217,7 @@ return [
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '6.2.3',
+                'version' => '6.2.2',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://www.npmjs.com/package/appwrite-cli',
                'enabled' => true,
@@ -245,7 +245,7 @@ return [
            [
                'key' => 'nodejs',
                'name' => 'Node.js',
-                'version' => '16.0.0',
+                'version' => '15.0.1',
                'url' => 'https://github.com/appwrite/sdk-for-node',
                'package' => 'https://www.npmjs.com/package/node-appwrite',
                'enabled' => true,
@@ -263,7 +263,7 @@ return [
            [
                'key' => 'deno',
                'name' => 'Deno',
-                'version' => '14.0.0',
+                'version' => '12.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-deno',
                'package' => 'https://deno.land/x/appwrite',
                'enabled' => true,
@@ -281,7 +281,7 @@ return [
            [
                'key' => 'php',
                'name' => 'PHP',
-                'version' => '14.0.0',
+                'version' => '12.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-php',
                'package' => 'https://packagist.org/packages/appwrite/appwrite',
                'enabled' => true,
@@ -299,7 +299,7 @@ return [
            [
                'key' => 'python',
                'name' => 'Python',
-                'version' => '10.0.0',
+                'version' => '9.0.2',
                'url' => 'https://github.com/appwrite/sdk-for-python',
                'package' => 'https://pypi.org/project/appwrite/',
                'enabled' => true,
@@ -317,7 +317,7 @@ return [
            [
                'key' => 'ruby',
                'name' => 'Ruby',
-                'version' => '15.0.0',
+                'version' => '12.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-ruby',
                'package' => 'https://rubygems.org/gems/appwrite',
                'enabled' => true,
@@ -335,7 +335,7 @@ return [
            [
                'key' => 'go',
                'name' => 'Go',
-                'version' => '0.5.0',
+                'version' => '0.3.0',
                'url' => 'https://github.com/appwrite/sdk-for-go',
                'package' => 'https://github.com/appwrite/sdk-for-go',
                'enabled' => true,
@@ -353,7 +353,7 @@ return [
            [
                'key' => 'dotnet',
                'name' => '.NET',
-                'version' => '0.12.0',
+                'version' => '0.11.0',
                'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                'package' => 'https://www.nuget.org/packages/Appwrite',
                'enabled' => true,
@@ -371,7 +371,7 @@ return [
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '15.0.0',
+                'version' => '14.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
@@ -389,7 +389,7 @@ return [
            [
                'key' => 'kotlin',
                'name' => 'Kotlin',
-                'version' => '8.0.0',
+                'version' => '6.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                'enabled' => true,
@@ -411,7 +411,7 @@ return [
            [
                'key' => 'swift',
                'name' => 'Swift',
-                'version' => '9.0.0',
+                'version' => '8.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-swift',
                'package' => 'https://github.com/appwrite/sdk-for-swift',
                'enabled' => true,
@@ -26,6 +26,7 @@ $member = [
    'subscribers.write',
    'subscribers.read',
    'assistant.read',
+    'rules.read'
 ];

 $admins = [
@@ -58,6 +59,10 @@ $admins = [
    'health.read',
    'functions.read',
    'functions.write',
+    'sites.read',
+    'sites.write',
+    'log.read',
+    'log.write',
    'execution.read',
    'execution.write',
    'rules.read',
@@ -6,4 +6,4 @@

 use Appwrite\Runtimes\Runtimes;

-return (new Runtimes('v4'))->getAll();
+return (new Runtimes('v5'))->getAll();
@@ -64,6 +64,18 @@ return [ // List of publicly visible scopes
    'functions.write' => [
        'description' => 'Access to create, update, and delete your project\'s functions and code deployments',
    ],
+    'sites.read' => [
+        'description' => 'Access to read your project\'s sites and deployments',
+    ],
+    'sites.write' => [
+        'description' => 'Access to create, update, and delete your project\'s sites and deployments',
+    ],
+    'log.read' => [
+        'description' => 'Access to read your site\'s logs',
+    ],
+    'log.write' => [
+        'description' => 'Access to update, and delete your site\'s logs',
+    ],
    'execution.read' => [
        'description' => 'Access to read your project\'s execution logs',
    ],
@@ -173,12 +173,25 @@ return [
        'optional' => false,
        'icon' => '',
    ],
+    'sites' => [
+        'key' => 'sites',
+        'name' => 'Sites',
+        'subtitle' => 'The Sites Service allows you view, create and manage your web applications.',
+        'description' => '/docs/services/sites.md',
+        'controller' => '', // Uses modules
+        'sdk' => true,
+        'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/sites',
+        'tests' => false,
+        'optional' => true,
+        'icon' => '', // TODO: Update icon later
+    ],
    'functions' => [
        'key' => 'functions',
        'name' => 'Functions',
        'subtitle' => 'The Functions Service allows you view, create and manage your Cloud Functions.',
        'description' => '/docs/services/functions.md',
-        'controller' => 'api/functions.php',
+        'controller' => '', // Uses modules
        'sdk' => true,
        'docs' => true,
        'docsUrl' => 'https://appwrite.io/docs/functions',
@@ -1,6 +1,6 @@
 <?php

-use Appwrite\Functions\Specification;
+use Appwrite\Platform\Modules\Compute\Specification;

 return [
    Specification::S_05VCPU_512MB => [
@@ -1,7 +1,7 @@
 {
    "openapi": "3.0.0",
    "info": {
-        "version": "1.6.2",
+        "version": "1.6.1",
        "title": "Appwrite",
        "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
        "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -18,9 +18,6 @@
    "servers": [
        {
            "url": "https:\/\/cloud.appwrite.io\/v1"
-        },
-        {
-            "url": "https:\/\/<REGION>.cloud.appwrite.io\/v1"
        }
    ],
    "paths": {
@@ -46,7 +43,6 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "group": "account",
                    "weight": 9,
                    "cookies": false,
                    "type": "",
@@ -95,7 +91,6 @@
                },
                "x-appwrite": {
                    "method": "create",
-                    "group": "account",
                    "weight": 8,
                    "cookies": false,
                    "type": "",
@@ -180,7 +175,6 @@
                },
                "x-appwrite": {
                    "method": "updateEmail",
-                    "group": "account",
                    "weight": 34,
                    "cookies": false,
                    "type": "",
@@ -256,7 +250,6 @@
                },
                "x-appwrite": {
                    "method": "listIdentities",
-                    "group": "identities",
                    "weight": 57,
                    "cookies": false,
                    "type": "",
@@ -315,7 +308,6 @@
                },
                "x-appwrite": {
                    "method": "deleteIdentity",
-                    "group": "identities",
                    "weight": 58,
                    "cookies": false,
                    "type": "",
@@ -378,7 +370,6 @@
                },
                "x-appwrite": {
                    "method": "createJWT",
-                    "group": "tokens",
                    "weight": 29,
                    "cookies": false,
                    "type": "",
@@ -427,7 +418,6 @@
                },
                "x-appwrite": {
                    "method": "listLogs",
-                    "group": "logs",
                    "weight": 31,
                    "cookies": false,
                    "type": "",
@@ -493,7 +483,6 @@
                },
                "x-appwrite": {
                    "method": "updateMFA",
-                    "group": "mfa",
                    "weight": 44,
                    "cookies": false,
                    "type": "",
@@ -563,7 +552,6 @@
                },
                "x-appwrite": {
                    "method": "createMfaAuthenticator",
-                    "group": "mfa",
                    "weight": 46,
                    "cookies": false,
                    "type": "",
@@ -609,7 +597,7 @@
                ]
            },
            "put": {
-                "summary": "Update authenticator (confirmation)",
+                "summary": "Verify authenticator",
                "operationId": "accountUpdateMfaAuthenticator",
                "tags": [
                    "account"
@@ -629,7 +617,6 @@
                },
                "x-appwrite": {
                    "method": "updateMfaAuthenticator",
-                    "group": "mfa",
                    "weight": 47,
                    "cookies": false,
                    "type": "",
@@ -707,7 +694,6 @@
                },
                "x-appwrite": {
                    "method": "deleteMfaAuthenticator",
-                    "group": "mfa",
                    "weight": 51,
                    "cookies": false,
                    "type": "",
@@ -775,7 +761,6 @@
                },
                "x-appwrite": {
                    "method": "createMfaChallenge",
-                    "group": "mfa",
                    "weight": 52,
                    "cookies": false,
                    "type": "",
@@ -829,7 +814,7 @@
                }
            },
            "put": {
-                "summary": "Update MFA challenge (confirmation)",
+                "summary": "Create MFA challenge (confirmation)",
                "operationId": "accountUpdateMfaChallenge",
                "tags": [
                    "account"
@@ -849,7 +834,6 @@
                },
                "x-appwrite": {
                    "method": "updateMfaChallenge",
-                    "group": "mfa",
                    "weight": 53,
                    "cookies": false,
                    "type": "",
@@ -925,7 +909,6 @@
                },
                "x-appwrite": {
                    "method": "listMfaFactors",
-                    "group": "mfa",
                    "weight": 45,
                    "cookies": false,
                    "type": "",
@@ -956,7 +939,7 @@
        },
        "\/account\/mfa\/recovery-codes": {
            "get": {
-                "summary": "List MFA recovery codes",
+                "summary": "Get MFA recovery codes",
                "operationId": "accountGetMfaRecoveryCodes",
                "tags": [
                    "account"
@@ -976,7 +959,6 @@
                },
                "x-appwrite": {
                    "method": "getMfaRecoveryCodes",
-                    "group": "mfa",
                    "weight": 50,
                    "cookies": false,
                    "type": "",
@@ -1025,7 +1007,6 @@
                },
                "x-appwrite": {
                    "method": "createMfaRecoveryCodes",
-                    "group": "mfa",
                    "weight": 48,
                    "cookies": false,
                    "type": "",
@@ -1054,7 +1035,7 @@
                ]
            },
            "patch": {
-                "summary": "Update MFA recovery codes (regenerate)",
+                "summary": "Regenerate MFA recovery codes",
                "operationId": "accountUpdateMfaRecoveryCodes",
                "tags": [
                    "account"
@@ -1074,7 +1055,6 @@
                },
                "x-appwrite": {
                    "method": "updateMfaRecoveryCodes",
-                    "group": "mfa",
                    "weight": 49,
                    "cookies": false,
                    "type": "",
@@ -1125,7 +1105,6 @@
                },
                "x-appwrite": {
                    "method": "updateName",
-                    "group": "account",
                    "weight": 32,
                    "cookies": false,
                    "type": "",
@@ -1195,7 +1174,6 @@
                },
                "x-appwrite": {
                    "method": "updatePassword",
-                    "group": "account",
                    "weight": 33,
                    "cookies": false,
                    "type": "",
@@ -1270,7 +1248,6 @@
                },
                "x-appwrite": {
                    "method": "updatePhone",
-                    "group": "account",
                    "weight": 35,
                    "cookies": false,
                    "type": "",
@@ -1346,7 +1323,6 @@
                },
                "x-appwrite": {
                    "method": "getPrefs",
-                    "group": "account",
                    "weight": 30,
                    "cookies": false,
                    "type": "",
@@ -1395,7 +1371,6 @@
                },
                "x-appwrite": {
                    "method": "updatePrefs",
-                    "group": "account",
                    "weight": 36,
                    "cookies": false,
                    "type": "",
@@ -1465,7 +1440,6 @@
                },
                "x-appwrite": {
                    "method": "createRecovery",
-                    "group": "recovery",
                    "weight": 38,
                    "cookies": false,
                    "type": "",
@@ -1522,7 +1496,7 @@
                }
            },
            "put": {
-                "summary": "Update password recovery (confirmation)",
+                "summary": "Create password recovery (confirmation)",
                "operationId": "accountUpdateRecovery",
                "tags": [
                    "account"
@@ -1542,7 +1516,6 @@
                },
                "x-appwrite": {
                    "method": "updateRecovery",
-                    "group": "recovery",
                    "weight": 39,
                    "cookies": false,
                    "type": "",
@@ -1624,7 +1597,6 @@
                },
                "x-appwrite": {
                    "method": "listSessions",
-                    "group": "sessions",
                    "weight": 11,
                    "cookies": false,
                    "type": "",
@@ -1666,7 +1638,6 @@
                },
                "x-appwrite": {
                    "method": "deleteSessions",
-                    "group": "sessions",
                    "weight": 12,
                    "cookies": false,
                    "type": "",
@@ -1717,7 +1688,6 @@
                },
                "x-appwrite": {
                    "method": "createAnonymousSession",
-                    "group": "sessions",
                    "weight": 17,
                    "cookies": false,
                    "type": "",
@@ -1766,7 +1736,6 @@
                },
                "x-appwrite": {
                    "method": "createEmailPasswordSession",
-                    "group": "sessions",
                    "weight": 16,
                    "cookies": false,
                    "type": "",
@@ -1840,7 +1809,6 @@
                },
                "x-appwrite": {
                    "method": "updateMagicURLSession",
-                    "group": "sessions",
                    "weight": 26,
                    "cookies": false,
                    "type": "",
@@ -1907,7 +1875,6 @@
                },
                "x-appwrite": {
                    "method": "createOAuth2Session",
-                    "group": "sessions",
                    "weight": 19,
                    "cookies": false,
                    "type": "webAuth",
@@ -1935,7 +1902,7 @@
                "parameters": [
                    {
                        "name": "provider",
-                        "description": "OAuth2 Provider. Currently, supported providers are: amazon, apple, auth0, authentik, autodesk, bitbucket, bitly, box, dailymotion, discord, disqus, dropbox, etsy, facebook, figma, github, gitlab, google, linkedin, microsoft, notion, oidc, okta, paypal, paypalSandbox, podio, salesforce, slack, spotify, stripe, tradeshift, tradeshiftBox, twitch, wordpress, yahoo, yammer, yandex, zoho, zoom.",
+                        "description": "OAuth2 Provider. Currently, supported providers are: amazon, apple, auth0, authentik, autodesk, bitbucket, bitly, box, dailymotion, discord, disqus, dropbox, etsy, facebook, github, gitlab, google, linkedin, microsoft, notion, oidc, okta, paypal, paypalSandbox, podio, salesforce, slack, spotify, stripe, tradeshift, tradeshiftBox, twitch, wordpress, yahoo, yammer, yandex, zoho, zoom.",
                        "required": true,
                        "schema": {
                            "type": "string",
@@ -1955,7 +1922,6 @@
                                "dropbox",
                                "etsy",
                                "facebook",
-                                "figma",
                                "github",
                                "gitlab",
                                "google",
@@ -2049,7 +2015,6 @@
                },
                "x-appwrite": {
                    "method": "updatePhoneSession",
-                    "group": "sessions",
                    "weight": 27,
                    "cookies": false,
                    "type": "",
@@ -2123,7 +2088,6 @@
                },
                "x-appwrite": {
                    "method": "createSession",
-                    "group": "sessions",
                    "weight": 18,
                    "cookies": false,
                    "type": "",
@@ -2197,7 +2161,6 @@
                },
                "x-appwrite": {
                    "method": "getSession",
-                    "group": "sessions",
                    "weight": 13,
                    "cookies": false,
                    "type": "",
@@ -2258,7 +2221,6 @@
                },
                "x-appwrite": {
                    "method": "updateSession",
-                    "group": "sessions",
                    "weight": 15,
                    "cookies": false,
                    "type": "",
@@ -2312,7 +2274,6 @@
                },
                "x-appwrite": {
                    "method": "deleteSession",
-                    "group": "sessions",
                    "weight": 14,
                    "cookies": false,
                    "type": "",
@@ -2375,7 +2336,6 @@
                },
                "x-appwrite": {
                    "method": "updateStatus",
-                    "group": "account",
                    "weight": 37,
                    "cookies": false,
                    "type": "",
@@ -2426,7 +2386,6 @@
                },
                "x-appwrite": {
                    "method": "createPushTarget",
-                    "group": "pushTargets",
                    "weight": 54,
                    "cookies": false,
                    "type": "",
@@ -2505,7 +2464,6 @@
                },
                "x-appwrite": {
                    "method": "updatePushTarget",
-                    "group": "pushTargets",
                    "weight": 55,
                    "cookies": false,
                    "type": "",
@@ -2576,7 +2534,6 @@
                },
                "x-appwrite": {
                    "method": "deletePushTarget",
-                    "group": "pushTargets",
                    "weight": 56,
                    "cookies": false,
                    "type": "",
@@ -2637,7 +2594,6 @@
                },
                "x-appwrite": {
                    "method": "createEmailToken",
-                    "group": "tokens",
                    "weight": 25,
                    "cookies": false,
                    "type": "",
@@ -2716,7 +2672,6 @@
                },
                "x-appwrite": {
                    "method": "createMagicURLToken",
-                    "group": "tokens",
                    "weight": 24,
                    "cookies": false,
                    "type": "",
@@ -2796,7 +2751,6 @@
                },
                "x-appwrite": {
                    "method": "createOAuth2Token",
-                    "group": "tokens",
                    "weight": 23,
                    "cookies": false,
                    "type": "webAuth",
@@ -2824,7 +2778,7 @@
                "parameters": [
                    {
                        "name": "provider",
-                        "description": "OAuth2 Provider. Currently, supported providers are: amazon, apple, auth0, authentik, autodesk, bitbucket, bitly, box, dailymotion, discord, disqus, dropbox, etsy, facebook, figma, github, gitlab, google, linkedin, microsoft, notion, oidc, okta, paypal, paypalSandbox, podio, salesforce, slack, spotify, stripe, tradeshift, tradeshiftBox, twitch, wordpress, yahoo, yammer, yandex, zoho, zoom.",
+                        "description": "OAuth2 Provider. Currently, supported providers are: amazon, apple, auth0, authentik, autodesk, bitbucket, bitly, box, dailymotion, discord, disqus, dropbox, etsy, facebook, github, gitlab, google, linkedin, microsoft, notion, oidc, okta, paypal, paypalSandbox, podio, salesforce, slack, spotify, stripe, tradeshift, tradeshiftBox, twitch, wordpress, yahoo, yammer, yandex, zoho, zoom.",
                        "required": true,
                        "schema": {
                            "type": "string",
@@ -2844,7 +2798,6 @@
                                "dropbox",
                                "etsy",
                                "facebook",
-                                "figma",
                                "github",
                                "gitlab",
                                "google",
@@ -2938,7 +2891,6 @@
                },
                "x-appwrite": {
                    "method": "createPhoneToken",
-                    "group": "tokens",
                    "weight": 28,
                    "cookies": false,
                    "type": "",
@@ -3015,7 +2967,6 @@
                },
                "x-appwrite": {
                    "method": "createVerification",
-                    "group": "verification",
                    "weight": 40,
                    "cookies": false,
                    "type": "",
@@ -3063,7 +3014,7 @@
                }
            },
            "put": {
-                "summary": "Update email verification (confirmation)",
+                "summary": "Create email verification (confirmation)",
                "operationId": "accountUpdateVerification",
                "tags": [
                    "account"
@@ -3083,7 +3034,6 @@
                },
                "x-appwrite": {
                    "method": "updateVerification",
-                    "group": "verification",
                    "weight": 41,
                    "cookies": false,
                    "type": "",
@@ -3159,7 +3109,6 @@
                },
                "x-appwrite": {
                    "method": "createPhoneVerification",
-                    "group": "verification",
                    "weight": 42,
                    "cookies": false,
                    "type": "",
@@ -3211,7 +3160,6 @@
                },
                "x-appwrite": {
                    "method": "updatePhoneVerification",
-                    "group": "verification",
                    "weight": 43,
                    "cookies": false,
                    "type": "",
@@ -3280,7 +3228,6 @@
                },
                "x-appwrite": {
                    "method": "getBrowser",
-                    "group": null,
                    "weight": 60,
                    "cookies": false,
                    "type": "location",
@@ -3406,7 +3353,6 @@
                },
                "x-appwrite": {
                    "method": "getCreditCard",
-                    "group": null,
                    "weight": 59,
                    "cookies": false,
                    "type": "location",
@@ -3538,7 +3484,6 @@
                },
                "x-appwrite": {
                    "method": "getFavicon",
-                    "group": null,
                    "weight": 63,
                    "cookies": false,
                    "type": "location",
@@ -3596,7 +3541,6 @@
                },
                "x-appwrite": {
                    "method": "getFlag",
-                    "group": null,
                    "weight": 61,
                    "cookies": false,
                    "type": "location",
@@ -4084,7 +4028,6 @@
                },
                "x-appwrite": {
                    "method": "getImage",
-                    "group": null,
                    "weight": 62,
                    "cookies": false,
                    "type": "location",
@@ -4166,7 +4109,6 @@
                },
                "x-appwrite": {
                    "method": "getInitials",
-                    "group": null,
                    "weight": 65,
                    "cookies": false,
                    "type": "location",
@@ -4258,7 +4200,6 @@
                },
                "x-appwrite": {
                    "method": "getQR",
-                    "group": null,
                    "weight": 64,
                    "cookies": false,
                    "type": "location",
@@ -4357,7 +4298,6 @@
                },
                "x-appwrite": {
                    "method": "listDocuments",
-                    "group": "documents",
                    "weight": 109,
                    "cookies": false,
                    "type": "",
@@ -4442,7 +4382,6 @@
                },
                "x-appwrite": {
                    "method": "createDocument",
-                    "group": "documents",
                    "weight": 108,
                    "cookies": false,
                    "type": "",
@@ -4549,7 +4488,6 @@
                },
                "x-appwrite": {
                    "method": "getDocument",
-                    "group": "documents",
                    "weight": 110,
                    "cookies": false,
                    "type": "",
@@ -4644,7 +4582,6 @@
                },
                "x-appwrite": {
                    "method": "updateDocument",
-                    "group": "documents",
                    "weight": 112,
                    "cookies": false,
                    "type": "",
@@ -4743,7 +4680,6 @@
                },
                "x-appwrite": {
                    "method": "deleteDocument",
-                    "group": "documents",
                    "weight": 113,
                    "cookies": false,
                    "type": "",
@@ -4827,8 +4763,7 @@
                },
                "x-appwrite": {
                    "method": "listExecutions",
-                    "group": "executions",
-                    "weight": 305,
+                    "weight": 306,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4913,8 +4848,7 @@
                },
                "x-appwrite": {
                    "method": "createExecution",
-                    "group": "executions",
-                    "weight": 304,
+                    "weight": 305,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5028,8 +4962,7 @@
                },
                "x-appwrite": {
                    "method": "getExecution",
-                    "group": "executions",
-                    "weight": 306,
+                    "weight": 307,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5102,8 +5035,7 @@
                },
                "x-appwrite": {
                    "method": "query",
-                    "group": "graphql",
-                    "weight": 330,
+                    "weight": 331,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5154,8 +5086,7 @@
                },
                "x-appwrite": {
                    "method": "mutation",
-                    "group": "graphql",
-                    "weight": 329,
+                    "weight": 330,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5206,7 +5137,6 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "group": null,
                    "weight": 117,
                    "cookies": false,
                    "type": "",
@@ -5258,7 +5188,6 @@
                },
                "x-appwrite": {
                    "method": "listCodes",
-                    "group": null,
                    "weight": 118,
                    "cookies": false,
                    "type": "",
@@ -5310,7 +5239,6 @@
                },
                "x-appwrite": {
                    "method": "listContinents",
-                    "group": null,
                    "weight": 122,
                    "cookies": false,
                    "type": "",
@@ -5362,7 +5290,6 @@
                },
                "x-appwrite": {
                    "method": "listCountries",
-                    "group": null,
                    "weight": 119,
                    "cookies": false,
                    "type": "",
@@ -5414,7 +5341,6 @@
                },
                "x-appwrite": {
                    "method": "listCountriesEU",
-                    "group": null,
                    "weight": 120,
                    "cookies": false,
                    "type": "",
@@ -5466,7 +5392,6 @@
                },
                "x-appwrite": {
                    "method": "listCountriesPhones",
-                    "group": null,
                    "weight": 121,
                    "cookies": false,
                    "type": "",
@@ -5518,7 +5443,6 @@
                },
                "x-appwrite": {
                    "method": "listCurrencies",
-                    "group": null,
                    "weight": 123,
                    "cookies": false,
                    "type": "",
@@ -5570,7 +5494,6 @@
                },
                "x-appwrite": {
                    "method": "listLanguages",
-                    "group": null,
                    "weight": 124,
                    "cookies": false,
                    "type": "",
@@ -5622,8 +5545,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "group": "subscribers",
-                    "weight": 375,
+                    "weight": 376,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5705,8 +5627,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "group": "subscribers",
-                    "weight": 379,
+                    "weight": 380,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5780,8 +5701,7 @@
                },
                "x-appwrite": {
                    "method": "listFiles",
-                    "group": "files",
-                    "weight": 207,
+                    "weight": 208,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5866,8 +5786,7 @@
                },
                "x-appwrite": {
                    "method": "createFile",
-                    "group": "files",
-                    "weight": 206,
+                    "weight": 207,
                    "cookies": false,
                    "type": "upload",
                    "deprecated": false,
@@ -5964,8 +5883,7 @@
                },
                "x-appwrite": {
                    "method": "getFile",
-                    "group": "files",
-                    "weight": 208,
+                    "weight": 209,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6036,8 +5954,7 @@
                },
                "x-appwrite": {
                    "method": "updateFile",
-                    "group": "files",
-                    "weight": 213,
+                    "weight": 214,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6125,8 +6042,7 @@
                },
                "x-appwrite": {
                    "method": "deleteFile",
-                    "group": "files",
-                    "weight": 214,
+                    "weight": 215,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6192,8 +6108,7 @@
                },
                "x-appwrite": {
                    "method": "getFileDownload",
-                    "group": "files",
-                    "weight": 210,
+                    "weight": 211,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6259,8 +6174,7 @@
                },
                "x-appwrite": {
                    "method": "getFilePreview",
-                    "group": "files",
-                    "weight": 209,
+                    "weight": 210,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6476,8 +6390,7 @@
                },
                "x-appwrite": {
                    "method": "getFileView",
-                    "group": "files",
-                    "weight": 211,
+                    "weight": 212,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6550,8 +6463,7 @@
                },
                "x-appwrite": {
                    "method": "list",
-                    "group": "teams",
-                    "weight": 218,
+                    "weight": 219,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6626,8 +6538,7 @@
                },
                "x-appwrite": {
                    "method": "create",
-                    "group": "teams",
-                    "weight": 217,
+                    "weight": 218,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6711,8 +6622,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "group": "teams",
-                    "weight": 219,
+                    "weight": 220,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6773,8 +6683,7 @@
                },
                "x-appwrite": {
                    "method": "updateName",
-                    "group": "teams",
-                    "weight": 221,
+                    "weight": 222,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6847,8 +6756,7 @@
                },
                "x-appwrite": {
                    "method": "delete",
-                    "group": "teams",
-                    "weight": 223,
+                    "weight": 224,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6911,8 +6819,7 @@
                },
                "x-appwrite": {
                    "method": "listMemberships",
-                    "group": "memberships",
-                    "weight": 225,
+                    "weight": 226,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6997,8 +6904,7 @@
                },
                "x-appwrite": {
                    "method": "createMembership",
-                    "group": "memberships",
-                    "weight": 224,
+                    "weight": 225,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7108,8 +7014,7 @@
                },
                "x-appwrite": {
                    "method": "getMembership",
-                    "group": "memberships",
-                    "weight": 226,
+                    "weight": 227,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7180,8 +7085,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembership",
-                    "group": "memberships",
-                    "weight": 227,
+                    "weight": 228,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7267,8 +7171,7 @@
                },
                "x-appwrite": {
                    "method": "deleteMembership",
-                    "group": "memberships",
-                    "weight": 229,
+                    "weight": 230,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7341,8 +7244,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembershipStatus",
-                    "group": "memberships",
-                    "weight": 228,
+                    "weight": 229,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7439,8 +7341,7 @@
                },
                "x-appwrite": {
                    "method": "getPrefs",
-                    "group": "teams",
-                    "weight": 220,
+                    "weight": 221,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7500,8 +7401,7 @@
                },
                "x-appwrite": {
                    "method": "updatePrefs",
-                    "group": "teams",
-                    "weight": 222,
+                    "weight": 223,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -0,0 +1,40 @@
+<?php
+
+return [
+    'NODE' => [
+        'name' => 'node',
+        'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
+    ],
+    'PYTHON' => [
+        'name' => 'python',
+        'versions' => ['3.12', '3.11', '3.10', '3.9', '3.8']
+    ],
+    'DART' => [
+        'name' => 'dart',
+        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
+    ],
+    'GO' => [
+        'name' => 'go',
+        'versions' => ['1.23']
+    ],
+    'PHP' => [
+        'name' => 'php',
+        'versions' => ['8.3', '8.2', '8.1', '8.0']
+    ],
+    'DENO' => [
+        'name' => 'deno',
+        'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
+    ],
+    'BUN' => [
+        'name' => 'bun',
+        'versions' => ['1.1', '1.0']
+    ],
+    'RUBY' => [
+        'name' => 'ruby',
+        'versions' => ['3.3', '3.2', '3.1', '3.0']
+    ],
+    'FLUTTER' => [
+        'name' => 'flutter',
+        'versions' => ['3.24']
+    ],
+];
@@ -1,39 +1,8 @@
 <?php

-const TEMPLATE_RUNTIMES = [
-    'NODE' => [
-        'name' => 'node',
-        'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
-    ],
-    'PYTHON' => [
-        'name' => 'python',
-        'versions' => ['3.12', '3.11', '3.10', '3.9', '3.8']
-    ],
-    'DART' => [
-        'name' => 'dart',
-        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
-    ],
-    'GO' => [
-        'name' => 'go',
-        'versions' => ['1.23']
-    ],
-    'PHP' => [
-        'name' => 'php',
-        'versions' => ['8.3', '8.2', '8.1', '8.0']
-    ],
-    'DENO' => [
-        'name' => 'deno',
-        'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
-    ],
-    'BUN' => [
-        'name' => 'bun',
-        'versions' => ['1.1', '1.0']
-    ],
-    'RUBY' => [
-        'name' => 'ruby',
-        'versions' => ['3.3', '3.2', '3.1', '3.0']
-    ],
-];
+use Utopia\Config\Config;
+
+$templateRuntimes = Config::getParam('template-runtimes');

 function getRuntimes($runtime, $commands, $entrypoint, $providerRootDirectory, $versionsDenyList = [])
 {
@@ -62,24 +31,24 @@ return [
        'timeout' => 15,
        'useCases' => ['starter'],
        'runtimes' => [
-            ...getRuntimes(TEMPLATE_RUNTIMES['NODE'], 'npm install', 'src/main.js', 'node/starter'),
+            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/starter'),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/starter'
            ),
-            ...getRuntimes(TEMPLATE_RUNTIMES['DART'], 'dart pub get', 'lib/main.dart', 'dart/starter'),
-            ...getRuntimes(TEMPLATE_RUNTIMES['GO'], '', 'main.go', 'go/starter'),
+            ...getRuntimes($templateRuntimes['DART'], 'dart pub get', 'lib/main.dart', 'dart/starter'),
+            ...getRuntimes($templateRuntimes['GO'], '', 'main.go', 'go/starter'),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/starter'
            ),
-            ...getRuntimes(TEMPLATE_RUNTIMES['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter'),
-            ...getRuntimes(TEMPLATE_RUNTIMES['BUN'], 'bun install', 'src/main.ts', 'bun/starter'),
-            ...getRuntimes(TEMPLATE_RUNTIMES['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter'),
+            ...getRuntimes($templateRuntimes['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter'),
+            ...getRuntimes($templateRuntimes['BUN'], 'bun install', 'src/main.ts', 'bun/starter'),
+            ...getRuntimes($templateRuntimes['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter'),
        ],
        'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/starter">file</a>.',
        'vcsProvider' => 'github',
@@ -101,7 +70,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-upstash-vector'
@@ -145,7 +114,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-redis-labs'
@@ -188,7 +157,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-neo4j-auradb'
@@ -240,7 +209,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-mongo-atlas'
@@ -277,7 +246,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-neon-postgres'
@@ -344,25 +313,25 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/prompt-chatgpt'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/prompt_chatgpt'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/prompt-chatgpt'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['DART'],
+                $templateRuntimes['DART'],
                'dart pub get',
                'lib/main.dart',
                'dart/prompt_chatgpt'
@@ -405,19 +374,19 @@ return [
        'useCases' => ['messaging'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/discord-command-bot'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt && python src/setup.py',
                'src/main.py',
                'python/discord_command_bot'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['GO'],
+                $templateRuntimes['GO'],
                '',
                'main.go',
                'go/discord-command-bot'
@@ -468,7 +437,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/analyze-with-perspectiveapi'
@@ -504,19 +473,19 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/censor-with-redact'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/censor_with_redact'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['DART'],
+                $templateRuntimes['DART'],
                'dart pub get',
                'lib/main.dart',
                'dart/censor_with_redact'
@@ -550,7 +519,7 @@ return [
        'timeout' => 15,
        'useCases' => ['utilities'],
        'runtimes' => [
-            ...getRuntimes(TEMPLATE_RUNTIMES['NODE'], 'npm install', 'src/main.js', 'node/generate-pdf')
+            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/generate-pdf')
        ],
        'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/generate-pdf">file</a>.',
        'vcsProvider' => 'github',
@@ -573,7 +542,7 @@ return [
        'useCases' => ['dev-tools'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/github-issue-bot'
@@ -616,7 +585,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/url-shortener'
@@ -667,19 +636,19 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/sync-with-algolia'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/sync_with_algolia'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/sync-with-algolia'
@@ -748,31 +717,31 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/sync-with-meilisearch'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/sync-with-meilisearch'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/sync-with-meilisearch'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['BUN'],
+                $templateRuntimes['BUN'],
                'bun install',
                'src/main.ts',
                'bun/sync-with-meilisearch'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['RUBY'],
+                $templateRuntimes['RUBY'],
                'bundle install',
                'lib/main.rb',
                'ruby/sync-with-meilisearch'
@@ -841,37 +810,37 @@ return [
        'useCases' => ['messaging'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/whatsapp-with-vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/whatsapp_with_vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['DART'],
+                $templateRuntimes['DART'],
                'dart pub get',
                'lib/main.dart',
                'dart/whatsapp-with-vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/whatsapp-with-vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['BUN'],
+                $templateRuntimes['BUN'],
                'bun install',
                'src/main.ts',
                'bun/whatsapp-with-vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['RUBY'],
+                $templateRuntimes['RUBY'],
                'bundle install',
                'lib/main.rb',
                'ruby/whatsapp-with-vonage'
@@ -927,7 +896,7 @@ return [
        'useCases' => ['messaging'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/push-notification-with-fcm'
@@ -983,19 +952,19 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/email-contact-form'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/email_contact_form'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/email-contact-form'
@@ -1066,7 +1035,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/subscriptions-with-stripe'
@@ -1107,7 +1076,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/payments-with-stripe'
@@ -1164,7 +1133,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/text-generation-with-huggingface'
@@ -1198,7 +1167,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/language-translation-with-huggingface'
@@ -1232,7 +1201,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/image-classification-with-huggingface'
@@ -1290,7 +1259,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/object-detection-with-huggingface'
@@ -1348,7 +1317,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/speech-recognition-with-huggingface'
@@ -1406,7 +1375,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/text-to-speech-with-huggingface'
@@ -1464,7 +1433,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/generate-with-replicate'
@@ -1499,7 +1468,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/generate-with-together-ai'
@@ -1541,7 +1510,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/chat-with-perplexity-ai'
@@ -1582,7 +1551,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/generate-with-replicate'
@@ -1617,7 +1586,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/sync-with-pinecone'
@@ -1680,7 +1649,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/rag-with-langchain'
@@ -1743,7 +1712,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/speak-with-elevenlabs'
@@ -1798,7 +1767,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/speak-with-lmnt'
@@ -1839,7 +1808,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/chat-with-anyscale'
@@ -1880,7 +1849,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/music-generation-with-huggingface'
@@ -1922,7 +1891,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/generate-with-fal-ai'
@@ -1957,7 +1926,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/subscriptions-with-lemon-squeezy'
@@ -2012,7 +1981,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/payments-with-lemon-squeezy'
@@ -0,0 +1,914 @@
+<?php
+
+use Utopia\System\System;
+
+/**
+ * List of Appwrite Sites templates
+ */
+
+$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
+$hostname = System::getEnv('_APP_DOMAIN');
+
+// TODO: Development override
+if (System::getEnv('_APP_ENV') === 'development') {
+    $hostname = 'localhost';
+}
+
+$url = $protocol . '://' . $hostname;
+
+class UseCases
+{
+    public const PORTFOLIO = 'portfolio';
+    public const STARTER = 'starter';
+    public const EVENTS = 'events';
+    public const ECOMMERCE = 'ecommerce';
+    public const DOCUMENTATION = 'documentation';
+    public const BLOG = 'blog';
+}
+
+const TEMPLATE_FRAMEWORKS = [
+    'SVELTEKIT' => [
+        'key' => 'sveltekit',
+        'name' => 'SvelteKit',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'outputDirectory' => './build',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'ssr',
+        'fallbackFile' => '',
+    ],
+    'NEXTJS' => [
+        'key' => 'nextjs',
+        'name' => 'Next.js',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'outputDirectory' => './.next',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'ssr',
+        'fallbackFile' => '',
+    ],
+    'NUXT' => [
+        'key' => 'nuxt',
+        'name' => 'Nuxt',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'outputDirectory' => './.output',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'ssr',
+        'fallbackFile' => '',
+    ],
+    'REMIX' => [
+        'key' => 'remix',
+        'name' => 'Remix',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'outputDirectory' => './build',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'ssr',
+        'fallbackFile' => '',
+    ],
+    'ASTRO' => [
+        'key' => 'astro',
+        'name' => 'Astro',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'outputDirectory' => './dist',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'ssr',
+        'fallbackFile' => '',
+    ],
+    'FLUTTER' => [
+        'key' => 'flutter',
+        'name' => 'Flutter',
+        'installCommand' => '',
+        'buildCommand' => 'flutter build web',
+        'outputDirectory' => './build/web',
+        'buildRuntime' => 'flutter-3.29',
+        'adapter' => 'static',
+        'fallbackFile' => '',
+    ],
+    'OTHER' => [
+        'key' => 'other',
+        'name' => 'Other',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'static',
+        'fallbackFile' => 'index.html',
+    ],
+    'VITE' => [
+        'key' => 'vite',
+        'name' => 'Vite',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'static',
+        'outputDirectory' => './dist',
+    ],
+    'REACT' => [
+        'key' => 'react',
+        'name' => 'React',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'static',
+        'outputDirectory' => './dist',
+        'fallbackFile' => 'index.html',
+    ],
+    'ANGULAR' => [
+        'key' => 'angular',
+        'name' => 'Angular',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'static',
+        'outputDirectory' => './dist/angular/browser',
+        'fallbackFile' => 'index.html',
+    ],
+    'VUE' => [
+        'key' => 'vue',
+        'name' => 'Vue.js',
+        'installCommand' => 'npm install',
+        'buildCommand' => 'npm run build',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'static',
+        'outputDirectory' => './dist',
+        'fallbackFile' => 'index.html',
+    ],
+    'OTHER' => [
+        'key' => 'other',
+        'name' => 'Other',
+        'installCommand' => '',
+        'buildCommand' => '',
+        'buildRuntime' => 'node-22',
+        'adapter' => 'static',
+        'outputDirectory' => './',
+    ],
+];
+
+function getFramework(string $frameworkEnum, array $overrides)
+{
+    $settings = \array_merge(TEMPLATE_FRAMEWORKS[$frameworkEnum], $overrides);
+    return $settings;
+}
+
+return [
+    [
+        'key' => 'vitepress',
+        'name' => 'Vitepress',
+        'useCases' => [UseCases::DOCUMENTATION],
+        'screenshotDark' => $url . '/images/sites/templates/vitepress-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/vitepress-light.png',
+        'frameworks' => [
+            getFramework('VITE', [
+                'providerRootDirectory' => './vite/vitepress',
+                'outputDirectory' => '404.html',
+                'installCommand' => 'npm i vitepress && npm install',
+                'buildCommand' => 'npm run docs:build',
+                'outputDirectory' => './.vitepress/dist',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'vuepress',
+        'name' => 'Vuepress',
+        'useCases' => [UseCases::DOCUMENTATION],
+        'screenshotDark' => $url . '/images/sites/templates/vuepress-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/vuepress-light.png',
+        'frameworks' => [
+            getFramework('VUE', [
+                'providerRootDirectory' => './vue/vuepress',
+                'outputDirectory' => '404.html',
+                'installCommand' => 'npm install',
+                'buildCommand' => 'npm run build',
+                'outputDirectory' => './src/.vuepress/dist',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'docusaurus',
+        'name' => 'Docusaurus',
+        'useCases' => [UseCases::DOCUMENTATION],
+        'screenshotDark' => $url . '/images/sites/templates/docusaurus-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/docusaurus-light.png',
+        'frameworks' => [
+            getFramework('REACT', [
+                'providerRootDirectory' => './react/docusaurus',
+                'outputDirectory' => '404.html',
+                'installCommand' => 'npm install',
+                'buildCommand' => 'npm run build',
+                'outputDirectory' => './build',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'nxt-lnk',
+        'name' => 'Nxt Lnk',
+        'useCases' => [UseCases::PORTFOLIO],
+        'screenshotDark' => $url . '/images/sites/templates/nxt-lnk-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/nxt-lnk-light.png',
+        'frameworks' => [
+            getFramework('NEXTJS', [
+                'providerRootDirectory' => './nextjs/nxtlnk',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'magic-portfolio',
+        'name' => 'Magic Portfolio',
+        'useCases' => [UseCases::PORTFOLIO],
+        'screenshotDark' => $url . '/images/sites/templates/magic-portfolio-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/magic-portfolio-light.png',
+        'frameworks' => [
+            getFramework('NEXTJS', [
+                'providerRootDirectory' => './nextjs/magic-portfolio',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'littlelink',
+        'name' => 'LittleLink',
+        'useCases' => [UseCases::PORTFOLIO],
+        'screenshotDark' => $url . '/images/sites/templates/littlelink-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/littlelink-light.png',
+        'frameworks' => [
+            getFramework('OTHER', [
+                'providerRootDirectory' => './other/littlelink',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'logspot',
+        'name' => 'Logspot',
+        'useCases' => [UseCases::BLOG],
+        'screenshotDark' => $url . '/images/sites/templates/logspot-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/logspot-light.png',
+        'frameworks' => [
+            getFramework('NUXT', [
+                'providerRootDirectory' => './nuxt/logspot',
+                'buildCommand' => 'npm run generate',
+                'outputDirectory' => './dist',
+                'adapter' => 'static',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'astro-nano',
+        'name' => 'Astro Nano',
+        'useCases' => [UseCases::PORTFOLIO],
+        'screenshotDark' => $url . '/images/sites/templates/astro-nano-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/astro-nano-light.png',
+        'frameworks' => [
+            getFramework('ASTRO', [
+                'providerRootDirectory' => './astro/nano',
+                'outputDirectory' => './dist',
+                'adapter' => 'static',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'astro-starlight',
+        'name' => 'Astro Starlight',
+        'useCases' => [UseCases::DOCUMENTATION],
+        'screenshotDark' => $url . '/images/sites/templates/astro-starlight-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/astro-starlight-light.png',
+        'frameworks' => [
+            getFramework('ASTRO', [
+                'providerRootDirectory' => './astro/starlight',
+                'outputDirectory' => './dist',
+                'adapter' => 'static',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'astro-sphere',
+        'name' => 'Astro Sphere',
+        'useCases' => [UseCases::PORTFOLIO],
+        'screenshotDark' => $url . '/images/sites/templates/astro-sphere-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/astro-sphere-light.png',
+        'frameworks' => [
+            getFramework('ASTRO', [
+                'providerRootDirectory' => './astro/sphere',
+                'outputDirectory' => './dist',
+                'adapter' => 'static',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'astro-starlog',
+        'name' => 'Astro Starlog',
+        'useCases' => [UseCases::BLOG],
+        'screenshotDark' => $url . '/images/sites/templates/astro-starlog-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/astro-starlog-light.png',
+        'frameworks' => [
+            getFramework('ASTRO', [
+                'providerRootDirectory' => './astro/starlog',
+                'outputDirectory' => './dist',
+                'adapter' => 'static',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'onelink',
+        'name' => 'Onelink',
+        'useCases' => [UseCases::PORTFOLIO],
+        'screenshotDark' => $url . '/images/sites/templates/onelink-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/onelink-light.png',
+        'frameworks' => [
+            getFramework('NUXT', [
+                'providerRootDirectory' => './nuxt/onelink',
+                'buildCommand' => 'npm run generate',
+                'outputDirectory' => './dist',
+                'adapter' => 'static',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.3.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'starter-for-flutter',
+        'name' => 'Flutter starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-flutter-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-flutter-light.png',
+        'frameworks' => [
+            getFramework('FLUTTER', [
+                'providerRootDirectory' => './',
+                'buildCommand' => 'bash build.sh',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-flutter',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'APPWRITE_PUBLIC_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'starter-for-js',
+        'name' => 'JavaScript starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-js-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-js-light.png',
+        'frameworks' => [
+            getFramework('VITE', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-js',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'VITE_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'VITE_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'VITE_APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'starter-for-angular',
+        'name' => 'Angular starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-angular-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-angular-light.png',
+        'frameworks' => [
+            getFramework('ANGULAR', [
+                'providerRootDirectory' => './',
+                'outputDirectory' => './dist/angular-starter-kit-for-appwrite/browser',
+                'buildCommand' => 'bash prepare-env.sh && npm run build'
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-angular',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'starter-for-svelte',
+        'name' => 'Svelte starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-svelte-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-svelte-light.png',
+        'frameworks' => [
+            getFramework('SVELTEKIT', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-svelte',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'PUBLIC_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'PUBLIC_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'PUBLIC_APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'starter-for-react',
+        'name' => 'React starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-react-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-react-light.png',
+        'frameworks' => [
+            getFramework('REACT', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-react',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'VITE_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'VITE_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'VITE_APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'starter-for-vue',
+        'name' => 'Vue starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-vue-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-vue-light.png',
+        'frameworks' => [
+            getFramework('VUE', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-vue',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'VITE_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'VITE_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'VITE_APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'starter-for-react-native',
+        'name' => 'React Native starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-react-native-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-react-native-light.png',
+        'frameworks' => [
+            getFramework('REACT', [
+                'providerRootDirectory' => './',
+                'fallbackFile' => '+not-found.html',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-react-native',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'EXPO_PUBLIC_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'EXPO_PUBLIC_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'EXPO_PUBLIC_APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'starter-for-nextjs',
+        'name' => 'Next.js starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-nextjs-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-nextjs-light.png',
+        'frameworks' => [
+            getFramework('NEXTJS', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-nextjs',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'NEXT_PUBLIC_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'NEXT_PUBLIC_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'NEXT_PUBLIC_APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'starter-for-nuxt',
+        'name' => 'Nuxt starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/starter-for-nuxt-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/starter-for-nuxt-light.png',
+        'frameworks' => [
+            getFramework('NUXT', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'starter-for-nuxt',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'NUXT_PUBLIC_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'NUXT_PUBLIC_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'NUXT_PUBLIC_APPWRITE_PROJECT_NAME',
+                'description' => 'Your Appwrite project name',
+                'value' => '{projectName}',
+                'placeholder' => '{projectName}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'template-for-event',
+        'name' => 'Event template',
+        'useCases' => [UseCases::EVENTS],
+        'screenshotDark' => $url . '/images/sites/templates/template-for-event-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/template-for-event-light.png',
+        'frameworks' => [
+            getFramework('NEXTJS', [
+                'providerRootDirectory' => './',
+                'installCommand' => 'pnpm install',
+                'buildCommand' => 'npm run build',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'template-for-event',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'NEXT_PUBLIC_APPWRITE_FUNCTION_PROJECT_ID',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'NEXT_PUBLIC_APPWRITE_FUNCTION_API_ENDPOINT',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'template-for-portfolio',
+        'name' => 'Portfolio template',
+        'useCases' => [UseCases::PORTFOLIO],
+        'screenshotDark' => $url . '/images/sites/templates/template-for-portfolio-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/template-for-portfolio-light.png',
+        'frameworks' => [
+            getFramework('NEXTJS', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'template-for-portfolio',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'template-for-store',
+        'name' => 'Store template',
+        'useCases' => [UseCases::ECOMMERCE],
+        'screenshotDark' => $url . '/images/sites/templates/template-for-store-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/template-for-store-light.png',
+        'frameworks' => [
+            getFramework('SVELTEKIT', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'template-for-store',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => [
+            [
+                'name' => 'STRIPE_SECRET_KEY',
+                'description' => 'Your Stripe secret key',
+                'value' => 'disabled',
+                'placeholder' => 'sk_.....',
+                'required' => false,
+                'type' => 'password'
+            ],
+            [
+                'name' => 'PUBLIC_APPWRITE_ENDPOINT',
+                'description' => 'Endpoint of Appwrite server',
+                'value' => '{apiEndpoint}',
+                'placeholder' => '{apiEndpoint}',
+                'required' => true,
+                'type' => 'text'
+            ],
+            [
+                'name' => 'PUBLIC_APPWRITE_PROJECT_ID',
+                'description' => 'Your Appwrite project ID',
+                'value' => '{projectId}',
+                'placeholder' => '{projectId}',
+                'required' => true,
+                'type' => 'text'
+            ],
+        ]
+    ],
+    [
+        'key' => 'template-for-blog',
+        'name' => 'Blog template',
+        'useCases' => [UseCases::BLOG],
+        'screenshotDark' => $url . '/images/sites/templates/template-for-blog-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/template-for-blog-light.png',
+        'frameworks' => [
+            getFramework('SVELTEKIT', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'template-for-blog',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => []
+    ],
+    [
+        'key' => 'astro-starter',
+        'name' => 'Astro starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/astro-starter-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/astro-starter-light.png',
+        'frameworks' => [
+            getFramework('ASTRO', [
+                'providerRootDirectory' => './astro/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.2.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'remix-starter',
+        'name' => 'Remix starter',
+        'useCases' => [UseCases::STARTER],
+        'screenshotDark' => $url . '/images/sites/templates/remix-starter-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/remix-starter-light.png',
+        'frameworks' => [
+            getFramework('REMIX', [
+                'providerRootDirectory' => './remix/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.2.*',
+        'variables' => [],
+    ],
+];
@@ -79,15 +79,6 @@ return [
                'question' => 'Enter your Appwrite hostname',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_CUSTOM_DOMAIN_DENY_LIST',
-                'description' => 'List of reserved or prohibited domains when configuring custom domains.',
-                'introduction' => '',
-                'default' => 'example.com,test.com,app.example.com',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
            [
                'name' => '_APP_DOMAIN_FUNCTIONS',
                'description' => 'A domain to use for function preview URLs. Setting to empty turns off function preview URLs.',
@@ -800,7 +791,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_CPUS',
-                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty or 0, CPU limit will be disabled.',
+                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
                'introduction' => '0.7.0',
                'default' => '0',
                'required' => false,
@@ -809,7 +800,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_MEMORY',
-                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty or 0, memory limit will be disabled.',
+                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
                'introduction' => '0.7.0',
                'default' => '0',
                'required' => false,
@@ -1057,22 +1048,13 @@ return [
            ],
            [
                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
-                'description' => 'The maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                'introduction' => '0.7.0',
                'default' => '1209600',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE',
-                'description' => 'The maximum duration (in seconds) upto which to retain console audit logs. The default value is 15778800 seconds (6 months).',
-                'introduction' => '1.6.2',
-                'default' => '15778800',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
            [
                'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',
@@ -43,7 +43,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -156,6 +155,9 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, Doc


 $createSession = function (string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails) {
+    $roles = Authorization::getRoles();
+    $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+    $isAppUser = Auth::isAppUser($roles);

    /** @var Utopia\Database\Document $user */
    $userFromRequest = Authorization::skip(fn () => $dbForProject->getDocument('users', $userId));
@@ -271,7 +273,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
        ->setAttribute('current', true)
        ->setAttribute('countryName', $countryName)
        ->setAttribute('expire', $expire)
-        ->setAttribute('secret', Auth::encodeSession($user->getId(), $sessionSecret))
+        ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $sessionSecret) : '')
    ;

    $response->dynamic($session, Response::MODEL_SESSION);
@@ -287,7 +289,6 @@ App::post('/v1/account')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'create',
        description: '/docs/references/account/create.md',
        auth: [],
@@ -431,7 +432,6 @@ App::get('/v1/account')
    ->label('scope', 'account')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'get',
        description: '/docs/references/account/get.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -461,7 +461,6 @@ App::delete('/v1/account')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'delete',
        description: '/docs/references/account/delete.md',
        auth: [AuthType::ADMIN],
@@ -514,7 +513,6 @@ App::get('/v1/account/sessions')
    ->label('scope', 'account')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'listSessions',
        description: '/docs/references/account/list-sessions.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -532,6 +530,9 @@ App::get('/v1/account/sessions')
    ->inject('project')
    ->action(function (Response $response, Document $user, Locale $locale, Document $project) {

+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);

        $sessions = $user->getAttribute('sessions', []);
        $current = Auth::sessionVerify($sessions, Auth::$secret);
@@ -541,7 +542,7 @@ App::get('/v1/account/sessions')

            $session->setAttribute('countryName', $countryName);
            $session->setAttribute('current', ($current == $session->getId()) ? true : false);
-            $session->setAttribute('secret', $session->getAttribute('secret', ''));
+            $session->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $session->getAttribute('secret', '') : '');

            $sessions[$key] = $session;
        }
@@ -561,7 +562,6 @@ App::delete('/v1/account/sessions')
    ->label('audits.resource', 'user/{user.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'deleteSessions',
        description: '/docs/references/account/delete-sessions.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -631,7 +631,6 @@ App::get('/v1/account/sessions/:sessionId')
    ->label('scope', 'account')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'getSession',
        description: '/docs/references/account/get-session.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -650,6 +649,10 @@ App::get('/v1/account/sessions/:sessionId')
    ->inject('project')
    ->action(function (?string $sessionId, Response $response, Document $user, Locale $locale, Document $project) {

+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
        $sessions = $user->getAttribute('sessions', []);
        $sessionId = ($sessionId === 'current')
            ? Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret)
@@ -662,7 +665,7 @@ App::get('/v1/account/sessions/:sessionId')
                $session
                    ->setAttribute('current', ($session->getAttribute('secret') == Auth::hash(Auth::$secret)))
                    ->setAttribute('countryName', $countryName)
-                    ->setAttribute('secret', $session->getAttribute('secret', ''))
+                    ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $session->getAttribute('secret', '') : '')
                ;

                return $response->dynamic($session, Response::MODEL_SESSION);
@@ -681,7 +684,6 @@ App::delete('/v1/account/sessions/:sessionId')
    ->label('audits.resource', 'user/{user.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'deleteSession',
        description: '/docs/references/account/delete-session.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -770,7 +772,6 @@ App::patch('/v1/account/sessions/:sessionId')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'updateSession',
        description: '/docs/references/account/update-session.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -855,7 +856,6 @@ App::post('/v1/account/sessions/email')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'createEmailPasswordSession',
        description: '/docs/references/account/create-session-email-password.md',
        auth: [],
@@ -897,6 +897,10 @@ App::post('/v1/account/sessions/email')
            throw new Exception(Exception::USER_BLOCKED); // User is in status blocked
        }

+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
        $user->setAttributes($profile->getArrayCopy());

        $hooks->trigger('passwordValidator', [$dbForProject, $project, $password, &$user, false]);
@@ -962,7 +966,7 @@ App::post('/v1/account/sessions/email')
        $session
            ->setAttribute('current', true)
            ->setAttribute('countryName', $countryName)
-            ->setAttribute('secret', Auth::encodeSession($user->getId(), $secret))
+            ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '')
        ;

        $queueForEvents
@@ -992,7 +996,6 @@ App::post('/v1/account/sessions/anonymous')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'createAnonymousSession',
        description: '/docs/references/account/create-session-anonymous.md',
        auth: [],
@@ -1016,6 +1019,9 @@ App::post('/v1/account/sessions/anonymous')
    ->inject('queueForEvents')
    ->action(function (Request $request, Response $response, Locale $locale, Document $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents) {
        $protocol = $request->getProtocol();
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);

        if ('console' === $project->getId()) {
            throw new Exception(Exception::USER_ANONYMOUS_CONSOLE_PROHIBITED, 'Failed to create anonymous user');
@@ -1117,7 +1123,7 @@ App::post('/v1/account/sessions/anonymous')
        $session
            ->setAttribute('current', true)
            ->setAttribute('countryName', $countryName)
-            ->setAttribute('secret', Auth::encodeSession($user->getId(), $secret))
+            ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '')
        ;

        $response->dynamic($session, Response::MODEL_SESSION);
@@ -1133,7 +1139,6 @@ App::post('/v1/account/sessions/token')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'createSession',
        description: '/docs/references/account/create-session.md',
        auth: [],
@@ -1167,7 +1172,6 @@ App::get('/v1/account/sessions/oauth2/:provider')
    ->label('scope', 'sessions.write')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'createOAuth2Session',
        description: '/docs/references/account/create-session-oauth2.md',
        type: MethodType::WEBAUTH,
@@ -1239,7 +1243,7 @@ App::get('/v1/account/sessions/oauth2/:provider')
    });

 App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
-    ->desc('Get OAuth2 callback')
+    ->desc('OAuth2 callback')
    ->groups(['account'])
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
    ->label('scope', 'public')
@@ -1269,7 +1273,7 @@ App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
    });

 App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
-    ->desc('Create OAuth2 callback')
+    ->desc('OAuth2 callback')
    ->groups(['account'])
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
    ->label('scope', 'public')
@@ -1300,7 +1304,7 @@ App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
    });

 App::get('/v1/account/sessions/oauth2/:provider/redirect')
-    ->desc('Get OAuth2 redirect')
+    ->desc('OAuth2 redirect')
    ->groups(['api', 'account', 'session'])
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
    ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -1445,7 +1449,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                Query::notEqual('userInternalId', $user->getInternalId()),
            ]);
            if (!$identityWithMatchingEmail->isEmpty()) {
-                $failureRedirect(Exception::USER_ALREADY_EXISTS);
+                throw new Exception(Exception::USER_ALREADY_EXISTS);
            }

            $userWithMatchingEmail = $dbForProject->find('users', [
@@ -1453,7 +1457,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                Query::notEqual('$id', $userId),
            ]);
            if (!empty($userWithMatchingEmail)) {
-                $failureRedirect(Exception::USER_ALREADY_EXISTS);
+                throw new Exception(Exception::USER_ALREADY_EXISTS);
            }

            $sessionUpgrade = true;
@@ -1482,7 +1486,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')

        if ($user === false || $user->isEmpty()) { // No user logged in or with OAuth2 provider ID, create new one or connect with account with same email
            if (empty($email)) {
-                $failureRedirect(Exception::USER_UNAUTHORIZED, 'OAuth provider failed to return email.');
+                throw new Exception(Exception::USER_UNAUTHORIZED, 'OAuth provider failed to return email.');
            }

            /**
@@ -1525,7 +1529,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                    Query::equal('providerEmail', [$email]),
                ]);
                if (!$identityWithMatchingEmail->isEmpty()) {
-                    $failureRedirect(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                    throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
                }

                try {
@@ -1597,7 +1601,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                Query::notEqual('userInternalId', $user->getInternalId()),
            ]);
            if (!empty($identitiesWithMatchingEmail)) {
-                $failureRedirect(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
            }

            $dbForProject->createDocument('identities', new Document([
@@ -1765,7 +1769,6 @@ App::get('/v1/account/tokens/oauth2/:provider')
    ->label('scope', 'sessions.write')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'tokens',
        name: 'createOAuth2Token',
        description: '/docs/references/account/create-token-oauth2.md',
        auth: [],
@@ -1846,7 +1849,6 @@ App::post('/v1/account/tokens/magic-url')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'tokens',
        name: 'createMagicURLToken',
        description: '/docs/references/account/create-token-magic-url.md',
        auth: [],
@@ -1882,6 +1884,9 @@ App::post('/v1/account/tokens/magic-url')
            $phrase = Phrase::generate();
        }

+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);

        $result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
        if (!$result->isEmpty()) {
@@ -2063,11 +2068,17 @@ App::post('/v1/account/tokens/magic-url')
            ->setRecipient($email)
            ->trigger();

+        // Set to unhashed secret for events and server responses
        $token->setAttribute('secret', $tokenSecret);

        $queueForEvents
            ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);

+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $token->setAttribute('secret', '');
+        }
+
        if (!empty($phrase)) {
            $token->setAttribute('phrase', $phrase);
        }
@@ -2087,7 +2098,6 @@ App::post('/v1/account/tokens/email')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'tokens',
        name: 'createEmailToken',
        description: '/docs/references/account/create-token-email.md',
        auth: [],
@@ -2121,6 +2131,10 @@ App::post('/v1/account/tokens/email')
            $phrase = Phrase::generate();
        }

+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
        $result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
        if (!$result->isEmpty()) {
            $user->setAttributes($result->getArrayCopy());
@@ -2289,11 +2303,17 @@ App::post('/v1/account/tokens/email')
            ->setRecipient($email)
            ->trigger();

+        // Set to unhashed secret for events and server responses
        $token->setAttribute('secret', $tokenSecret);

        $queueForEvents
            ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);

+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $token->setAttribute('secret', '');
+        }
+
        if (!empty($phrase)) {
            $token->setAttribute('phrase', $phrase);
        }
@@ -2313,7 +2333,6 @@ App::put('/v1/account/sessions/magic-url')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'updateMagicURLSession',
        description: '/docs/references/account/create-session.md',
        auth: [],
@@ -2351,7 +2370,6 @@ App::put('/v1/account/sessions/phone')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'sessions',
        name: 'updatePhoneSession',
        description: '/docs/references/account/create-session.md',
        auth: [],
@@ -2390,7 +2408,6 @@ App::post('/v1/account/tokens/phone')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'tokens',
        name: 'createPhoneToken',
        description: '/docs/references/account/create-token-phone.md',
        auth: [],
@@ -2422,6 +2439,10 @@ App::post('/v1/account/tokens/phone')
            throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
        }

+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
        $result = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
        if (!$result->isEmpty()) {
            $user->setAttributes($result->getArrayCopy());
@@ -2573,13 +2594,14 @@ App::post('/v1/account/tokens/phone')
            }
        }

+        // Set to unhashed secret for events and server responses
        $token->setAttribute('secret', $secret);

        $queueForEvents
            ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);

-        // Encode secret for clients
-        $token->setAttribute('secret', Auth::encodeSession($user->getId(), $secret));
+        // Hide secret for clients
+        $token->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '');

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -2594,7 +2616,6 @@ App::post('/v1/account/jwts')
    ->label('auth.type', 'jwt')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'tokens',
        name: 'createJWT',
        description: '/docs/references/account/create-jwt.md',
        auth: [],
@@ -2643,7 +2664,6 @@ App::get('/v1/account/prefs')
    ->label('scope', 'account')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'getPrefs',
        description: '/docs/references/account/get-prefs.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -2670,7 +2690,6 @@ App::get('/v1/account/logs')
    ->label('scope', 'account')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'logs',
        name: 'listLogs',
        description: '/docs/references/account/list-logs.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -2747,7 +2766,6 @@ App::patch('/v1/account/name')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'updateName',
        description: '/docs/references/account/update-name.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -2786,7 +2804,6 @@ App::patch('/v1/account/password')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'updatePassword',
        description: '/docs/references/account/update-password.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -2860,7 +2877,6 @@ App::patch('/v1/account/email')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'updateEmail',
        description: '/docs/references/account/update-email.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -2957,7 +2973,6 @@ App::patch('/v1/account/phone')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'updatePhone',
        description: '/docs/references/account/update-phone.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3043,7 +3058,6 @@ App::patch('/v1/account/prefs')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'updatePrefs',
        description: '/docs/references/account/update-prefs.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3081,7 +3095,6 @@ App::patch('/v1/account/status')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'account',
        name: 'updateStatus',
        description: '/docs/references/account/update-status.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3132,7 +3145,6 @@ App::post('/v1/account/recovery')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'recovery',
        name: 'createRecovery',
        description: '/docs/references/account/create-recovery.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3162,6 +3174,11 @@ App::post('/v1/account/recovery')
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
        }
        $url = htmlentities($url);
+
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
        $email = \strtolower($email);

        $profile = $dbForProject->findOne('users', [
@@ -3285,13 +3302,19 @@ App::post('/v1/account/recovery')
            ->setSubject($subject)
            ->trigger();

+        // Set to unhashed secret for events and server responses
        $recovery->setAttribute('secret', $secret);

        $queueForEvents
            ->setParam('userId', $profile->getId())
            ->setParam('tokenId', $recovery->getId())
            ->setUser($profile)
-            ->setPayload(Response::showSensitive(fn () => $response->output($recovery, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setPayload($response->output($recovery, Response::MODEL_TOKEN), sensitive: ['secret']);
+
+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $recovery->setAttribute('secret', '');
+        }

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3299,7 +3322,7 @@ App::post('/v1/account/recovery')
    });

 App::put('/v1/account/recovery')
-    ->desc('Update password recovery (confirmation)')
+    ->desc('Create password recovery (confirmation)')
    ->groups(['api', 'account'])
    ->label('scope', 'sessions.write')
    ->label('event', 'users.[userId].recovery.[tokenId].update')
@@ -3308,7 +3331,6 @@ App::put('/v1/account/recovery')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'recovery',
        name: 'updateRecovery',
        description: '/docs/references/account/update-recovery.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3385,7 +3407,7 @@ App::put('/v1/account/recovery')
        $queueForEvents
            ->setParam('userId', $profile->getId())
            ->setParam('tokenId', $recoveryDocument->getId())
-            ->setPayload(Response::showSensitive(fn () => $response->output($recoveryDocument, Response::MODEL_TOKEN)), sensitive: ['secret']);
+        ;

        $response->dynamic($recoveryDocument, Response::MODEL_TOKEN);
    });
@@ -3399,7 +3421,6 @@ App::post('/v1/account/verification')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'verification',
        name: 'createVerification',
        description: '/docs/references/account/create-email-verification.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3433,6 +3454,9 @@ App::post('/v1/account/verification')
            throw new Exception(Exception::USER_EMAIL_ALREADY_VERIFIED);
        }

+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
        $verificationSecret = Auth::tokenGenerator(Auth::TOKEN_LENGTH_VERIFICATION);
        $expire = DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);

@@ -3541,12 +3565,18 @@ App::post('/v1/account/verification')
            ->setName($user->getAttribute('name') ?? '')
            ->trigger();

+        // Set to unhashed secret for events and server responses
        $verification->setAttribute('secret', $verificationSecret);

        $queueForEvents
            ->setParam('userId', $user->getId())
            ->setParam('tokenId', $verification->getId())
-            ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setPayload($response->output($verification, Response::MODEL_TOKEN), sensitive: ['secret']);
+
+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $verification->setAttribute('secret', '');
+        }

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3554,7 +3584,7 @@ App::post('/v1/account/verification')
    });

 App::put('/v1/account/verification')
-    ->desc('Update email verification (confirmation)')
+    ->desc('Create email verification (confirmation)')
    ->groups(['api', 'account'])
    ->label('scope', 'public')
    ->label('event', 'users.[userId].verification.[tokenId].update')
@@ -3562,7 +3592,6 @@ App::put('/v1/account/verification')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'verification',
        name: 'updateVerification',
        description: '/docs/references/account/update-email-verification.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3614,8 +3643,7 @@ App::put('/v1/account/verification')

        $queueForEvents
            ->setParam('userId', $userId)
-            ->setParam('tokenId', $verification->getId())
-            ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setParam('tokenId', $verification->getId());

        $response->dynamic($verification, Response::MODEL_TOKEN);
    });
@@ -3630,7 +3658,6 @@ App::post('/v1/account/verification/phone')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'verification',
        name: 'createPhoneVerification',
        description: '/docs/references/account/create-phone-verification.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3669,6 +3696,10 @@ App::post('/v1/account/verification/phone')
            throw new Exception(Exception::USER_PHONE_ALREADY_VERIFIED);
        }

+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
        $secret = null;
        $sendSMS = true;
        $mockNumbers = $project->getAttribute('auths', [])['mockNumbers'] ?? [];
@@ -3757,6 +3788,7 @@ App::post('/v1/account/verification/phone')
            }
        }

+        // Set to unhashed secret for events and server responses
        $verification->setAttribute('secret', $secret);

        $queueForEvents
@@ -3764,6 +3796,11 @@ App::post('/v1/account/verification/phone')
            ->setParam('tokenId', $verification->getId())
            ->setPayload($response->output($verification, Response::MODEL_TOKEN), sensitive: ['secret']);

+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $verification->setAttribute('secret', '');
+        }
+
        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
            ->dynamic($verification, Response::MODEL_TOKEN);
@@ -3778,7 +3815,6 @@ App::put('/v1/account/verification/phone')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'verification',
        name: 'updatePhoneVerification',
        description: '/docs/references/account/update-phone-verification.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3844,7 +3880,6 @@ App::patch('/v1/account/mfa')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'updateMFA',
        description: '/docs/references/account/update-mfa.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3898,7 +3933,6 @@ App::get('/v1/account/mfa/factors')
    ->label('scope', 'account')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'listMfaFactors',
        description: '/docs/references/account/list-mfa-factors.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -3939,7 +3973,6 @@ App::post('/v1/account/mfa/authenticators/:type')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'createMfaAuthenticator',
        description: '/docs/references/account/create-mfa-authenticator.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -4007,7 +4040,7 @@ App::post('/v1/account/mfa/authenticators/:type')
    });

 App::put('/v1/account/mfa/authenticators/:type')
-    ->desc('Update authenticator (confirmation)')
+    ->desc('Verify authenticator')
    ->groups(['api', 'account'])
    ->label('event', 'users.[userId].update.mfa')
    ->label('scope', 'account')
@@ -4016,7 +4049,6 @@ App::put('/v1/account/mfa/authenticators/:type')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'updateMfaAuthenticator',
        description: '/docs/references/account/update-mfa-authenticator.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -4086,7 +4118,6 @@ App::post('/v1/account/mfa/recovery-codes')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'createMfaRecoveryCodes',
        description: '/docs/references/account/create-mfa-recovery-codes.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -4124,7 +4155,7 @@ App::post('/v1/account/mfa/recovery-codes')
    });

 App::patch('/v1/account/mfa/recovery-codes')
-    ->desc('Update MFA recovery codes (regenerate)')
+    ->desc('Regenerate MFA recovery codes')
    ->groups(['api', 'account', 'mfaProtected'])
    ->label('event', 'users.[userId].update.mfa')
    ->label('scope', 'account')
@@ -4133,7 +4164,6 @@ App::patch('/v1/account/mfa/recovery-codes')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'updateMfaRecoveryCodes',
        description: '/docs/references/account/update-mfa-recovery-codes.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -4170,12 +4200,11 @@ App::patch('/v1/account/mfa/recovery-codes')
    });

 App::get('/v1/account/mfa/recovery-codes')
-    ->desc('List MFA recovery codes')
+    ->desc('Get MFA recovery codes')
    ->groups(['api', 'account', 'mfaProtected'])
    ->label('scope', 'account')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'getMfaRecoveryCodes',
        description: '/docs/references/account/get-mfa-recovery-codes.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -4214,7 +4243,6 @@ App::delete('/v1/account/mfa/authenticators/:type')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'deleteMfaAuthenticator',
        description: '/docs/references/account/delete-mfa-authenticator.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -4260,7 +4288,6 @@ App::post('/v1/account/mfa/challenge')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'createMfaChallenge',
        description: '/docs/references/account/create-mfa-challenge.md',
        auth: [],
@@ -4471,7 +4498,7 @@ App::post('/v1/account/mfa/challenge')
    });

 App::put('/v1/account/mfa/challenge')
-    ->desc('Update MFA challenge (confirmation)')
+    ->desc('Create MFA challenge (confirmation)')
    ->groups(['api', 'account', 'mfa'])
    ->label('scope', 'account')
    ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -4480,7 +4507,6 @@ App::put('/v1/account/mfa/challenge')
    ->label('audits.userId', '{response.userId}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'mfa',
        name: 'updateMfaChallenge',
        description: '/docs/references/account/update-mfa-challenge.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -4574,7 +4600,6 @@ App::post('/v1/account/targets/push')
    ->label('event', 'users.[userId].targets.[targetId].create')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'pushTargets',
        name: 'createPushTarget',
        description: '/docs/references/account/create-push-target.md',
        auth: [AuthType::SESSION],
@@ -4655,7 +4680,6 @@ App::put('/v1/account/targets/:targetId/push')
    ->label('event', 'users.[userId].targets.[targetId].update')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'pushTargets',
        name: 'updatePushTarget',
        description: '/docs/references/account/update-push-target.md',
        auth: [AuthType::SESSION],
@@ -4720,7 +4744,6 @@ App::delete('/v1/account/targets/:targetId/push')
    ->label('event', 'users.[userId].targets.[targetId].delete')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'pushTargets',
        name: 'deletePushTarget',
        description: '/docs/references/account/delete-push-target.md',
        auth: [AuthType::SESSION],
@@ -4771,7 +4794,6 @@ App::get('/v1/account/identities')
    ->label('scope', 'account')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'identities',
        name: 'listIdentities',
        description: '/docs/references/account/list-identities.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -4823,11 +4845,8 @@ App::get('/v1/account/identities')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $results = $dbForProject->find('identities', $queries);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
+        $results = $dbForProject->find('identities', $queries);
        $total = $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT);

        $response->dynamic(new Document([
@@ -4846,7 +4865,6 @@ App::delete('/v1/account/identities/:identityId')
    ->label('audits.userId', '{user.$id}')
    ->label('sdk', new Method(
        namespace: 'account',
-        group: 'identities',
        name: 'deleteIdentity',
        description: '/docs/references/account/delete-identity.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -171,7 +171,6 @@ App::get('/v1/avatars/credit-cards/:code')
    ->label('cache.resource', 'avatar/credit-card')
    ->label('sdk', new Method(
        namespace: 'avatars',
-        group: null,
        name: 'getCreditCard',
        description: '/docs/references/avatars/get-credit-card.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -199,7 +198,6 @@ App::get('/v1/avatars/browsers/:code')
    ->label('cache.resource', 'avatar/browser')
    ->label('sdk', new Method(
        namespace: 'avatars',
-        group: null,
        name: 'getBrowser',
        description: '/docs/references/avatars/get-browser.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -227,7 +225,6 @@ App::get('/v1/avatars/flags/:code')
    ->label('cache.resource', 'avatar/flag')
    ->label('sdk', new Method(
        namespace: 'avatars',
-        group: null,
        name: 'getFlag',
        description: '/docs/references/avatars/get-flag.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -255,7 +252,6 @@ App::get('/v1/avatars/image')
    ->label('cache.resource', 'avatar/image')
    ->label('sdk', new Method(
        namespace: 'avatars',
-        group: null,
        name: 'getImage',
        description: '/docs/references/avatars/get-image.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -326,7 +322,6 @@ App::get('/v1/avatars/favicon')
    ->label('cache.resource', 'avatar/favicon')
    ->label('sdk', new Method(
        namespace: 'avatars',
-        group: null,
        name: 'getFavicon',
        description: '/docs/references/avatars/get-favicon.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -477,7 +472,6 @@ App::get('/v1/avatars/qr')
    ->label('scope', 'avatars.read')
    ->label('sdk', new Method(
        namespace: 'avatars',
-        group: null,
        name: 'getQR',
        description: '/docs/references/avatars/get-qr.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -526,7 +520,6 @@ App::get('/v1/avatars/initials')
    ->label('cache.resource', 'avatar/initials')
    ->label('sdk', new Method(
        namespace: 'avatars',
-        group: null,
        name: 'getInitials',
        description: '/docs/references/avatars/get-initials.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -27,7 +27,6 @@ App::get('/v1/console/variables')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'console',
-        group: 'console',
        name: 'variables',
        description: '/docs/references/console/variables.md',
        auth: [AuthType::ADMIN],
@@ -57,23 +56,25 @@ App::get('/v1/console/variables')
        $variables = new Document([
            '_APP_DOMAIN_TARGET' => System::getEnv('_APP_DOMAIN_TARGET'),
            '_APP_STORAGE_LIMIT' => +System::getEnv('_APP_STORAGE_LIMIT'),
-            '_APP_FUNCTIONS_SIZE_LIMIT' => +System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
+            '_APP_COMPUTE_SIZE_LIMIT' => +System::getEnv('_APP_COMPUTE_SIZE_LIMIT'),
            '_APP_USAGE_STATS' => System::getEnv('_APP_USAGE_STATS'),
            '_APP_VCS_ENABLED' => $isVcsEnabled,
            '_APP_DOMAIN_ENABLED' => $isDomainEnabled,
-            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled
+            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled,
+            '_APP_DOMAIN_SITES' => System::getEnv('_APP_DOMAIN_SITES'),
+            '_APP_OPTIONS_FORCE_HTTPS' => System::getEnv('_APP_OPTIONS_FORCE_HTTPS'),
+            '_APP_DOMAINS_NAMESERVERS' => System::getEnv('_APP_DOMAINS_NAMESERVERS'),
        ]);

        $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
    });

 App::post('/v1/console/assistant')
-    ->desc('Create assistant query')
+    ->desc('Ask query')
    ->groups(['api', 'assistant'])
    ->label('scope', 'assistant.read')
    ->label('sdk', new Method(
        namespace: 'assistant',
-        group: 'console',
        name: 'chat',
        description: '/docs/references/assistant/chat.md',
        auth: [AuthType::ADMIN],
@@ -31,7 +31,6 @@ use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\Index as IndexException;
 use Utopia\Database\Exception\Limit as LimitException;
 use Utopia\Database\Exception\NotFound as NotFoundException;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Exception\Restricted as RestrictedException;
 use Utopia\Database\Exception\Structure as StructureException;
@@ -467,7 +466,6 @@ App::post('/v1/databases')
    ->label('audits.resource', 'database/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'databases',
        name: 'create',
        description: '/docs/references/databases/create.md',
        auth: [AuthType::KEY],
@@ -536,6 +534,7 @@ App::post('/v1/databases')
        }

        $queueForEvents->setParam('databaseId', $database->getId());
+        $queueForStatsUsage->addMetric(str_replace(['{databaseInternalId}'], [$database->getInternalId()], METRIC_DATABASE_ID_STORAGE), 1); // per database

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -549,7 +548,6 @@ App::get('/v1/databases')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'databases',
        name: 'list',
        description: '/docs/references/databases/list.md',
        auth: [AuthType::KEY],
@@ -599,15 +597,9 @@ App::get('/v1/databases')

        $filterQueries = Query::groupByType($queries)['filters'];

-        try {
-            $databases = $dbForProject->find('databases', $queries);
-            $total = $dbForProject->count('databases', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
        $response->dynamic(new Document([
-            'databases' => $databases,
-            'total' => $total,
+            'databases' => $dbForProject->find('databases', $queries),
+            'total' => $dbForProject->count('databases', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_DATABASE_LIST);
    });

@@ -618,7 +610,6 @@ App::get('/v1/databases/:databaseId')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'databases',
        name: 'get',
        description: '/docs/references/databases/get.md',
        auth: [AuthType::KEY],
@@ -651,7 +642,6 @@ App::get('/v1/databases/:databaseId/logs')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'logs',
        name: 'listLogs',
        description: '/docs/references/databases/get-logs.md',
        auth: [AuthType::ADMIN],
@@ -755,7 +745,6 @@ App::put('/v1/databases/:databaseId')
    ->label('audits.resource', 'database/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'databases',
        name: 'update',
        description: '/docs/references/databases/update.md',
        auth: [AuthType::KEY],
@@ -801,7 +790,6 @@ App::delete('/v1/databases/:databaseId')
    ->label('audits.resource', 'database/{request.databaseId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'databases',
        name: 'delete',
        description: '/docs/references/databases/delete.md',
        auth: [AuthType::KEY],
@@ -842,6 +830,9 @@ App::delete('/v1/databases/:databaseId')
            ->setParam('databaseId', $database->getId())
            ->setPayload($response->output($database, Response::MODEL_DATABASE));

+        $queueForStatsUsage
+            ->addMetric(METRIC_DATABASES_STORAGE, 1); // Global, deletion forces full recalculation
+
        $response->noContent();
    });

@@ -855,7 +846,6 @@ App::post('/v1/databases/:databaseId/collections')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'collections',
        name: 'createCollection',
        description: '/docs/references/databases/create-collection.md',
        auth: [AuthType::KEY],
@@ -927,7 +917,6 @@ App::get('/v1/databases/:databaseId/collections')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'collections',
        name: 'listCollections',
        description: '/docs/references/databases/list-collections.md',
        auth: [AuthType::KEY],
@@ -986,15 +975,9 @@ App::get('/v1/databases/:databaseId/collections')

        $filterQueries = Query::groupByType($queries)['filters'];

-        try {
-            $collections = $dbForProject->find('database_' . $database->getInternalId(), $queries);
-            $total = $dbForProject->count('database_' . $database->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
        $response->dynamic(new Document([
-            'collections' => $collections,
-            'total' => $total,
+            'collections' => $dbForProject->find('database_' . $database->getInternalId(), $queries),
+            'total' => $dbForProject->count('database_' . $database->getInternalId(), $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_COLLECTION_LIST);
    });

@@ -1006,7 +989,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'collections',
        name: 'getCollection',
        description: '/docs/references/databases/get-collection.md',
        auth: [AuthType::KEY],
@@ -1048,7 +1030,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'collections',
        name: 'listCollectionLogs',
        description: '/docs/references/databases/get-collection-logs.md',
        auth: [AuthType::ADMIN],
@@ -1161,7 +1142,6 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'collections',
        name: 'updateCollection',
        description: '/docs/references/databases/update-collection.md',
        auth: [AuthType::KEY],
@@ -1236,7 +1216,6 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'collections',
        name: 'deleteCollection',
        description: '/docs/references/databases/delete-collection.md',
        auth: [AuthType::KEY],
@@ -1300,7 +1279,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createStringAttribute',
        description: '/docs/references/databases/create-string-attribute.md',
        auth: [AuthType::KEY],
@@ -1363,7 +1341,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email'
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createEmailAttribute',
        description: '/docs/references/databases/create-email-attribute.md',
        auth: [AuthType::KEY],
@@ -1412,7 +1389,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createEnumAttribute',
        description: '/docs/references/databases/create-attribute-enum.md',
        auth: [AuthType::KEY],
@@ -1466,7 +1442,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createIpAttribute',
        description: '/docs/references/databases/create-ip-attribute.md',
        auth: [AuthType::KEY],
@@ -1515,7 +1490,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createUrlAttribute',
        description: '/docs/references/databases/create-url-attribute.md',
        auth: [AuthType::KEY],
@@ -1564,7 +1538,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createIntegerAttribute',
        description: '/docs/references/databases/create-integer-attribute.md',
        auth: [AuthType::KEY],
@@ -1642,7 +1615,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createFloatAttribute',
        description: '/docs/references/databases/create-float-attribute.md',
        auth: [AuthType::KEY],
@@ -1718,7 +1690,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createBooleanAttribute',
        description: '/docs/references/databases/create-boolean-attribute.md',
        auth: [AuthType::KEY],
@@ -1766,7 +1737,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createDatetimeAttribute',
        description: '/docs/references/databases/create-datetime-attribute.md',
        auth: [AuthType::KEY],
@@ -1817,7 +1787,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/relati
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'createRelationshipAttribute',
        description: '/docs/references/databases/create-relationship-attribute.md',
        auth: [AuthType::KEY],
@@ -1949,7 +1918,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'listAttributes',
        description: '/docs/references/databases/list-attributes.md',
        auth: [AuthType::KEY],
@@ -2018,12 +1986,9 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
        }

        $filters = Query::groupByType($queries)['filters'];
-        try {
-            $attributes = $dbForProject->find('attributes', $queries);
-            $total = $dbForProject->count('attributes', $filters, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
+        $attributes = $dbForProject->find('attributes', $queries);
+        $total = $dbForProject->count('attributes', $filters, APP_LIMIT_COUNT);

        $response->dynamic(new Document([
            'attributes' => $attributes,
@@ -2039,7 +2004,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'getAttribute',
        description: '/docs/references/databases/get-attribute.md',
        auth: [AuthType::KEY],
@@ -2124,7 +2088,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/strin
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateStringAttribute',
        description: '/docs/references/databases/update-string-attribute.md',
        auth: [AuthType::KEY],
@@ -2176,7 +2139,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/email
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateEmailAttribute',
        description: '/docs/references/databases/update-email-attribute.md',
        auth: [AuthType::KEY],
@@ -2226,7 +2188,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/enum/
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateEnumAttribute',
        description: '/docs/references/databases/update-enum-attribute.md',
        auth: [AuthType::KEY],
@@ -2278,7 +2239,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/ip/:k
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateIpAttribute',
        description: '/docs/references/databases/update-ip-attribute.md',
        auth: [AuthType::KEY],
@@ -2328,7 +2288,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/url/:
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateUrlAttribute',
        description: '/docs/references/databases/update-url-attribute.md',
        auth: [AuthType::KEY],
@@ -2378,7 +2337,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integ
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateIntegerAttribute',
        description: '/docs/references/databases/update-integer-attribute.md',
        auth: [AuthType::KEY],
@@ -2438,7 +2396,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateFloatAttribute',
        description: '/docs/references/databases/update-float-attribute.md',
        auth: [AuthType::KEY],
@@ -2498,7 +2455,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/boole
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateBooleanAttribute',
        description: '/docs/references/databases/update-boolean-attribute.md',
        auth: [AuthType::KEY],
@@ -2547,7 +2503,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/datet
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateDatetimeAttribute',
        description: '/docs/references/databases/update-datetime-attribute.md',
        auth: [AuthType::KEY],
@@ -2596,7 +2551,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/:key/
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'updateRelationshipAttribute',
        description: '/docs/references/databases/update-relationship-attribute.md',
        auth: [AuthType::KEY],
@@ -2662,7 +2616,6 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'attributes',
        name: 'deleteAttribute',
        description: '/docs/references/databases/delete-attribute.md',
        auth: [AuthType::KEY],
@@ -2779,6 +2732,9 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
            ->setContext('database', $db)
            ->setPayload($response->output($attribute, $model));

+        $queueForStatsUsage
+            ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$db->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection
+
        $response->noContent();
    });

@@ -2793,7 +2749,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'collections',
        name: 'createIndex',
        description: '/docs/references/databases/create-index.md',
        auth: [AuthType::KEY],
@@ -2964,7 +2919,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'indexes',
        name: 'listIndexes',
        description: '/docs/references/databases/list-indexes.md',
        auth: [AuthType::KEY],
@@ -3033,16 +2987,9 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $total = $dbForProject->count('indexes', $filterQueries, APP_LIMIT_COUNT);
-            $indexes = $dbForProject->find('indexes', $queries);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
-
        $response->dynamic(new Document([
-            'total' => $total,
-            'indexes' => $indexes,
+            'total' => $dbForProject->count('indexes', $filterQueries, APP_LIMIT_COUNT),
+            'indexes' => $dbForProject->find('indexes', $queries),
        ]), Response::MODEL_INDEX_LIST);
    });

@@ -3054,7 +3001,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'indexes',
        name: 'getIndex',
        description: '/docs/references/databases/get-index.md',
        auth: [AuthType::KEY],
@@ -3104,7 +3050,6 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'indexes',
        name: 'deleteIndex',
        description: '/docs/references/databases/delete-index.md',
        auth: [AuthType::KEY],
@@ -3183,7 +3128,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
        [
            new Method(
                namespace: 'databases',
-                group: 'documents',
                name: 'createDocument',
                description: '/docs/references/databases/create-document.md',
                auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -3412,7 +3356,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')

        $queueForStatsUsage
            ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, max($operations, 1))
-            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_WRITES), $operations); // per collection
+            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_WRITES), $operations)
+            ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$database->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection

        $response->addHeader('X-Debug-Operations', $operations);

@@ -3445,7 +3390,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'documents',
        name: 'listDocuments',
        description: '/docs/references/databases/list-documents.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -3509,12 +3453,9 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')

            $cursor->setValue($cursorDocument);
        }
-        try {
-            $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
-            $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
+        $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
+        $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries, APP_LIMIT_COUNT);

        $operations = 0;

@@ -3625,7 +3566,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'documents',
        name: 'getDocument',
        description: '/docs/references/databases/get-document.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -3737,7 +3677,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'logs',
        name: 'listDocumentLogs',
        description: '/docs/references/databases/get-document-logs.md',
        auth: [AuthType::ADMIN],
@@ -3858,7 +3797,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'documents',
        name: 'updateDocument',
        description: '/docs/references/databases/update-document.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -4113,7 +4051,6 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: 'documents',
        name: 'deleteDocument',
        description: '/docs/references/databases/delete-document.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -4204,7 +4141,8 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu

        $queueForStatsUsage
            ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, 1)
-            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_WRITES), 1); // per collection
+            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_WRITES), 1)
+            ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$database->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection

        $response->addHeader('X-Debug-Operations', 1);

@@ -4234,7 +4172,6 @@ App::get('/v1/databases/usage')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: null,
        name: 'getUsage',
        description: '/docs/references/databases/get-usage.md',
        auth: [AuthType::ADMIN],
@@ -4330,7 +4267,6 @@ App::get('/v1/databases/:databaseId/usage')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: null,
        name: 'getDatabaseUsage',
        description: '/docs/references/databases/get-database-usage.md',
        auth: [AuthType::ADMIN],
@@ -4432,7 +4368,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/usage')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
        namespace: 'databases',
-        group: null,
        name: 'getCollectionUsage',
        description: '/docs/references/databases/get-collection-usage.md',
        auth: [AuthType::ADMIN],
@@ -44,7 +44,6 @@ App::get('/v1/graphql')
    ->label('scope', 'graphql')
    ->label('sdk', new Method(
        namespace: 'graphql',
-        group: 'graphql',
        name: 'get',
        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        hide: true,
@@ -91,7 +90,6 @@ App::post('/v1/graphql/mutation')
    ->label('scope', 'graphql')
    ->label('sdk', new Method(
        namespace: 'graphql',
-        group: 'graphql',
        name: 'mutation',
        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        description: '/docs/references/graphql/post.md',
@@ -142,7 +140,6 @@ App::post('/v1/graphql')
    ->label('scope', 'graphql')
    ->label('sdk', new Method(
        namespace: 'graphql',
-        group: 'graphql',
        name: 'query',
        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        description: '/docs/references/graphql/post.md',
@@ -32,7 +32,6 @@ App::get('/v1/health')
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
        namespace: 'health',
-        group: 'health',
        name: 'get',
        auth: [AuthType::KEY],
        description: '/docs/references/health/get.md',
@@ -72,7 +71,6 @@ App::get('/v1/health/db')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'health',
        name: 'getDB',
        description: '/docs/references/health/get-db.md',
        responses: [
@@ -133,7 +131,6 @@ App::get('/v1/health/cache')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'health',
        name: 'getCache',
        description: '/docs/references/health/get-cache.md',
        responses: [
@@ -198,7 +195,6 @@ App::get('/v1/health/pubsub')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'health',
        name: 'getPubSub',
        description: '/docs/references/health/get-pubsub.md',
        responses: [
@@ -263,7 +259,6 @@ App::get('/v1/health/time')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'health',
        name: 'getTime',
        description: '/docs/references/health/get-time.md',
        responses: [
@@ -327,7 +322,6 @@ App::get('/v1/health/queue/webhooks')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueWebhooks',
        description: '/docs/references/health/get-queue-webhooks.md',
        responses: [
@@ -360,7 +354,6 @@ App::get('/v1/health/queue/logs')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueLogs',
        description: '/docs/references/health/get-queue-logs.md',
        responses: [
@@ -393,7 +386,6 @@ App::get('/v1/health/certificate')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'health',
        name: 'getCertificate',
        description: '/docs/references/health/get-certificate.md',
        responses: [
@@ -450,7 +442,6 @@ App::get('/v1/health/queue/certificates')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueCertificates',
        description: '/docs/references/health/get-queue-certificates.md',
        responses: [
@@ -483,7 +474,6 @@ App::get('/v1/health/queue/builds')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueBuilds',
        description: '/docs/references/health/get-queue-builds.md',
        responses: [
@@ -516,7 +506,6 @@ App::get('/v1/health/queue/databases')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueDatabases',
        description: '/docs/references/health/get-queue-databases.md',
        responses: [
@@ -550,7 +539,6 @@ App::get('/v1/health/queue/deletes')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueDeletes',
        description: '/docs/references/health/get-queue-deletes.md',
        responses: [
@@ -583,7 +571,6 @@ App::get('/v1/health/queue/mails')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueMails',
        description: '/docs/references/health/get-queue-mails.md',
        responses: [
@@ -616,7 +603,6 @@ App::get('/v1/health/queue/messaging')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueMessaging',
        description: '/docs/references/health/get-queue-messaging.md',
        responses: [
@@ -649,7 +635,6 @@ App::get('/v1/health/queue/migrations')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueMigrations',
        description: '/docs/references/health/get-queue-migrations.md',
        responses: [
@@ -682,7 +667,6 @@ App::get('/v1/health/queue/functions')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueFunctions',
        description: '/docs/references/health/get-queue-functions.md',
        responses: [
@@ -715,7 +699,6 @@ App::get('/v1/health/queue/stats-resources')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueStatsResources',
        description: '/docs/references/health/get-queue-stats-resources.md',
        responses: [
@@ -748,7 +731,6 @@ App::get('/v1/health/queue/stats-usage')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getQueueUsage',
        description: '/docs/references/health/get-queue-stats-usage.md',
        responses: [
@@ -774,6 +756,38 @@ App::get('/v1/health/queue/stats-usage')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    });

+App::get('/v1/health/queue/stats-usage-dump')
+    ->desc('Get usage dump queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk', new Method(
+        auth: [AuthType::KEY],
+        namespace: 'health',
+        name: 'getQueueStatsUsageDump',
+        description: '/docs/references/health/get-queue-stats-usage-dump.md',
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_HEALTH_QUEUE,
+            )
+        ],
+        contentType: ContentType::JSON
+    ))
+    ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
+    ->inject('publisher')
+    ->inject('response')
+    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+        $threshold = \intval($threshold);
+
+        $size = $publisher->getQueueSize(new Queue(Event::STATS_USAGE_DUMP_QUEUE_NAME));
+
+        if ($size >= $threshold) {
+            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+        }
+
+        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
+    });
+
 App::get('/v1/health/storage/local')
    ->desc('Get local storage')
    ->groups(['api', 'health'])
@@ -781,7 +795,6 @@ App::get('/v1/health/storage/local')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'storage',
        name: 'getStorageLocal',
        description: '/docs/references/health/get-storage-local.md',
        responses: [
@@ -831,7 +844,6 @@ App::get('/v1/health/storage')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'storage',
        name: 'getStorage',
        description: '/docs/references/health/get-storage.md',
        responses: [
@@ -845,9 +857,10 @@ App::get('/v1/health/storage')
    ->inject('response')
    ->inject('deviceForFiles')
    ->inject('deviceForFunctions')
+    ->inject('deviceForSites')
    ->inject('deviceForBuilds')
-    ->action(function (Response $response, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds) {
-        $devices = [$deviceForFiles, $deviceForFunctions, $deviceForBuilds];
+    ->action(function (Response $response, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForSites, Device $deviceForBuilds) {
+        $devices = [$deviceForFiles, $deviceForFunctions, $deviceForSites,  $deviceForBuilds];
        $checkStart = \microtime(true);

        foreach ($devices as $device) {
@@ -879,7 +892,6 @@ App::get('/v1/health/anti-virus')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'health',
        name: 'getAntivirus',
        description: '/docs/references/health/get-storage-anti-virus.md',
        responses: [
@@ -925,7 +937,6 @@ App::get('/v1/health/queue/failed/:name')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        group: 'queue',
        name: 'getFailedJobs',
        description: '/docs/references/health/get-failed-queue-jobs.md',
        responses: [
@@ -944,6 +955,7 @@ App::get('/v1/health/queue/failed/:name')
        Event::FUNCTIONS_QUEUE_NAME,
        Event::STATS_RESOURCES_QUEUE_NAME,
        Event::STATS_USAGE_QUEUE_NAME,
+        Event::STATS_USAGE_DUMP_QUEUE_NAME,
        Event::WEBHOOK_QUEUE_NAME,
        Event::CERTIFICATES_QUEUE_NAME,
        Event::BUILDS_QUEUE_NAME,
@@ -969,6 +981,9 @@ App::get('/v1/health/stats') // Currently only used internally
 ->desc('Get system stats')
    ->groups(['api', 'health'])
    ->label('scope', 'root')
+    // ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    // ->label('sdk.namespace', 'health')
+    // ->label('sdk.method', 'getStats')
    ->label('docs', false)
    ->inject('response')
    ->inject('register')
@@ -17,7 +17,6 @@ App::get('/v1/locale')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
-        group: null,
        name: 'get',
        description: '/docs/references/locale/get-locale.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -81,7 +80,6 @@ App::get('/v1/locale/codes')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
-        group: null,
        name: 'listCodes',
        description: '/docs/references/locale/list-locale-codes.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -107,7 +105,6 @@ App::get('/v1/locale/countries')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
-        group: null,
        name: 'listCountries',
        description: '/docs/references/locale/list-countries.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -144,7 +141,6 @@ App::get('/v1/locale/countries/eu')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
-        group: null,
        name: 'listCountriesEU',
        description: '/docs/references/locale/list-countries-eu.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -183,7 +179,6 @@ App::get('/v1/locale/countries/phones')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
-        group: null,
        name: 'listCountriesPhones',
        description: '/docs/references/locale/list-countries-phones.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -221,7 +216,6 @@ App::get('/v1/locale/continents')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
-        group: null,
        name: 'listContinents',
        description: '/docs/references/locale/list-continents.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -257,7 +251,6 @@ App::get('/v1/locale/currencies')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
-        group: null,
        name: 'listCurrencies',
        description: '/docs/references/locale/list-currencies.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -284,7 +277,6 @@ App::get('/v1/locale/languages')
    ->label('scope', 'locale.read')
    ->label('sdk', new Method(
        namespace: 'locale',
-        group: null,
        name: 'listLanguages',
        description: '/docs/references/locale/list-languages.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -30,7 +30,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
@@ -64,7 +63,6 @@ App::post('/v1/messaging/providers/mailgun')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createMailgunProvider',
        description: '/docs/references/messaging/create-mailgun-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -158,7 +156,6 @@ App::post('/v1/messaging/providers/sendgrid')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createSendgridProvider',
        description: '/docs/references/messaging/create-sendgrid-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -240,7 +237,6 @@ App::post('/v1/messaging/providers/smtp')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createSmtpProvider',
        description: '/docs/references/messaging/create-smtp-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -335,7 +331,6 @@ App::post('/v1/messaging/providers/msg91')
    ->label('event', 'providers.[providerId].create')
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createMsg91Provider',
        description: '/docs/references/messaging/create-msg91-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -418,7 +413,6 @@ App::post('/v1/messaging/providers/telesign')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createTelesignProvider',
        description: '/docs/references/messaging/create-telesign-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -502,7 +496,6 @@ App::post('/v1/messaging/providers/textmagic')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createTextmagicProvider',
        description: '/docs/references/messaging/create-textmagic-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -586,7 +579,6 @@ App::post('/v1/messaging/providers/twilio')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createTwilioProvider',
        description: '/docs/references/messaging/create-twilio-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -670,7 +662,6 @@ App::post('/v1/messaging/providers/vonage')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createVonageProvider',
        description: '/docs/references/messaging/create-vonage-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -754,7 +745,6 @@ App::post('/v1/messaging/providers/fcm')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createFcmProvider',
        description: '/docs/references/messaging/create-fcm-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -824,7 +814,6 @@ App::post('/v1/messaging/providers/apns')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'createApnsProvider',
        description: '/docs/references/messaging/create-apns-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -914,7 +903,6 @@ App::get('/v1/messaging/providers')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'listProviders',
        description: '/docs/references/messaging/list-providers.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -963,15 +951,10 @@ App::get('/v1/messaging/providers')

            $cursor->setValue($cursorDocument);
        }
-        try {
-            $providers = $dbForProject->find('providers', $queries);
-            $total = $dbForProject->count('providers', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'providers' => $providers,
-            'total' => $total,
+            'providers' => $dbForProject->find('providers', $queries),
+            'total' => $dbForProject->count('providers', $queries, APP_LIMIT_COUNT),
        ]), Response::MODEL_PROVIDER_LIST);
    });

@@ -982,7 +965,6 @@ App::get('/v1/messaging/providers/:providerId/logs')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'listProviderLogs',
        description: '/docs/references/messaging/list-provider-logs.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1079,7 +1061,6 @@ App::get('/v1/messaging/providers/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'getProvider',
        description: '/docs/references/messaging/get-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1113,7 +1094,6 @@ App::patch('/v1/messaging/providers/mailgun/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateMailgunProvider',
        description: '/docs/references/messaging/update-mailgun-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1226,7 +1206,6 @@ App::patch('/v1/messaging/providers/sendgrid/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateSendgridProvider',
        description: '/docs/references/messaging/update-sendgrid-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1324,7 +1303,6 @@ App::patch('/v1/messaging/providers/smtp/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateSmtpProvider',
        description: '/docs/references/messaging/update-smtp-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1453,7 +1431,6 @@ App::patch('/v1/messaging/providers/msg91/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateMsg91Provider',
        description: '/docs/references/messaging/update-msg91-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1540,7 +1517,6 @@ App::patch('/v1/messaging/providers/telesign/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateTelesignProvider',
        description: '/docs/references/messaging/update-telesign-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1629,7 +1605,6 @@ App::patch('/v1/messaging/providers/textmagic/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateTextmagicProvider',
        description: '/docs/references/messaging/update-textmagic-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1718,7 +1693,6 @@ App::patch('/v1/messaging/providers/twilio/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateTwilioProvider',
        description: '/docs/references/messaging/update-twilio-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1807,7 +1781,6 @@ App::patch('/v1/messaging/providers/vonage/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateVonageProvider',
        description: '/docs/references/messaging/update-vonage-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1896,7 +1869,6 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateFcmProvider',
        description: '/docs/references/messaging/update-fcm-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1972,7 +1944,6 @@ App::patch('/v1/messaging/providers/apns/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'updateApnsProvider',
        description: '/docs/references/messaging/update-apns-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2074,7 +2045,6 @@ App::delete('/v1/messaging/providers/:providerId')
    ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'providers',
        name: 'deleteProvider',
        description: '/docs/references/messaging/delete-provider.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2117,7 +2087,6 @@ App::post('/v1/messaging/topics')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'topics',
        name: 'createTopic',
        description: '/docs/references/messaging/create-topic.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2164,7 +2133,6 @@ App::get('/v1/messaging/topics')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'topics',
        name: 'listTopics',
        description: '/docs/references/messaging/list-topics.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2213,15 +2181,10 @@ App::get('/v1/messaging/topics')

            $cursor->setValue($cursorDocument[0]);
        }
-        try {
-            $topics = $dbForProject->find('topics', $queries);
-            $total = $dbForProject->count('topics', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'topics' => $topics,
-            'total' => $total,
+            'topics' => $dbForProject->find('topics', $queries),
+            'total' => $dbForProject->count('topics', $queries, APP_LIMIT_COUNT),
        ]), Response::MODEL_TOPIC_LIST);
    });

@@ -2232,7 +2195,6 @@ App::get('/v1/messaging/topics/:topicId/logs')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'topics',
        name: 'listTopicLogs',
        description: '/docs/references/messaging/list-topic-logs.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2330,7 +2292,6 @@ App::get('/v1/messaging/topics/:topicId')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'topics',
        name: 'getTopic',
        description: '/docs/references/messaging/get-topic.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2365,7 +2326,6 @@ App::patch('/v1/messaging/topics/:topicId')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'topics',
        name: 'updateTopic',
        description: '/docs/references/messaging/update-topic.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2416,7 +2376,6 @@ App::delete('/v1/messaging/topics/:topicId')
    ->label('resourceType', RESOURCE_TYPE_TOPICS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'topics',
        name: 'deleteTopic',
        description: '/docs/references/messaging/delete-topic.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2464,7 +2423,6 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'subscribers',
        name: 'createSubscriber',
        description: '/docs/references/messaging/create-subscriber.md',
        auth: [AuthType::JWT, AuthType::SESSION, AuthType::ADMIN, AuthType::KEY],
@@ -2564,7 +2522,6 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'subscribers',
        name: 'listSubscribers',
        description: '/docs/references/messaging/list-subscribers.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2622,11 +2579,8 @@ App::get('/v1/messaging/topics/:topicId/subscribers')

            $cursor->setValue($cursorDocument);
        }
-        try {
-            $subscribers = $dbForProject->find('subscribers', $queries);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
+        $subscribers = $dbForProject->find('subscribers', $queries);

        $subscribers = batch(\array_map(function (Document $subscriber) use ($dbForProject) {
            return function () use ($subscriber, $dbForProject) {
@@ -2653,7 +2607,6 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'subscribers',
        name: 'listSubscriberLogs',
        description: '/docs/references/messaging/list-subscriber-logs.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2751,7 +2704,6 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'subscribers',
        name: 'getSubscriber',
        description: '/docs/references/messaging/get-subscriber.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2800,7 +2752,6 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'subscribers',
        name: 'deleteSubscriber',
        description: '/docs/references/messaging/delete-subscriber.md',
        auth: [AuthType::JWT, AuthType::SESSION, AuthType::ADMIN, AuthType::KEY],
@@ -2867,7 +2818,6 @@ App::post('/v1/messaging/messages/email')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'createEmail',
        description: '/docs/references/messaging/create-email.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3026,7 +2976,6 @@ App::post('/v1/messaging/messages/sms')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'createSms',
        description: '/docs/references/messaging/create-sms.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3149,7 +3098,6 @@ App::post('/v1/messaging/messages/push')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'createPush',
        description: '/docs/references/messaging/create-push.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3364,7 +3312,6 @@ App::get('/v1/messaging/messages')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'listMessages',
        description: '/docs/references/messaging/list-messages.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3413,15 +3360,10 @@ App::get('/v1/messaging/messages')

            $cursor->setValue($cursorDocument);
        }
-        try {
-            $messages = $dbForProject->find('messages', $queries);
-            $total = $dbForProject->count('messages', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'messages' => $messages,
-            'total' => $total,
+            'messages' => $dbForProject->find('messages', $queries),
+            'total' => $dbForProject->count('messages', $queries, APP_LIMIT_COUNT),
        ]), Response::MODEL_MESSAGE_LIST);
    });

@@ -3432,7 +3374,6 @@ App::get('/v1/messaging/messages/:messageId/logs')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'logs',
        name: 'listMessageLogs',
        description: '/docs/references/messaging/list-message-logs.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3530,7 +3471,6 @@ App::get('/v1/messaging/messages/:messageId/targets')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'listTargets',
        description: '/docs/references/messaging/list-message-targets.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3593,15 +3533,10 @@ App::get('/v1/messaging/messages/:messageId/targets')

            $cursor->setValue($cursorDocument);
        }
-        try {
-            $targets = $dbForProject->find('targets', $queries);
-            $total = $dbForProject->count('targets', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'targets' => $targets,
-            'total' => $total,
+            'targets' => $dbForProject->find('targets', $queries),
+            'total' => $dbForProject->count('targets', $queries, APP_LIMIT_COUNT),
        ]), Response::MODEL_TARGET_LIST);
    });

@@ -3612,7 +3547,6 @@ App::get('/v1/messaging/messages/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'getMessage',
        description: '/docs/references/messaging/get-message.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3646,7 +3580,6 @@ App::patch('/v1/messaging/messages/email/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'updateEmail',
        description: '/docs/references/messaging/update-email.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3853,7 +3786,6 @@ App::patch('/v1/messaging/messages/sms/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'updateSms',
        description: '/docs/references/messaging/update-sms.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -4015,7 +3947,6 @@ App::patch('/v1/messaging/messages/push/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'updatePush',
        description: '/docs/references/messaging/update-push.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -4275,7 +4206,6 @@ App::delete('/v1/messaging/messages/:messageId')
    ->label('resourceType', RESOURCE_TYPE_MESSAGES)
    ->label('sdk', new Method(
        namespace: 'messaging',
-        group: 'messages',
        name: 'delete',
        description: '/docs/references/messaging/delete-message.md',
        auth: [AuthType::ADMIN, AuthType::KEY],
@@ -12,7 +12,6 @@ use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
@@ -32,13 +31,12 @@ include_once __DIR__ . '/../shared/api.php';

 App::post('/v1/migrations/appwrite')
    ->groups(['api', 'migrations'])
-    ->desc('Create Appwrite migration')
+    ->desc('Migrate Appwrite data')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'createAppwriteMigration',
        description: '/docs/references/migrations/migration-appwrite.md',
        auth: [AuthType::ADMIN],
@@ -94,13 +92,12 @@ App::post('/v1/migrations/appwrite')

 App::post('/v1/migrations/firebase')
    ->groups(['api', 'migrations'])
-    ->desc('Create Firebase migration')
+    ->desc('Migrate Firebase data')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'createFirebaseMigration',
        description: '/docs/references/migrations/migration-firebase.md',
        auth: [AuthType::ADMIN],
@@ -161,13 +158,12 @@ App::post('/v1/migrations/firebase')

 App::post('/v1/migrations/supabase')
    ->groups(['api', 'migrations'])
-    ->desc('Create Supabase migration')
+    ->desc('Migrate Supabase data')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'createSupabaseMigration',
        description: '/docs/references/migrations/migration-supabase.md',
        auth: [AuthType::ADMIN],
@@ -228,13 +224,12 @@ App::post('/v1/migrations/supabase')

 App::post('/v1/migrations/nhost')
    ->groups(['api', 'migrations'])
-    ->desc('Create NHost migration')
+    ->desc('Migrate NHost data')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'createNHostMigration',
        description: '/docs/references/migrations/migration-nhost.md',
        auth: [AuthType::ADMIN],
@@ -301,7 +296,6 @@ App::get('/v1/migrations')
    ->label('scope', 'migrations.read')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'list',
        description: '/docs/references/migrations/list-migrations.md',
        auth: [AuthType::ADMIN],
@@ -353,15 +347,10 @@ App::get('/v1/migrations')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $migrations = $dbForProject->find('migrations', $queries);
-            $total = $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'migrations' => $migrations,
-            'total' => $total,
+            'migrations' => $dbForProject->find('migrations', $queries),
+            'total' => $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_MIGRATION_LIST);
    });

@@ -371,7 +360,6 @@ App::get('/v1/migrations/:migrationId')
    ->label('scope', 'migrations.read')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'get',
        description: '/docs/references/migrations/get-migration.md',
        auth: [AuthType::ADMIN],
@@ -397,11 +385,10 @@ App::get('/v1/migrations/:migrationId')

 App::get('/v1/migrations/appwrite/report')
    ->groups(['api', 'migrations'])
-    ->desc('Get Appwrite migration report')
+    ->desc('Generate a report on Appwrite data')
    ->label('scope', 'migrations.write')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'getAppwriteReport',
        description: '/docs/references/migrations/migration-appwrite-report.md',
        auth: [AuthType::ADMIN],
@@ -421,7 +408,6 @@ App::get('/v1/migrations/appwrite/report')
    ->inject('project')
    ->inject('user')
    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
-
        $appwrite = new Appwrite($projectID, $endpoint, $key);

        try {
@@ -446,11 +432,10 @@ App::get('/v1/migrations/appwrite/report')

 App::get('/v1/migrations/firebase/report')
    ->groups(['api', 'migrations'])
-    ->desc('Get Firebase migration report')
+    ->desc('Generate a report on Firebase data')
    ->label('scope', 'migrations.write')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'getFirebaseReport',
        description: '/docs/references/migrations/migration-firebase-report.md',
        auth: [AuthType::ADMIN],
@@ -499,11 +484,10 @@ App::get('/v1/migrations/firebase/report')

 App::get('/v1/migrations/supabase/report')
    ->groups(['api', 'migrations'])
-    ->desc('Get Supabase migration report')
+    ->desc('Generate a report on Supabase Data')
    ->label('scope', 'migrations.write')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'getSupabaseReport',
        description: '/docs/references/migrations/migration-supabase-report.md',
        auth: [AuthType::ADMIN],
@@ -548,11 +532,10 @@ App::get('/v1/migrations/supabase/report')

 App::get('/v1/migrations/nhost/report')
    ->groups(['api', 'migrations'])
-    ->desc('Get NHost migration report')
+    ->desc('Generate a report on NHost Data')
    ->label('scope', 'migrations.write')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'getNHostReport',
        description: '/docs/references/migrations/migration-nhost-report.md',
        auth: [AuthType::ADMIN],
@@ -597,14 +580,13 @@ App::get('/v1/migrations/nhost/report')

 App::patch('/v1/migrations/:migrationId')
    ->groups(['api', 'migrations'])
-    ->desc('Update retry migration')
+    ->desc('Retry migration')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].retry')
    ->label('audits.event', 'migration.retry')
    ->label('audits.resource', 'migrations/{request.migrationId}')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'retry',
        description: '/docs/references/migrations/retry-migration.md',
        auth: [AuthType::ADMIN],
@@ -655,7 +637,6 @@ App::delete('/v1/migrations/:migrationId')
    ->label('audits.resource', 'migrations/{request.migrationId}')
    ->label('sdk', new Method(
        namespace: 'migrations',
-        group: null,
        name: 'delete',
        description: '/docs/references/migrations/delete-migration.md',
        auth: [AuthType::ADMIN],
@@ -17,6 +17,7 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DateTimeValidator;
 use Utopia\Database\Validator\UID;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;

@@ -26,7 +27,6 @@ App::get('/v1/project/usage')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'project',
-        group: null,
        name: 'getUsage',
        description: '/docs/references/project/get-usage.md',
        auth: [AuthType::ADMIN],
@@ -388,7 +388,6 @@ App::post('/v1/project/variables')
    ->label('audits.event', 'variable.create')
    ->label('sdk', new Method(
        namespace: 'project',
-        group: null,
        name: 'createVariable',
        description: '/docs/references/project/create-variable.md',
        auth: [AuthType::ADMIN],
@@ -401,11 +400,12 @@ App::post('/v1/project/variables')
    ))
    ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
+    ->param('secret', true, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
    ->inject('project')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
-    ->action(function (string $key, string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $key, string $value, bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
        $variableId = ID::unique();

        $variable = new Document([
@@ -420,6 +420,7 @@ App::post('/v1/project/variables')
            'resourceType' => 'project',
            'key' => $key,
            'value' => $value,
+            'secret' => $secret,
            'search' => implode(' ', [$variableId, $key, 'project']),
        ]);

@@ -448,7 +449,6 @@ App::get('/v1/project/variables')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'project',
-        group: null,
        name: 'listVariables',
        description: '/docs/references/project/list-variables.md',
        auth: [AuthType::ADMIN],
@@ -479,7 +479,6 @@ App::get('/v1/project/variables/:variableId')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'project',
-        group: null,
        name: 'getVariable',
        description: '/docs/references/project/get-variable.md',
        auth: [AuthType::ADMIN],
@@ -509,7 +508,6 @@ App::put('/v1/project/variables/:variableId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'project',
-        group: null,
        name: 'updateVariable',
        description: '/docs/references/project/update-variable.md',
        auth: [AuthType::ADMIN],
@@ -523,19 +521,25 @@ App::put('/v1/project/variables/:variableId')
    ->param('variableId', '', new UID(), 'Variable unique ID.', false)
    ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', true)
+    ->param('secret', null, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
    ->inject('project')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
-    ->action(function (string $variableId, string $key, ?string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $variableId, string $key, ?string $value, ?bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
        $variable = $dbForProject->getDocument('variables', $variableId);
        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
            throw new Exception(Exception::VARIABLE_NOT_FOUND);
        }

+        if ($variable->getAttribute('secret') === true && $secret === false) {
+            throw new Exception(Exception::VARIABLE_CANNOT_UNSET_SECRET);
+        }
+
        $variable
            ->setAttribute('key', $key)
            ->setAttribute('value', $value ?? $variable->getAttribute('value'))
+            ->setAttribute('secret', $secret ?? $variable->getAttribute('secret'))
            ->setAttribute('search', implode(' ', [$variableId, $key, 'project']));

        try {
@@ -561,7 +565,6 @@ App::delete('/v1/project/variables/:variableId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'project',
-        group: null,
        name: 'deleteVariable',
        description: '/docs/references/project/delete-variable.md',
        auth: [AuthType::ADMIN],
@@ -28,7 +28,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -69,7 +68,6 @@ App::post('/v1/projects')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'create',
        description: '/docs/references/projects/create.md',
        auth: [AuthType::ADMIN],
@@ -140,14 +138,6 @@ App::post('/v1/projects')

        $databases = Config::getParam('pools-database', []);

-        if ($region !== 'default') {
-            $databaseKeys = System::getEnv('_APP_DATABASE_KEYS', '');
-            $keys = explode(',', $databaseKeys);
-            $databases = array_filter($keys, function ($value) use ($region) {
-                return str_contains($value, $region);
-            });
-        }
-
        $databaseOverride = System::getEnv('_APP_DATABASE_OVERRIDE');
        $index = \array_search($databaseOverride, $databases);
        if ($index !== false) {
@@ -215,17 +205,17 @@ App::post('/v1/projects')
            $dsn = new DSN('mysql://' . $dsn);
        }

+        $adapter = $pools->get($dsn->getHost())->pop()->getResource();
+        $dbForProject = new Database($adapter, $cache);
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
        $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
+
        $projectTables = !\in_array($dsn->getHost(), $sharedTables);
        $sharedTablesV1 = \in_array($dsn->getHost(), $sharedTablesV1);
        $sharedTablesV2 = !$projectTables && !$sharedTablesV1;
        $sharedTables = $sharedTablesV1 || $sharedTablesV2;

        if (!$sharedTablesV2) {
-            $adapter = $pools->get($dsn->getHost())->pop()->getResource();
-            $dbForProject = new Database($adapter, $cache);
-
            if ($sharedTables) {
                $dbForProject
                    ->setSharedTables(true)
@@ -307,7 +297,6 @@ App::get('/v1/projects')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'list',
        description: '/docs/references/projects/list.md',
        auth: [AuthType::ADMIN],
@@ -360,15 +349,10 @@ App::get('/v1/projects')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $projects = $dbForPlatform->find('projects', $queries);
-            $total = $dbForPlatform->count('projects', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'projects' => $projects,
-            'total' => $total,
+            'projects' => $dbForPlatform->find('projects', $queries),
+            'total' => $dbForPlatform->count('projects', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_PROJECT_LIST);
    });

@@ -378,7 +362,6 @@ App::get('/v1/projects/:projectId')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'get',
        description: '/docs/references/projects/get.md',
        auth: [AuthType::ADMIN],
@@ -411,7 +394,6 @@ App::patch('/v1/projects/:projectId')
    ->label('audits.resource', 'project/{request.projectId}')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'update',
        description: '/docs/references/projects/update.md',
        auth: [AuthType::ADMIN],
@@ -465,7 +447,6 @@ App::patch('/v1/projects/:projectId/team')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'updateTeam',
        description: '/docs/references/projects/update-team.md',
        auth: [AuthType::ADMIN],
@@ -540,7 +521,6 @@ App::patch('/v1/projects/:projectId/service')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'updateServiceStatus',
        description: '/docs/references/projects/update-service-status.md',
        auth: [AuthType::ADMIN],
@@ -578,7 +558,6 @@ App::patch('/v1/projects/:projectId/service/all')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'updateServiceStatusAll',
        description: '/docs/references/projects/update-service-status-all.md',
        auth: [AuthType::ADMIN],
@@ -619,7 +598,6 @@ App::patch('/v1/projects/:projectId/api')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'updateApiStatus',
        description: '/docs/references/projects/update-api-status.md',
        auth: [AuthType::ADMIN],
@@ -657,7 +635,6 @@ App::patch('/v1/projects/:projectId/api/all')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'updateApiStatusAll',
        description: '/docs/references/projects/update-api-status-all.md',
        auth: [AuthType::ADMIN],
@@ -698,7 +675,6 @@ App::patch('/v1/projects/:projectId/oauth2')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateOAuth2',
        description: '/docs/references/projects/update-oauth2.md',
        auth: [AuthType::ADMIN],
@@ -749,7 +725,6 @@ App::patch('/v1/projects/:projectId/auth/session-alerts')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateSessionAlerts',
        description: '/docs/references/projects/update-session-alerts.md',
        auth: [AuthType::ADMIN],
@@ -787,7 +762,6 @@ App::patch('/v1/projects/:projectId/auth/memberships-privacy')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateMembershipsPrivacy',
        description: '/docs/references/projects/update-memberships-privacy.md',
        auth: [AuthType::ADMIN],
@@ -829,7 +803,6 @@ App::patch('/v1/projects/:projectId/auth/limit')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateAuthLimit',
        description: '/docs/references/projects/update-auth-limit.md',
        auth: [AuthType::ADMIN],
@@ -867,7 +840,6 @@ App::patch('/v1/projects/:projectId/auth/duration')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateAuthDuration',
        description: '/docs/references/projects/update-auth-duration.md',
        auth: [AuthType::ADMIN],
@@ -905,7 +877,6 @@ App::patch('/v1/projects/:projectId/auth/:method')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateAuthStatus',
        description: '/docs/references/projects/update-auth-status.md',
        auth: [AuthType::ADMIN],
@@ -946,7 +917,6 @@ App::patch('/v1/projects/:projectId/auth/password-history')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateAuthPasswordHistory',
        description: '/docs/references/projects/update-auth-password-history.md',
        auth: [AuthType::ADMIN],
@@ -984,7 +954,6 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateAuthPasswordDictionary',
        description: '/docs/references/projects/update-auth-password-dictionary.md',
        auth: [AuthType::ADMIN],
@@ -1017,12 +986,11 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
    });

 App::patch('/v1/projects/:projectId/auth/personal-data')
-    ->desc('Update personal data check')
+    ->desc('Enable or disable checking user passwords for similarity with their personal data.')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updatePersonalDataCheck',
        description: '/docs/references/projects/update-personal-data-check.md',
        auth: [AuthType::ADMIN],
@@ -1060,7 +1028,6 @@ App::patch('/v1/projects/:projectId/auth/max-sessions')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateAuthSessionsLimit',
        description: '/docs/references/projects/update-auth-sessions-limit.md',
        auth: [AuthType::ADMIN],
@@ -1098,7 +1065,6 @@ App::patch('/v1/projects/:projectId/auth/mock-numbers')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'updateMockNumbers',
        description: '/docs/references/projects/update-mock-numbers.md',
        auth: [AuthType::ADMIN],
@@ -1146,7 +1112,6 @@ App::delete('/v1/projects/:projectId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'projects',
        name: 'delete',
        description: '/docs/references/projects/delete.md',
        auth: [AuthType::ADMIN],
@@ -1190,7 +1155,6 @@ App::post('/v1/projects/:projectId/webhooks')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'webhooks',
        name: 'createWebhook',
        description: '/docs/references/projects/create-webhook.md',
        auth: [AuthType::ADMIN],
@@ -1255,7 +1219,6 @@ App::get('/v1/projects/:projectId/webhooks')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'webhooks',
        name: 'listWebhooks',
        description: '/docs/references/projects/list-webhooks.md',
        auth: [AuthType::ADMIN],
@@ -1294,7 +1257,6 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
    ->label('scope', 'projects.read')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'webhooks',
        name: 'getWebhook',
        description: '/docs/references/projects/get-webhook.md',
        auth: [AuthType::ADMIN],
@@ -1335,7 +1297,6 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'webhooks',
        name: 'updateWebhook',
        description: '/docs/references/projects/update-webhook.md',
        auth: [AuthType::ADMIN],
@@ -1401,7 +1362,6 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'webhooks',
        name: 'updateWebhookSignature',
        description: '/docs/references/projects/update-webhook-signature.md',
        auth: [AuthType::ADMIN],
@@ -1447,7 +1407,6 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'webhooks',
        name: 'deleteWebhook',
        description: '/docs/references/projects/delete-webhook.md',
        auth: [AuthType::ADMIN],
@@ -1495,7 +1454,6 @@ App::post('/v1/projects/:projectId/keys')
    ->label('scope', 'keys.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'keys',
        name: 'createKey',
        description: '/docs/references/projects/create-key.md',
        auth: [AuthType::ADMIN],
@@ -1552,7 +1510,6 @@ App::get('/v1/projects/:projectId/keys')
    ->label('scope', 'keys.read')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'keys',
        name: 'listKeys',
        description: '/docs/references/projects/list-keys.md',
        auth: [AuthType::ADMIN],
@@ -1591,7 +1548,6 @@ App::get('/v1/projects/:projectId/keys/:keyId')
    ->label('scope', 'keys.read')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'keys',
        name: 'getKey',
        description: '/docs/references/projects/get-key.md',
        auth: [AuthType::ADMIN],
@@ -1632,7 +1588,6 @@ App::put('/v1/projects/:projectId/keys/:keyId')
    ->label('scope', 'keys.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'keys',
        name: 'updateKey',
        description: '/docs/references/projects/update-key.md',
        auth: [AuthType::ADMIN],
@@ -1685,7 +1640,6 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
    ->label('scope', 'keys.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'keys',
        name: 'deleteKey',
        description: '/docs/references/projects/delete-key.md',
        auth: [AuthType::ADMIN],
@@ -1733,7 +1687,6 @@ App::post('/v1/projects/:projectId/jwts')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'auth',
        name: 'createJWT',
        description: '/docs/references/projects/create-jwt.md',
        auth: [AuthType::ADMIN],
@@ -1777,7 +1730,6 @@ App::post('/v1/projects/:projectId/platforms')
    ->label('scope', 'platforms.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'platforms',
        name: 'createPlatform',
        description: '/docs/references/projects/create-platform.md',
        auth: [AuthType::ADMIN],
@@ -1834,7 +1786,6 @@ App::get('/v1/projects/:projectId/platforms')
    ->label('scope', 'platforms.read')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'platforms',
        name: 'listPlatforms',
        description: '/docs/references/projects/list-platforms.md',
        auth: [AuthType::ADMIN],
@@ -1873,7 +1824,6 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
    ->label('scope', 'platforms.read')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'platforms',
        name: 'getPlatform',
        description: '/docs/references/projects/get-platform.md',
        auth: [AuthType::ADMIN],
@@ -1914,7 +1864,6 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
    ->label('scope', 'platforms.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'platforms',
        name: 'updatePlatform',
        description: '/docs/references/projects/update-platform.md',
        auth: [AuthType::ADMIN],
@@ -1970,7 +1919,6 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
    ->label('scope', 'platforms.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'platforms',
        name: 'deletePlatform',
        description: '/docs/references/projects/delete-platform.md',
        auth: [AuthType::ADMIN],
@@ -2018,7 +1966,6 @@ App::patch('/v1/projects/:projectId/smtp')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'templates',
        name: 'updateSmtp',
        description: '/docs/references/projects/update-smtp.md',
        auth: [AuthType::ADMIN],
@@ -2115,7 +2062,6 @@ App::post('/v1/projects/:projectId/smtp/tests')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'templates',
        name: 'createSmtpTest',
        description: '/docs/references/projects/create-smtp-test.md',
        auth: [AuthType::ADMIN],
@@ -2182,7 +2128,6 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'templates',
        name: 'getSmsTemplate',
        description: '/docs/references/projects/get-sms-template.md',
        auth: [AuthType::ADMIN],
@@ -2230,7 +2175,6 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'templates',
        name: 'getEmailTemplate',
        description: '/docs/references/projects/get-email-template.md',
        auth: [AuthType::ADMIN],
@@ -2289,7 +2233,6 @@ App::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'templates',
        name: 'updateSmsTemplate',
        description: '/docs/references/projects/update-sms-template.md',
        auth: [AuthType::ADMIN],
@@ -2336,7 +2279,6 @@ App::patch('/v1/projects/:projectId/templates/email/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'templates',
        name: 'updateEmailTemplate',
        description: '/docs/references/projects/update-email-template.md',
        auth: [AuthType::ADMIN],
@@ -2393,7 +2335,6 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'templates',
        name: 'deleteSmsTemplate',
        description: '/docs/references/projects/delete-sms-template.md',
        auth: [AuthType::ADMIN],
@@ -2439,12 +2380,11 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
    });

 App::delete('/v1/projects/:projectId/templates/email/:type/:locale')
-    ->desc('Delete custom email template')
+    ->desc('Reset custom email template')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
    ->label('sdk', new Method(
        namespace: 'projects',
-        group: 'templates',
        name: 'deleteEmailTemplate',
        description: '/docs/references/projects/delete-email-template.md',
        auth: [AuthType::ADMIN],
@@ -15,169 +15,13 @@ use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Query as QueryException;
-use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Query\Cursor;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Domain;
 use Utopia\Logger\Log;
 use Utopia\System\System;
-use Utopia\Validator\Domain as ValidatorDomain;
 use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
-
-App::post('/v1/proxy/rules')
-    ->groups(['api', 'proxy'])
-    ->desc('Create rule')
-    ->label('scope', 'rules.write')
-    ->label('event', 'rules.[ruleId].create')
-    ->label('audits.event', 'rule.create')
-    ->label('audits.resource', 'rule/{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'proxy',
-        group: null,
-        name: 'createRule',
-        description: '/docs/references/proxy/create-rule.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_CREATED,
-                model: Response::MODEL_PROXY_RULE,
-            )
-        ]
-    ))
-    ->param('domain', null, new ValidatorDomain(), 'Domain name.')
-    ->param('resourceType', null, new WhiteList(['api', 'function']), 'Action definition for the rule. Possible values are "api", "function"')
-    ->param('resourceId', '', new UID(), 'ID of resource for the action type. If resourceType is "api", leave empty. If resourceType is "function", provide ID of the function.', true)
-    ->inject('response')
-    ->inject('project')
-    ->inject('queueForCertificates')
-    ->inject('queueForEvents')
-    ->inject('dbForPlatform')
-    ->inject('dbForProject')
-    ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject) {
-
-        $mainDomain = System::getEnv('_APP_DOMAIN', '');
-        if ($domain === $mainDomain) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your main domain to specific resource. Please use subdomain or a different domain.');
-        }
-
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS');
-        $denyListDomains = System::getEnv('_APP_CUSTOM_DOMAIN_DENY_LIST');
-
-        if (!empty($denyListDomains)) {
-            $functionsDomain .= ',' . $denyListDomains;
-        }
-
-        $deniedDomains = array_map('trim', explode(',', $functionsDomain));
-
-        foreach ($deniedDomains as $deniedDomain) {
-            if (str_ends_with($domain, $deniedDomain)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions domain or its subdomain to a specific resource. Please use a different domain.');
-            }
-        }
-
-        if ($domain === 'localhost' || $domain === APP_HOSTNAME_INTERNAL) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'This domain name is not allowed. Please pick another one.');
-        }
-
-        // TODO: @christyjacob remove once we migrate the rules in 1.7.x
-        if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-            $document = $dbForPlatform->getDocument('rules', md5($domain));
-        } else {
-            $document = $dbForPlatform->findOne('rules', [
-                Query::equal('domain', [$domain]),
-            ]);
-        }
-
-
-        if (!$document->isEmpty()) {
-            if ($document->getAttribute('projectId') === $project->getId()) {
-                $resourceType = $document->getAttribute('resourceType');
-                $resourceId = $document->getAttribute('resourceId');
-                $message = "Domain already assigned to '{$resourceType}' service";
-                if (!empty($resourceId)) {
-                    $message .= " with ID '{$resourceId}'";
-                }
-
-                $message .= '.';
-            } else {
-                $message = 'Domain already assigned to different project.';
-            }
-
-            throw new Exception(Exception::RULE_ALREADY_EXISTS, $message);
-        }
-
-        $resourceInternalId = '';
-
-        if ($resourceType == 'function') {
-            if (empty($resourceId)) {
-                throw new Exception(Exception::FUNCTION_NOT_FOUND);
-            }
-
-            $function = $dbForProject->getDocument('functions', $resourceId);
-
-            if ($function->isEmpty()) {
-                throw new Exception(Exception::RULE_RESOURCE_NOT_FOUND);
-            }
-
-            $resourceInternalId = $function->getInternalId();
-        }
-
-        try {
-            $domain = new Domain($domain);
-        } catch (\Throwable) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Domain may not start with http:// or https://.');
-        }
-
-        // TODO: @christyjacob remove once we migrate the rules in 1.7.x
-        $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique();
-
-        $rule = new Document([
-            '$id' => $ruleId,
-            'projectId' => $project->getId(),
-            'projectInternalId' => $project->getInternalId(),
-            'domain' => $domain->get(),
-            'resourceType' => $resourceType,
-            'resourceId' => $resourceId,
-            'resourceInternalId' => $resourceInternalId,
-            'certificateId' => '',
-            'owner' => '',
-            'region' => $project->getAttribute('region')
-        ]);
-
-        $status = 'created';
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS');
-        if (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) {
-            $status = 'verified';
-        }
-
-        if ($status === 'created') {
-            $target = new Domain(System::getEnv('_APP_DOMAIN_TARGET', ''));
-            $validator = new CNAME($target->get()); // Verify Domain with DNS records
-
-            if ($validator->isValid($domain->get())) {
-                $status = 'verifying';
-
-                $queueForCertificates
-                    ->setDomain(new Document([
-                        'domain' => $rule->getAttribute('domain')
-                    ]))
-                    ->trigger();
-            }
-        }
-
-        $rule->setAttribute('status', $status);
-        $rule = $dbForPlatform->createDocument('rules', $rule);
-
-        $queueForEvents->setParam('ruleId', $rule->getId());
-
-        $rule->setAttribute('logs', '');
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($rule, Response::MODEL_PROXY_RULE);
-    });

 App::get('/v1/proxy/rules')
    ->groups(['api', 'proxy'])
@@ -185,7 +29,6 @@ App::get('/v1/proxy/rules')
    ->label('scope', 'rules.read')
    ->label('sdk', new Method(
        namespace: 'proxy',
-        group: null,
        name: 'listRules',
        description: '/docs/references/proxy/list-rules.md',
        auth: [AuthType::ADMIN],
@@ -260,7 +103,6 @@ App::get('/v1/proxy/rules/:ruleId')
    ->label('scope', 'rules.read')
    ->label('sdk', new Method(
        namespace: 'proxy',
-        group: null,
        name: 'getRule',
        description: '/docs/references/proxy/get-rule.md',
        auth: [AuthType::ADMIN],
@@ -298,7 +140,6 @@ App::delete('/v1/proxy/rules/:ruleId')
    ->label('audits.resource', 'rule/{request.ruleId}')
    ->label('sdk', new Method(
        namespace: 'proxy',
-        group: null,
        name: 'deleteRule',
        description: '/docs/references/proxy/delete-rule.md',
        auth: [AuthType::ADMIN],
@@ -343,7 +184,6 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
    ->label('audits.resource', 'rule/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'proxy',
-        group: null,
        name: 'updateRuleVerification',
        description: '/docs/references/proxy/update-rule-verification.md',
        auth: [AuthType::ADMIN],
@@ -24,7 +24,6 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\NotFound as NotFoundException;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -63,7 +62,6 @@ App::post('/v1/storage/buckets')
    ->label('audits.resource', 'bucket/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'buckets',
        name: 'createBucket',
        description: '/docs/references/storage/create-bucket.md',
        auth: [AuthType::KEY],
@@ -166,7 +164,6 @@ App::get('/v1/storage/buckets')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'buckets',
        name: 'listBuckets',
        description: '/docs/references/storage/list-buckets.md',
        auth: [AuthType::KEY],
@@ -219,15 +216,10 @@ App::get('/v1/storage/buckets')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $buckets = $dbForProject->find('buckets', $queries);
-            $total = $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'buckets' => $buckets,
-            'total' => $total,
+            'buckets' => $dbForProject->find('buckets', $queries),
+            'total' => $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_BUCKET_LIST);
    });

@@ -238,7 +230,6 @@ App::get('/v1/storage/buckets/:bucketId')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'buckets',
        name: 'getBucket',
        description: '/docs/references/storage/get-bucket.md',
        auth: [AuthType::KEY],
@@ -273,7 +264,6 @@ App::put('/v1/storage/buckets/:bucketId')
    ->label('audits.resource', 'bucket/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'buckets',
        name: 'updateBucket',
        description: '/docs/references/storage/update-bucket.md',
        auth: [AuthType::KEY],
@@ -344,7 +334,6 @@ App::delete('/v1/storage/buckets/:bucketId')
    ->label('audits.resource', 'bucket/{request.bucketId}')
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'buckets',
        name: 'deleteBucket',
        description: '/docs/references/storage/delete-bucket.md',
        auth: [AuthType::KEY],
@@ -398,7 +387,6 @@ App::post('/v1/storage/buckets/:bucketId/files')
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'files',
        name: 'createFile',
        description: '/docs/references/storage/create-file.md',
        type: MethodType::UPLOAD,
@@ -768,7 +756,6 @@ App::get('/v1/storage/buckets/:bucketId/files')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'files',
        name: 'listFiles',
        description: '/docs/references/storage/list-files.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -850,8 +837,6 @@ App::get('/v1/storage/buckets/:bucketId/files')
            }
        } catch (NotFoundException) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
        }

        $response->dynamic(new Document([
@@ -868,7 +853,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'files',
        name: 'getFile',
        description: '/docs/references/storage/get-file.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -925,7 +909,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->label('cache.resource', 'file/{request.fileId}')
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'files',
        name: 'getFilePreview',
        description: '/docs/references/storage/get-file-preview.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1108,7 +1091,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'files',
        name: 'getFileDownload',
        description: '/docs/references/storage/get-file-download.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1257,7 +1239,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'files',
        name: 'getFileView',
        description: '/docs/references/storage/get-file-view.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1415,6 +1396,9 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
    ->groups(['api', 'storage'])
    ->label('scope', 'public')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', '*/*')
+    ->label('sdk.methodType', 'location')
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
    ->param('jwt', '', new Text(2048, 0), 'JSON Web Token to validate', true)
@@ -1575,7 +1559,6 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'files',
        name: 'updateFile',
        description: '/docs/references/storage/update-file.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1690,7 +1673,6 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: 'files',
        name: 'deleteFile',
        description: '/docs/references/storage/delete-file.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1790,7 +1772,6 @@ App::get('/v1/storage/usage')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: null,
        name: 'getUsage',
        description: '/docs/references/storage/get-usage.md',
        auth: [AuthType::ADMIN],
@@ -1877,7 +1858,6 @@ App::get('/v1/storage/:bucketId/usage')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
    ->label('sdk', new Method(
        namespace: 'storage',
-        group: null,
        name: 'getBucketUsage',
        description: '/docs/references/storage/get-bucket-usage.md',
        auth: [AuthType::ADMIN],
@@ -33,7 +33,6 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -63,7 +62,6 @@ App::post('/v1/teams')
    ->label('audits.resource', 'team/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'teams',
        name: 'create',
        description: '/docs/references/teams/create-team.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -154,7 +152,6 @@ App::get('/v1/teams')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'teams',
        name: 'list',
        description: '/docs/references/teams/list-teams.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -207,12 +204,9 @@ App::get('/v1/teams')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $results = $dbForProject->find('teams', $queries);
-            $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
+        $results = $dbForProject->find('teams', $queries);
+        $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);

        $response->dynamic(new Document([
            'teams' => $results,
@@ -226,7 +220,6 @@ App::get('/v1/teams/:teamId')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'teams',
        name: 'get',
        description: '/docs/references/teams/get-team.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -257,7 +250,6 @@ App::get('/v1/teams/:teamId/prefs')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'teams',
        name: 'getPrefs',
        description: '/docs/references/teams/get-team-prefs.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -293,7 +285,6 @@ App::put('/v1/teams/:teamId')
    ->label('audits.resource', 'team/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'teams',
        name: 'updateName',
        description: '/docs/references/teams/update-team-name.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -341,7 +332,6 @@ App::put('/v1/teams/:teamId/prefs')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'teams',
        name: 'updatePrefs',
        description: '/docs/references/teams/update-team-prefs.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -381,7 +371,6 @@ App::delete('/v1/teams/:teamId')
    ->label('audits.resource', 'team/{request.teamId}')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'teams',
        name: 'delete',
        description: '/docs/references/teams/delete-team.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -440,7 +429,6 @@ App::post('/v1/teams/:teamId/memberships')
    ->label('audits.userId', '{request.userId}')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'memberships',
        name: 'createMembership',
        description: '/docs/references/teams/create-team-membership.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -627,10 +615,7 @@ App::post('/v1/teams/:teamId/memberships')
            $membership = ($isPrivilegedUser || $isAppUser) ?
                Authorization::skip(fn () => $dbForProject->createDocument('memberships', $membership)) :
                $dbForProject->createDocument('memberships', $membership);
-
-            if ($isPrivilegedUser || $isAppUser) {
-                Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
-            }
+            Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));

        } elseif ($membership->getAttribute('confirm') === false) {
            $membership->setAttribute('secret', Auth::hash($secret));
@@ -808,7 +793,6 @@ App::get('/v1/teams/:teamId/memberships')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'memberships',
        name: 'listMemberships',
        description: '/docs/references/teams/list-team-members.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -872,20 +856,17 @@ App::get('/v1/teams/:teamId/memberships')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $memberships = $dbForProject->find(
-                collection: 'memberships',
-                queries: $queries,
-            );
-            $total = $dbForProject->count(
-                collection: 'memberships',
-                queries: $filterQueries,
-                max: APP_LIMIT_COUNT
-            );
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }

+        $memberships = $dbForProject->find(
+            collection: 'memberships',
+            queries: $queries,
+        );
+
+        $total = $dbForProject->count(
+            collection: 'memberships',
+            queries: $filterQueries,
+            max: APP_LIMIT_COUNT
+        );

        $memberships = array_filter($memberships, fn (Document $membership) => !empty($membership->getAttribute('userId')));

@@ -950,7 +931,6 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'memberships',
        name: 'getMembership',
        description: '/docs/references/teams/get-team-member.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1037,7 +1017,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->label('audits.resource', 'team/{request.teamId}')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'memberships',
        name: 'updateMembership',
        description: '/docs/references/teams/update-team-membership.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1052,6 +1031,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->param('membershipId', '', new UID(), 'Membership ID.')
    ->param('roles', [], function (Document $project) {
        if ($project->getId() === 'console') {
+            ;
            $roles = array_keys(Config::getParam('roles', []));
            array_filter($roles, function ($role) {
                return !in_array($role, [Auth::USER_ROLE_APPS, Auth::USER_ROLE_GUESTS, Auth::USER_ROLE_USERS]);
@@ -1063,10 +1043,9 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->inject('request')
    ->inject('response')
    ->inject('user')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents) {
+    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $team = $dbForProject->getDocument('teams', $teamId);
        if ($team->isEmpty()) {
@@ -1087,21 +1066,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
        $isAppUser = Auth::isAppUser(Authorization::getRoles());
        $isOwner = Authorization::isRole('team:' . $team->getId() . '/owner');

-        if ($project->getId() === 'console') {
-            // Quick check: fetch up to 2 owners to determine if only one exists
-            $ownersCount = $dbForProject->count(
-                collection: 'memberships',
-                queries: [Query::contains('roles', ['owner'])],
-                max: 2
-            );
-
-            // Prevent role change if there's only one owner left,
-            // the requester is that owner, and the new `$roles` no longer include 'owner'!
-            if ($ownersCount === 1 && $isOwner && !\in_array('owner', $roles)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'There must be at least one owner in the organization.');
-            }
-        }
-
        if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
            throw new Exception(Exception::USER_UNAUTHORIZED, 'User is not allowed to modify roles');
        }
@@ -1141,7 +1105,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
    ->label('audits.userId', '{request.userId}')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'memberships',
        name: 'updateMembershipStatus',
        description: '/docs/references/teams/update-team-membership-status.md',
        auth: [AuthType::SESSION, AuthType::JWT],
@@ -1299,7 +1262,6 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
    ->label('audits.resource', 'team/{request.teamId}')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'memberships',
        name: 'deleteMembership',
        description: '/docs/references/teams/delete-team-membership.md',
        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1370,7 +1332,6 @@ App::get('/v1/teams/:teamId/logs')
    ->label('scope', 'teams.read')
    ->label('sdk', new Method(
        namespace: 'teams',
-        group: 'logs',
        name: 'listLogs',
        description: '/docs/references/teams/get-team-logs.md',
        auth: [AuthType::ADMIN],
@@ -33,7 +33,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -192,7 +191,6 @@ App::post('/v1/users')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'create',
        description: '/docs/references/users/create-user.md',
        auth: [AuthType::KEY],
@@ -227,7 +225,6 @@ App::post('/v1/users/bcrypt')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'createBcryptUser',
        description: '/docs/references/users/create-bcrypt-user.md',
        auth: [AuthType::KEY],
@@ -262,7 +259,6 @@ App::post('/v1/users/md5')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'createMD5User',
        description: '/docs/references/users/create-md5-user.md',
        auth: [AuthType::KEY],
@@ -297,7 +293,6 @@ App::post('/v1/users/argon2')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'createArgon2User',
        description: '/docs/references/users/create-argon2-user.md',
        auth: [AuthType::KEY],
@@ -332,7 +327,6 @@ App::post('/v1/users/sha')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'createSHAUser',
        description: '/docs/references/users/create-sha-user.md',
        auth: [AuthType::KEY],
@@ -374,7 +368,6 @@ App::post('/v1/users/phpass')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'createPHPassUser',
        description: '/docs/references/users/create-phpass-user.md',
        auth: [AuthType::KEY],
@@ -409,7 +402,6 @@ App::post('/v1/users/scrypt')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'createScryptUser',
        description: '/docs/references/users/create-scrypt-user.md',
        auth: [AuthType::KEY],
@@ -457,7 +449,6 @@ App::post('/v1/users/scrypt-modified')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'createScryptModifiedUser',
        description: '/docs/references/users/create-scrypt-modified-user.md',
        auth: [AuthType::KEY],
@@ -496,7 +487,6 @@ App::post('/v1/users/:userId/targets')
    ->label('scope', 'targets.write')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'targets',
        name: 'createTarget',
        description: '/docs/references/users/create-target.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -588,7 +578,6 @@ App::get('/v1/users')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'list',
        description: '/docs/references/users/list-users.md',
        auth: [AuthType::KEY],
@@ -641,15 +630,10 @@ App::get('/v1/users')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $users = $dbForProject->find('users', $queries);
-            $total = $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'users' => $users,
-            'total' => $total,
+            'users' => $dbForProject->find('users', $queries),
+            'total' => $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_USER_LIST);
    });

@@ -659,7 +643,6 @@ App::get('/v1/users/:userId')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'get',
        description: '/docs/references/users/get-user.md',
        auth: [AuthType::KEY],
@@ -690,7 +673,6 @@ App::get('/v1/users/:userId/prefs')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'getPrefs',
        description: '/docs/references/users/get-user-prefs.md',
        auth: [AuthType::KEY],
@@ -723,7 +705,6 @@ App::get('/v1/users/:userId/targets/:targetId')
    ->label('scope', 'targets.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'targets',
        name: 'getTarget',
        description: '/docs/references/users/get-user-target.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -761,7 +742,6 @@ App::get('/v1/users/:userId/sessions')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'sessions',
        name: 'listSessions',
        description: '/docs/references/users/list-user-sessions.md',
        auth: [AuthType::KEY],
@@ -808,7 +788,6 @@ App::get('/v1/users/:userId/memberships')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'memberships',
        name: 'listMemberships',
        description: '/docs/references/users/list-user-memberships.md',
        auth: [AuthType::KEY],
@@ -853,7 +832,6 @@ App::get('/v1/users/:userId/logs')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'logs',
        name: 'listLogs',
        description: '/docs/references/users/list-user-logs.md',
        auth: [AuthType::KEY],
@@ -950,7 +928,6 @@ App::get('/v1/users/:userId/targets')
    ->label('scope', 'targets.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'targets',
        name: 'listTargets',
        description: '/docs/references/users/list-user-targets.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -1003,15 +980,10 @@ App::get('/v1/users/:userId/targets')

            $cursor->setValue($cursorDocument);
        }
-        try {
-            $targets = $dbForProject->find('targets', $queries);
-            $total = $dbForProject->count('targets', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'targets' => $targets,
-            'total' => $total,
+            'targets' => $dbForProject->find('targets', $queries),
+            'total' => $dbForProject->count('targets', $queries, APP_LIMIT_COUNT),
        ]), Response::MODEL_TARGET_LIST);
    });

@@ -1021,7 +993,6 @@ App::get('/v1/users/identities')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'identities',
        name: 'listIdentities',
        description: '/docs/references/users/list-identities.md',
        auth: [AuthType::KEY],
@@ -1074,15 +1045,10 @@ App::get('/v1/users/identities')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $identities = $dbForProject->find('identities', $queries);
-            $total = $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'identities' => $identities,
-            'total' => $total,
+            'identities' => $dbForProject->find('identities', $queries),
+            'total' => $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_IDENTITY_LIST);
    });

@@ -1096,7 +1062,6 @@ App::patch('/v1/users/:userId/status')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updateStatus',
        description: '/docs/references/users/update-user-status.md',
        auth: [AuthType::KEY],
@@ -1137,7 +1102,6 @@ App::put('/v1/users/:userId/labels')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updateLabels',
        description: '/docs/references/users/update-user-labels.md',
        auth: [AuthType::KEY],
@@ -1180,7 +1144,6 @@ App::patch('/v1/users/:userId/verification/phone')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updatePhoneVerification',
        description: '/docs/references/users/update-user-phone-verification.md',
        auth: [AuthType::KEY],
@@ -1222,7 +1185,6 @@ App::patch('/v1/users/:userId/name')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updateName',
        description: '/docs/references/users/update-user-name.md',
        auth: [AuthType::KEY],
@@ -1265,7 +1227,6 @@ App::patch('/v1/users/:userId/password')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updatePassword',
        description: '/docs/references/users/update-user-password.md',
        auth: [AuthType::KEY],
@@ -1348,7 +1309,6 @@ App::patch('/v1/users/:userId/email')
    ->label('audits.userId', '{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updateEmail',
        description: '/docs/references/users/update-user-email.md',
        auth: [AuthType::KEY],
@@ -1448,7 +1408,6 @@ App::patch('/v1/users/:userId/phone')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updatePhone',
        description: '/docs/references/users/update-user-phone.md',
        auth: [AuthType::KEY],
@@ -1538,7 +1497,6 @@ App::patch('/v1/users/:userId/verification')
    ->label('audits.userId', '{request.userId}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updateEmailVerification',
        description: '/docs/references/users/update-user-email-verification.md',
        auth: [AuthType::KEY],
@@ -1576,7 +1534,6 @@ App::patch('/v1/users/:userId/prefs')
    ->label('scope', 'users.write')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updatePrefs',
        description: '/docs/references/users/update-user-prefs.md',
        auth: [AuthType::KEY],
@@ -1617,7 +1574,6 @@ App::patch('/v1/users/:userId/targets/:targetId')
    ->label('scope', 'targets.write')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'targets',
        name: 'updateTarget',
        description: '/docs/references/users/update-target.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -1722,7 +1678,6 @@ App::patch('/v1/users/:userId/mfa')
    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'updateMfa',
        description: '/docs/references/users/update-user-mfa.md',
        auth: [AuthType::KEY],
@@ -1762,7 +1717,6 @@ App::get('/v1/users/:userId/mfa/factors')
    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'mfa',
        name: 'listMfaFactors',
        description: '/docs/references/users/list-mfa-factors.md',
        auth: [AuthType::KEY],
@@ -1801,7 +1755,6 @@ App::get('/v1/users/:userId/mfa/recovery-codes')
    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'mfa',
        name: 'getMfaRecoveryCodes',
        description: '/docs/references/users/get-mfa-recovery-codes.md',
        auth: [AuthType::KEY],
@@ -1846,7 +1799,6 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'mfa',
        name: 'createMfaRecoveryCodes',
        description: '/docs/references/users/create-mfa-recovery-codes.md',
        auth: [AuthType::KEY],
@@ -1888,7 +1840,7 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
    });

 App::put('/v1/users/:userId/mfa/recovery-codes')
-    ->desc('Update MFA recovery codes (regenerate)')
+    ->desc('Regenerate MFA recovery codes')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.mfa.recovery-codes')
    ->label('scope', 'users.write')
@@ -1898,7 +1850,6 @@ App::put('/v1/users/:userId/mfa/recovery-codes')
    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'mfa',
        name: 'updateMfaRecoveryCodes',
        description: '/docs/references/users/update-mfa-recovery-codes.md',
        auth: [AuthType::KEY],
@@ -1949,7 +1900,6 @@ App::delete('/v1/users/:userId/mfa/authenticators/:type')
    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'mfa',
        name: 'deleteMfaAuthenticator',
        description: '/docs/references/users/delete-mfa-authenticator.md',
        auth: [AuthType::KEY],
@@ -1997,7 +1947,6 @@ App::post('/v1/users/:userId/sessions')
    ->label('usage.metric', 'sessions.{scope}.requests.create')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'sessions',
        name: 'createSession',
        description: '/docs/references/users/create-session.md',
        auth: [AuthType::KEY],
@@ -2082,7 +2031,6 @@ App::post('/v1/users/:userId/tokens')
    ->label('audits.resource', 'user/{request.userId}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'sessions',
        name: 'createToken',
        description: '/docs/references/users/create-token.md',
        auth: [AuthType::KEY],
@@ -2145,7 +2093,6 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
    ->label('audits.resource', 'user/{request.userId}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'sessions',
        name: 'deleteSession',
        description: '/docs/references/users/delete-user-session.md',
        auth: [AuthType::KEY],
@@ -2196,7 +2143,6 @@ App::delete('/v1/users/:userId/sessions')
    ->label('audits.resource', 'user/{user.$id}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'sessions',
        name: 'deleteSessions',
        description: '/docs/references/users/delete-user-sessions.md',
        auth: [AuthType::KEY],
@@ -2246,7 +2192,6 @@ App::delete('/v1/users/:userId')
    ->label('audits.resource', 'user/{request.userId}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'users',
        name: 'delete',
        description: '/docs/references/users/delete.md',
        auth: [AuthType::KEY],
@@ -2296,7 +2241,6 @@ App::delete('/v1/users/:userId/targets/:targetId')
    ->label('scope', 'targets.write')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'targets',
        name: 'deleteTarget',
        description: '/docs/references/users/delete-target.md',
        auth: [AuthType::KEY, AuthType::ADMIN],
@@ -2354,7 +2298,6 @@ App::delete('/v1/users/identities/:identityId')
    ->label('audits.resource', 'identity/{request.$identityId}')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'identities',
        name: 'deleteIdentity',
        description: '/docs/references/users/delete-identity.md',
        auth: [AuthType::KEY],
@@ -2394,7 +2337,6 @@ App::post('/v1/users/:userId/jwts')
    ->label('scope', 'users.write')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: 'sessions',
        name: 'createJWT',
        description: '/docs/references/users/create-user-jwt.md',
        auth: [AuthType::KEY],
@@ -2450,7 +2392,6 @@ App::get('/v1/users/usage')
    ->label('scope', 'users.read')
    ->label('sdk', new Method(
        namespace: 'users',
-        group: null,
        name: 'getUsage',
        description: '/docs/references/users/get-usage.md',
        auth: [AuthType::ADMIN],
@@ -14,12 +14,11 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Appwrite\Vcs\Comment;
 use Utopia\App;
-use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Order as OrderException;
+use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -27,22 +26,35 @@ use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Query\Cursor;
-use Utopia\Detector\Adapter\Bun;
-use Utopia\Detector\Adapter\CPP;
-use Utopia\Detector\Adapter\Dart;
-use Utopia\Detector\Adapter\Deno;
-use Utopia\Detector\Adapter\Dotnet;
-use Utopia\Detector\Adapter\Java;
-use Utopia\Detector\Adapter\JavaScript;
-use Utopia\Detector\Adapter\PHP;
-use Utopia\Detector\Adapter\Python;
-use Utopia\Detector\Adapter\Ruby;
-use Utopia\Detector\Adapter\Swift;
-use Utopia\Detector\Detector;
+use Utopia\Detector\Detection\Framework\Astro;
+use Utopia\Detector\Detection\Framework\Flutter;
+use Utopia\Detector\Detection\Framework\NextJs;
+use Utopia\Detector\Detection\Framework\Nuxt;
+use Utopia\Detector\Detection\Framework\Remix;
+use Utopia\Detector\Detection\Framework\SvelteKit;
+use Utopia\Detector\Detection\Packager\NPM;
+use Utopia\Detector\Detection\Packager\PNPM;
+use Utopia\Detector\Detection\Packager\Yarn;
+use Utopia\Detector\Detection\Runtime\Bun;
+use Utopia\Detector\Detection\Runtime\CPP;
+use Utopia\Detector\Detection\Runtime\Dart;
+use Utopia\Detector\Detection\Runtime\Deno;
+use Utopia\Detector\Detection\Runtime\Dotnet;
+use Utopia\Detector\Detection\Runtime\Java;
+use Utopia\Detector\Detection\Runtime\Node;
+use Utopia\Detector\Detection\Runtime\PHP;
+use Utopia\Detector\Detection\Runtime\Python;
+use Utopia\Detector\Detection\Runtime\Ruby;
+use Utopia\Detector\Detection\Runtime\Swift;
+use Utopia\Detector\Detector\Framework;
+use Utopia\Detector\Detector\Packager;
+use Utopia\Detector\Detector\Runtime;
+use Utopia\Detector\Detector\Strategy;
 use Utopia\System\System;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Host;
 use Utopia\Validator\Text;
+use Utopia\Validator\WhiteList;
 use Utopia\VCS\Adapter\Git\GitHub;
 use Utopia\VCS\Exception\RepositoryNotFound;

@@ -50,29 +62,30 @@ use function Swoole\Coroutine\batch;

 $createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForPlatform, Build $queueForBuilds, callable $getProjectDB, Request $request) {
    $errors = [];
-    foreach ($repositories as $resource) {
+    foreach ($repositories as $repository) {
        try {
-            $resourceType = $resource->getAttribute('resourceType');
+            $resourceType = $repository->getAttribute('resourceType');

-            if ($resourceType !== "function") {
+            if ($resourceType !== "function" && $resourceType !== "site") {
                continue;
            }

-            $projectId = $resource->getAttribute('projectId');
+            $projectId = $repository->getAttribute('projectId');
            $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
            $dbForProject = $getProjectDB($project);

-            $functionId = $resource->getAttribute('resourceId');
-            $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
-            $functionInternalId = $function->getInternalId();
+            $resourceCollection = $resourceType === "function" ? 'functions' : 'sites';
+            $resourceId = $repository->getAttribute('resourceId');
+            $resource = Authorization::skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
+            $resourceInternalId = $resource->getInternalId();

            $deploymentId = ID::unique();
-            $repositoryId = $resource->getId();
-            $repositoryInternalId = $resource->getInternalId();
-            $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
-            $installationId = $resource->getAttribute('installationId');
-            $installationInternalId = $resource->getAttribute('installationInternalId');
-            $productionBranch = $function->getAttribute('providerBranch');
+            $repositoryId = $repository->getId();
+            $repositoryInternalId = $repository->getInternalId();
+            $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+            $installationId = $repository->getAttribute('installationId');
+            $installationInternalId = $repository->getAttribute('installationInternalId');
+            $productionBranch = $resource->getAttribute('providerBranch');
            $activate = false;

            if ($providerBranch == $productionBranch && $external === false) {
@@ -96,7 +109,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
            $isAuthorized = !$external;

            if (!$isAuthorized && !empty($providerPullRequestId)) {
-                if (\in_array($providerPullRequestId, $resource->getAttribute('providerPullRequestIds', []))) {
+                if (\in_array($providerPullRequestId, $repository->getAttribute('providerPullRequestIds', []))) {
                    $isAuthorized = true;
                }
            }
@@ -109,7 +122,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId

            $latestCommentId = '';

-            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
+            if (!empty($providerPullRequestId) && $resource->getAttribute('providerSilentMode', false) === false) {
                $latestComment = Authorization::skip(fn () => $dbForPlatform->findOne('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
@@ -118,14 +131,15 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId

                if (!$latestComment->isEmpty()) {
                    $latestCommentId = $latestComment->getAttribute('providerCommentId', '');
+
                    $comment = new Comment();
                    $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
+                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');

                    $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                } else {
                    $comment = new Comment();
-                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
+                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');
                    $latestCommentId = \strval($github->createComment($owner, $repositoryName, $providerPullRequestId, $comment->generateComment()));

                    if (!empty($latestCommentId)) {
@@ -162,19 +176,19 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    $latestCommentId = $comment->getAttribute('providerCommentId', '');
                    $comment = new Comment();
                    $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
+                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');

                    $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                }
            }

            if (!$isAuthorized) {
-                $functionName = $function->getAttribute('name');
+                $resourceName = $resource->getAttribute('name');
                $projectName = $project->getAttribute('name');
-                $name = "{$functionName} ({$projectName})";
+                $name = "{$resourceName} ({$projectName})";
                $message = 'Authorization required for external contributor.';

-                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
                try {
                    $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                    if (empty($repositoryName)) {
@@ -194,6 +208,17 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                $providerRepositoryOwner = $pullRequestResponse['head']['repo']['name'];
            }

+            $commands = [];
+            if (!empty($resource->getAttribute('installCommand', ''))) {
+                $commands[] = $resource->getAttribute('installCommand', '');
+            }
+            if (!empty($resource->getAttribute('buildCommand', ''))) {
+                $commands[] = $resource->getAttribute('buildCommand', '');
+            }
+            if (!empty($resource->getAttribute('commands', ''))) {
+                $commands[] = $resource->getAttribute('commands', '');
+            }
+
            $deployment = $dbForProject->createDocument('deployments', new Document([
                '$id' => $deploymentId,
                '$permissions' => [
@@ -201,11 +226,14 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    Permission::update(Role::any()),
                    Permission::delete(Role::any()),
                ],
-                'resourceId' => $functionId,
-                'resourceInternalId' => $functionInternalId,
-                'resourceType' => 'functions',
-                'entrypoint' => $function->getAttribute('entrypoint'),
-                'commands' => $function->getAttribute('commands'),
+                'resourceId' => $resourceId,
+                'resourceInternalId' => $resourceInternalId,
+                'resourceType' => $resourceCollection,
+                'entrypoint' => $resource->getAttribute('entrypoint', ''),
+                'buildCommands' => \implode(' && ', $commands),
+                'buildOutput' => $resource->getAttribute('outputDirectory', ''),
+                'adapter' => $resource->getAttribute('adapter', ''),
+                'fallbackFile' => $resource->getAttribute('fallbackFile', ''),
                'type' => 'vcs',
                'installationId' => $installationId,
                'installationInternalId' => $installationInternalId,
@@ -219,21 +247,120 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                'providerCommitHash' => $providerCommitHash,
                'providerCommitAuthorUrl' => $providerCommitAuthorUrl,
                'providerCommitAuthor' => $providerCommitAuthor,
-                'providerCommitMessage' => $providerCommitMessage,
+                'providerCommitMessage' => mb_strimwidth($providerCommitMessage, 0, 255, '...'),
                'providerCommitUrl' => $providerCommitUrl,
                'providerCommentId' => \strval($latestCommentId),
                'providerBranch' => $providerBranch,
-                'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
+                'search' => implode(' ', [$deploymentId, $resource->getAttribute('entrypoint', '')]),
                'activate' => $activate,
            ]));

-            if (!empty($providerCommitHash) && $function->getAttribute('providerSilentMode', false) === false) {
-                $functionName = $function->getAttribute('name');
+            $resource = $resource
+                ->setAttribute('latestDeploymentId', $deployment->getId())
+                ->setAttribute('latestDeploymentInternalId', $deployment->getInternalId())
+                ->setAttribute('latestDeploymentCreatedAt', $deployment->getCreatedAt())
+                ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
+            $dbForProject->updateDocument($resource->getCollection(), $resource->getId(), $resource);
+
+            if ($resource->getCollection() === 'sites') {
+                $projectId = $project->getId();
+
+                // Deployment preview
+                $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
+                $domain = ID::unique() . "." . $sitesDomain;
+                $ruleId = md5($domain);
+                Authorization::skip(
+                    fn () => $dbForPlatform->createDocument('rules', new Document([
+                        '$id' => $ruleId,
+                        'projectId' => $project->getId(),
+                        'projectInternalId' => $project->getInternalId(),
+                        'domain' => $domain,
+                        'type' => 'deployment',
+                        'trigger' => 'deployment',
+                        'deploymentId' => $deployment->getId(),
+                        'deploymentInternalId' => $deployment->getInternalId(),
+                        'deploymentResourceType' => 'site',
+                        'deploymentResourceId' => $resourceId,
+                        'deploymentResourceInternalId' => $resourceInternalId,
+                        'deploymentVcsProviderBranch' => $providerBranch,
+                        'status' => 'verified',
+                        'certificateId' => '',
+                        'search' => implode(' ', [$ruleId, $domain]),
+                        'owner' => 'Appwrite',
+                        'region' => $project->getAttribute('region')
+                    ]))
+                );
+
+                // VCS branch preview
+                if (!empty($providerBranch)) {
+                    $domain = "branch-{$providerBranch}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
+                    $ruleId = md5($domain);
+                    try {
+                        Authorization::skip(
+                            fn () => $dbForPlatform->createDocument('rules', new Document([
+                                '$id' => $ruleId,
+                                'projectId' => $project->getId(),
+                                'projectInternalId' => $project->getInternalId(),
+                                'domain' => $domain,
+                                'type' => 'deployment',
+                                'trigger' => 'deployment',
+                                'deploymentId' => $deployment->getId(),
+                                'deploymentInternalId' => $deployment->getInternalId(),
+                                'deploymentResourceType' => 'site',
+                                'deploymentResourceId' => $resourceId,
+                                'deploymentResourceInternalId' => $resourceInternalId,
+                                'deploymentVcsProviderBranch' => $providerBranch,
+                                'status' => 'verified',
+                                'certificateId' => '',
+                                'search' => implode(' ', [$ruleId, $domain]),
+                                'owner' => 'Appwrite',
+                                'region' => $project->getAttribute('region')
+                            ]))
+                        );
+                    } catch (Duplicate $err) {
+                        // Ignore, rule already exists; will be updated by builds worker
+                    }
+                }
+
+                // VCS commit preview
+                if (!empty($providerCommitHash)) {
+                    $domain = "commit-{$providerCommitHash}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
+                    $ruleId = md5($domain);
+                    try {
+                        Authorization::skip(
+                            fn () => $dbForPlatform->createDocument('rules', new Document([
+                                '$id' => $ruleId,
+                                'projectId' => $project->getId(),
+                                'projectInternalId' => $project->getInternalId(),
+                                'domain' => $domain,
+                                'type' => 'deployment',
+                                'trigger' => 'deployment',
+                                'deploymentId' => $deployment->getId(),
+                                'deploymentInternalId' => $deployment->getInternalId(),
+                                'deploymentResourceType' => 'site',
+                                'deploymentResourceId' => $resourceId,
+                                'deploymentResourceInternalId' => $resourceInternalId,
+                                'deploymentVcsProviderBranch' => $providerBranch,
+                                'status' => 'verified',
+                                'certificateId' => '',
+                                'search' => implode(' ', [$ruleId, $domain]),
+                                'owner' => 'Appwrite',
+                                'region' => $project->getAttribute('region')
+                            ]))
+                        );
+                    } catch (Duplicate $err) {
+                        // Ignore, rule already exists; will be updated by builds worker
+                    }
+                }
+            }
+
+            if (!empty($providerCommitHash) && $resource->getAttribute('providerSilentMode', false) === false) {
+                $resourceName = $resource->getAttribute('name');
                $projectName = $project->getAttribute('name');
-                $name = "{$functionName} ({$projectName})";
+                $name = "{$resourceName} ({$projectName})";
                $message = 'Starting...';

-                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
                try {
                    $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                    if (empty($repositoryName)) {
@@ -244,17 +371,17 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                }
                $owner = $github->getOwnerName($providerInstallationId);

-                $providerTargetUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/functions/function-$functionId";
+                $providerTargetUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/$resourceCollection/$resourceType-$resourceId";
                $github->updateCommitStatus($repositoryName, $providerCommitHash, $owner, 'pending', $message, $providerTargetUrl, $name);
            }

            $queueForBuilds
                ->setType(BUILD_TYPE_DEPLOYMENT)
-                ->setResource($function)
+                ->setResource($resource)
                ->setDeployment($deployment)
                ->setProject($project); // set the project because it won't be set for git deployments

-            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function
+            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function/site

            //TODO: Add event?
        } catch (Throwable $e) {
@@ -270,13 +397,12 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 };

 App::get('/v1/vcs/github/authorize')
-    ->desc('Create GitHub app installation')
+    ->desc('Install GitHub app')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'installations',
        name: 'createGitHubInstallation',
        description: '/docs/references/vcs/create-github-installation.md',
        auth: [AuthType::ADMIN],
@@ -320,7 +446,7 @@ App::get('/v1/vcs/github/authorize')
    });

 App::get('/v1/vcs/github/callback')
-    ->desc('Get installation and authorization from GitHub app')
+    ->desc('Capture installation and authorization from GitHub app')
    ->groups(['api', 'vcs'])
    ->label('scope', 'public')
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
@@ -458,7 +584,6 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'repositories',
        name: 'getRepositoryContents',
        description: '/docs/references/vcs/get-repository-contents.md',
        auth: [AuthType::ADMIN],
@@ -519,31 +644,35 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
        ]), Response::MODEL_VCS_CONTENT_LIST);
    });

-App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
-    ->desc('Create runtime settings detection')
+App::post('/v1/vcs/github/installations/:installationId/detections')
+    ->alias('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
+    ->desc('Create repository detection')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'repositories',
        name: 'createRepositoryDetection',
        description: '/docs/references/vcs/create-repository-detection.md',
        auth: [AuthType::ADMIN],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_DETECTION,
+                model: Response::MODEL_DETECTION_RUNTIME,
+            ),
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_DETECTION_FRAMEWORK,
            )
        ]
    ))
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->param('providerRepositoryId', '', new Text(256), 'Repository Id')
+    ->param('type', '', new WhiteList(['runtime', 'framework']), 'Detector type. Must be one of the following: runtime, framework')
    ->param('providerRootDirectory', '', new Text(256, 0), 'Path to Root Directory', true)
    ->inject('gitHub')
    ->inject('response')
-    ->inject('project')
    ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $providerRepositoryId, string $providerRootDirectory, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
+    ->action(function (string $installationId, string $providerRepositoryId, string $type, string $providerRootDirectory, GitHub $github, Response $response, Database $dbForPlatform) {
        $installation = $dbForPlatform->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
@@ -569,32 +698,108 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:pr
        $files = \array_column($files, 'name');
        $languages = $github->listRepositoryLanguages($owner, $repositoryName);

-        $detectorFactory = new Detector($files, $languages);
+        $detector = new Packager($files);
+        $detector
+            ->addOption(new Yarn())
+            ->addOption(new PNPM())
+            ->addOption(new NPM());
+        $detection = $detector->detect();

-        $detectorFactory
-            ->addDetector(new JavaScript())
-            ->addDetector(new Bun())
-            ->addDetector(new PHP())
-            ->addDetector(new Python())
-            ->addDetector(new Dart())
-            ->addDetector(new Swift())
-            ->addDetector(new Ruby())
-            ->addDetector(new Java())
-            ->addDetector(new CPP())
-            ->addDetector(new Deno())
-            ->addDetector(new Dotnet());
+        $packager = !\is_null($detection) ? $detection->getName() : 'npm';

-        $runtime = $detectorFactory->detect();
+        if ($type === 'framework') {
+            $output = new Document([
+                'framework' => '',
+                'installCommand' => '',
+                'buildCommand' => '',
+                'outputDirectory' => '',
+            ]);

-        $runtimes = Config::getParam('runtimes');
-        $runtimeDetail = \array_reverse(\array_filter(\array_keys($runtimes), function ($key) use ($runtime, $runtimes) {
-            return $runtimes[$key]['key'] === $runtime;
-        }))[0] ?? '';
+            $detector = new Framework($files, $packager);
+            $detector
+                ->addOption(new Flutter())
+                ->addOption(new Nuxt())
+                ->addOption(new Astro())
+                ->addOption(new SvelteKit())
+                ->addOption(new NextJs())
+                ->addOption(new Remix());

-        $detection = [];
-        $detection['runtime'] = $runtimeDetail;
+            $framework = $detector->detect();

-        $response->dynamic(new Document($detection), Response::MODEL_DETECTION);
+            if (!\is_null($framework)) {
+                $output->setAttribute('installCommand', $framework->getInstallCommand());
+                $output->setAttribute('buildCommand', $framework->getBuildCommand());
+                $output->setAttribute('outputDirectory', $framework->getOutputDirectory());
+                $framework = $framework->getName();
+            } else {
+                $framework = 'other';
+                $output->setAttribute('installCommand', '');
+                $output->setAttribute('buildCommand', '');
+                $output->setAttribute('outputDirectory', '');
+            }
+
+            $frameworks = Config::getParam('frameworks');
+            if (!\in_array($framework, \array_keys($frameworks), true)) {
+                $framework = 'other';
+            }
+            $output->setAttribute('framework', $framework);
+        } else {
+            $output = new Document([
+                'runtime' => '',
+                'commands' => '',
+                'entrypoint' => '',
+            ]);
+
+            $strategies = [
+                new Strategy(Strategy::FILEMATCH),
+                new Strategy(Strategy::LANGUAGES),
+                new Strategy(Strategy::EXTENSION),
+            ];
+
+            foreach ($strategies as $strategy) {
+                $detector = new Runtime($strategy === Strategy::LANGUAGES ? $languages : $files, $strategy, $packager);
+                $detector
+                    ->addOption(new Node())
+                    ->addOption(new Bun())
+                    ->addOption(new Deno())
+                    ->addOption(new PHP())
+                    ->addOption(new Python())
+                    ->addOption(new Dart())
+                    ->addOption(new Swift())
+                    ->addOption(new Ruby())
+                    ->addOption(new Java())
+                    ->addOption(new CPP())
+                    ->addOption(new Dotnet());
+
+                $runtime = $detector->detect();
+
+                if (!\is_null($runtime)) {
+                    $output->setAttribute('commands', $runtime->getCommands());
+                    $output->setAttribute('entrypoint', $runtime->getEntrypoint());
+                    $runtime = $runtime->getName();
+                    break;
+                }
+            }
+
+            if (!empty($runtime)) {
+                $runtimes = Config::getParam('runtimes');
+                $runtimeWithVersion = '';
+                foreach ($runtimes as $runtimeKey => $runtimeConfig) {
+                    if ($runtimeConfig['key'] === $runtime) {
+                        $runtimeWithVersion = $runtimeKey;
+                    }
+                }
+
+                if (empty($runtimeWithVersion)) {
+                    throw new Exception(Exception::FUNCTION_RUNTIME_NOT_DETECTED);
+                }
+
+                $output->setAttribute('runtime', $runtimeWithVersion);
+            } else {
+                throw new Exception(Exception::FUNCTION_RUNTIME_NOT_DETECTED);
+            }
+        }
+        $response->dynamic($output, $type === 'framework' ? Response::MODEL_DETECTION_FRAMEWORK : Response::MODEL_DETECTION_RUNTIME);
    });

 App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
@@ -603,24 +808,27 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'repositories',
        name: 'listRepositories',
        description: '/docs/references/vcs/list-repositories.md',
        auth: [AuthType::ADMIN],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROVIDER_REPOSITORY_LIST,
+                model: Response::MODEL_PROVIDER_REPOSITORY_RUNTIME_LIST,
+            ),
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK_LIST,
            )
        ]
    ))
    ->param('installationId', '', new Text(256), 'Installation Id')
+    ->param('type', '', new WhiteList(['runtime', 'framework']), 'Detector type. Must be one of the following: runtime, framework')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('gitHub')
    ->inject('response')
-    ->inject('project')
    ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $search, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
+    ->action(function (string $installationId, string $type, string $search, GitHub $github, Response $response, Database $dbForPlatform) {
        if (empty($search)) {
            $search = "";
        }
@@ -650,39 +858,86 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
            return $repo;
        }, $repos);

-        $repos = batch(\array_map(function ($repo) use ($github) {
-            return function () use ($repo, $github) {
-                try {
-                    $files = $github->listRepositoryContents($repo['organization'], $repo['name'], '');
-                    $files = \array_column($files, 'name');
+        $repos = batch(\array_map(function ($repo) use ($type, $github) {
+            return function () use ($repo, $type, $github) {
+                $files = $github->listRepositoryContents($repo['organization'], $repo['name'], '');
+                $files = \array_column($files, 'name');
+
+                $detector = new Packager($files);
+                $detector
+                    ->addOption(new Yarn())
+                    ->addOption(new PNPM())
+                    ->addOption(new NPM());
+                $detection = $detector->detect();
+
+                $packager = !\is_null($detection) ? $detection->getName() : 'npm';
+
+                if ($type === 'framework') {
+                    $frameworkDetector = new Framework($files, $packager);
+                    $frameworkDetector
+                        ->addOption(new Flutter())
+                        ->addOption(new Nuxt())
+                        ->addOption(new Astro())
+                        ->addOption(new SvelteKit())
+                        ->addOption(new NextJs())
+                        ->addOption(new Remix());
+
+                    $detectedFramework = $frameworkDetector->detect();
+
+                    if (!\is_null($detectedFramework)) {
+                        $framework = $detectedFramework->getName();
+                    } else {
+                        $framework = 'other';
+                    }
+
+                    $frameworks = Config::getParam('frameworks');
+                    if (!\in_array($framework, \array_keys($frameworks), true)) {
+                        $framework = 'other';
+                    }
+                    $repo['framework'] = $framework;
+                } else {
                    $languages = $github->listRepositoryLanguages($repo['organization'], $repo['name']);

-                    $detectorFactory = new Detector($files, $languages);
+                    $strategies = [
+                        new Strategy(Strategy::FILEMATCH),
+                        new Strategy(Strategy::LANGUAGES),
+                        new Strategy(Strategy::EXTENSION),
+                    ];

-                    $detectorFactory
-                        ->addDetector(new JavaScript())
-                        ->addDetector(new Bun())
-                        ->addDetector(new PHP())
-                        ->addDetector(new Python())
-                        ->addDetector(new Dart())
-                        ->addDetector(new Swift())
-                        ->addDetector(new Ruby())
-                        ->addDetector(new Java())
-                        ->addDetector(new CPP())
-                        ->addDetector(new Deno())
-                        ->addDetector(new Dotnet());
+                    foreach ($strategies as $strategy) {
+                        $detector = new Runtime($strategy === Strategy::LANGUAGES ? $languages : $files, $strategy, $packager);
+                        $detector
+                            ->addOption(new Node())
+                            ->addOption(new Bun())
+                            ->addOption(new Deno())
+                            ->addOption(new PHP())
+                            ->addOption(new Python())
+                            ->addOption(new Dart())
+                            ->addOption(new Swift())
+                            ->addOption(new Ruby())
+                            ->addOption(new Java())
+                            ->addOption(new CPP())
+                            ->addOption(new Dotnet());

-                    $runtime = $detectorFactory->detect();
+                        $runtime = $detector->detect();

-                    $runtimes = Config::getParam('runtimes');
-                    $runtimeDetail = \array_reverse(\array_filter(\array_keys($runtimes), function ($key) use ($runtime, $runtimes) {
-                        return $runtimes[$key]['key'] === $runtime;
-                    }))[0] ?? '';
+                        if (!\is_null($runtime)) {
+                            $runtime = $runtime->getName();
+                            break;
+                        }
+                    }

-                    $repo['runtime'] = $runtimeDetail;
-                } catch (Throwable $error) {
-                    $repo['runtime'] = "";
-                    Console::warning("Runtime not detected for " . $repo['organization'] . "/" . $repo['name']);
+                    if (!empty($runtime)) {
+                        $runtimes = Config::getParam('runtimes');
+                        $runtimeWithVersion = '';
+                        foreach ($runtimes as $runtimeKey => $runtimeConfig) {
+                            if ($runtimeConfig['key'] === $runtime) {
+                                $runtimeWithVersion = $runtimeKey;
+                            }
+                        }
+
+                        $repo['runtime'] = $runtimeWithVersion ?? '';
+                    }
                }
                return $repo;
            };
@@ -693,9 +948,9 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
        }, $repos);

        $response->dynamic(new Document([
-            'providerRepositories' => $repos,
+            $type === 'framework' ? 'frameworkProviderRepositories' : 'runtimeProviderRepositories' => $repos,
            'total' => \count($repos),
-        ]), Response::MODEL_PROVIDER_REPOSITORY_LIST);
+        ]), ($type === 'framework') ? Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK_LIST : Response::MODEL_PROVIDER_REPOSITORY_RUNTIME_LIST);
    });

 App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
@@ -704,7 +959,6 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'repositories',
        name: 'createRepository',
        description: '/docs/references/vcs/create-repository.md',
        auth: [AuthType::ADMIN],
@@ -817,7 +1071,6 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'repositories',
        name: 'getRepository',
        description: '/docs/references/vcs/get-repository.md',
        auth: [AuthType::ADMIN],
@@ -872,7 +1125,6 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'repositories',
        name: 'listRepositoryBranches',
        description: '/docs/references/vcs/list-repository-branches.md',
        auth: [AuthType::ADMIN],
@@ -965,7 +1217,7 @@ App::post('/v1/vcs/github/events')

                $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);

-                //find functionId from functions table
+                //find resourceId from relevant resources table
                $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::limit(100),
@@ -977,7 +1229,7 @@ App::post('/v1/vcs/github/events')
                }
            } elseif ($event == $github::EVENT_INSTALLATION) {
                if ($parsedPayload["action"] == "deleted") {
-                    // TODO: Use worker for this job instead (update function as well)
+                    // TODO: Use worker for this job instead (update function/site as well)
                    $providerInstallationId = $parsedPayload["installationId"];

                    $installations = $dbForPlatform->find('installations', [
@@ -1066,7 +1318,6 @@ App::get('/v1/vcs/installations')
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'installations',
        name: 'listInstallations',
        description: '/docs/references/vcs/list-installations.md',
        auth: [AuthType::ADMIN],
@@ -1122,12 +1373,9 @@ App::get('/v1/vcs/installations')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $results = $dbForPlatform->find('installations', $queries);
-            $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
+        $results = $dbForPlatform->find('installations', $queries);
+        $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);

        $response->dynamic(new Document([
            'installations' => $results,
@@ -1141,7 +1389,6 @@ App::get('/v1/vcs/installations/:installationId')
    ->label('scope', 'vcs.read')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'installations',
        name: 'getInstallation',
        description: '/docs/references/vcs/get-installation.md',
        auth: [AuthType::ADMIN],
@@ -1176,7 +1423,6 @@ App::delete('/v1/vcs/installations/:installationId')
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'installations',
        name: 'deleteInstallation',
        description: '/docs/references/vcs/delete-installation.md',
        auth: [AuthType::ADMIN],
@@ -1212,12 +1458,11 @@ App::delete('/v1/vcs/installations/:installationId')
    });

 App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositoryId')
-    ->desc('Update external deployment (authorize)')
+    ->desc('Authorize external deployment')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
        namespace: 'vcs',
-        group: 'repositories',
        name: 'updateExternalDeployments',
        description: '/docs/references/vcs/update-external-deployments.md',
        auth: [AuthType::ADMIN],
@@ -3,25 +3,30 @@
 require_once __DIR__ . '/../init.php';

 use Ahc\Jwt\JWT;
+use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Auth;
+use Appwrite\Auth\Key;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Network\Validator\Origin;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
+use Appwrite\Platform\Appwrite;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Transformation\Adapter\Preview;
+use Appwrite\Transformation\Transformation;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Request\Filters\V16 as RequestV16;
 use Appwrite\Utopia\Request\Filters\V17 as RequestV17;
 use Appwrite\Utopia\Request\Filters\V18 as RequestV18;
+use Appwrite\Utopia\Request\Filters\V19 as RequestV19;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Filters\V16 as ResponseV16;
 use Appwrite\Utopia\Response\Filters\V17 as ResponseV17;
 use Appwrite\Utopia\Response\Filters\V18 as ResponseV18;
+use Appwrite\Utopia\Response\Filters\V19 as ResponseV19;
 use Appwrite\Utopia\View;
 use Executor\Executor;
 use MaxMind\Db\Reader;
@@ -42,6 +47,7 @@ use Utopia\Logger\Adapter\Sentry;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
 use Utopia\Logger\Logger;
+use Utopia\Platform\Service;
 use Utopia\System\System;
 use Utopia\Validator\Hostname;
 use Utopia\Validator\Text;
@@ -50,7 +56,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);

-function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey)
 {
    $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');

@@ -61,9 +67,9 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

    // TODO: @christyjacob remove once we migrate the rules in 1.7.x
    if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-        $route = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
+        $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
    } else {
-        $route = Authorization::skip(
+        $rule = Authorization::skip(
            fn () => $dbForPlatform->find('rules', [
                Query::equal('domain', [$host]),
                Query::limit(1)
@@ -71,20 +77,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        )[0] ?? new Document();
    }

-    if ($route->isEmpty()) {
-
-        $appDomainFunctionsFallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
-        $appDomainFunctions =  System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-
-        if (!empty($appDomainFunctionsFallback) && \str_ends_with($host, $appDomainFunctionsFallback)) {
-            $appDomainFunctions =  $appDomainFunctionsFallback;
-        }
-
-        if ($host === $appDomainFunctions) {
+    if ($rule->isEmpty()) {
+        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '') || $host === System::getEnv('_APP_DOMAIN_SITES', '')) {
            throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain cannot be used for security reasons. Please use any subdomain instead.');
        }

-        if (\str_ends_with($host, $appDomainFunctions)) {
+        if (\str_ends_with($host, System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) || \str_ends_with($host, System::getEnv('_APP_DOMAIN_SITES', ''))) {
            throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain is not connected to any Appwrite resource yet. Please configure custom domain or function domain to allow this request.');
        }

@@ -96,10 +94,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

        // Act as API - no Proxy logic
        $utopia->getRoute()?->label('error', '');
+
        return false;
    }

-    $projectId = $route->getAttribute('projectId');
+    $projectId = $rule->getAttribute('projectId');
    $project = Authorization::skip(
        fn () => $dbForPlatform->getDocument('projects', $projectId)
    );
@@ -125,46 +124,34 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        return false;
    }

-    $type = $route->getAttribute('resourceType');
+    $type = $rule->getAttribute('type', '');

-    if ($type === 'function') {
-        $method = $utopia->getRoute()?->getLabel('sdk', null);
-
-        if (empty($method)) {
-            $utopia->getRoute()?->label('sdk', new Method(
-                namespace: 'functions',
-                group: 'executions',
-                name: 'createExecution',
-                description: '/docs/references/functions/create-execution.md',
-                auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_CREATED,
-                        model: Response::MODEL_EXECUTION,
-                    )
-                ],
-                contentType: ContentType::MULTIPART,
-                requestType: 'application/json',
-            ));
-        } else {
-            /** @var Method $method */
-            $method->setNamespace('functions');
-            $method->setMethodName('createExecution');
-            $utopia->getRoute()?->label('sdk', $method);
-        }
-
-        if (System::getEnv('_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
-            if ($request->getProtocol() !== 'https') {
+    if ($type === 'deployment') {
+        if (System::getEnv('_APP_OPTIONS_COMPUTE_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
+            if ($request->getProtocol() !== 'https' && $request->getHostname() !== APP_HOSTNAME_INTERNAL) {
                if ($request->getMethod() !== Request::METHOD_GET) {
                    throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                }
-
                return $response->redirect('https://' . $request->getHostname() . $request->getURI());
            }
        }

-        $functionId = $route->getAttribute('resourceId');
-        $projectId = $route->getAttribute('projectId');
+        /** @var Database $dbForProject */
+        $dbForProject = $getProjectDB($project);
+
+        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
+
+        if ($deployment->getAttribute('resourceType', '') === 'functions') {
+            $type = 'function';
+        } elseif ($deployment->getAttribute('resourceType', '') === 'sites') {
+            $type = 'site';
+        }
+
+        $resource = $type === 'function' ?
+            Authorization::skip(fn () => $dbForProject->getDocument('functions', $deployment->getAttribute('resourceId', ''))) :
+            Authorization::skip(fn () => $dbForProject->getDocument('sites', $deployment->getAttribute('resourceId', '')));
+
+        $isPreview = $type === 'function' ? false : ($rule->getAttribute('trigger', '') !== 'manual');

        $path = ($swooleRequest->server['request_uri'] ?? '/');
        $query = ($swooleRequest->server['query_string'] ?? '');
@@ -172,78 +159,143 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            $path .= '?' . $query;
        }

+        $protocol = $request->getProtocol();
+
+        /**
+            Ensure preview authorization
+            - Authorization is skippable for tests, and build screenshot
+            - If cookie is not sent by client -> not authorized
+            - If JWT in cookie is invalid or expired -> not authorized
+            - If user is blocked or removed -> not authorized
+            - If user's session is removed or expired -> not authorized
+            - If user is not member of team of this deployment -> not authorized
+            - If not authorized, redirect to Console redirect UI
+            - If authorized, continue as if auth was not required
+        */
+        $requirePreview = \is_null($apiKey) || !$apiKey->isPreviewAuthDisabled();
+        if ($isPreview && $requirePreview) {
+            $cookie = $request->getCookie(Auth::$cookieNamePreview, '');
+            $authorized = false;
+
+            // Security checks to mark authorized true
+            if (!empty($cookie)) {
+                $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
+
+                $payload = [];
+                try {
+                    $payload = $jwt->decode($cookie);
+                } catch (JWTException $error) {
+                    // Authorized remains false
+                }
+
+                $userExists = false;
+                $userId = $payload['userId'] ?? '';
+                if (!empty($userId)) {
+                    $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
+                    if (!$user->isEmpty() && $user->getAttribute('status', false)) {
+                        $userExists = true;
+                    }
+                }
+
+                $sessionExists = false;
+                $jwtSessionId = $payload['sessionId'] ?? '';
+                if (!empty($jwtSessionId) && !empty($user->find('$id', $jwtSessionId, 'sessions'))) {
+                    $sessionExists = true;
+                }
+
+                $membershipExists = false;
+                $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+                if (!$project->isEmpty() && isset($user)) {
+                    $teamId = $project->getAttribute('teamId', '');
+                    $membership = $user->find('teamId', $teamId, 'memberships');
+                    if (!empty($membership)) {
+                        $membershipExists = true;
+                    }
+                }
+
+                if ($userExists && $sessionExists && $membershipExists) {
+                    $authorized = true;
+                }
+            }
+
+            if (!$authorized) {
+                $url = (System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https') . "://" . System::getEnv('_APP_DOMAIN');
+                $response
+                    ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+                    ->addHeader('Pragma', 'no-cache')
+                    ->redirect($url . '/console/auth/preview?'
+                        . \http_build_query([
+                            'projectId' => $projectId,
+                            'origin' => $protocol . '://' . $host,
+                            'path' => $path
+                        ]));
+                return true;
+            }
+        }

        $body = $swooleRequest->getContent() ?? '';
        $method = $swooleRequest->server['request_method'];

        $requestHeaders = $request->getHeaders();

-        $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-
-        $dbForProject = $getProjectDB($project);
-
-        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
-
-        if ($function->isEmpty() || !$function->getAttribute('enabled')) {
+        if ($resource->isEmpty() || !$resource->getAttribute('enabled')) {
            throw new AppwriteException(AppwriteException::FUNCTION_NOT_FOUND);
        }

-        if ($isResourceBlocked($project, RESOURCE_TYPE_FUNCTIONS, $functionId)) {
+        if ($isResourceBlocked($project, $type === 'function' ? RESOURCE_TYPE_FUNCTIONS : RESOURCE_TYPE_SITES, $resource->getId())) {
            throw new AppwriteException(AppwriteException::GENERAL_RESOURCE_BLOCKED);
        }

-        $version = $function->getAttribute('version', 'v2');
-        $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
+        $version = match ($type) {
+            'function' => $resource->getAttribute('version', 'v2'),
+            'site' => 'v5',
+        };

-        $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;
+        $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
+        $spec = Config::getParam('specifications')[$resource->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)];
+
+        $runtime = match ($type) {
+            'function' => $runtimes[$resource->getAttribute('runtime')] ?? null,
+            'site' => $runtimes[$resource->getAttribute('buildRuntime')] ?? null,
+            default => null
+        };
+
+        // Static site enforced runtime
+        if ($deployment->getAttribute('adapter', '') === 'static') {
+            $runtime = $runtimes['static-1'] ?? null;
+        }

        if (\is_null($runtime)) {
-            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
+            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $resource->getAttribute('runtime', '') . '" is not supported');
        }

-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));
-
-        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
-            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
-        }
-
-        if ($deployment->isEmpty()) {
-            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
-        }
-
-        /** Check if build has completed */
-        $build = Authorization::skip(fn () => $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', '')));
-        if ($build->isEmpty()) {
-            throw new AppwriteException(AppwriteException::BUILD_NOT_FOUND);
-        }
-
-        if ($build->getAttribute('status') !== 'ready') {
+        if ($deployment->getAttribute('status') !== 'ready') {
            throw new AppwriteException(AppwriteException::BUILD_NOT_READY);
        }

-        $permissions = $function->getAttribute('execute');
-
-        if (!(\in_array('any', $permissions)) && !(\in_array('guests', $permissions))) {
-            throw new AppwriteException(AppwriteException::USER_UNAUTHORIZED, 'To execute function using domain, execute permissions must include "any" or "guests"');
+        if ($type === 'function') {
+            $permissions = $resource->getAttribute('execute');
+            if (!(\in_array('any', $permissions)) && !(\in_array('guests', $permissions))) {
+                throw new AppwriteException(AppwriteException::USER_UNAUTHORIZED, 'To execute function using domain, execute permissions must include "any" or "guests"');
+            }
        }

-        $jwtExpiry = $function->getAttribute('timeout', 900);
-        $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
-        $apiKey = $jwtObj->encode([
-            'projectId' => $project->getId(),
-            'scopes' => $function->getAttribute('scopes', [])
-        ]);
-
        $headers = \array_merge([], $requestHeaders);
-        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
-        $headers['x-appwrite-trigger'] = 'http';
        $headers['x-appwrite-user-id'] = '';
-        $headers['x-appwrite-user-jwt'] = '';
        $headers['x-appwrite-country-code'] = '';
        $headers['x-appwrite-continent-code'] = '';
        $headers['x-appwrite-continent-eu'] = 'false';

+        $jwtExpiry = $resource->getAttribute('timeout', 900);
+        $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
+        $jwtKey = $jwtObj->encode([
+            'projectId' => $project->getId(),
+            'scopes' => $resource->getAttribute('scopes', [])
+        ]);
+        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $jwtKey;
+        $headers['x-appwrite-trigger'] = 'http';
+        $headers['x-appwrite-user-jwt'] = '';
+
        $ip = $headers['x-real-ip'] ?? '';
        if (!empty($ip)) {
            $record = $geodb->get($ip);
@@ -269,12 +321,10 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        $execution = new Document([
            '$id' => $executionId,
            '$permissions' => [],
-            'functionInternalId' => $function->getInternalId(),
-            'functionId' => $function->getId(),
+            'resourceInternalId' => $resource->getInternalId(),
+            'resourceId' => $resource->getId(),
            'deploymentInternalId' => $deployment->getInternalId(),
            'deploymentId' => $deployment->getId(),
-            'trigger' => 'http', // http / schedule / event
-            'status' =>  'processing', // waiting / processing / completed / failed
            'responseStatusCode' => 0,
            'responseHeaders' => [],
            'requestPath' => $path,
@@ -283,13 +333,25 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            'errors' => '',
            'logs' => '',
            'duration' => 0.0,
-            'search' => implode(' ', [$functionId, $executionId]),
        ]);

-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('executionId', $execution->getId())
-            ->setContext('function', $function);
+        if ($type === 'function') {
+            $execution->setAttribute('resourceType', 'functions');
+            $execution->setAttribute('trigger', 'http'); // http / schedule / event
+            $execution->setAttribute('status', 'processing'); // waiting / processing / completed / failed
+
+            $queueForEvents
+                ->setParam('functionId', $resource->getId())
+                ->setParam('executionId', $execution->getId())
+                ->setContext('function', $resource);
+        } elseif ($type === 'site') {
+            $execution->setAttribute('resourceType', 'sites');
+
+            $queueForEvents
+                ->setParam('siteId', $resource->getId())
+                ->setParam('executionId', $execution->getId())
+                ->setContext('site', $resource);
+        }

        $durationStart = \microtime(true);

@@ -306,12 +368,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        }

        // Shared vars
-        foreach ($function->getAttribute('varsProject', []) as $var) {
+        foreach ($resource->getAttribute('varsProject', []) as $var) {
            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
        }

        // Function vars
-        foreach ($function->getAttribute('vars', []) as $var) {
+        foreach ($resource->getAttribute('vars', []) as $var) {
            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
        }

@@ -322,14 +384,14 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        // Appwrite vars
        $vars = \array_merge($vars, [
            'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-            'APPWRITE_FUNCTION_ID' => $functionId,
-            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
+            'APPWRITE_FUNCTION_ID' => $resource->getId(),
+            'APPWRITE_FUNCTION_NAME' => $resource->getAttribute('name'),
            'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
            'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
-            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
+            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
+            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
            'APPWRITE_VERSION' => APP_VERSION_STABLE,
            'APPWRITE_REGION' => $project->getAttribute('region'),
            'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
@@ -347,31 +409,93 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
        ]);

+        // SPA fallbackFile override
+        if ($deployment->getAttribute('adapter', '') === 'static' && $deployment->getAttribute('fallbackFile', '') !== '') {
+            $vars['OPEN_RUNTIMES_STATIC_FALLBACK'] = $deployment->getAttribute('fallbackFile', '');
+        }
+
        /** Execute function */
+        $executor = new Executor(System::getEnv('_APP_EXECUTOR_HOST'));
        try {
-            $version = $function->getAttribute('version', 'v2');
-            $command = $runtime['startCommand'];
-            $command = $version === 'v2' ? '' : 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $command . '"';
+            $version = match ($type) {
+                'function' => $resource->getAttribute('version', 'v2'),
+                'site' => 'v5',
+            };
+            $entrypoint = match ($type) {
+                'function' => $deployment->getAttribute('entrypoint', ''),
+                'site' => '',
+            };
+
+            if ($type === 'function') {
+                $runtimeEntrypoint = match ($version) {
+                    'v2' => '',
+                    default => 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $runtime['startCommand'] . '"'
+                };
+            } elseif ($type === 'site') {
+                $frameworks = Config::getParam('frameworks', []);
+                $framework = $frameworks[$resource->getAttribute('framework', '')] ?? null;
+
+                $startCommand = $runtime['startCommand'];
+
+                if (!is_null($framework)) {
+                    $adapter = ($framework['adapters'] ?? [])[$deployment->getAttribute('adapter', '')] ?? null;
+                    if (!is_null($adapter) && isset($adapter['startCommand'])) {
+                        $startCommand = $adapter['startCommand'];
+                    }
+                }
+
+                $runtimeEntrypoint = 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $startCommand . '"';
+            }
+
+            $entrypoint = match ($type) {
+                'function' => $deployment->getAttribute('entrypoint', ''),
+                'site' => '',
+            };
+
            $executionResponse = $executor->createExecution(
                projectId: $project->getId(),
                deploymentId: $deployment->getId(),
                body: \strlen($body) > 0 ? $body : null,
                variables: $vars,
-                timeout: $function->getAttribute('timeout', 0),
+                timeout: $resource->getAttribute('timeout', 30),
                image: $runtime['image'],
-                source: $build->getAttribute('path', ''),
-                entrypoint: $deployment->getAttribute('entrypoint', ''),
+                source: $deployment->getAttribute('buildPath', ''),
+                entrypoint: $entrypoint,
                version: $version,
                path: $path,
                method: $method,
                headers: $headers,
-                runtimeEntrypoint: $command,
-                cpus: $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
-                memory: $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
-                logging: $function->getAttribute('logging', true),
+                runtimeEntrypoint: $runtimeEntrypoint,
+                cpus: $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
+                memory: $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
+                logging: $resource->getAttribute('logging', true),
                requestTimeout: 30
            );

+            // Branded 404 override
+            if ($executionResponse['statusCode'] === 404 && $deployment->getAttribute('adapter', '') === 'static') {
+                $layout = new View(__DIR__ . '/../views/general/404.phtml');
+                $executionResponse['body'] = $layout->render();
+                $executionResponse['headers']['content-length'] = \strlen($executionResponse['body']);
+            }
+
+            // Branded banner for previews
+            if (\is_null($apiKey) || $apiKey->isBannerDisabled() === false) {
+                $transformation = new Transformation();
+                $transformation->addAdapter(new Preview());
+                $transformation->setInput($executionResponse['body']);
+                $transformation->setTraits($executionResponse['headers']);
+                if ($isPreview && $transformation->transform()) {
+                    $executionResponse['body'] = $transformation->getOutput();
+
+                    foreach ($executionResponse['headers'] as $key => $value) {
+                        if (\strtolower($key) === 'content-length') {
+                            $executionResponse['headers'][$key] = \strlen($executionResponse['body']);
+                        }
+                    }
+                }
+            }
+
            $headersFiltered = [];
            foreach ($executionResponse['headers'] as $key => $value) {
                if (\in_array(\strtolower($key), FUNCTION_ALLOWLIST_HEADERS_RESPONSE)) {
@@ -382,31 +506,38 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            /** Update execution status */
            $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
            $execution->setAttribute('status', $status);
-            $execution->setAttribute('responseStatusCode', $executionResponse['statusCode']);
-            $execution->setAttribute('responseHeaders', $headersFiltered);
            $execution->setAttribute('logs', $executionResponse['logs']);
            $execution->setAttribute('errors', $executionResponse['errors']);
+            $execution->setAttribute('responseStatusCode', $executionResponse['statusCode']);
+            $execution->setAttribute('responseHeaders', $headersFiltered);
            $execution->setAttribute('duration', $executionResponse['duration']);
-
        } catch (\Throwable $th) {
            $durationEnd = \microtime(true);

            $execution
                ->setAttribute('duration', $durationEnd - $durationStart)
-                ->setAttribute('status', 'failed')
-                ->setAttribute('responseStatusCode', 500)
-                ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
+                ->setAttribute('responseStatusCode', 500);
+
+            if ($type === 'function') {
+                $execution
+                    ->setAttribute('status', 'failed')
+                    ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
+            }
            Console::error($th->getMessage());

            if ($th instanceof AppwriteException) {
                throw $th;
            }
        } finally {
-            $queueForFunctions
-                ->setType(Func::TYPE_ASYNC_WRITE)
-                ->setExecution($execution)
-                ->setProject($project)
-                ->trigger();
+            if ($type === 'function') {
+                $queueForFunctions
+                    ->setType(Func::TYPE_ASYNC_WRITE)
+                    ->setExecution($execution)
+                    ->setProject($project)
+                    ->trigger();
+            } elseif ($type === 'site') { // TODO: Move it to logs worker later
+                $dbForProject->createDocument('executions', $execution);
+            }
        }

        $execution->setAttribute('logs', '');
@@ -428,7 +559,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                $contentType = $header['value'];
            }

-            $response->setHeader($header['name'], $header['value']);
+            if (\strtolower($header['name']) === 'transfer-encoding') {
+                continue;
+            }
+
+            $response->addHeader(\strtolower($header['name']), $header['value']);
        }

        $response
@@ -447,19 +582,28 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
            ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
            ->addMetric(METRIC_EXECUTIONS, 1)
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
+            ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
            ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
-            ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
+            ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
+            ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT)))
+            ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT)))
            ->setProject($project)
-            ->trigger()
-        ;
+            ->trigger();

        return true;
    } elseif ($type === 'api') {
        $utopia->getRoute()?->label('error', '');
        return false;
+    } elseif ($type === 'redirect') {
+        $url = $rule->getAttribute('redirectUrl', '');
+
+        $query = ($swooleRequest->server['query_string'] ?? '');
+        if (!empty($query)) {
+            $url .= '?' . $query;
+        }
+
+        $response->redirect($url, \intval($rule->getAttribute('redirectStatusCode', 301)));
+        return true;
    } else {
        throw new AppwriteException(AppwriteException::GENERAL_SERVER_ERROR, 'Unknown resource type ' . $type);
    }
@@ -468,7 +612,6 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
    return false;
 }

-/*
 App::init()
    ->groups(['api'])
    ->inject('project')
@@ -478,10 +621,9 @@ App::init()
            throw new AppwriteException(AppwriteException::GENERAL_BAD_REQUEST, 'Admin mode is not allowed for console project');
        }
    });
-*/

 App::init()
-    ->groups(['database', 'functions', 'storage', 'messaging'])
+    ->groups(['database', 'functions', 'sites', 'messaging'])
    ->inject('project')
    ->inject('request')
    ->action(function (Document $project, Request $request) {
@@ -511,10 +653,10 @@ App::init()
    ->inject('queueForEvents')
    ->inject('queueForCertificates')
    ->inject('queueForFunctions')
-    ->inject('executor')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, Executor $executor, callable $isResourceBlocked, string $previewHostname) {
+    ->inject('apiKey')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
        /*
        * Appwrite Router
        */
@@ -522,8 +664,8 @@ App::init()
        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname)) {
-                return;
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
+                $utopia->getRoute()?->label('router', true);
            }
        }

@@ -550,6 +692,9 @@ App::init()
            if (version_compare($requestFormat, '1.6.0', '<')) {
                $request->addFilter(new RequestV18());
            }
+            if (version_compare($requestFormat, '1.7.0', '<')) {
+                $request->addFilter(new RequestV19());
+            }
        }

        $domain = $request->getHostname();
@@ -598,14 +743,16 @@ App::init()
                    }

                    if ($domainDocument->isEmpty()) {
+                        $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique();
                        $domainDocument = new Document([
                            // TODO: @christyjacob remove once we migrate the rules in 1.7.x
-                            '$id' => System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique(),
+                            '$id' => $ruleId,
                            'domain' => $domain->get(),
-                            'resourceType' => 'api',
+                            'type' => 'api',
                            'status' => 'verifying',
                            'projectId' => $console->getId(),
                            'projectInternalId' => $console->getInternalId(),
+                            'search' => implode(' ', [$ruleId, $domain->get()]),
                            'owner' => $owner,
                            'region' => $console->getAttribute('region')
                        ]);
@@ -641,6 +788,22 @@ App::init()
        $validator = new Hostname($clients);
        if ($validator->isValid($origin)) {
            $refDomainOrigin = $origin;
+        } elseif (!empty($origin)) {
+            // Auto-allow domains with linked rule
+            if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+                $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($origin ?? '')));
+            } else {
+                $rule = Authorization::skip(
+                    fn () => $dbForPlatform->find('rules', [
+                        Query::equal('domain', [$origin]),
+                        Query::limit(1)
+                    ])
+                )[0] ?? new Document();
+            }
+
+            if (!$rule->isEmpty() && $rule->getAttribute('projectInternalId') === $project->getInternalId()) {
+                $refDomainOrigin = $origin;
+            }
        }

        $refDomain = (!empty($protocol) ? $protocol : $request->getProtocol()) . '://' . $refDomainOrigin . (!empty($port) ? ':' . $port : '');
@@ -689,8 +852,11 @@ App::init()
            if (version_compare($responseFormat, '1.6.0', '<')) {
                $response->addFilter(new ResponseV18());
            }
+            if (version_compare($responseFormat, '1.7.0', '<')) {
+                $response->addFilter(new ResponseV19());
+            }
            if (version_compare($responseFormat, APP_VERSION_STABLE, '>')) {
-                $response->addHeader('X-Appwrite-Warning', "The current SDK is built for Appwrite " . $responseFormat . ". However, the current Appwrite server version is ". APP_VERSION_STABLE . ". Please downgrade your SDK to match the Appwrite version: https://appwrite.io/docs/sdks");
+                $response->addHeader('X-Appwrite-Warning', "The current SDK is built for Appwrite " . $responseFormat . ". However, the current Appwrite server version is " . APP_VERSION_STABLE . ". Please downgrade your SDK to match the Appwrite version: https://appwrite.io/docs/sdks");
            }
        }

@@ -751,12 +917,12 @@ App::options()
    ->inject('queueForEvents')
    ->inject('queueForStatsUsage')
    ->inject('queueForFunctions')
-    ->inject('executor')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
    ->inject('project')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project) {
+    ->inject('apiKey')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project, ?Key $apiKey) {
        /*
        * Appwrite Router
        */
@@ -764,8 +930,8 @@ App::options()
        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname)) {
-                return;
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
+                $utopia->getRoute()?->label('router', true);
            }
        }

@@ -881,18 +1047,17 @@ App::error()
        if (!empty($providerConfig) && $error->getCode() >= 400 && $error->getCode() < 500) {
            // Register error logger
            try {
-                $loggingProvider = new DSN($providerConfig);
+                $loggingProvider = new DSN($providerConfig ?? '');
                $providerName = $loggingProvider->getScheme();

                if (!empty($providerName) && $providerName === 'sentry') {
                    $key = $loggingProvider->getPassword();
                    $projectId = $loggingProvider->getUser() ?? '';
                    $host = 'https://' . $loggingProvider->getHost();
-                    $sampleRate = $loggingProvider->getParam('sample', 0.01);

                    $adapter = new Sentry($projectId, $key, $host);
                    $logger = new Logger($adapter);
-                    $logger->setSample($sampleRate);
+                    $logger->setSample(0.01);
                    $publish = true;
                } else {
                    throw new \Exception('Invalid experimental logging provider');
@@ -1051,6 +1216,7 @@ App::error()
                ->setParam('trace', $output['trace'] ?? []);

            $response->html($layout->render());
+            return;
        }

        $response->dynamic(
@@ -1072,11 +1238,11 @@ App::get('/robots.txt')
    ->inject('queueForEvents')
    ->inject('queueForStatsUsage')
    ->inject('queueForFunctions')
-    ->inject('executor')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
+    ->inject('apiKey')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

@@ -1084,7 +1250,9 @@ App::get('/robots.txt')
            $template = new View(__DIR__ . '/../views/general/robots.phtml');
            $response->text($template->render(false));
        } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname);
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
+                $utopia->getRoute()?->label('router', true);
+            }
        }
    });

@@ -1101,11 +1269,11 @@ App::get('/humans.txt')
    ->inject('queueForEvents')
    ->inject('queueForStatsUsage')
    ->inject('queueForFunctions')
-    ->inject('executor')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
+    ->inject('apiKey')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

@@ -1113,7 +1281,9 @@ App::get('/humans.txt')
            $template = new View(__DIR__ . '/../views/general/humans.phtml');
            $response->text($template->render(false));
        } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname);
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
+                $utopia->getRoute()?->label('router', true);
+            }
        }
    });

@@ -1175,6 +1345,21 @@ App::get('/v1/ping')
    ->desc('Test the connection between the Appwrite and the SDK.')
    ->label('scope', 'global')
    ->label('event', 'projects.[projectId].ping')
+    ->label('sdk', new Method(
+        namespace: 'ping',
+        name: 'get',
+        hide: true,
+        description: <<<EOT
+        Send a ping to project as part of onboarding.
+        EOT,
+        auth: [],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_ANY,
+            )
+        ],
+    ))
    ->inject('response')
    ->inject('project')
    ->inject('dbForPlatform')
@@ -1202,6 +1387,34 @@ App::get('/v1/ping')
        $response->text('Pong!');
    });

+// Preview authorization
+App::get('/_appwrite/authorize')
+    ->inject('request')
+    ->inject('response')
+    ->inject('previewHostname')
+    ->action(function (Request $request, Response $response, string $previewHostname) {
+
+        $host = $request->getHostname() ?? '';
+        if (!empty($previewHostname)) {
+            $host = $previewHostname;
+        }
+
+        $referrer = $request->getReferer();
+        $protocol = \parse_url($request->getOrigin($referrer), PHP_URL_SCHEME);
+
+        $jwt = $request->getParam('jwt', '');
+        $path = $request->getParam('path', '');
+
+        $duration = 60 * 60 * 24; // 1 day in seconds
+        $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
+
+        $response
+            ->addCookie(Auth::$cookieNamePreview, $jwt, (new \DateTime($expire))->getTimestamp(), '/', $host, ('https' === $protocol), true, null)
+            ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+            ->addHeader('Pragma', 'no-cache')
+            ->redirect($protocol . '://' . $host . $path);
+    });
+
 App::wildcard()
    ->groups(['api'])
    ->label('scope', 'global')
@@ -1210,9 +1423,15 @@ App::wildcard()
    });

 foreach (Config::getParam('services', []) as $service) {
-    include_once $service['controller'];
+    if (!empty($service['controller'])) {
+        include_once $service['controller'];
+    }
 }

+// Modules
+$platform = new Appwrite();
+$platform->init(Service::TYPE_HTTP);
+
 // Check for any errors found while we were initialising the SDK Methods.
 if (!empty(Method::getErrors())) {
    throw new \Exception('Errors found during SDK initialization:' . PHP_EOL . implode(PHP_EOL, Method::getErrors()));
@@ -157,6 +157,15 @@ $usageDatabaseListener = function (string $event, Document $document, StatsUsage
            $queueForStatsUsage
                ->addMetric(METRIC_FUNCTIONS, $value); // per project

+            if ($event === Database::EVENT_DOCUMENT_DELETE) {
+                $queueForStatsUsage
+                    ->addReduce($document);
+            }
+            break;
+        case $document->getCollection() === 'sites':
+            $queueForStatsUsage
+                ->addMetric(METRIC_SITES, $value); // per project
+
            if ($event === Database::EVENT_DOCUMENT_DELETE) {
                $queueForStatsUsage
                    ->addReduce($document);
@@ -238,36 +247,34 @@ App::init()
                    subject: 'keys'
                );

-                if (!$dbKey) {
-                    throw new Exception(Exception::USER_UNAUTHORIZED);
-                }
+                if ($dbKey) {
+                    $accessedAt = $dbKey->getAttribute('accessedAt', '');

-                $accessedAt = $dbKey->getAttribute('accessedAt', '');
-
-                if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
-                    $dbKey->setAttribute('accessedAt', DateTime::now());
-                    $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
-                    $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-                }
-
-                $sdkValidator = new WhiteList($servers, true);
-                $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
-
-                if ($sdkValidator->isValid($sdk)) {
-                    $sdks = $dbKey->getAttribute('sdks', []);
-
-                    if (!in_array($sdk, $sdks)) {
-                        $sdks[] = $sdk;
-                        $dbKey->setAttribute('sdks', $sdks);
-
-                        /** Update access time as well */
-                        $dbKey->setAttribute('accessedAt', Datetime::now());
+                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
+                        $dbKey->setAttribute('accessedAt', DateTime::now());
                        $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
                        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
                    }
-                }

-                $queueForAudits->setUser($user);
+                    $sdkValidator = new WhiteList($servers, true);
+                    $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
+
+                    if ($sdkValidator->isValid($sdk)) {
+                        $sdks = $dbKey->getAttribute('sdks', []);
+
+                        if (!in_array($sdk, $sdks)) {
+                            $sdks[] = $sdk;
+                            $dbKey->setAttribute('sdks', $sdks);
+
+                            /** Update access time as well */
+                            $dbKey->setAttribute('accessedAt', Datetime::now());
+                            $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
+                            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+                        }
+                    }
+
+                    $queueForAudits->setUser($user);
+                }
            }
        } // Admin User Authentication
        elseif (($project->getId() === 'console' && !$team->isEmpty() && !$user->isEmpty()) || ($project->getId() !== 'console' && !$user->isEmpty() && $mode === APP_MODE_ADMIN)) {
@@ -392,8 +399,7 @@ App::init()
    ->inject('timelimit')
    ->inject('mode')
    ->inject('apiKey')
-    ->inject('plan')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, string $mode, ?Key $apiKey, array $plan) use ($usageDatabaseListener, $eventDatabaseListener) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, string $mode, ?Key $apiKey) use ($usageDatabaseListener, $eventDatabaseListener) {

        $route = $utopia->getRoute();

@@ -523,10 +529,6 @@ App::init()

        $useCache = $route->getLabel('cache', false);
        if ($useCache) {
-            $route = $utopia->match($request);
-            $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
-            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && !Auth::isPrivilegedUser(Authorization::getRoles());
-
            $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
            $cacheLog  = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
            $cache = new Cache(
@@ -536,10 +538,10 @@ App::init()
            $data = $cache->load($key, $timestamp);

            if (!empty($data) && !$cacheLog->isEmpty()) {
-                $parts = explode('/', $cacheLog->getAttribute('resourceType', ''));
+                $parts = explode('/', $cacheLog->getAttribute('resourceType'));
                $type = $parts[0] ?? null;

-                if ($type === 'bucket' && (!$isImageTransformation || !$isDisabled)) {
+                if ($type === 'bucket') {
                    $bucketId = $parts[1] ?? null;
                    $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

@@ -580,10 +582,8 @@ App::init()
                $response
                    ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp))
                    ->addHeader('X-Appwrite-Cache', 'hit')
-                    ->setContentType($cacheLog->getAttribute('mimeType'));
-                if (!$isImageTransformation || !$isDisabled) {
-                    $response->send($data);
-                }
+                    ->setContentType($cacheLog->getAttribute('mimeType'))
+                    ->send($data);
            } else {
                $response
                    ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
@@ -13,6 +13,7 @@ use Swoole\Table;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\CLI\Console;
+use Utopia\Compression\Compression;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -28,6 +29,8 @@ use Utopia\Pools\Group;
 use Utopia\Swoole\Files;
 use Utopia\System\System;

+Files::load(__DIR__.'/../public');
+
 const DOMAIN_SYNC_TIMER = 30; // 30 seconds

 $domains = new Table(1_000_000); // 1 million rows
@@ -43,6 +46,29 @@ $http = new Server(
 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
 $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));

+$http
+    ->set([
+        'worker_num' => $totalWorkers,
+        'dispatch_func' => 'dispatch',
+        'open_http2_protocol' => true,
+        'http_compression' => false,
+        'package_max_length' => $payloadSize,
+        'buffer_output_size' => $payloadSize,
+        'task_worker_num' => 1, // required for the task to fetch domains background
+    ]);
+
+$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
+    Console::success('Worker ' . ++$workerId . ' started successfully');
+});
+
+$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
+    Console::success('Starting reload...');
+});
+
+$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
+    Console::success('Reload completed...');
+});
+
 /**
 * Assigns HTTP requests to worker threads by analyzing its payload/content.
 *
@@ -60,105 +86,76 @@ $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intva
 */
 function dispatch(Server $server, int $fd, int $type, $data = null): int
 {
-    $resolveWorkerId = function (Server $server, $data = null) {
-        global $totalWorkers, $domains;
+    global $totalWorkers, $domains;

-        // If data is not set we can send request to any worker
-        // first we try to pick idle worker, if not we randomly pick a worker
-        if ($data === null) {
-            for ($i = 0; $i < $totalWorkers; $i++) {
-                if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
-                    return $i;
-                }
-            }
-            return rand(0, $totalWorkers - 1);
-        }
-
-        $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
-
-        // Each worker has numeric ID, starting from 0 and incrementing
-        // From 0 to riskyWorkers, we consider safe workers
-        // From riskyWorkers to totalWorkers, we consider risky workers
-        $riskyWorkers = (int)floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
-
-        $domain = '';
-        // max up to 3 as first line has request details and second line has host
-        $lines = explode("\n", $data, 3);
-        $request = $lines[0];
-        if (count($lines) > 1) {
-            $domain = trim(explode('Host: ', $lines[1])[1]);
-        }
-
-        // Sync executions are considered risky
-        $risky = false;
-        if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
-            $risky = true;
-        } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
-            $risky = true;
-        } elseif ($domains->get(md5($domain), 'value') === 1) {
-            // executions request coming from custom domain
-            $risky = true;
-        }
-
-        if ($risky) {
-            // If risky request, only consider risky workers
-            for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
-                /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
-                if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
-                    // If idle worker found, give to him
-                    return $j;
-                }
-            }
-
-            // If no idle workers, give to random risky worker
-            $worker = rand($riskyWorkers, $totalWorkers - 1);
-            Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
-            return $worker;
-        }
-
-        // If safe request, give to any idle worker
-        // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
+    // If data is not set we can send request to any worker
+    // first we try to pick idle worker, if not we randomly pick a worker
+    if ($data === null) {
        for ($i = 0; $i < $totalWorkers; $i++) {
            if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
                return $i;
            }
        }
+        return rand(0, $totalWorkers - 1);
+    }

-        // If no idle worker found, give to random safe worker
-        // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
-        $worker = rand(0, $riskyWorkers - 1);
-        Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
+    $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
+
+    // Each worker has numeric ID, starting from 0 and incrementing
+    // From 0 to riskyWorkers, we consider safe workers
+    // From riskyWorkers to totalWorkers, we consider risky workers
+    $riskyWorkers = (int) floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
+
+    $domain = '';
+    // max up to 3 as first line has request details and second line has host
+    $lines = explode("\n", $data, 3);
+    $request = $lines[0];
+    if (count($lines) > 1) {
+        $domain = trim(explode('Host: ', $lines[1])[1]);
+    }
+
+    // Sync executions are considered risky
+    $risky = false;
+    if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
+        $risky = true;
+    } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
+        $risky = true;
+    } elseif ($domains->get(md5($domain), 'value') === 1) {
+        // executions request coming from custom domain
+        $risky = true;
+    }
+
+    if ($risky) {
+        // If risky request, only consider risky workers
+        for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
+            /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
+            if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
+                // If idle worker found, give to him
+                return $j;
+            }
+        }
+
+        // If no idle workers, give to random risky worker
+        $worker = rand($riskyWorkers, $totalWorkers - 1);
+        Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
        return $worker;
-    };
-    $workerId = $resolveWorkerId($server, $data);
-    $server->bind($fd, $workerId);
-    return $workerId;
+    }
+
+    // If safe request, give to any idle worker
+    // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
+    for ($i = 0; $i < $totalWorkers; $i++) {
+        if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
+            return $i;
+        }
+    }
+
+    // If no idle worker found, give to random safe worker
+    // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
+    $worker = rand(0, $riskyWorkers - 1);
+    Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
+    return $worker;
 }

-
-$http
-    ->set([
-        Constant::OPTION_WORKER_NUM => $totalWorkers,
-        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
-        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
-        Constant::OPTION_HTTP_COMPRESSION => false,
-        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
-        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
-        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
-    ]);
-
-$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
-    Console::success('Worker ' . ++$workerId . ' started successfully');
-});
-
-$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
-    Console::success('Starting reload...');
-});
-
-$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
-    Console::success('Reload completed...');
-});
-
 include __DIR__ . '/controllers/general.php';

 function createDatabase(App $app, string $resourceKey, string $dbName, array $collections, mixed $pools, callable $extraSetup = null): void
@@ -255,8 +252,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                $audit->setup();
            }

-            if ($dbForPlatform->getDocument('buckets', 'default')->isEmpty() &&
-                !$dbForPlatform->exists($dbForPlatform->getDatabase(), 'bucket_1')) {
+            if ($dbForPlatform->getDocument('buckets', 'default')->isEmpty()) {
                Console::info("    └── Creating default bucket...");
                $dbForPlatform->createDocument('buckets', new Document([
                    '$id' => ID::custom('default'),
@@ -308,6 +304,54 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg

                $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
            }
+
+            if (Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots')->isEmpty())) {
+                Console::info("    └── Creating screenshots bucket...");
+                Authorization::skip(fn () => $dbForPlatform->createDocument('buckets', new Document([
+                    '$id' => ID::custom('screenshots'),
+                    '$collection' => ID::custom('buckets'),
+                    'name' => 'Screenshots',
+                    'maximumFileSize' => 5000000, // ~5MB
+                    'allowedFileExtensions' => [ 'png' ],
+                    'enabled' => true,
+                    'compression' => Compression::GZIP,
+                    'encryption' => false,
+                    'antivirus' => false,
+                    'fileSecurity' => true,
+                    '$permissions' => [],
+                    'search' => 'buckets Screenshots',
+                ])));
+
+                $bucket = Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots'));
+
+                Console::info("    └── Creating files collection for screenshots bucket...");
+                $files = $collections['buckets']['files'] ?? [];
+                if (empty($files)) {
+                    throw new Exception('Files collection is not configured.');
+                }
+
+                $attributes = array_map(fn ($attr) => new Document([
+                    '$id' => ID::custom($attr['$id']),
+                    'type' => $attr['type'],
+                    'size' => $attr['size'],
+                    'required' => $attr['required'],
+                    'signed' => $attr['signed'],
+                    'array' => $attr['array'],
+                    'filters' => $attr['filters'],
+                    'default' => $attr['default'] ?? null,
+                    'format' => $attr['format'] ?? ''
+                ]), $files['attributes']);
+
+                $indexes = array_map(fn ($index) => new Document([
+                    '$id' => ID::custom($index['$id']),
+                    'type' => $index['type'],
+                    'attributes' => $index['attributes'],
+                    'lengths' => $index['lengths'],
+                    'orders' => $index['orders'],
+                ]), $files['indexes']);
+
+                Authorization::skip(fn () => $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes));
+            }
        });

        $projectCollections = $collections['projects'];
@@ -520,7 +564,6 @@ $http->on('Task', function () use ($register, $domains) {
                if ($lastSyncUpdate != null) {
                    $queries[] = Query::greaterThanEqual('$updatedAt', $lastSyncUpdate);
                }
-                $queries[] = Query::equal('resourceType', ['function']);
                $results = [];
                try {
                    $results = Authorization::skip(fn () =>  $dbForPlatform->find('rules', $queries));
@@ -531,7 +574,7 @@ $http->on('Task', function () use ($register, $domains) {
                $sum = count($results);
                foreach ($results as $document) {
                    $domain = $document->getAttribute('domain');
-                    if (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
+                    if (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS')) || str_ends_with($domain, System::getEnv('_APP_DOMAIN_SITES'))) {
                        continue;
                    }
                    $domains->set(md5($domain), ['value' => 1]);
@@ -2,6 +2,7 @@

 use Utopia\Config\Config;

+Config::load('template-runtimes', __DIR__ . '/../config/template-runtimes.php');
 Config::load('events', __DIR__ . '/../config/events.php');
 Config::load('auth', __DIR__ . '/../config/auth.php');
 Config::load('apis', __DIR__ . '/../config/apis.php');  // List of APIs
@@ -10,6 +11,7 @@ Config::load('oAuthProviders', __DIR__ . '/../config/oAuthProviders.php');
 Config::load('platforms', __DIR__ . '/../config/platforms.php');
 Config::load('console', __DIR__ . '/../config/console.php');
 Config::load('collections', __DIR__ . '/../config/collections.php');
+Config::load('frameworks', __DIR__ . '/../config/frameworks.php');
 Config::load('runtimes', __DIR__ . '/../config/runtimes.php');
 Config::load('runtimes-v2', __DIR__ . '/../config/runtimes-v2.php');
 Config::load('usage', __DIR__ . '/../config/usage.php');
@@ -33,5 +35,6 @@ Config::load('storage-logos', __DIR__ . '/../config/storage/logos.php');
 Config::load('storage-mimes', __DIR__ . '/../config/storage/mimes.php');
 Config::load('storage-inputs', __DIR__ . '/../config/storage/inputs.php');
 Config::load('storage-outputs', __DIR__ . '/../config/storage/outputs.php');
-Config::load('runtime-specifications', __DIR__ . '/../config/runtimes/specifications.php');
-Config::load('function-templates', __DIR__ . '/../config/function-templates.php');
+Config::load('specifications', __DIR__ . '/../config/specifications.php');
+Config::load('templates-function', __DIR__ . '/../config/templates/function.php');
+Config::load('templates-site', __DIR__ . '/../config/templates/site.php');
@@ -1,6 +1,6 @@
 <?php

-use Appwrite\Functions\Specification;
+use Appwrite\Platform\Modules\Compute\Specification;

 const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
@@ -32,7 +32,7 @@ const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
 const APP_CACHE_BUSTER = 4318;
-const APP_VERSION_STABLE = '1.6.2';
+const APP_VERSION_STABLE = '1.7.0';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -46,6 +46,7 @@ const APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER = 300 * 1000; // 5 minutes
 const APP_DATABASE_TIMEOUT_MILLISECONDS_TASK = 300 * 1000; // 5 minutes
 const APP_DATABASE_QUERY_MAX_VALUES = 500;
 const APP_STORAGE_UPLOADS = '/storage/uploads';
+const APP_STORAGE_SITES = '/storage/sites';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
 const APP_STORAGE_BUILDS = '/storage/builds';
 const APP_STORAGE_CACHE = '/storage/cache';
@@ -64,9 +65,9 @@ const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
 const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
 const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
 const APP_HOSTNAME_INTERNAL = 'appwrite';
-const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
-const APP_FUNCTION_CPUS_DEFAULT = 0.5;
-const APP_FUNCTION_MEMORY_DEFAULT = 512;
+const APP_COMPUTE_CPUS_DEFAULT = 0.5;
+const APP_COMPUTE_MEMORY_DEFAULT = 512;
+const APP_COMPUTE_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
 const APP_PLATFORM_SERVER = 'server';
 const APP_PLATFORM_CLIENT = 'client';
 const APP_PLATFORM_CONSOLE = 'console';
@@ -92,6 +93,7 @@ const DELETE_TYPE_DATABASES = 'databases';
 const DELETE_TYPE_DOCUMENT = 'document';
 const DELETE_TYPE_COLLECTIONS = 'collections';
 const DELETE_TYPE_PROJECTS = 'projects';
+const DELETE_TYPE_SITES = 'sites';
 const DELETE_TYPE_FUNCTIONS = 'functions';
 const DELETE_TYPE_DEPLOYMENTS = 'deployments';
 const DELETE_TYPE_USERS = 'users';
@@ -181,6 +183,7 @@ const METRIC_FILES_IMAGES_TRANSFORMED = 'files.imagesTransformed';
 const METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED = '{bucketInternalId}.files.imagesTransformed';
 const METRIC_BUCKET_ID_FILES = '{bucketInternalId}.files';
 const METRIC_BUCKET_ID_FILES_STORAGE  = '{bucketInternalId}.files.storage';
+const METRIC_SITES = 'sites';
 const METRIC_FUNCTIONS  = 'functions';
 const METRIC_DEPLOYMENTS  = 'deployments';
 const METRIC_DEPLOYMENTS_STORAGE  = 'deployments.storage';
@@ -199,15 +202,29 @@ const METRIC_FUNCTION_ID_BUILDS_STORAGE = '{functionInternalId}.builds.storage';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE  = '{functionInternalId}.builds.compute';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE_SUCCESS  = '{functionInternalId}.builds.compute.success';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE_FAILED  = '{functionInternalId}.builds.compute.failed';
+const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
+const METRIC_SITES_ID_BUILDS  = 'sites.{siteInternalId}.builds';
+const METRIC_SITES_ID_BUILDS_SUCCESS  = 'sites.{siteInternalId}.builds.success';
+const METRIC_SITES_ID_BUILDS_FAILED  = 'sites.{siteInternalId}.builds.failed';
+const METRIC_SITES_ID_BUILDS_STORAGE = 'sites.{siteInternalId}.builds.storage';
+const METRIC_SITES_ID_BUILDS_COMPUTE  = 'sites.{siteInternalId}.builds.compute';
+const METRIC_SITES_ID_BUILDS_COMPUTE_SUCCESS  = 'sites.{siteInternalId}.builds.compute.success';
+const METRIC_SITES_ID_BUILDS_COMPUTE_FAILED  = 'sites.{siteInternalId}.builds.compute.failed';
+const METRIC_SITES_ID_BUILDS_MB_SECONDS = 'sites.{siteInternalId}.builds.mbSeconds';
 const METRIC_FUNCTION_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
 const METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceInternalId}.deployments.storage';
-const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
 const METRIC_EXECUTIONS  = 'executions';
 const METRIC_EXECUTIONS_COMPUTE  = 'executions.compute';
 const METRIC_EXECUTIONS_MB_SECONDS = 'executions.mbSeconds';
 const METRIC_FUNCTION_ID_EXECUTIONS  = '{functionInternalId}.executions';
 const METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE  = '{functionInternalId}.executions.compute';
 const METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS = '{functionInternalId}.executions.mbSeconds';
+const METRIC_SITE_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
+const METRIC_SITE_ID_DEPLOYMENTS_STORAGE = '{resourceType}.{resourceInternalId}.deployments.storage';
+const METRIC_SITE_ID_BUILDS  = '{siteInternalId}.builds';
+const METRIC_SITE_ID_BUILDS_STORAGE = '{siteInternalId}.builds.storage';
+const METRIC_SITE_ID_BUILDS_COMPUTE  = '{siteInternalId}.builds.compute';
+const METRIC_SITE_ID_BUILDS_MB_SECONDS = '{siteInternalId}.builds.mbSeconds';
 const METRIC_NETWORK_REQUESTS  = 'network.requests';
 const METRIC_NETWORK_INBOUND  = 'network.inbound';
 const METRIC_NETWORK_OUTBOUND  = 'network.outbound';
@@ -231,6 +248,7 @@ const METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceIn

 const RESOURCE_TYPE_PROJECTS = 'projects';
 const RESOURCE_TYPE_FUNCTIONS = 'functions';
+const RESOURCE_TYPE_SITES = 'sites';
 const RESOURCE_TYPE_DATABASES = 'databases';
 const RESOURCE_TYPE_BUCKETS = 'buckets';
 const RESOURCE_TYPE_PROVIDERS = 'providers';
@@ -225,7 +225,7 @@ Database::addFilter(
        return $database
            ->find('variables', [
                Query::equal('resourceInternalId', [$document->getInternalId()]),
-                Query::equal('resourceType', ['function']),
+                Query::equal('resourceType', ['function', 'site']),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]);
    }
@@ -21,7 +21,6 @@ use Appwrite\Extend\Exception;
 use Appwrite\GraphQL\Schema;
 use Appwrite\Network\Validator\Origin;
 use Appwrite\Utopia\Request;
-use Executor\Executor;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\App;
 use Utopia\Cache\Adapter\Sharding;
@@ -39,7 +38,6 @@ use Utopia\Logger\Log;
 use Utopia\Pools\Group;
 use Utopia\Queue\Publisher;
 use Utopia\Storage\Device;
-use Utopia\Storage\Device\AWS;
 use Utopia\Storage\Device\Backblaze;
 use Utopia\Storage\Device\DOSpaces;
 use Utopia\Storage\Device\Linode;
@@ -48,8 +46,6 @@ use Utopia\Storage\Device\S3;
 use Utopia\Storage\Device\Wasabi;
 use Utopia\Storage\Storage;
 use Utopia\System\System;
-use Utopia\Telemetry\Adapter as Telemetry;
-use Utopia\Telemetry\Adapter\None as NoTelemetry;
 use Utopia\Validator\Hostname;
 use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;

@@ -466,9 +462,7 @@ App::setResource('getLogsDB', function (Group $pools, Cache $cache) {
    };
 }, ['pools', 'cache']);

-App::setResource('telemetry', fn () => new NoTelemetry());
-
-App::setResource('cache', function (Group $pools, Telemetry $telemetry) {
+App::setResource('cache', function (Group $pools) {
    $list = Config::getParam('pools-cache', []);
    $adapters = [];

@@ -476,15 +470,12 @@ App::setResource('cache', function (Group $pools, Telemetry $telemetry) {
        $adapters[] = $pools
            ->get($value)
            ->pop()
-            ->getResource();
+            ->getResource()
+        ;
    }

-    $cache = new Cache(new Sharding($adapters));
-
-    $cache->setTelemetry($telemetry);
-
-    return $cache;
-}, ['pools', 'telemetry']);
+    return new Cache(new Sharding($adapters));
+}, ['pools']);

 App::setResource('redis', function () {
    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
@@ -515,6 +506,10 @@ App::setResource('deviceForFiles', function ($project) {
    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
 }, ['project']);

+App::setResource('deviceForSites', function ($project) {
+    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
+}, ['project']);
+
 App::setResource('deviceForFunctions', function ($project) {
    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
@@ -549,12 +544,7 @@ function getDevice(string $root, string $connection = ''): Device

        switch ($device) {
            case Storage::DEVICE_S3:
-                if (!empty($url)) {
-                    return new S3($root, $accessKey, $accessSecret, $url, $region, $acl);
-                } else {
-                    return new AWS($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-                }
-                // no break
+                return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl, $url);
            case STORAGE::DEVICE_DO_SPACES:
                $device = new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
                $device->setHttpVersion(S3::HTTP_VERSION_1_1);
@@ -581,12 +571,7 @@ function getDevice(string $root, string $connection = ''): Device
                $s3Bucket = System::getEnv('_APP_STORAGE_S3_BUCKET', '');
                $s3Acl = 'private';
                $s3EndpointUrl = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
-                if (!empty($s3EndpointUrl)) {
-                    return new S3($root, $s3AccessKey, $s3SecretKey, $s3EndpointUrl, $s3Region, $s3Acl);
-                } else {
-                    return new AWS($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
-                }
-                // no break
+                return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl, $s3EndpointUrl);
            case Storage::DEVICE_DO_SPACES:
                $doSpacesAccessKey = System::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
                $doSpacesSecretKey = System::getEnv('_APP_STORAGE_DO_SPACES_SECRET', '');
@@ -821,16 +806,24 @@ App::setResource(
    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
 );

-App::setResource('previewHostname', function (Request $request) {
+App::setResource('previewHostname', function (Request $request, ?Key $apiKey) {
+    $allowed = false;
+
    if (App::isDevelopment()) {
-        $host = $request->getQuery('appwrite-hostname') ?? '';
+        $allowed = true;
+    } elseif (!\is_null($apiKey) && $apiKey->getHostnameOverride() === true) {
+        $allowed = true;
+    }
+
+    if ($allowed) {
+        $host = $request->getQuery('appwrite-hostname', $request->getHeader('x-appwrite-hostname', '')) ?? '';
        if (!empty($host)) {
            return $host;
        }
    }

    return '';
-}, ['request']);
+}, ['request', 'apiKey']);

 App::setResource('apiKey', function (Request $request, Document $project): ?Key {
    $key = $request->getHeader('x-appwrite-key');
@@ -841,5 +834,3 @@ App::setResource('apiKey', function (Request $request, Document $project): ?Key

    return Key::decode($project, $key);
 }, ['request', 'project']);
-
-App::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>404 Not Found</title>
+
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+
+        body {
+            background-color: #FFFFFF;
+        }
+
+        .main {
+            display: flex;
+            min-height: 100vh;
+            width: 100vw;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .content {
+            margin-left: auto;
+            margin-right: auto;
+            max-width: 400px;
+        }
+
+        span {
+            padding: var(--space-1, 2px) var(--space-3, 6px);
+            border-radius: var(--border-radius-XS, 6px);
+            background: var(--color-overlay-on-neutral, rgba(0, 0, 0, 0.06));
+            color: var(--color-fgColor-neutral-secondary, #56565C);
+            text-align: center;
+            font-family: var(--font-family-sansSerif, Inter);
+            font-size: var(--font-size-S, 14px);
+            font-style: normal;
+            font-weight: 400;
+            line-height: 140%;
+            letter-spacing: -0.063px;
+        }
+
+        h1 {
+            color: var(--color-fgColor-neutral-primary, #2D2D31);
+            text-align: center;
+            font-family: var(--font-family-sansSerif, Inter);
+            font-size: var(--font-size-XXXL, 32px);
+            font-style: normal;
+            font-weight: 400;
+            line-height: 140%;
+            letter-spacing: -0.144px;
+            margin-top: 8px;
+            margin-bottom: 32px;
+        }
+
+        button {
+            border-radius: var(--border-radius-S, 8px);
+            font-family: var(--font-family-sansSerif, Inter);
+            font-size: var(--font-size-S, 14px);
+            font-style: normal;
+            font-weight: 500;
+            line-height: 140%;
+            letter-spacing: -0.063px;
+            padding: var(--space-3, 6px) var(--space-5, 10px);
+            cursor: pointer;
+            border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #D8D8DB);
+            background: var(--color-bgColor-neutral-primary, #FFF);
+            color: var(--color-fgColor-neutral-secondary, #56565C);
+        }
+
+        .center {
+            display: flex;
+            justify-content: center;
+        }
+
+        .brand {
+            position: absolute;
+            width: 100%;
+            bottom: 32px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            gap: 8px;
+        }
+
+        .brand p {
+            font-family: var(--font-family-monospace, "Aeonik Fono");
+            font-size: var(--font-size-XS, 12px);
+            font-style: normal;
+            font-weight: 400;
+            line-height: 130%;
+            letter-spacing: 0.96px;
+            text-transform: uppercase;
+            color: var(--color-fgColor-neutral-secondary, #56565C);
+        }
+
+        .brand svg {
+            height: 20px;
+        }
+
+        .logo-dark {
+            display: none;
+        }
+
+        @media (prefers-color-scheme: dark) {
+            body {
+                background-color: #1D1D21;
+            }
+
+            h1 {
+                color: var(--color-fgColor-neutral-primary, #EDEDF0);
+            }
+
+            button {
+                border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #414146);
+                background: var(--color-bgColor-neutral-primary, #1D1D21);
+                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
+            }
+
+            .brand p {
+                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
+            }
+
+            span {
+                background: var(--color-overlay-on-neutral, rgba(255, 255, 255, 0.20));
+                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
+            }
+
+            .logo-light {
+                display: none;
+            }
+
+            .logo-dark {
+                display: block;
+            }
+        }
+    </style>
+</head>
+
+<body>
+    <div class="main">
+        <div class="content">
+            <div class="center"><span>Page not found</span></div>
+            <h1>The page you’re looking for doesn’t exist.</h1>
+            <div class="center"><a href="/"><button>Go to homepage</button></a></div>
+        </div>
+    </div>
+
+    <div class="brand">
+        <p>Powered by</p>
+        <svg class="logo-dark" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M31.8649 16.2461C33.6492 16.2461 34.5511 15.3184 34.9433 14.6867H35.1197C35.1981 15.3578 35.6687 15.9895 36.5903 15.9895H38.3353V14.0156H37.8843C37.5706 14.0156 37.4138 13.838 37.4138 13.5617V5.64661H35.1001V6.90986H34.9236C34.4727 6.27823 33.5315 5.39001 31.8061 5.39001C29.0611 5.39001 27.022 7.67965 27.022 10.818C27.022 13.9564 29.1003 16.2461 31.8649 16.2461ZM32.2767 13.9959C30.6493 13.9959 29.3748 12.7919 29.3748 10.8378C29.3748 8.92316 30.6101 7.62044 32.2571 7.62044C33.8256 7.62044 35.1393 8.78499 35.1393 10.8378C35.1393 12.5945 34.0217 13.9959 32.2767 13.9959Z" fill="#EDEDF0" />
+            <path d="M39.7013 20H42.0149V14.6867H42.1914C42.6227 15.3184 43.5443 16.2461 45.3677 16.2461C48.1127 16.2461 50.1127 13.9169 50.1127 10.818C50.1127 7.69939 47.9755 5.39001 45.2109 5.39001C43.4462 5.39001 42.5835 6.35719 42.1718 6.89012H41.9953V5.64661H39.7013V20ZM44.8776 14.0551C43.2894 14.0551 41.9757 12.8708 41.9757 10.818C41.9757 9.06133 43.0933 7.58096 44.8383 7.58096C46.4657 7.58096 47.7402 8.86395 47.7402 10.818C47.7402 12.7326 46.5049 14.0551 44.8776 14.0551Z" fill="#EDEDF0" />
+            <path d="M51.3065 20H53.6202V14.6867H53.7966C54.228 15.3184 55.1495 16.2461 56.973 16.2461C59.718 16.2461 61.5273 13.9169 61.5273 10.818C61.5273 7.69939 59.5807 5.39001 56.8161 5.39001C55.0515 5.39001 54.1888 6.35719 53.777 6.89012H53.6005V5.64661H51.3065V20ZM56.4828 14.0551C54.8946 14.0551 53.5809 12.8708 53.5809 10.818C53.5809 9.06133 54.6985 7.58096 56.4436 7.58096C58.071 7.58096 59.3454 8.86395 59.3454 10.818C59.3454 12.7326 58.1102 14.0551 56.4828 14.0551Z" fill="#EDEDF0" />
+            <path d="M64.5857 16.2296H67.8601L69.7227 8.11721H69.8404L71.7031 16.2296H74.9579L77.5642 5.88678H75.2323L73.3697 14.0189H73.1932L71.3305 5.88678H68.2522L66.3699 14.0189H66.1935L64.3504 5.88678H61.8799L64.5857 16.2296Z" fill="#EDEDF0" />
+            <path d="M78.7363 16.2296H81.0499V11.1174C81.0499 9.16334 81.9519 7.9593 83.6381 7.9593H84.6576V5.63019H83.893C82.5793 5.63019 81.5793 6.53815 81.1872 7.40663H81.0303V5.88678H78.7363V16.2296Z" fill="#EDEDF0" />
+            <path d="M96.1391 16.2296H97.943V14.1571H96.1587C95.4529 14.1571 95.1588 13.8413 95.1588 13.111V7.93956H98.0606V5.88678H95.1588V2.98526H92.9628V5.88678H91.0413V7.93956H92.8255V13.1307C92.8255 15.3217 94.1392 16.2296 96.1391 16.2296Z" fill="#EDEDF0" />
+            <path d="M104.15 16.2461C106.287 16.2461 108.17 15.1802 108.836 13.0287L106.719 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.327 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.915 7.58096 98.915 10.8378C98.915 13.9959 101.013 16.2461 104.15 16.2461ZM101.327 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.621 8.31128 106.738 9.71269H101.327Z" fill="#EDEDF0" />
+            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0125 16.2296H87.6989V7.93956H85.895V5.88678H90.0125V16.2296Z" fill="#EDEDF0" />
+            <path d="M88.6834 4.45145C89.5265 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5265 1.54993 88.6834 1.54993C87.8403 1.54993 87.2129 2.18155 87.2129 2.99082C87.2129 3.81983 87.8403 4.45145 88.6834 4.45145Z" fill="#EDEDF0" />
+            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
+            <path d="M20.2006 7.88412V12.4486H11.9414C12.8021 11.6166 13.3389 10.4373 13.3389 9.12899C13.3389 8.69744 13.2806 8.27999 13.1713 7.88412H20.2006Z" fill="#FD366E" />
+        </svg>
+        <svg class="logo-light" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M31.8648 16.2461C33.649 16.2461 34.5509 15.3184 34.9431 14.6867H35.1195C35.198 15.3578 35.6685 15.9895 36.5901 15.9895H38.3351V14.0156H37.8841C37.5704 14.0156 37.4136 13.838 37.4136 13.5617V5.64661H35.0999V6.90986H34.9235C34.4725 6.27823 33.5314 5.39001 31.8059 5.39001C29.0609 5.39001 27.0218 7.67965 27.0218 10.818C27.0218 13.9564 29.1001 16.2461 31.8648 16.2461ZM32.2765 13.9959C30.6491 13.9959 29.3746 12.7919 29.3746 10.8378C29.3746 8.92316 30.6099 7.62044 32.2569 7.62044C33.8255 7.62044 35.1391 8.78499 35.1391 10.8378C35.1391 12.5945 34.0215 13.9959 32.2765 13.9959Z" fill="#2D2D31" />
+            <path d="M39.7011 20H42.0147V14.6867H42.1912C42.6226 15.3184 43.5441 16.2461 45.3676 16.2461C48.1126 16.2461 50.1125 13.9169 50.1125 10.818C50.1125 7.69939 47.9753 5.39001 45.2107 5.39001C43.4461 5.39001 42.5833 6.35719 42.1716 6.89012H41.9951V5.64661H39.7011V20ZM44.8774 14.0551C43.2892 14.0551 41.9755 12.8708 41.9755 10.818C41.9755 9.06133 43.0931 7.58096 44.8382 7.58096C46.4656 7.58096 47.74 8.86395 47.74 10.818C47.74 12.7326 46.5048 14.0551 44.8774 14.0551Z" fill="#2D2D31" />
+            <path d="M51.3063 20H53.62V14.6867H53.7964C54.2278 15.3184 55.1493 16.2461 56.9728 16.2461C59.7178 16.2461 61.5271 13.9169 61.5271 10.818C61.5271 7.69939 59.5805 5.39001 56.8159 5.39001C55.0513 5.39001 54.1886 6.35719 53.7768 6.89012H53.6004V5.64661H51.3063V20ZM56.4826 14.0551C54.8944 14.0551 53.5808 12.8708 53.5808 10.818C53.5808 9.06133 54.6984 7.58096 56.4434 7.58096C58.0708 7.58096 59.3453 8.86395 59.3453 10.818C59.3453 12.7326 58.11 14.0551 56.4826 14.0551Z" fill="#2D2D31" />
+            <path d="M64.5855 16.2296H67.8599L69.7226 8.11721H69.8402L71.7029 16.2296H74.9577L77.564 5.88678H75.2322L73.3695 14.0189H73.193L71.3303 5.88678H68.252L66.3697 14.0189H66.1933L64.3502 5.88678H61.8797L64.5855 16.2296Z" fill="#2D2D31" />
+            <path d="M78.7361 16.2296H81.0498V11.1174C81.0498 9.16334 81.9517 7.9593 83.6379 7.9593H84.6575V5.63019H83.8928C82.5791 5.63019 81.5791 6.53815 81.187 7.40663H81.0301V5.88678H78.7361V16.2296Z" fill="#2D2D31" />
+            <path d="M96.1389 16.2296H97.9428V14.1571H96.1585C95.4527 14.1571 95.1586 13.8413 95.1586 13.111V7.93956H98.0604V5.88678H95.1586V2.98526H92.9626V5.88678H91.0411V7.93956H92.8253V13.1307C92.8253 15.3217 94.139 16.2296 96.1389 16.2296Z" fill="#2D2D31" />
+            <path d="M104.15 16.2461C106.287 16.2461 108.169 15.1802 108.836 13.0287L106.718 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.326 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.9148 7.58096 98.9148 10.8378C98.9148 13.9959 101.013 16.2461 104.15 16.2461ZM101.326 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.62 8.31128 106.738 9.71269H101.326Z" fill="#2D2D31" />
+            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0123 16.2296H87.6987V7.93956H85.8948V5.88678H90.0123V16.2296Z" fill="#2D2D31" />
+            <path d="M88.6835 4.45145C89.5266 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5266 1.54993 88.6835 1.54993C87.8404 1.54993 87.213 2.18155 87.213 2.99082C87.213 3.81983 87.8404 4.45145 88.6835 4.45145Z" fill="#2D2D31" />
+            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
+            <path d="M20.2007 7.88412V12.4486H11.9415C12.8022 11.6166 13.339 10.4373 13.339 9.12899C13.339 8.69744 13.2807 8.27999 13.1714 7.88412H20.2007Z" fill="#FD366E" />
+        </svg>
+
+    </div>
+</body>
+
+</html>
@@ -86,7 +86,7 @@ $image = $this->getParam('image', '');
      - _APP_OPTIONS_ABUSE
      - _APP_OPTIONS_ROUTER_PROTECTION
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET
@@ -133,12 +133,13 @@ $image = $this->getParam('image', '');
      - _APP_STORAGE_WASABI_SECRET
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
-      - _APP_FUNCTIONS_SIZE_LIMIT
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
+      - _APP_SITES_RUNTIMES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_CONFIG
@@ -148,7 +149,6 @@ $image = $this->getParam('image', '');
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_SMS_PROVIDER
@@ -168,7 +168,7 @@ $image = $this->getParam('image', '');
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:5.2.58
+    image: <?php echo $organization; ?>/console:5.2.53
    restart: unless-stopped
    networks:
      - appwrite
@@ -341,7 +341,6 @@ $image = $this->getParam('image', '');
      - _APP_EXECUTOR_HOST
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_EXECUTION
      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
      - _APP_EMAIL_CERTIFICATES
@@ -405,13 +404,13 @@ $image = $this->getParam('image', '');
      - _APP_VCS_GITHUB_APP_NAME
      - _APP_VCS_GITHUB_PRIVATE_KEY
      - _APP_VCS_GITHUB_APP_ID
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_DOMAIN
      - _APP_STORAGE_DEVICE
      - _APP_STORAGE_S3_ACCESS_KEY
@@ -496,10 +495,10 @@ $image = $this->getParam('image', '');
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_USAGE_STATS
@@ -653,7 +652,6 @@ $image = $this->getParam('image', '');
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES

@@ -744,6 +742,34 @@ $image = $this->getParam('image', '');
      - _APP_LOGGING_CONFIG
      - _APP_USAGE_AGGREGATION_INTERVAL

+  appwrite-worker-stats-usage-dump:
+    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    entrypoint: worker-stats-usage-dump
+    <<: *x-logging
+    container_name: appwrite-worker-stats-usage-dump
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_USAGE_STATS
+      - _APP_LOGGING_CONFIG
+      - _APP_USAGE_AGGREGATION_INTERVAL
+
  appwrite-task-scheduler-functions:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
    entrypoint: schedule-functions
@@ -835,7 +861,7 @@ $image = $this->getParam('image', '');
    <<: *x-logging
    restart: unless-stopped
    stop_signal: SIGINT
-    image: openruntimes/executor:0.6.11
+    image: openruntimes/executor:0.7.0
    networks:
      - appwrite
      - runtimes
@@ -847,9 +873,9 @@ $image = $this->getParam('image', '');
      # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
      - /tmp:/tmp:rw
    environment:
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
@@ -15,9 +15,11 @@ use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\StatsUsage;
+use Appwrite\Event\StatsUsageDump;
+/** remove */
+/** /remove */
 use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
-use Executor\Executor;
 use Swoole\Runtime;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\Cache\Adapter\Sharding;
@@ -213,18 +215,15 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
 }, ['pools', 'cache']);

 Server::setResource('abuseRetention', function () {
-    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
+    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400);
 });

-Server::setResource('auditRetention', function (Document $project) {
-    if ($project->getId() === 'console') {
-        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
-    }
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
-}, ['project']);
+Server::setResource('auditRetention', function () {
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600));
+});

 Server::setResource('executionRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600));
 });

 Server::setResource('cache', function (Registry $register) {
@@ -278,6 +277,10 @@ Server::setResource('queueForStatsUsage', function (Publisher $publisher) {
    return new StatsUsage($publisher);
 }, ['publisher']);

+Server::setResource('queueForStatsUsageDump', function (Publisher $publisher) {
+    return new StatsUsageDump($publisher);
+}, ['publisher']);
+
 Server::setResource('queueForDatabase', function (Publisher $publisher) {
    return new EventDatabase($publisher);
 }, ['publisher']);
@@ -334,6 +337,10 @@ Server::setResource('pools', function (Registry $register) {
    return $register->get('pools');
 }, ['register']);

+Server::setResource('deviceForSites', function (Document $project) {
+    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
+}, ['project']);
+
 Server::setResource('deviceForFunctions', function (Document $project) {
    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
@@ -409,8 +416,6 @@ Server::setResource('logError', function (Registry $register, Document $project)
    };
 }, ['register', 'project']);

-Server::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
-
 $pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/cli.php screenshot $@
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/worker.php stats-usage-dump $@
@@ -14,7 +14,8 @@
        "test": "vendor/bin/phpunit",
        "lint": "vendor/bin/pint --test",
        "format": "vendor/bin/pint",
-        "bench": "vendor/bin/phpbench run --report=benchmark"
+        "bench": "vendor/bin/phpbench run --report=benchmark",
+        "check": "./vendor/bin/phpstan analyse -c phpstan.neon"
    },
    "autoload": {
        "psr-4": {
@@ -43,7 +44,7 @@
        "ext-openssl": "*",
        "ext-zlib": "*",
        "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.16.*",
+        "appwrite/php-runtimes": "0.19.*",
        "appwrite/php-clamav": "2.0.*",
        "utopia-php/abuse": "0.52.*",
        "utopia-php/analytics": "0.10.*",
@@ -51,11 +52,12 @@
        "utopia-php/cache": "0.12.*",
        "utopia-php/cli": "0.15.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.66.*",
+        "utopia-php/detector": "0.1.*",
+        "utopia-php/database": "0.61.*",
        "utopia-php/domains": "0.5.*",
        "utopia-php/dsn": "0.2.1",
        "utopia-php/framework": "0.33.*",
-        "utopia-php/fetch": "0.4.*",
+        "utopia-php/fetch": "0.3.*",
        "utopia-php/image": "0.8.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.6.*",
@@ -63,7 +65,7 @@
        "utopia-php/migration": "0.8.*",
        "utopia-php/orchestration": "0.9.*",
        "utopia-php/platform": "0.7.*",
-        "utopia-php/pools": "0.8.*",
+        "utopia-php/pools": "0.7.*",
        "utopia-php/preloader": "0.2.*",
        "utopia-php/queue": "0.9.*",
        "utopia-php/registry": "0.5.*",
@@ -71,8 +73,8 @@
        "utopia-php/swoole": "0.8.*",
        "utopia-php/system": "0.9.*",
        "utopia-php/telemetry": "0.1.*",
-        "utopia-php/vcs": "0.9.*",
-        "utopia-php/websocket": "0.3.*",
+        "utopia-php/vcs": "0.10.*",
+        "utopia-php/websocket": "0.1.*",
        "matomo/device-detector": "6.1.*",
        "dragonmantank/cron-expression": "3.3.2",
        "phpmailer/phpmailer": "6.9.1",
@@ -87,6 +89,7 @@
        "appwrite/sdk-generator": "0.40.*",
        "phpunit/phpunit": "9.*",
        "swoole/ide-helper": "5.1.2",
+        "phpstan/phpstan": "1.8.*",
        "textalk/websocket": "1.5.*",
        "laravel/pint": "1.*",
        "phpbench/phpbench": "1.*"
@@ -99,8 +102,8 @@
            "php": "8.3"
        },
        "allow-plugins": {
-            "php-http/discovery": false,
-            "tbachert/spi": false
+            "php-http/discovery": true,
+            "tbachert/spi": true
        }
    }
 }
@@ -76,6 +76,8 @@ services:
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
      - appwrite-functions:/storage/functions:rw
+      - appwrite-sites:/storage/sites:rw
+      - appwrite-builds:/storage/builds:rw
      - ./phpunit.xml:/usr/src/code/phpunit.xml
      - ./tests:/usr/src/code/tests
      - ./app:/usr/src/code/app
@@ -110,7 +112,7 @@ services:
      - _APP_OPTIONS_ABUSE
      - _APP_OPTIONS_ROUTER_PROTECTION
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET
@@ -157,12 +159,14 @@ services:
      - _APP_STORAGE_WASABI_SECRET
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
-      - _APP_FUNCTIONS_SIZE_LIMIT
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
+      - _APP_SITES_RUNTIMES
+      - _APP_DOMAIN_SITES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_CONFIG
@@ -171,7 +175,6 @@ services:
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_SMS_PROVIDER
@@ -198,14 +201,11 @@ services:
      - _APP_DATABASE_SHARED_TABLES_V1
      - _APP_DATABASE_SHARED_NAMESPACE
      - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
-      - _APP_CUSTOM_DOMAIN_DENY_LIST
-    extra_hosts:
-      - "host.docker.internal:host-gateway"

  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: appwrite/console:5.2.58
+    image: appwrite/console:5.3.0-sites-rc.31
    restart: unless-stopped
    networks:
      - appwrite
@@ -348,6 +348,7 @@ services:
      - appwrite-uploads:/storage/uploads:rw
      - appwrite-cache:/storage/cache:rw
      - appwrite-functions:/storage/functions:rw
+      - appwrite-sites:/storage/sites:rw
      - appwrite-builds:/storage/builds:rw
      - appwrite-certificates:/storage/certificates:rw
      - ./app:/usr/src/code/app
@@ -393,8 +394,6 @@ services:
      - _APP_DATABASE_SHARED_TABLES
      - _APP_DATABASE_SHARED_TABLES_V1
      - _APP_EMAIL_CERTIFICATES
-      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE

  appwrite-worker-databases:
    entrypoint: worker-databases
@@ -436,7 +435,9 @@ services:
      - appwrite
    volumes:
      - appwrite-functions:/storage/functions:rw
+      - appwrite-sites:/storage/sites:rw
      - appwrite-builds:/storage/builds:rw
+      - appwrite-uploads:/storage/uploads:rw
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
    depends_on:
@@ -461,13 +462,13 @@ services:
      - _APP_VCS_GITHUB_APP_NAME
      - _APP_VCS_GITHUB_PRIVATE_KEY
      - _APP_VCS_GITHUB_APP_ID
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_DOMAIN
      - _APP_STORAGE_DEVICE
      - _APP_STORAGE_S3_ACCESS_KEY
@@ -492,8 +493,7 @@ services:
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
      - _APP_DATABASE_SHARED_TABLES
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - _APP_DOMAIN_SITES

  appwrite-worker-certificates:
    entrypoint: worker-certificates
@@ -559,10 +559,10 @@ services:
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_USAGE_STATS
@@ -729,7 +729,6 @@ services:
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_MAINTENANCE_DELAY
@@ -828,6 +827,38 @@ services:
      - _APP_USAGE_AGGREGATION_INTERVAL
      - _APP_DATABASE_SHARED_TABLES

+  appwrite-worker-stats-usage-dump:
+    entrypoint: worker-stats-usage-dump
+    <<: *x-logging
+    container_name: appwrite-worker-stats-usage-dump
+    image: appwrite-dev
+    networks:
+      - appwrite
+    volumes:
+      - ./app:/usr/src/code/app
+      - ./src:/usr/src/code/src
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_USAGE_STATS
+      - _APP_LOGGING_CONFIG
+      - _APP_USAGE_AGGREGATION_INTERVAL
+      - _APP_DATABASE_SHARED_TABLES
+      - _APP_STATS_USAGE_DUAL_WRITING_DBS
+
  appwrite-task-scheduler-functions:
    entrypoint: schedule-functions
    <<: *x-logging
@@ -919,12 +950,18 @@ services:
    environment:
      - _APP_ASSISTANT_OPENAI_API_KEY

+  appwrite-browser:
+    container_name: appwrite-browser
+    image: appwrite/browser:0.2.2
+    networks:
+      - appwrite
+
  openruntimes-executor:
    container_name: openruntimes-executor
    hostname: exc1
    <<: *x-logging
    stop_signal: SIGINT
-    image: openruntimes/executor:0.6.11
+    image: openruntimes/executor:0.7.13
    restart: unless-stopped
    networks:
      - appwrite
@@ -933,19 +970,21 @@ services:
      - /var/run/docker.sock:/var/run/docker.sock
      - appwrite-builds:/storage/builds:rw
      - appwrite-functions:/storage/functions:rw
+      - appwrite-sites:/storage/sites:rw
      # Host mount nessessary to share files between executor and runtimes.
      # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
      - /tmp:/tmp:rw
    environment:
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_IMAGE_PULL=enabled
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES,$_APP_SITES_RUNTIMES
      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4
+      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v5
      - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
      - OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
      - OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY
@@ -1103,5 +1142,6 @@ volumes:
  appwrite-uploads:
  appwrite-certificates:
  appwrite-functions:
+  appwrite-sites:
  appwrite-builds:
-  appwrite-config:
+  appwrite-config:
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
--- a/Show More
+++ b/Show More