Merge branch '1.8.x' into fix-mails

Merge pull request #11174 from appwrite/feat-string-types
Update specs
2026-05-26 13:51:13 +00:00 · 2026-01-30 07:28:38 +05:30 · 2026-01-29 14:39:06 +00:00 · 2026-01-30 02:21:32 +13:00 · 2026-01-30 02:07:33 +13:00 · 2026-01-29 13:53:32 +01:00
396 changed files with 39363 additions and 13938 deletions
@@ -2,6 +2,7 @@ _APP_ENV=development
 _APP_EDITION=self-hosted
 _APP_LOCALE=en
 _APP_WORKER_PER_CORE=6
+_APP_COMPRESSION_ENABLED=enabled
 _APP_COMPRESSION_MIN_SIZE_BYTES=1024
 _APP_CONSOLE_WHITELIST_ROOT=disabled
 _APP_CONSOLE_WHITELIST_EMAILS=
@@ -69,8 +70,8 @@ _APP_STORAGE_ANTIVIRUS_PORT=3310
 _APP_SMTP_HOST=maildev
 _APP_SMTP_PORT=1025
 _APP_SMTP_SECURE=
-_APP_SMTP_USERNAME=
-_APP_SMTP_PASSWORD=
+_APP_SMTP_USERNAME=user
+_APP_SMTP_PASSWORD=password
 _APP_SMS_PROVIDER=sms://username:password@mock
 _APP_SMS_FROM=+123456789
 _APP_SMS_PROJECTS_DENY_LIST=
@@ -101,9 +102,12 @@ _APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_STATS_RESOURCES_INTERVAL=30
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400
+_APP_INTERVAL_DOMAIN_VERIFICATION=60
+_APP_INTERVAL_CLEANUP_STALE_EXECUTIONS=300
 _APP_USAGE_STATS=enabled
 _APP_LOGGING_CONFIG=
 _APP_LOGGING_CONFIG_REALTIME=
+_APP_GRAPHQL_INTROSPECTION=enabled
 _APP_GRAPHQL_MAX_BATCH_SIZE=10
 _APP_GRAPHQL_MAX_COMPLEXITY=250
 _APP_GRAPHQL_MAX_DEPTH=4
@@ -125,4 +129,5 @@ _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=10
 _APP_PROJECT_REGIONS=default
 _APP_FUNCTIONS_CREATION_ABUSE_LIMIT=5000
 _APP_STATS_USAGE_DUAL_WRITING_DBS=database_db_main
-_APP_TRUSTED_HEADERS=x-forwarded-for
+_APP_TRUSTED_HEADERS=x-forwarded-for
+_APP_POOL_ADAPTER=stack
@@ -223,7 +223,7 @@ jobs:
            -e _APP_DATABASE_SHARED_TABLES \
            -e _APP_DATABASE_SHARED_TABLES_V1 \
            -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group devKeys,screenshots
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group abuseEnabled,screenshots

      - name: Failure Logs
        if: failure()
@@ -312,7 +312,7 @@ jobs:
            -e _APP_DATABASE_SHARED_TABLES \
            -e _APP_DATABASE_SHARED_TABLES_V1 \
            -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group devKeys,screenshots
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group abuseEnabled,screenshots

      - name: Failure Logs
        if: failure()
@@ -322,8 +322,8 @@ jobs:
          echo "=== OpenRuntimes Executor Logs ==="
          docker compose logs openruntimes-executor

-  e2e_dev_keys:
-    name: E2E Service Test (Dev Keys)
+  e2e_abuse_enabled:
+    name: E2E Service Test (Abuse enabled)
    runs-on: ubuntu-latest
    needs: setup
    steps:
@@ -344,7 +344,7 @@ jobs:
          docker compose up -d
          sleep 30

-      - name: Run Projects tests with dev keys in dedicated table mode
+      - name: Run Projects tests in dedicated table mode
        run: |
          echo "Using project tables"
          export _APP_DATABASE_SHARED_TABLES=
@@ -354,7 +354,7 @@ jobs:
            -e _APP_DATABASE_SHARED_TABLES \
            -e _APP_DATABASE_SHARED_TABLES_V1 \
            -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-            appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=devKeys
+            appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=abuseEnabled

      - name: Failure Logs
        if: failure()
@@ -364,8 +364,8 @@ jobs:
          echo "=== OpenRuntimes Executor Logs ==="
          docker compose logs openruntimes-executor

-  e2e_dev_keys_shared_mode:
-    name: E2E Shared Mode Service Test (Dev Keys)
+  e2e_abuse_enabled_shared_mode:
+    name: E2E Shared Mode Service Test (Abuse enabled)
    runs-on: ubuntu-latest
    needs: [ setup, check_database_changes ]
    if: needs.check_database_changes.outputs.database_changed == 'true'
@@ -394,7 +394,7 @@ jobs:
          docker compose up -d
          sleep 30

-      - name: Run Projects tests with dev keys in ${{ matrix.tables-mode }} table mode
+      - name: Run Projects tests in ${{ matrix.tables-mode }} table mode
        run: |
          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
            echo "Using shared tables V1"
@@ -410,7 +410,7 @@ jobs:
            -e _APP_DATABASE_SHARED_TABLES \
            -e _APP_DATABASE_SHARED_TABLES_V1 \
            -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-            appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=devKeys
+            appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=abuseEnabled

      - name: Failure Logs
        if: failure()
@@ -420,7 +420,7 @@ jobs:
          echo "=== OpenRuntimes Executor Logs ==="
          docker compose logs openruntimes-executor

-  e2e_screenshots_keys:
+  e2e_screenshots:
    name: E2E Service Test (Site Screenshots)
    runs-on: ubuntu-latest
    needs: setup
@@ -0,0 +1,77 @@
+# AGENTS.md
+
+Appwrite is an end-to-end backend server for web, mobile, native, and backend apps. This guide provides context and instructions for AI coding agents working on the Appwrite codebase.
+
+## Project Overview
+
+Appwrite is a self-hosted Backend-as-a-Service (BaaS) platform that provides developers with a set of APIs and tools to build secure, scalable applications. The project uses a hybrid monolithic-microservice architecture built with PHP, running on Swoole for high performance.
+
+**Key Technologies:**
+- **Backend:** PHP 8.3+, Swoole
+- **Libraries:** Utopia PHP
+- **Database:** MariaDB, Redis
+- **Cache:** Redis
+- **Queue:** Redis
+- **Containers:** Docker
+
+## Development Commands
+
+```bash
+# Run Appwrite
+docker compose up -d --force-recreate --build
+
+# Run specific test
+docker compose exec appwrite test /usr/src/code/tests/e2e/Services/[ServiceName] --filter=[FunctionName]
+
+# Format code
+composer format
+```
+
+## Code Style Guidelines
+
+- Follow [PSR-12](https://www.php-fig.org/psr/psr-12/) coding standard
+- Use PSR-4 autoloading
+- Strict type declarations where applicable
+- Comprehensive PHPDoc comments
+
+### Naming Conventions
+
+#### `resourceType` Naming Rule
+
+When a collection has a combination of `resourceType`, `resourceId`, and/or `resourceInternalId`, the value of `resourceType` MUST always be **plural** - for example: `functions`, `sites`, `deployments`.
+
+Examples:
+```php
+'resourceType' => 'functions'
+'resourceType' => 'sites'
+'resourceType' => 'deployments'
+```
+
+## Security Considerations
+
+### Critical Security Practices
+
+- **Never hardcode credentials** - Use environment variables
+- **Rate limiting** - Respect abuse prevention mechanisms
+
+## Dependencies
+
+Avoid introducing new dependencies other than utopia-php.
+
+## Adding new endpoints
+
+When adding new endpoints, make sure to use modules and follow its patterns. Find instruction in [Modules AGENTS.md](src/Appwrite/Platform/AGENTS.md) file.
+
+## Pull Request Guidelines
+### Before Submitting
+
+-  Run `composer format`
+- Update documentation if adding features
+- Add/update tests for your changes
+- Check that Docker build succeeds
+`docs/specs/authentication.drawio.svg`
+
+## Known Issues and Gotchas
+
+- **Hot Reload:** Code changes require container restart in some cases
+- **Logging:** There is no central place for logs, so when debugging, ensure to check all possibly relevant containers
@@ -1,3 +1,101 @@
+# Version 1.8.1
+
+## What's Changed
+
+### Notable changes
+
+* Add branch deployments support in [#10486](https://github.com/appwrite/appwrite/pull/10486)
+* Add TanStack Start sites support in [#10681](https://github.com/appwrite/appwrite/pull/10681)
+* Add Next.js standalone support in [#10747](https://github.com/appwrite/appwrite/pull/10747)
+* Add Resend integration in [#10690](https://github.com/appwrite/appwrite/pull/10690)
+* Add option to enable/disable image transformations per-bucket in [#10722](https://github.com/appwrite/appwrite/pull/10722)
+* Add operators support in [#10735](https://github.com/appwrite/appwrite/pull/10735) and [#10800](https://github.com/appwrite/appwrite/pull/10800)
+* Add function and sites stats in [#10786](https://github.com/appwrite/appwrite/pull/10786)
+* Add disable count feature in [#10668](https://github.com/appwrite/appwrite/pull/10668)
+* Add ElevenLabs site template in [#10782](https://github.com/appwrite/appwrite/pull/10782)
+* Add suggested environment variables in [#10795](https://github.com/appwrite/appwrite/pull/10795)
+* Update GeoDB database in [#10890](https://github.com/appwrite/appwrite/pull/10890)
+* Update Flutter default build runtime in [#10807](https://github.com/appwrite/appwrite/pull/10807)
+* Upgrade runtimes in [#10804](https://github.com/appwrite/appwrite/pull/10804)
+
+### Fixes
+
+* Fix duplicate document error while creating file in [#10891](https://github.com/appwrite/appwrite/pull/10891)
+* Fix "Update external deployment (authorize)" throwing 500 error due to invalid query in [#10888](https://github.com/appwrite/appwrite/pull/10888)
+* Fix error setting user password in [#10889](https://github.com/appwrite/appwrite/pull/10889)
+* Fix error generating email MFA challenges in [#10884](https://github.com/appwrite/appwrite/pull/10884)
+* Fix file token expiry in [#10877](https://github.com/appwrite/appwrite/pull/10877)
+* Fix TanStack Nitro default in [#10860](https://github.com/appwrite/appwrite/pull/10860)
+* Fix TanStack builds in [#10767](https://github.com/appwrite/appwrite/pull/10767)
+* Fix nullable validation in [#10819](https://github.com/appwrite/appwrite/pull/10819) and [#10778](https://github.com/appwrite/appwrite/pull/10778)
+* Fix WebP library in [#10738](https://github.com/appwrite/appwrite/pull/10738)
+* Fix batch writes in [#10812](https://github.com/appwrite/appwrite/pull/10812)
+* Fix error handler error in [#10719](https://github.com/appwrite/appwrite/pull/10719)
+* Fix Next 16 compatibility in [#10713](https://github.com/appwrite/appwrite/pull/10713)
+* Fix stats usage memory leak in [#10683](https://github.com/appwrite/appwrite/pull/10683)
+* Fix author URL in template deployments in [#10535](https://github.com/appwrite/appwrite/pull/10535)
+* Fix VCS lock deletion in [#10691](https://github.com/appwrite/appwrite/pull/10691)
+
+### Miscellaneous
+
+* Add CSV export functionality in [#10546](https://github.com/appwrite/appwrite/pull/10546), [#10750](https://github.com/appwrite/appwrite/pull/10750), [#10813](https://github.com/appwrite/appwrite/pull/10813), and [#10847](https://github.com/appwrite/appwrite/pull/10847)
+* Add JWT disposition in [#10867](https://github.com/appwrite/appwrite/pull/10867)
+* Add screenshots endpoint in [#10675](https://github.com/appwrite/appwrite/pull/10675)
+* Add screenshot endpoint stats in [#10706](https://github.com/appwrite/appwrite/pull/10706)
+* Add users attributes in [#10688](https://github.com/appwrite/appwrite/pull/10688)
+* Add max build duration environment variable in [#10674](https://github.com/appwrite/appwrite/pull/10674)
+* Add custom realtime logger in [#10871](https://github.com/appwrite/appwrite/pull/10871)
+* Add logs in [#10869](https://github.com/appwrite/appwrite/pull/10869)
+* Improve MFA docs endpoint order in [#10793](https://github.com/appwrite/appwrite/pull/10793)
+* Auth refactor in [#10758](https://github.com/appwrite/appwrite/pull/10758), [#10837](https://github.com/appwrite/appwrite/pull/10837), [#10682](https://github.com/appwrite/appwrite/pull/10682), and [#10667](https://github.com/appwrite/appwrite/pull/10667)
+* Bump assistant to 0.8.4 in [#10887](https://github.com/appwrite/appwrite/pull/10887)
+* Bump database to 3.1.5 in [#10766](https://github.com/appwrite/appwrite/pull/10766)
+* Bump Utopia DNS in [#10761](https://github.com/appwrite/appwrite/pull/10761)
+* Update domains to 0.8.3 in [#10658](https://github.com/appwrite/appwrite/pull/10658)
+* Update domains to 0.9.1 in [#10678](https://github.com/appwrite/appwrite/pull/10678)
+* Update Apple Swift to 13.3.0 in [#10679](https://github.com/appwrite/appwrite/pull/10679)
+* Update Apple Swift in [#10663](https://github.com/appwrite/appwrite/pull/10663)
+* Update CLI to 10.2.2 in [#10672](https://github.com/appwrite/appwrite/pull/10672)
+* Update to CLI 12.0.0 in [#10853](https://github.com/appwrite/appwrite/pull/10853)
+* Update docs examples to use Permission class in [#10707](https://github.com/appwrite/appwrite/pull/10707)
+* Update SDK examples docs in [#10855](https://github.com/appwrite/appwrite/pull/10855)
+* Release Python SDK in [#10762](https://github.com/appwrite/appwrite/pull/10762)
+* Release Flutter 20.3.2 in [#10838](https://github.com/appwrite/appwrite/pull/10838)
+* Release Flutter/Dart add screenshot examples in [#10811](https://github.com/appwrite/appwrite/pull/10811)
+* Release PHP CLI in [#10791](https://github.com/appwrite/appwrite/pull/10791)
+* Release SDKs in [#10817](https://github.com/appwrite/appwrite/pull/10817)
+* Update SDKs in [#10694](https://github.com/appwrite/appwrite/pull/10694), [#10729](https://github.com/appwrite/appwrite/pull/10729), and [#10744](https://github.com/appwrite/appwrite/pull/10744)
+* Update SDK generator in [#10743](https://github.com/appwrite/appwrite/pull/10743)
+* Update database in [#10664](https://github.com/appwrite/appwrite/pull/10664)
+* Update README file in [#10763](https://github.com/appwrite/appwrite/pull/10763)
+* SDK release documentation in [#10745](https://github.com/appwrite/appwrite/pull/10745)
+* SDK release runtime config in [#10765](https://github.com/appwrite/appwrite/pull/10765)
+* Sync specs in [#10789](https://github.com/appwrite/appwrite/pull/10789)
+* Sync 1.8.0 in [#10677](https://github.com/appwrite/appwrite/pull/10677)
+* Add workflow for issue triage in [#10718](https://github.com/appwrite/appwrite/pull/10718)
+* Add issue auto-labeler in [#10700](https://github.com/appwrite/appwrite/pull/10700)
+* Add AI moderator repo in [#10717](https://github.com/appwrite/appwrite/pull/10717)
+* Browser bump in [#10850](https://github.com/appwrite/appwrite/pull/10850)
+* Template type enum override in [#10848](https://github.com/appwrite/appwrite/pull/10848)
+* VCS reference type in [#10852](https://github.com/appwrite/appwrite/pull/10852)
+* Index scope description in [#10851](https://github.com/appwrite/appwrite/pull/10851)
+* Config for environment in [#10833](https://github.com/appwrite/appwrite/pull/10833)
+* Format instance in [#10830](https://github.com/appwrite/appwrite/pull/10830)
+* Replace sleep in webhooks service in [#10656](https://github.com/appwrite/appwrite/pull/10656)
+* Update email composer in [#10720](https://github.com/appwrite/appwrite/pull/10720)
+* Update facts on GitHub sites and functions in [#10593](https://github.com/appwrite/appwrite/pull/10593) and [#10771](https://github.com/appwrite/appwrite/pull/10771)
+* Fix wrong user type in [#10875](https://github.com/appwrite/appwrite/pull/10875)
+* Fix limit and offset computation in [#10880](https://github.com/appwrite/appwrite/pull/10880)
+* Fix enum examples in [#10828](https://github.com/appwrite/appwrite/pull/10828)
+* Fix response models multi-methods in [#10815](https://github.com/appwrite/appwrite/pull/10815)
+* Fix undefined variable in [#10654](https://github.com/appwrite/appwrite/pull/10654)
+* Fix undefined sequence in [#10652](https://github.com/appwrite/appwrite/pull/10652)
+* Fix description in [#10702](https://github.com/appwrite/appwrite/pull/10702)
+* Fix warning in builds worker in [#10705](https://github.com/appwrite/appwrite/pull/10705)
+* Fix sites create deployment docs in [#10566](https://github.com/appwrite/appwrite/pull/10566)
+* Fix test dependencies projects in [#10655](https://github.com/appwrite/appwrite/pull/10655)
+* Fix list sites test in [#10726](https://github.com/appwrite/appwrite/pull/10726)
+
 # Version 1.8.0

 ## What's Changed
@@ -222,73 +222,51 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi
 ```bash
 .
 ├── app # Main application
-│   ├── assets
-│   │   ├── dbip
-│   │   ├── fonts
-│   │   └── security
 │   ├── config # Config files
-│   │   ├── avatars
-│   │   ├── collections
-│   │   ├── locale
-│   │   ├── specs
-│   │   ├── storage
-│   │   └── templates
 │   ├── controllers # API & dashboard controllers
 │   │   ├── api
 │   │   ├── shared
 │   │   └── web
-│   ├── init # DB schemas
-│   │   └── database
-│   └── views # HTML server-side templates
-│       ├── general
-│       └── install
+│   ├── db # DB schemas
+│   ├── sdks # SDKs generated copies (used for generating code examples)
+│   ├── tasks # Server CLI commands
+│   ├── views # HTML server-side templates
+│   └── workers # Background workers
 ├── bin # Server executables (tasks & workers)
-├── dev # Debugger config
+├── docker # Docker related resources and configs
 ├── docs # Docs and tutorials
 │   ├── examples
-│   ├── lists
 │   ├── references
-│   ├── sdks
 │   ├── services
 │   ├── specs
 │   └── tutorials
 ├── public # Public files
+│   ├── dist
 │   ├── fonts
 │   ├── images
-│   ├── sdk-console
-│   ├── sdk-project
-│   └── sdk-web
-├── src # Supporting libraries (each lib has one role, common libs are released as
-│   ├── Appwrite
-│   │   ├── Auth
-│   │   ├── Certificates
-│   │   ├── Deletes
-│   │   ├── Detector
-│   │   ├── Docker
-│   │   ├── Event
-│   │   ├── Extend
-│   │   ├── Functions/Validator
-│   │   ├── GraphQL
-│   │   ├── Hooks
-│   │   ├── Messaging
-│   │   ├── Migration
-│   │   ├── Network
-│   │   ├── OpenSSL
-│   │   ├── Platform
-│   │   ├── Promises
-│   │   ├── PubSub
-│   │   ├── SDK
-│   │   ├── Task/Validator
-│   │   ├── Template
-│   │   ├── Transformation
-│   │   ├── URL
-│   │   ├── Utopia
-│   │   └── Vcs
-│   └── Executor
+│   ├── scripts
+│   └── styles
+├── src # Supporting libraries (each lib has one role, common libs are released as individual projects)
+│   └── Appwrite
+│       ├── Auth
+│       ├── Detector
+│       ├── Docker
+|       ├── DSN
+│       ├── Event
+│       ├── Extend
+│       ├── GraphQL
+│       ├── Messaging
+│       ├── Migration
+│       ├── Network
+│       ├── OpenSSL
+│       ├── Promises
+│       ├── Specification
+│       ├── Task
+│       ├── Template
+│       ├── URL
+│       └── Utopia
 └── tests # End to end & unit tests
-    ├── benchmarks
    ├── e2e
-    ├── extensions
    ├── resources
    └── unit
 ```
@@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
    --no-plugins --no-scripts --prefer-dist \
    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`

-FROM appwrite/base:0.10.6 AS base
+FROM appwrite/base:0.11.5 AS base

 LABEL maintainer="team@appwrite.io"

@@ -57,6 +57,7 @@ RUN mkdir -p /storage/uploads && \
 # Executables
 RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/install && \
+    chmod +x /usr/local/bin/interval && \
    chmod +x /usr/local/bin/maintenance &&  \
    chmod +x /usr/local/bin/migrate && \
    chmod +x /usr/local/bin/realtime && \
@@ -76,6 +77,7 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/queue-count-success && \
    chmod +x /usr/local/bin/worker-audits && \
    chmod +x /usr/local/bin/worker-builds && \
+    chmod +x /usr/local/bin/worker-screenshots && \
    chmod +x /usr/local/bin/worker-certificates && \
    chmod +x /usr/local/bin/worker-databases && \
    chmod +x /usr/local/bin/worker-deletes && \
@@ -72,7 +72,7 @@ docker run -it --rm \
    --volume /var/run/docker.sock:/var/run/docker.sock \
    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
    --entrypoint="install" \
-    appwrite/appwrite:1.8.0
+    appwrite/appwrite:1.8.1
 ```

 ### Windows
@@ -84,7 +84,7 @@ docker run -it --rm ^
    --volume //var/run/docker.sock:/var/run/docker.sock ^
    --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
    --entrypoint="install" ^
-    appwrite/appwrite:1.8.0
+    appwrite/appwrite:1.8.1
 ```

 #### PowerShell
@@ -94,7 +94,7 @@ docker run -it --rm `
    --volume /var/run/docker.sock:/var/run/docker.sock `
    --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
    --entrypoint="install" `
-    appwrite/appwrite:1.8.0
+    appwrite/appwrite:1.8.1
 ```

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
@@ -75,7 +75,7 @@ docker run -it --rm \
    --volume /var/run/docker.sock:/var/run/docker.sock \
    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
    --entrypoint="install" \
-    appwrite/appwrite:1.8.0
+    appwrite/appwrite:1.8.1
 ```

 ### Windows
@@ -87,7 +87,7 @@ docker run -it --rm ^
    --volume //var/run/docker.sock:/var/run/docker.sock ^
    --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
    --entrypoint="install" ^
-    appwrite/appwrite:1.8.0
+    appwrite/appwrite:1.8.1
 ```

 #### PowerShell
@@ -97,7 +97,7 @@ docker run -it --rm `
    --volume /var/run/docker.sock:/var/run/docker.sock `
    --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
    --entrypoint="install" `
-    appwrite/appwrite:1.8.0
+    appwrite/appwrite:1.8.1
 ```

 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.
@@ -78,6 +78,7 @@ CLI::setResource('dbForPlatform', function ($pools, $cache, $authorization) {
            $dbForPlatform = new Database($adapter, $cache);

            $dbForPlatform
+                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
                ->setNamespace('_console')
                ->setMetadata('host', \gethostname())
@@ -168,6 +169,7 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
        }

        $database
+            ->setDatabase(APP_DATABASE)
            ->setAuthorization($authorization)
            ->setMetadata('host', \gethostname())
            ->setMetadata('project', $project->getId());
@@ -189,6 +191,7 @@ CLI::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorizatio
        $database = new Database($adapter, $cache);

        $database
+            ->setDatabase(APP_DATABASE)
            ->setAuthorization($authorization)
            ->setSharedTables(true)
            ->setNamespace('logsV1')
@@ -265,6 +268,14 @@ CLI::setResource('logError', function (Registry $register) {
            $log->addExtra('trace', $error->getTraceAsString());
            $log->addExtra('detailedTrace', $error->getTrace());

+            if ($error->getPrevious() !== null) {
+                if ($error->getPrevious()->getMessage() != $error->getMessage()) {
+                    $log->addExtra('previousMessage', $error->getPrevious()->getMessage());
+                }
+                $log->addExtra('previousFile', $error->getPrevious()->getFile());
+                $log->addExtra('previousLine', $error->getPrevious()->getLine());
+            }
+
            $log->setAction($action);

            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
@@ -26,8 +26,8 @@ unset($common['files']);
 $collections = [
    'buckets' => $buckets,
    'databases' => $databases,
-    'projects' => array_merge($projects, $common),
-    'console' => array_merge($platform, $common),
+    'projects' => array_merge_recursive($projects, $common),
+    'console' => array_merge_recursive($platform, $common),
    'logs' => $logs,
 ];

@@ -1288,6 +1288,17 @@ return [
                'array' => false,
                'filters' => ['json'],
            ],
+            [
+                '$id' => ID::custom('labels'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => true,
+                'filters' => [],
+            ],
        ],
        'indexes' => [
            [
@@ -6,7 +6,7 @@ use Utopia\Database\Helpers\ID;

 $providers = Config::getParam('oAuthProviders', []);

-return [
+$platformCollections = [
    'projects' => [
        '$collection' => ID::custom(Database::METADATA),
        '$id' => ID::custom('projects'),
@@ -330,7 +330,18 @@ return [
                'default' => null,
                'array' => false,
                'filters' => ['datetime'],
-            ]
+            ],
+            [
+                '$id' => ID::custom('labels'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => true,
+                'required' => false,
+                'default' => [],
+                'array' => true,
+                'filters' => [],
+            ],
        ],
        'indexes' => [
            [
@@ -622,24 +633,35 @@ return [
        'name' => 'keys',
        'attributes' => [
            [
-                '$id' => ID::custom('projectInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('projectId'),
+                '$id' => ID::custom('resourceType'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
                'signed' => true,
                'required' => false,
-                'default' => 0,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('resourceId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('resourceInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
                'array' => false,
                'filters' => [],
            ],
@@ -712,14 +734,14 @@ return [
        ],
        'indexes' => [
            [
-                '$id' => ID::custom('_key_project'),
+                '$id' => ID::custom('_key_resource'),
                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
+                'attributes' => ['resourceType', 'resourceInternalId'],
+                'lengths' => [],
+                'orders' => [],
            ],
            [
-                '$id' => '_key_accessedAt',
+                '$id' => ID::custom('_key_accessedAt'),
                'type' => Database::INDEX_KEY,
                'attributes' => ['accessedAt'],
                'lengths' => [],
@@ -1362,21 +1384,21 @@ return [
                '$id' => '_key_type',
                'type' => Database::INDEX_KEY,
                'attributes' => ['type'],
-                'lengths' => [32],
+                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
            [
                '$id' => '_key_trigger',
                'type' => Database::INDEX_KEY,
                'attributes' => ['trigger'],
-                'lengths' => [32],
+                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
            [
                '$id' => '_key_deploymentResourceType',
                'type' => Database::INDEX_KEY,
                'attributes' => ['deploymentResourceType'],
-                'lengths' => [32],
+                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
            [
@@ -1418,23 +1440,23 @@ return [
                '$id' => ID::custom('_key_owner'),
                'type' => Database::INDEX_KEY,
                'attributes' => ['owner'],
-                'lengths' => [16],
+                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => ID::custom('_key_region'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['region'],
-                'lengths' => [16],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_piid_riid_rt'),
+                '$id' => ID::custom('_key_piid_diid_drt'),
                'type' => Database::INDEX_KEY,
                'attributes' => ['projectInternalId', 'deploymentInternalId', 'deploymentResourceType'],
                'lengths' => [],
                'orders' => [],
            ],
+            [
+                '$id' => '_key_region_status_createdAt',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['region', 'status', '$createdAt'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

@@ -1903,3 +1925,31 @@ return [
        'indexes' => []
    ],
 ];
+
+// Organization API keys subquery
+$platformCollections['teams']['attributes'][] = [
+    '$id' => ID::custom('keys'),
+    'type' => Database::VAR_STRING,
+    'format' => '',
+    'size' => 16384,
+    'signed' => true,
+    'required' => false,
+    'default' => null,
+    'array' => false,
+    'filters' => ['subQueryOrganizationKeys'],
+];
+
+// Account API keys subquery
+$platformCollections['users']['attributes'][] = [
+    '$id' => ID::custom('keys'),
+    'type' => Database::VAR_STRING,
+    'format' => '',
+    'size' => 16384,
+    'signed' => true,
+    'required' => false,
+    'default' => null,
+    'array' => false,
+    'filters' => ['subQueryAccountKeys'],
+];
+
+return $platformCollections;
@@ -567,6 +567,17 @@ return [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('deploymentRetention'),
+                'type' => Database::VAR_INTEGER,
+                'format' => '',
+                'size' => 0,
+                'signed' => true,
+                'required' => false,
+                'default' => 0,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('deploymentInternalId'),
                'type' => Database::VAR_STRING,
@@ -765,6 +776,17 @@ return [
                'default' => null,
                'filters' => [],
            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('startCommand'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 20000,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'filters' => [],
+            ],
            [
                'array' => false,
                '$id' => ID::custom('specification'),
@@ -776,6 +798,28 @@ return [
                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
                'filters' => [],
            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('buildSpecification'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => false,
+                'required' => false,
+                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
+                'filters' => [],
+            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('runtimeSpecification'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => false,
+                'required' => false,
+                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('scopes'),
                'type' => Database::VAR_STRING,
@@ -1035,6 +1079,17 @@ return [
                'default' => null,
                'filters' => [],
            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('startCommand'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 20000,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('fallbackFile'),
                'type' => Database::VAR_STRING,
@@ -1046,6 +1101,17 @@ return [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('deploymentRetention'),
+                'type' => Database::VAR_INTEGER,
+                'format' => '',
+                'size' => 0,
+                'signed' => true,
+                'required' => false,
+                'default' => 0,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('deploymentInternalId'),
                'type' => Database::VAR_STRING,
@@ -1200,6 +1266,28 @@ return [
                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
                'filters' => [],
            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('buildSpecification'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => false,
+                'required' => false,
+                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
+                'filters' => [],
+            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('runtimeSpecification'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => false,
+                'required' => false,
+                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('buildRuntime'),
                'type' => Database::VAR_STRING,
@@ -1357,6 +1445,17 @@ return [
                'default' => null,
                'filters' => [],
            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('startCommand'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 20000,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'filters' => [],
+            ],
            [
                'array' => false,
                '$id' => ID::custom('buildOutput'),
@@ -2098,6 +2197,13 @@ return [
                'lengths' => [],
                'orders' => [],
            ],
+            [
+                '$id' => ID::custom('_key_resourceType'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceType'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
        ],
    ],

@@ -357,6 +357,11 @@ return [
        'description' => 'API key and session used in the same request. Use either `setSession` or `setKey`. Learn about which authentication method to use in the SSR docs: https://appwrite.io/docs/products/auth/server-side-rendering',
        'code' => 403,
    ],
+    Exception::USER_JWT_AND_COOKIE_SET => [
+        'name' => Exception::USER_JWT_AND_COOKIE_SET,
+        'description' => 'JWT and cookie used in the same request. Use either `setJWT` or `setCookie`. Learn about which authentication method to use in the SSR docs: https://appwrite.io/docs/products/auth/server-side-rendering',
+        'code' => 403,
+    ],
    Exception::API_KEY_EXPIRED => [
        'name' => Exception::API_KEY_EXPIRED,
        'description' => 'The dynamic API key has expired. Please don\'t use dynamic API keys for more than duration of the execution.',
@@ -1074,6 +1079,11 @@ return [
        'description' => 'The project key has expired. Please generate a new key using the Appwrite console.',
        'code' => 401,
    ],
+    Exception::ACCOUNT_KEY_EXPIRED => [
+        'name' => Exception::ACCOUNT_KEY_EXPIRED,
+        'description' => 'The account API key has expired. Please generate a new key using the Appwrite console.',
+        'code' => 401,
+    ],
    Exception::ROUTER_HOST_NOT_FOUND => [
        'name' => Exception::ROUTER_HOST_NOT_FOUND,
        'description' => 'Host is not trusted. This could occur because you have not configured a custom domain. Add a custom domain to your project first and try again.',
@@ -1103,7 +1113,6 @@ return [
        'name' => Exception::RULE_VERIFICATION_FAILED,
        'description' => 'Domain verification failed. Please check if your DNS records are correct and try again.',
        'code' => 400,
-        'publish' => true
    ],
    Exception::PROJECT_SMTP_CONFIG_INVALID => [
        'name' => Exception::PROJECT_SMTP_CONFIG_INVALID,
@@ -1329,4 +1338,19 @@ return [
        'description' => 'Target has an invalid provider type.',
        'code' => 400,
    ],
+    Exception::USER_ID_MISSING => [
+        'name' => Exception::USER_ID_MISSING,
+        'description' => 'When using account API key, make sure to pass x-appwrite-user header with your user ID.',
+        'code' => 403,
+    ],
+    Exception::ORGANIZATION_ID_MISSING => [
+        'name' => Exception::ORGANIZATION_ID_MISSING,
+        'description' => 'When using organization API key, make sure to pass x-appwrite-organization header with your organization ID.',
+        'code' => 403,
+    ],
+    Exception::PROJECT_ID_MISSING => [
+        'name' => Exception::PROJECT_ID_MISSING,
+        'description' => 'When using project API key, make sure to pass x-appwrite-project header with your project ID.',
+        'code' => 403,
+    ],
 ];
@@ -50,17 +50,12 @@
                font-style: normal;
                font-display: swap;
            }
-            
-            @font-face {
-                font-family: 'Poppins';
-                src: url('https://assets.appwrite.io/fonts/poppins/poppins-v23-latin-regular.woff2') format('woff2');
-                font-weight: 400;
-                font-style: normal;
-                font-display: swap;
-            }
        </style>
        <style>
-            body {
+            .main {
+                max-width: 650px;
+                margin: 0 auto;
+                margin-top: 32px;
                padding: 32px;
                line-height: 1.5;
                color: #616b7c;
@@ -68,15 +63,12 @@
                font-weight: 400;
                font-family: "Inter", sans-serif;
                background-color: #ffffff;
-                margin: 0;
-                padding: 0;
-                line-height: 150%;
            }
-            a {
+            .main a {
                color: currentColor;
                word-break: break-all;
            }
-            a.button {
+            .main a.button {
                box-sizing: border-box;
                display: inline-block;
                text-align: center;
@@ -87,8 +79,8 @@
                border: 1px solid #414146;
                border-radius: 8px;
            }
-            a.button:hover,
-            a.button:focus {
+            .main a.button:hover,
+            .main a.button:focus {
                opacity: 0.8;
            }
            table {
@@ -102,11 +94,6 @@
            td {
                vertical-align: top;
            }
-            .main {
-                max-width: 650px;
-                margin: 0 auto;
-                margin-top: 32px;
-            }
            h1 {
                font-size: 22px;
                margin-bottom: 0px;
@@ -138,9 +125,6 @@
                border: none;
                border-top: 1px solid #e8e9f0;
            }
-            h* {
-                font-family: 'Poppins', sans-serif;
-            }
            p {
                margin-bottom: 10px;
            }
@@ -155,21 +139,20 @@

 <body style="direction: {{direction}}">

-<div style="display: none; overflow: hidden; max-height: 0; max-width: 0; opacity: 0; line-height: 1px;">
-    {{preview}}
-    <div>{{previewWhitespace}}</div>
-</div>
+    <div style="display: none; overflow: hidden; max-height: 0; max-width: 0; opacity: 0; line-height: 1px;">
+        {{preview}}
+        <div>{{previewWhitespace}}</div>
+    </div>

-<div style="max-width:650px; word-wrap: break-word; overflow-wrap: break-word;
-  word-break: normal; margin:0 auto;">
-    <table style="margin-top: 32px">
-        <tr>
-            <td>
-                {{body}}
-            </td>
-        </tr>
-    </table>
-</div>
+    <div class="main" style="max-width:650px; word-wrap: break-word; overflow-wrap: break-word; word-break: normal; margin:0 auto;">
+        <table style="margin-top: 32px">
+            <tr>
+                <td>
+                    {{body}}
+                </td>
+            </tr>
+        </table>
+    </div>

 </body>
 </html>
@@ -0,0 +1,15 @@
+<?php
+
+// List of scopes for Account API keys (Tokens)
+
+return [
+    "account" => [
+        "description" => 'Access to manage account, its organizations, sessions, tokens, and billing.',
+    ],
+    "teams.read" => [
+        "description" => 'Access to read account\'s organizations.',
+    ],
+    "teams.write" => [
+        "description" => 'Access to create, update and delete account\'s organizations and its memberships.',
+    ],
+];
@@ -0,0 +1,42 @@
+<?php
+
+// List of scopes for organization (teams) API keys
+
+return [
+    "platforms.read" => [
+        "description" => 'Access to read project\'s platforms',
+    ],
+    "platforms.write" => [
+        "description" =>
+            'Access to create, update, and delete project\'s platforms',
+    ],
+    "projects.read" => [
+        "description" => 'Access to read organization\'s projects',
+    ],
+    "projects.write" => [
+        "description" =>
+            "Access to create, update, and delete projects in organization",
+    ],
+    "keys.read" => [
+        "description" => 'Access to read project\'s API keys',
+    ],
+    "keys.write" => [
+        "description" =>
+            "Access to create, update, and delete project\'s API keys",
+    ],
+    "devKeys.read" => [
+        "description" => 'Access to read project\'s development keys',
+    ],
+    "devKeys.write" => [
+        "description" =>
+            "Access to create, update, and delete project\'s development keys",
+    ],
+    "webhooks.read" => [
+        "description" =>
+            "Access to read project\'s webhooks",
+    ],
+    "webhooks.write" => [
+        "description" =>
+            "Access to create, update, and delete project\'s webhooks",
+    ],
+];
@@ -60,7 +60,7 @@ return [
            [
                'key' => 'flutter',
                'name' => 'Flutter',
-                'version' => '20.3.2',
+                'version' => '20.3.3',
                'url' => 'https://github.com/appwrite/sdk-for-flutter',
                'package' => 'https://pub.dev/packages/appwrite',
                'enabled' => true,
@@ -116,6 +116,7 @@ return [
            [
                'key' => 'android',
                'name' => 'Android',
+                'namespace' => 'io.appwrite',
                'version' => '11.4.0',
                'url' => 'https://github.com/appwrite/sdk-for-android',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
@@ -226,7 +227,7 @@ return [
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '12.0.1',
+                'version' => '13.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://www.npmjs.com/package/appwrite-cli',
                'enabled' => true,
@@ -249,6 +250,26 @@ return [
                    ],
                ],
            ],
+            [
+                'key' => 'markdown',
+                'name' => 'Markdown',
+                'version' => '0.1.0',
+                'url' => 'https://github.com/appwrite/sdk-for-md.git',
+                'package' => 'https://www.npmjs.com/package/@appwrite.io/docs',
+                'enabled' => true,
+                'beta' => false,
+                'dev' => false,
+                'hidden' => false,
+                'family' => APP_SDK_PLATFORM_CONSOLE,
+                'prism' => 'markdown',
+                'source' => \realpath(__DIR__ . '/../sdks/console-md'),
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-md.git',
+                'gitRepoName' => 'sdk-for-md',
+                'gitUserName' => 'appwrite',
+                'gitBranch' => 'dev',
+                'repoBranch' => 'main',
+                'changelog' => \realpath(__DIR__ . '/../../docs/sdks/md/CHANGELOG.md'),
+            ],
        ],
    ],

@@ -376,7 +397,7 @@ return [
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '20.1.0',
+                'version' => '20.1.1',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
@@ -395,6 +416,7 @@ return [
            [
                'key' => 'kotlin',
                'name' => 'Kotlin',
+                'namespace' => 'io.appwrite',
                'version' => '13.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
@@ -20,7 +20,7 @@ return [
        'name' => 'Console',
        'subtitle' => '',
        'description' => '',
-        'controller' => 'web/console.php',
+        'controller' => '', // Uses modules
        'sdk' => false,
        'docs' => false,
        'docsUrl' => '',
@@ -48,7 +48,7 @@ return [
        'name' => 'Avatars',
        'subtitle' => 'The Avatars service aims to help you complete everyday tasks related to your app image, icons, and avatars.',
        'description' => '/docs/services/avatars.md',
-        'controller' => 'api/avatars.php',
+        'controller' => '', // Uses modules
        'sdk' => true,
        'docs' => true,
        'docsUrl' => 'https://appwrite.io/docs/client/avatars',
@@ -104,7 +104,7 @@ return [
        'name' => 'Health',
        'subtitle' => 'The Health service allows you to both validate and monitor your Appwrite server\'s health.',
        'description' => '/docs/services/health.md',
-        'controller' => 'api/health.php',
+        'controller' => '', // Uses modules
        'sdk' => true,
        'docs' => true,
        'docsUrl' => 'https://appwrite.io/docs/server/health',
@@ -146,7 +146,7 @@ return [
        'name' => 'Storage',
        'subtitle' => 'The Storage service allows you to manage your project files.',
        'description' => '/docs/services/storage.md',
-        'controller' => 'api/storage.php',
+        'controller' => '', // Uses modules
        'sdk' => true,
        'docs' => true,
        'docsUrl' => 'https://appwrite.io/docs/client/storage',
@@ -270,9 +270,9 @@ return [
    'console' => [
        'key' => 'console',
        'name' => 'Console',
-        'subtitle' => 'The Console service allows you to interact with console relevant informations.',
+        'subtitle' => 'The Console service allows you to interact with console relevant information.',
        'description' => '',
-        'controller' => 'api/console.php',
+        'controller' => '', // Uses modules
        'sdk' => true,
        'docs' => true,
        'docsUrl' => '',
@@ -20,6 +20,34 @@ function getRuntimes($runtimes, $commands, $entrypoint, $providerRootDirectory,
    }));
 }

+
+class FunctionUseCases
+{
+    public const STARTER = 'starter';
+    public const DATABASES = 'databases';
+    public const AI = 'ai';
+    public const MESSAGING = 'messaging';
+    public const UTILITIES = 'utilities';
+    public const DEV_TOOLS = 'dev-tools';
+    public const AUTH = 'auth';
+
+    /**
+     * @var array<string>
+     */
+    public static function getAll(): array
+    {
+        return [
+            self::STARTER,
+            self::DATABASES,
+            self::AI,
+            self::MESSAGING,
+            self::UTILITIES,
+            self::DEV_TOOLS,
+            self::AUTH,
+        ];
+    }
+}
+
 return [
    [
        'icon' => 'icon-lightning-bolt',
@@ -32,7 +60,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['starter'],
+        'useCases' => [FunctionUseCases::STARTER],
        'runtimes' => [
            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/starter', $allowList),
            ...getRuntimes(
@@ -73,7 +101,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['databases'],
+        'useCases' => [FunctionUseCases::DATABASES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -119,7 +147,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['databases'],
+        'useCases' => [FunctionUseCases::DATABASES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -164,7 +192,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['databases'],
+        'useCases' => [FunctionUseCases::DATABASES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -218,7 +246,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['databases'],
+        'useCases' => [FunctionUseCases::DATABASES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -257,7 +285,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['databases'],
+        'useCases' => [FunctionUseCases::DATABASES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -326,7 +354,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -392,7 +420,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['messaging'],
+        'useCases' => [FunctionUseCases::MESSAGING],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -459,7 +487,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -497,7 +525,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -548,7 +576,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['utilities'],
+        'useCases' => [FunctionUseCases::UTILITIES],
        'runtimes' => [
            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/generate-pdf', $allowList)
        ],
@@ -571,7 +599,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['dev-tools'],
+        'useCases' => [FunctionUseCases::DEV_TOOLS],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -616,7 +644,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['utilities'],
+        'useCases' => [FunctionUseCases::UTILITIES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -669,7 +697,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['databases'],
+        'useCases' => [FunctionUseCases::DATABASES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -754,7 +782,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['databases'],
+        'useCases' => [FunctionUseCases::DATABASES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -853,7 +881,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['messaging'],
+        'useCases' => [FunctionUseCases::MESSAGING],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -946,7 +974,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['messaging'],
+        'useCases' => [FunctionUseCases::MESSAGING],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1004,7 +1032,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['utilities'],
+        'useCases' => [FunctionUseCases::UTILITIES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1091,7 +1119,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['utilities'],
+        'useCases' => [FunctionUseCases::UTILITIES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1134,7 +1162,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['utilities'],
+        'useCases' => [FunctionUseCases::UTILITIES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1193,7 +1221,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 30,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1229,7 +1257,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 30,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1265,7 +1293,7 @@ return [
        'events' => ['buckets.*.files.*.create'],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1325,7 +1353,7 @@ return [
        'events' => ['buckets.*.files.*.create'],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1385,7 +1413,7 @@ return [
        'events' => ['buckets.*.files.*.create'],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1448,7 +1476,7 @@ return [
        ],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1508,7 +1536,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 300,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1545,7 +1573,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 300,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1589,7 +1617,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1632,7 +1660,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 300,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1669,7 +1697,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 30,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1734,7 +1762,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 30,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1799,7 +1827,7 @@ return [
        'cron' => '',
        'events' => [],
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1856,7 +1884,7 @@ return [
        'cron' => '',
        'events' => [],
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1899,7 +1927,7 @@ return [
        'cron' => '',
        'events' => [],
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1942,7 +1970,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -1986,7 +2014,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 300,
-        'useCases' => ['ai'],
+        'useCases' => [FunctionUseCases::AI],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -2023,7 +2051,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['utilities'],
+        'useCases' => [FunctionUseCases::UTILITIES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -2080,7 +2108,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['utilities'],
+        'useCases' => [FunctionUseCases::UTILITIES],
        'runtimes' => [
            ...getRuntimes(
                $templateRuntimes['NODE'],
@@ -2153,7 +2181,7 @@ return [
        'events' => [],
        'cron' => '',
        'timeout' => 15,
-        'useCases' => ['auth'],
+        'useCases' => [FunctionUseCases::AUTH],
        'runtimes' => [
            ...getRuntimes($templateRuntimes['DART'], 'dart pub get', 'lib/main.dart', 'dart/sign_in_with_apple', $allowList)
        ],
@@ -13,7 +13,7 @@ $hostname = $platform['consoleHostname'] ?? '';

 $url = $protocol . '://' . $hostname;

-class UseCases
+class SiteUseCases
 {
    public const PORTFOLIO = 'portfolio';
    public const STARTER = 'starter';
@@ -21,9 +21,27 @@ class UseCases
    public const ECOMMERCE = 'ecommerce';
    public const DOCUMENTATION = 'documentation';
    public const BLOG = 'blog';
-    public const AI = 'artificial intelligence';
+    public const AI = 'ai';
    public const FORMS = 'forms';
    public const DASHBOARD = 'dashboard';
+
+    /**
+     * @var array<string>
+     */
+    public static function getAll(): array
+    {
+        return [
+            self::PORTFOLIO,
+            self::STARTER,
+            self::EVENTS,
+            self::ECOMMERCE,
+            self::DOCUMENTATION,
+            self::BLOG,
+            self::AI,
+            self::FORMS,
+            self::DASHBOARD,
+        ];
+    }
 }

 const TEMPLATE_FRAMEWORKS = [
@@ -188,7 +206,7 @@ return [
        'name' => 'Documentation template',
        'tagline' => 'Modern site to store your knowledge with a clean design, full-text search, dark mode, and more.',
        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::DOCUMENTATION],
+        'useCases' => [SiteUseCases::DOCUMENTATION],
        'screenshotDark' => $url . '/images/sites/templates/template-for-documentation-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/template-for-documentation-light.png',
        'frameworks' => [
@@ -209,7 +227,7 @@ return [
        // When we add Lynx with Appwrite SDK, use following tagline for it:
        // 'tagline' => 'Sample application built with Lynx, a cross-platform framework focused on performance.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-lynx-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-lynx-light.png',
        'frameworks' => [
@@ -220,7 +238,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -228,7 +246,7 @@ return [
        'name' => 'Vitepress',
        'tagline' => 'Platform for documentation and knowledge sharing powered by Vite.',
        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::DOCUMENTATION],
+        'useCases' => [SiteUseCases::DOCUMENTATION],
        'screenshotDark' => $url . '/images/sites/templates/vitepress-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/vitepress-light.png',
        'frameworks' => [
@@ -243,7 +261,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -251,7 +269,7 @@ return [
        'name' => 'Vuepress',
        'tagline' => 'Platform for documentation and knowledge sharing powered by Vue.',
        'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::DOCUMENTATION],
+        'useCases' => [SiteUseCases::DOCUMENTATION],
        'screenshotDark' => $url . '/images/sites/templates/vuepress-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/vuepress-light.png',
        'frameworks' => [
@@ -266,7 +284,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -274,7 +292,7 @@ return [
        'name' => 'Docusaurus',
        'tagline' => 'Platform for documentation and knowledge sharing powered by React.',
        'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::DOCUMENTATION],
+        'useCases' => [SiteUseCases::DOCUMENTATION],
        'screenshotDark' => $url . '/images/sites/templates/docusaurus-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/docusaurus-light.png',
        'frameworks' => [
@@ -289,7 +307,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -297,7 +315,7 @@ return [
        'name' => 'Nxt Lnk',
        'tagline' => 'Personal website for creators to merge all URLs to social profiles.',
        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::PORTFOLIO],
+        'useCases' => [SiteUseCases::PORTFOLIO],
        'screenshotDark' => $url . '/images/sites/templates/nxt-lnk-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/nxt-lnk-light.png',
        'frameworks' => [
@@ -308,7 +326,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -316,7 +334,7 @@ return [
        'name' => 'Magic Portfolio',
        'tagline' => 'Complex personal website to showcase your projects, articles, and more.',
        'score' => 7, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::PORTFOLIO],
+        'useCases' => [SiteUseCases::PORTFOLIO],
        'screenshotDark' => $url . '/images/sites/templates/magic-portfolio-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/magic-portfolio-light.png',
        'frameworks' => [
@@ -327,7 +345,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -335,7 +353,7 @@ return [
        'name' => 'LittleLink',
        'tagline' => 'Personal website for creators to merge all URLs to social profiles.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::PORTFOLIO],
+        'useCases' => [SiteUseCases::PORTFOLIO],
        'screenshotDark' => $url . '/images/sites/templates/littlelink-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/littlelink-light.png',
        'frameworks' => [
@@ -346,7 +364,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -354,7 +372,7 @@ return [
        'name' => 'Logspot',
        'tagline' => 'Website to publish changelogs of your application.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::BLOG],
+        'useCases' => [SiteUseCases::BLOG],
        'screenshotDark' => $url . '/images/sites/templates/logspot-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/logspot-light.png',
        'frameworks' => [
@@ -368,7 +386,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -376,7 +394,7 @@ return [
        'name' => 'Astro Nano',
        'tagline' => 'Minimal personal website to showcase your projects, articles, and more.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::PORTFOLIO],
+        'useCases' => [SiteUseCases::PORTFOLIO],
        'screenshotDark' => $url . '/images/sites/templates/astro-nano-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/astro-nano-light.png',
        'frameworks' => [
@@ -389,7 +407,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -397,7 +415,7 @@ return [
        'name' => 'Astro Starlight',
        'tagline' => 'Platform for documentation and knowledge sharing powered by Astro.',
        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::DOCUMENTATION],
+        'useCases' => [SiteUseCases::DOCUMENTATION],
        'screenshotDark' => $url . '/images/sites/templates/astro-starlight-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/astro-starlight-light.png',
        'frameworks' => [
@@ -410,7 +428,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -418,7 +436,7 @@ return [
        'name' => 'Astro Sphere',
        'tagline' => 'Modern personal website to showcase your projects, articles, and more.',
        'score' => 7, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::PORTFOLIO],
+        'useCases' => [SiteUseCases::PORTFOLIO],
        'screenshotDark' => $url . '/images/sites/templates/astro-sphere-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/astro-sphere-light.png',
        'frameworks' => [
@@ -431,7 +449,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -439,7 +457,7 @@ return [
        'name' => 'Astro Starlog',
        'tagline' => 'Platform for publishing written content and media powered by Astro.',
        'score' => 5, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::BLOG],
+        'useCases' => [SiteUseCases::BLOG],
        'screenshotDark' => $url . '/images/sites/templates/astro-starlog-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/astro-starlog-light.png',
        'frameworks' => [
@@ -452,7 +470,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -460,7 +478,7 @@ return [
        'name' => 'Onelink',
        'tagline' => 'Personal website for creators to merge all URLs to social profiles.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::PORTFOLIO],
+        'useCases' => [SiteUseCases::PORTFOLIO],
        'screenshotDark' => $url . '/images/sites/templates/onelink-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/onelink-light.png',
        'frameworks' => [
@@ -474,13 +492,13 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
        'key' => 'starter-for-flutter',
        'name' => 'Flutter starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Flutter application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-flutter-dark.png',
@@ -525,7 +543,7 @@ return [
    [
        'key' => 'starter-for-js',
        'name' => 'JavaScript starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple JavaScript application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-js-dark.png',
@@ -569,7 +587,7 @@ return [
    [
        'key' => 'starter-for-angular',
        'name' => 'Angular starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Angular application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-angular-dark.png',
@@ -615,7 +633,7 @@ return [
    [
        'key' => 'starter-for-astro',
        'name' => 'Astro starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Astro application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-astro-dark.png',
@@ -660,7 +678,7 @@ return [
    [
        'key' => 'starter-for-analog',
        'name' => 'Analog starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Analog application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-analog-dark.png',
@@ -704,7 +722,7 @@ return [
    [
        'key' => 'starter-for-remix',
        'name' => 'Remix starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Remix application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-remix-dark.png',
@@ -748,7 +766,7 @@ return [
    [
        'key' => 'starter-for-svelte',
        'name' => 'Svelte starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Svelte application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-svelte-dark.png',
@@ -792,7 +810,7 @@ return [
    [
        'key' => 'starter-for-react',
        'name' => 'React starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple React application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-react-dark.png',
@@ -836,7 +854,7 @@ return [
    [
        'key' => 'starter-for-vue',
        'name' => 'Vue starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Vue application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-vue-dark.png',
@@ -880,7 +898,7 @@ return [
    [
        'key' => 'starter-for-react-native',
        'name' => 'React Native starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple React Native application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-react-native-dark.png',
@@ -924,7 +942,7 @@ return [
    [
        'key' => 'starter-for-nextjs',
        'name' => 'Next.js starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Next.js application integrated with Appwrite SDK.',
        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-nextjs-dark.png',
@@ -968,7 +986,7 @@ return [
    [
        'key' => 'starter-for-tanstack-start',
        'name' => 'TanStack Start starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple TanStack Start application integrated with Appwrite SDK.',
        'score' => 9, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-tanstack-start-dark.png',
@@ -1012,7 +1030,7 @@ return [
    [
        'key' => 'starter-for-nuxt',
        'name' => 'Nuxt starter',
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'tagline' => 'Simple Nuxt application integrated with Appwrite SDK.',
        'score' => 3, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
        'screenshotDark' => $url . '/images/sites/templates/starter-for-nuxt-dark.png',
@@ -1058,7 +1076,7 @@ return [
        'name' => 'Event template',
        'tagline' => 'Hackathon landing page with support for project submissions.',
        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::EVENTS],
+        'useCases' => [SiteUseCases::EVENTS],
        'screenshotDark' => $url . '/images/sites/templates/template-for-event-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/template-for-event-light.png',
        'frameworks' => [
@@ -1096,7 +1114,7 @@ return [
        'name' => 'Portfolio template',
        'tagline' => 'Simple personal website to showcase your projects, articles, and more.',
        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::PORTFOLIO],
+        'useCases' => [SiteUseCases::PORTFOLIO],
        'screenshotDark' => $url . '/images/sites/templates/template-for-portfolio-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/template-for-portfolio-light.png',
        'frameworks' => [
@@ -1115,7 +1133,7 @@ return [
        'name' => 'Store template',
        'tagline' => 'E-commerce platform for selling products with Stripe integration.',
        'score' => 7, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::ECOMMERCE],
+        'useCases' => [SiteUseCases::ECOMMERCE],
        'screenshotDark' => $url . '/images/sites/templates/template-for-store-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/template-for-store-light.png',
        'frameworks' => [
@@ -1159,7 +1177,7 @@ return [
        'name' => 'Blog template',
        'tagline' => 'Platform for publishing written content and media.',
        'score' => 7, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::BLOG],
+        'useCases' => [SiteUseCases::BLOG],
        'screenshotDark' => $url . '/images/sites/templates/template-for-blog-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/template-for-blog-light.png',
        'frameworks' => [
@@ -1178,7 +1196,7 @@ return [
        'name' => 'Astro playground',
        'tagline' => 'A basic Astro website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-astro-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-astro-light.png',
        'frameworks' => [
@@ -1189,7 +1207,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1197,7 +1215,7 @@ return [
        'name' => 'Remix playground',
        'tagline' => 'A basic Remix website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-remix-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-remix-light.png',
        'frameworks' => [
@@ -1208,7 +1226,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1216,7 +1234,7 @@ return [
        'name' => 'Next.js playground',
        'tagline' => 'A basic Next.js website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-nextjs-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-nextjs-light.png',
        'frameworks' => [
@@ -1227,7 +1245,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1235,7 +1253,7 @@ return [
        'name' => 'Flutter playground',
        'tagline' => 'A basic Flutter website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-flutter-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-flutter-light.png',
        'frameworks' => [
@@ -1246,7 +1264,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1254,7 +1272,7 @@ return [
        'name' => 'Vite playground',
        'tagline' => 'A basic Vite website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-vite-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-vite-light.png',
        'frameworks' => [
@@ -1265,7 +1283,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1273,7 +1291,7 @@ return [
        'name' => 'Angular playground',
        'tagline' => 'A basic Angular website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-angular-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-angular-light.png',
        'frameworks' => [
@@ -1285,7 +1303,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1293,7 +1311,7 @@ return [
        'name' => 'Analog playground',
        'tagline' => 'A basic Analog website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-analog-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-analog-light.png',
        'frameworks' => [
@@ -1304,7 +1322,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1312,7 +1330,7 @@ return [
        'name' => 'Svelte playground',
        'tagline' => 'A basic Svelte website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-svelte-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-svelte-light.png',
        'frameworks' => [
@@ -1323,7 +1341,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],

@@ -1332,7 +1350,7 @@ return [
        'name' => 'React playground',
        'tagline' => 'A basic React website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-react-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-react-light.png',
        'frameworks' => [
@@ -1344,7 +1362,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],

@@ -1353,7 +1371,7 @@ return [
        'name' => 'Vue playground',
        'tagline' => 'A basic Vue website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-vue-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-vue-light.png',
        'frameworks' => [
@@ -1364,7 +1382,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1372,7 +1390,7 @@ return [
        'name' => 'Nuxt playground',
        'tagline' => 'A basic Nuxt website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-nuxt-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-nuxt-light.png',
        'frameworks' => [
@@ -1383,7 +1401,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1391,7 +1409,7 @@ return [
        'name' => 'TanStack Start playground',
        'tagline' => 'A basic TanStack Start website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-tanstack-start-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-tanstack-start-light.png',
        'frameworks' => [
@@ -1402,7 +1420,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.5.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1410,7 +1428,7 @@ return [
        'name' => 'React Native playground',
        'tagline' => 'A basic React Native website without Appwrite SDK integration.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/playground-for-react-native-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/playground-for-react-native-light.png',
        'frameworks' => [
@@ -1421,7 +1439,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => [],
    ],
    [
@@ -1429,7 +1447,7 @@ return [
        'name' => 'Lynx gallery',
        'tagline' => 'A Lynx website showcasing gallery with smooth animations.',
        'score' => 1, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::STARTER],
+        'useCases' => [SiteUseCases::STARTER],
        'screenshotDark' => $url . '/images/sites/templates/gallery-for-lynx-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/gallery-for-lynx-light.png',
        'frameworks' => [
@@ -1440,7 +1458,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.7.*',
        'variables' => []
    ],
    [
@@ -1448,7 +1466,7 @@ return [
        'name' => 'Text-to-speech with ElevenLabs',
        'tagline' => 'Next.js app that transforms text into natural, human-like speech using ElevenLabs',
        'score' => 10, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::AI],
+        'useCases' => [SiteUseCases::AI],
        'screenshotDark' => $url . '/images/sites/templates/text-to-speech-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/text-to-speech-light.png',
        'frameworks' => [
@@ -1459,7 +1477,7 @@ return [
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates-for-sites',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.6.*',
+        'providerVersion' => '0.7.*',
        'variables' => [
            [
                'name' => 'ELEVENLABS_API_KEY',
@@ -1476,7 +1494,7 @@ return [
        'name' => 'CRM dashboard with React Admin',
        'tagline' => 'A React-based admin dashboard template with CRM features.',
        'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::DASHBOARD],
+        'useCases' => [SiteUseCases::DASHBOARD],
        'screenshotDark' => $url . '/images/sites/templates/crm-dashboard-react-admin-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/crm-dashboard-react-admin-light.png',
        'frameworks' => [
@@ -1579,7 +1597,7 @@ return [
        'name' => 'Job applications form with Formspree',
        'tagline' => 'A simple form submission template using Formspree.',
        'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::FORMS],
+        'useCases' => [SiteUseCases::FORMS],
        'screenshotDark' => $url . '/images/sites/templates/job-applications-formspree-dark.png',
        'screenshotLight' => $url . '/images/sites/templates/job-applications-formspree-light.png',
        'frameworks' => [
@@ -1285,6 +1285,15 @@ return [
        'category' => 'GraphQL',
        'description' => '',
        'variables' => [
+            [
+                'name' => '_APP_GRAPHQL_INTROSPECTION',
+                'description' => 'Enable or disable GraphQL introspection. Set to \'enabled\' to allow schema introspection, or \'disabled\' to block it. The default value is \'enabled\'.',
+                'introduction' => '',
+                'default' => 'enabled',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_GRAPHQL_MAX_BATCH_SIZE',
                'description' => 'Maximum number of batched queries per request. The default value is 10.',
@@ -33,11 +33,11 @@ use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Identities;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
+use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumberUtil;
 use MaxMind\Db\Reader;
-use Utopia\Abuse\Abuse;
 use Utopia\App;
-use Utopia\Audit\Audit as EventAudit;
+use Utopia\Audit\Audit;
 use Utopia\Auth\Hashes\Sha;
 use Utopia\Auth\Proofs\Code as ProofsCode;
 use Utopia\Auth\Proofs\Password as ProofsPassword;
@@ -68,6 +68,7 @@ use Utopia\Validator;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\Boolean;
+use Utopia\Validator\Range;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;

@@ -194,7 +195,7 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, arr
        ->setPreview($preview)
        ->setBody($body)
        ->setBodyTemplate($bodyTemplate)
-        ->setVariables($emailVariables)
+        ->appendVariables($emailVariables)
        ->setRecipient($email);

    // since this is console project, set email sender name!
@@ -959,6 +960,7 @@ App::post('/v1/account/sessions/email')
    ))
    ->label('abuse-limit', 10)
    ->label('abuse-key', 'url:{url},email:{param-email}')
+    ->label('abuse-reset', [201])
    ->param('email', '', new EmailValidator(), 'User email.')
    ->param('password', '', new Password(), 'User password. Must be at least 8 chars.')
    ->inject('request')
@@ -1259,6 +1261,7 @@ App::post('/v1/account/sessions/token')
    ))
    ->label('abuse-limit', 10)
    ->label('abuse-key', 'ip:{ip},userId:{param-userId}')
+    ->label('abuse-reset', [201])
    ->param('userId', '', new CustomId(), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
    ->param('secret', '', new Text(256), 'Secret of a token generated by login methods. For example, the `createMagicURLToken` or `createPhoneToken` methods.')
    ->inject('request')
@@ -2298,7 +2301,7 @@ App::post('/v1/account/tokens/magic-url')
            ->setSubject($subject)
            ->setPreview($preview)
            ->setBody($body)
-            ->setVariables($emailVariables)
+            ->appendVariables($emailVariables)
            ->setRecipient($email);

        if ($project->getId() === 'console') {
@@ -2599,7 +2602,7 @@ App::post('/v1/account/tokens/email')
            ->setPreview($preview)
            ->setBody($body)
            ->setBodyTemplate($bodyTemplate)
-            ->setVariables($emailVariables)
+            ->appendVariables($emailVariables)
            ->setRecipient($email);

        // since this is console project, set email sender name!
@@ -2651,6 +2654,7 @@ App::put('/v1/account/sessions/magic-url')
    ))
    ->label('abuse-limit', 10)
    ->label('abuse-key', 'ip:{ip},userId:{param-userId}')
+    ->label('abuse-reset', [201])
    ->param('userId', '', new CustomId(), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
    ->param('secret', '', new Text(256), 'Valid verification token.')
    ->inject('request')
@@ -2904,26 +2908,21 @@ App::post('/v1/account/tokens/phone')
                ->setRecipients([$phone])
                ->setProviderType(MESSAGE_TYPE_SMS);

-            if (isset($plan['authPhone'])) {
-                $timelimit = $timelimit('organization:{organizationId}', $plan['authPhone'], 30 * 24 * 60 * 60); // 30 days
-                $timelimit
-                    ->setParam('{organizationId}', $project->getAttribute('teamId'));
+            $helper = PhoneNumberUtil::getInstance();
+            try {
+                $countryCode = $helper->parse($phone)->getCountryCode();

-                $abuse = new Abuse($timelimit);
-                if ($abuse->check() && System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') {
-                    $helper = PhoneNumberUtil::getInstance();
-                    $countryCode = $helper->parse($phone)->getCountryCode();
-
-                    if (!empty($countryCode)) {
-                        $queueForStatsUsage
-                            ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
-                    }
+                if (!empty($countryCode)) {
+                    $queueForStatsUsage
+                        ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                }
-                $queueForStatsUsage
-                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
-                    ->setProject($project)
-                    ->trigger();
+            } catch (NumberParseException $e) {
+                // Ignore invalid phone number for country code stats
            }
+            $queueForStatsUsage
+                ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
+                ->setProject($project)
+                ->trigger();
        }

        $token->setAttribute('secret', $secret);
@@ -2963,20 +2962,22 @@ App::post('/v1/account/jwts')
        ],
        contentType: ContentType::JSON,
    ))
-    ->label('abuse-limit', 100)
+    ->param('duration', 900, new Range(0, 3600), 'Time in seconds before JWT expires. Default duration is 900 seconds, and maximum is 3600 seconds.', true)
+    ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
+    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->label('abuse-key', 'url:{url},userId:{userId}')
    ->inject('response')
    ->inject('user')
    ->inject('store')
    ->inject('proofForToken')
-    ->action(function (Response $response, User $user, Store $store, ProofsToken $proofForToken) {
+    ->action(function (int $duration, Response $response, User $user, Store $store, ProofsToken $proofForToken) {
        $sessionId = $user->sessionVerify($store->getProperty('secret', ''), $proofForToken);

        if (!$sessionId) {
            throw new Exception(Exception::USER_SESSION_NOT_FOUND);
        }

-        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 0);
+        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $duration, 0);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3040,7 +3041,8 @@ App::get('/v1/account/logs')
    ->inject('locale')
    ->inject('geodb')
    ->inject('dbForProject')
-    ->action(function (array $queries, bool $includeTotal, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject) {
+    ->inject('audit')
+    ->action(function (array $queries, bool $includeTotal, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject, Audit $audit) {

        try {
            $queries = Query::parseQueries($queries);
@@ -3048,9 +3050,10 @@ App::get('/v1/account/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $audit = new EventAudit($dbForProject);
-
-        $logs = $audit->getLogsByUser($user->getSequence(), $queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+        $logs = $audit->getLogsByUser($user->getSequence(), offset: $offset, limit: $limit);

        $output = [];

@@ -3079,7 +3082,7 @@ App::get('/v1/account/logs')
        }

        $response->dynamic(new Document([
-            'total' => $includeTotal ? $audit->countLogsByUser($user->getSequence(), $queries) : 0,
+            'total' => $includeTotal ? $audit->countLogsByUser($user->getSequence()) : 0,
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -3675,7 +3678,7 @@ App::post('/v1/account/recovery')
            ->setRecipient($profile->getAttribute('email', ''))
            ->setName($profile->getAttribute('name', ''))
            ->setBody($body)
-            ->setVariables($emailVariables)
+            ->appendVariables($emailVariables)
            ->setSubject($subject)
            ->setPreview($preview);

@@ -4006,7 +4009,7 @@ App::post('/v1/account/verifications/email')
            ->setPreview($preview)
            ->setBody($body)
            ->setBodyTemplate($bodyTemplate)
-            ->setVariables($emailVariables)
+            ->appendVariables($emailVariables)
            ->setRecipient($user->getAttribute('email'))
            ->setName($user->getAttribute('name') ?? '');

@@ -4236,26 +4239,21 @@ App::post('/v1/account/verifications/phone')
                ->setRecipients([$user->getAttribute('phone')])
                ->setProviderType(MESSAGE_TYPE_SMS);

-            if (isset($plan['authPhone'])) {
-                $timelimit = $timelimit('organization:{organizationId}', $plan['authPhone'], 30 * 24 * 60 * 60); // 30 days
-                $timelimit
-                    ->setParam('{organizationId}', $project->getAttribute('teamId'));
+            $helper = PhoneNumberUtil::getInstance();
+            try {
+                $countryCode = $helper->parse($phone)->getCountryCode();

-                $abuse = new Abuse($timelimit);
-                if ($abuse->check() && System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') {
-                    $helper = PhoneNumberUtil::getInstance();
-                    $countryCode = $helper->parse($phone)->getCountryCode();
-
-                    if (!empty($countryCode)) {
-                        $queueForStatsUsage
-                            ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
-                    }
+                if (!empty($countryCode)) {
+                    $queueForStatsUsage
+                        ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                }
-                $queueForStatsUsage
-                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
-                    ->setProject($project)
-                    ->trigger();
+            } catch (NumberParseException $e) {
+                // Ignore invalid phone number for country code stats
            }
+            $queueForStatsUsage
+                ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
+                ->setProject($project)
+                ->trigger();
        }

        $verification->setAttribute('secret', $secret);
@@ -1,147 +0,0 @@
-<?php
-
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\App;
-use Utopia\Database\Document;
-use Utopia\Domains\Domain;
-use Utopia\System\System;
-use Utopia\Validator\IP;
-use Utopia\Validator\Text;
-
-App::init()
-    ->groups(['console'])
-    ->inject('project')
-    ->action(function (Document $project) {
-        if ($project->getId() !== 'console') {
-            throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN);
-        }
-    });
-
-
-App::get('/v1/console/variables')
-    ->desc('Get variables')
-    ->groups(['api', 'projects'])
-    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: 'console',
-        group: 'console',
-        name: 'variables',
-        description: '/docs/references/console/variables.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_CONSOLE_VARIABLES,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
-    ->inject('response')
-    ->action(function (Response $response) {
-        $validator = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME'));
-        $isCNAMEValid = !empty(System::getEnv('_APP_DOMAIN_TARGET_CNAME', '')) && $validator->isKnown() && !$validator->isTest();
-
-        $validator = new IP(IP::V4);
-        $isAValid = !empty(System::getEnv('_APP_DOMAIN_TARGET_A', '')) && ($validator->isValid(System::getEnv('_APP_DOMAIN_TARGET_A')));
-
-        $validator = new IP(IP::V6);
-        $isAAAAValid = !empty(System::getEnv('_APP_DOMAIN_TARGET_AAAA', '')) && $validator->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA'));
-
-        $isDomainEnabled = $isAAAAValid || $isAValid || $isCNAMEValid;
-
-        $isVcsEnabled = !empty(System::getEnv('_APP_VCS_GITHUB_APP_NAME', ''))
-            && !empty(System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY', ''))
-            && !empty(System::getEnv('_APP_VCS_GITHUB_APP_ID', ''))
-            && !empty(System::getEnv('_APP_VCS_GITHUB_CLIENT_ID', ''))
-            && !empty(System::getEnv('_APP_VCS_GITHUB_CLIENT_SECRET', ''));
-
-        $isAssistantEnabled = !empty(System::getEnv('_APP_ASSISTANT_OPENAI_API_KEY', ''));
-
-        $variables = new Document([
-            '_APP_DOMAIN_TARGET_CNAME' => System::getEnv('_APP_DOMAIN_TARGET_CNAME'),
-            '_APP_DOMAIN_TARGET_AAAA' => System::getEnv('_APP_DOMAIN_TARGET_AAAA'),
-            '_APP_DOMAIN_TARGET_A' => System::getEnv('_APP_DOMAIN_TARGET_A'),
-            // Combine CAA domain with most common flags and tag (no parameters)
-            '_APP_DOMAIN_TARGET_CAA' => '0 issue "' . System::getEnv('_APP_DOMAIN_TARGET_CAA') . '"',
-            '_APP_STORAGE_LIMIT' => +System::getEnv('_APP_STORAGE_LIMIT'),
-            '_APP_COMPUTE_BUILD_TIMEOUT' => +System::getEnv('_APP_COMPUTE_BUILD_TIMEOUT'),
-            '_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_DOMAIN_SITES' => System::getEnv('_APP_DOMAIN_SITES'),
-            '_APP_DOMAIN_FUNCTIONS' => System::getEnv('_APP_DOMAIN_FUNCTIONS'),
-            '_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')
-    ->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],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::TEXT
-    ))
-    ->label('abuse-limit', 15)
-    ->label('abuse-key', 'userId:{userId}')
-    ->param('prompt', '', new Text(2000), 'Prompt. A string containing questions asked to the AI assistant.')
-    ->inject('response')
-    ->action(function (string $prompt, Response $response) {
-        $ch = curl_init('http://appwrite-assistant:3003/v1/models/assistant/prompt');
-        $responseHeaders = [];
-        $query = json_encode(['prompt' => $prompt]);
-        $headers = ['accept: text/event-stream'];
-        $handleEvent = function ($ch, $data) use ($response) {
-            $response->chunk($data);
-
-            return \strlen($data);
-        };
-
-        curl_setopt($ch, CURLOPT_WRITEFUNCTION, $handleEvent);
-
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 0);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 9000);
-        curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$responseHeaders) {
-            $len = strlen($header);
-            $header = explode(':', $header, 2);
-
-            if (count($header) < 2) { // ignore invalid headers
-                return $len;
-            }
-
-            $responseHeaders[strtolower(trim($header[0]))] = trim($header[1]);
-
-            return $len;
-        });
-
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $query);
-
-        curl_exec($ch);
-
-        curl_close($ch);
-
-        $response->chunk('', true);
-    });
@@ -224,8 +224,11 @@ function execute(
    $flags = DebugFlag::INCLUDE_DEBUG_MESSAGE | DebugFlag::INCLUDE_TRACE;
    $validations = GraphQL::getStandardValidationRules();

-    if (System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {
+    if (System::getEnv('_APP_GRAPHQL_INTROSPECTION', 'enabled') === 'disabled') {
        $validations[] = new DisableIntrospection();
+    }
+
+    if (System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {
        $validations[] = new QueryComplexity($maxComplexity);
        $validations[] = new QueryDepth($maxDepth);
    }
@@ -1147,7 +1147,8 @@ App::get('/v1/messaging/providers/:providerId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $providerId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('audit')
+    ->action(function (string $providerId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Audit $audit) {
        $provider = $dbForProject->getDocument('providers', $providerId);

        if ($provider->isEmpty()) {
@@ -1160,9 +1161,12 @@ App::get('/v1/messaging/providers/:providerId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $audit = new Audit($dbForProject);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
        $resource = 'provider/' . $providerId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, offset: $offset, limit: $limit);
        $output = [];

        foreach ($logs as $i => &$log) {
@@ -1209,7 +1213,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $includeTotal ? $audit->countLogsByResource($resource, $queries) : 0,
+            'total' => $includeTotal ? $audit->countLogsByResource($resource) : 0,
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -2552,7 +2556,8 @@ App::get('/v1/messaging/topics/:topicId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $topicId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('audit')
+    ->action(function (string $topicId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Audit $audit) {
        $topic = $dbForProject->getDocument('topics', $topicId);

        if ($topic->isEmpty()) {
@@ -2565,9 +2570,12 @@ App::get('/v1/messaging/topics/:topicId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $audit = new Audit($dbForProject);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
        $resource = 'topic/' . $topicId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, offset: $offset, limit: $limit);

        $output = [];

@@ -2615,7 +2623,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $includeTotal ? $audit->countLogsByResource($resource, $queries) : 0,
+            'total' => $includeTotal ? $audit->countLogsByResource($resource) : 0,
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -2968,7 +2976,8 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $subscriberId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('audit')
+    ->action(function (string $subscriberId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Audit $audit) {
        $subscriber = $dbForProject->getDocument('subscribers', $subscriberId);

        if ($subscriber->isEmpty()) {
@@ -2981,9 +2990,12 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $audit = new Audit($dbForProject);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
        $resource = 'subscriber/' . $subscriberId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, limit: $limit, offset: $offset);

        $output = [];

@@ -3031,7 +3043,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $includeTotal ? $audit->countLogsByResource($resource, $queries) : 0,
+            'total' => $includeTotal ? $audit->countLogsByResource($resource) : 0,
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -3767,7 +3779,8 @@ App::get('/v1/messaging/messages/:messageId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $messageId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('audit')
+    ->action(function (string $messageId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Audit $audit) {
        $message = $dbForProject->getDocument('messages', $messageId);

        if ($message->isEmpty()) {
@@ -3780,9 +3793,12 @@ App::get('/v1/messaging/messages/:messageId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $audit = new Audit($dbForProject);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
        $resource = 'message/' . $messageId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, limit: $limit, offset: $offset);

        $output = [];

@@ -3830,7 +3846,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $includeTotal ? $audit->countLogsByResource($resource, $queries) : 0,
+            'total' => $includeTotal ? $audit->countLogsByResource($resource) : 0,
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -21,6 +21,7 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use PHPMailer\PHPMailer\PHPMailer;
 use Utopia\App;
+use Utopia\Audit\Adapter\Database as AdapterDatabase;
 use Utopia\Audit\Audit;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
@@ -203,6 +204,7 @@ App::post('/v1/projects')
                'accessedAt' => DateTime::now(),
                'search' => implode(' ', [$projectId, $name]),
                'database' => $dsn,
+                'labels' => [],
            ]));
        } catch (Duplicate) {
            throw new Exception(Exception::PROJECT_ALREADY_EXISTS);
@@ -225,6 +227,7 @@ App::post('/v1/projects')
        if (!$sharedTablesV2) {
            $adapter = new DatabasePool($pools->get($dsn->getHost()));
            $dbForProject = new Database($adapter, $cache);
+            $dbForProject->setDatabase(APP_DATABASE);

            if ($sharedTables) {
                $dbForProject
@@ -247,13 +250,15 @@ App::post('/v1/projects')
            }

            if ($create || $projectTables) {
-                $audit = new Audit($dbForProject);
+                $adapter = new AdapterDatabase($dbForProject);
+                $audit = new Audit($adapter);
                $audit->setup();
            }

            if (!$create && $sharedTablesV1) {
-                $attributes = \array_map(fn ($attribute) => new Document($attribute), Audit::ATTRIBUTES);
-                $indexes = \array_map(fn (array $index) => new Document($index), Audit::INDEXES);
+                $adapter = new AdapterDatabase($dbForProject);
+                $attributes = $adapter->getAttributeDocuments();
+                $indexes = $adapter->getIndexDocuments();
                $dbForProject->createDocument(Database::METADATA, new Document([
                    '$id' => ID::custom('audit'),
                    '$permissions' => [Permission::create(Role::any())],
@@ -294,7 +299,7 @@ App::post('/v1/projects')

        // Hook allowing instant project mirroring during migration
        // Outside of migration, hook is not registered and has no effect
-        $hooks->trigger('afterProjectCreation', [ $project, $pools, $cache ]);
+        $hooks->trigger('afterProjectCreation', [$project, $pools, $cache]);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -1478,7 +1483,7 @@ App::post('/v1/projects/:projectId/keys')
    ))
    ->param('projectId', '', new UID(), 'Project unique ID.')
    ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
-    ->param('scopes', null, new Nullable(new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
+    ->param('scopes', null, new Nullable(new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
    ->param('expire', null, new Nullable(new DatetimeValidator()), 'Expiration time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Use null for unlimited expiration.', true)
    ->inject('response')
    ->inject('dbForPlatform')
@@ -1497,8 +1502,9 @@ App::post('/v1/projects/:projectId/keys')
                Permission::update(Role::any()),
                Permission::delete(Role::any()),
            ],
-            'projectInternalId' => $project->getSequence(),
-            'projectId' => $project->getId(),
+            'resourceInternalId' => $project->getSequence(),
+            'resourceId' => $project->getId(),
+            'resourceType' => 'projects',
            'name' => $name,
            'scopes' => $scopes,
            'expire' => $expire,
@@ -1546,7 +1552,8 @@ App::get('/v1/projects/:projectId/keys')
        }

        $keys = $dbForPlatform->find('keys', [
-            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('resourceType', ['projects']),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
            Query::limit(5000),
        ]);

@@ -1587,7 +1594,8 @@ App::get('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForPlatform->findOne('keys', [
            Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('resourceType', ['projects']),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
        ]);

        if ($key->isEmpty()) {
@@ -1617,7 +1625,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
    ->param('projectId', '', new UID(), 'Project unique ID.')
    ->param('keyId', '', new UID(), 'Key unique ID.')
    ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
-    ->param('scopes', null, new Nullable(new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
+    ->param('scopes', null, new Nullable(new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
    ->param('expire', null, new Nullable(new DatetimeValidator()), 'Expiration time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Use null for unlimited expiration.', true)
    ->inject('response')
    ->inject('dbForPlatform')
@@ -1631,7 +1639,8 @@ App::put('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForPlatform->findOne('keys', [
            Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('resourceType', ['projects']),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
        ]);

        if ($key->isEmpty()) {
@@ -1682,7 +1691,8 @@ App::delete('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForPlatform->findOne('keys', [
            Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('resourceType', ['projects']),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
        ]);

        if ($key->isEmpty()) {
@@ -1716,7 +1726,7 @@ App::post('/v1/projects/:projectId/jwts')
        ]
    ))
    ->param('projectId', '', new UID(), 'Project unique ID.')
-    ->param('scopes', [], new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of scopes allowed for JWT key. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
+    ->param('scopes', [], new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of scopes allowed for JWT key. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
    ->param('duration', 900, new Range(0, 3600), 'Time in seconds before JWT expires. Default duration is 900 seconds, and maximum is 3600 seconds.', true)
    ->inject('response')
    ->inject('dbForPlatform')
@@ -2079,6 +2089,7 @@ App::patch('/v1/projects/:projectId/smtp')
        if ($enabled) {
            $mail = new PHPMailer(true);
            $mail->isSMTP();
+            $mail->SMTPAuth = (!empty($username) && !empty($password));
            $mail->Username = $username;
            $mail->Password = $password;
            $mail->Host = $host;
@@ -2094,7 +2105,7 @@ App::patch('/v1/projects/:projectId/smtp')
                    throw new Exception('Connection is not valid.');
                }
            } catch (Throwable $error) {
-                throw new Exception(Exception::PROJECT_SMTP_CONFIG_INVALID, 'Could not connect to SMTP server: ' . $error->getMessage());
+                throw new Exception(Exception::PROJECT_SMTP_CONFIG_INVALID, $error->getMessage());
            }
        }

@@ -2665,7 +2676,7 @@ App::patch('/v1/projects/:projectId/auth/session-invalidation')
        $auths = $project->getAttribute('auths', []);
        $auths['invalidateSessions'] = $enabled;
        $dbForPlatform->updateDocument('projects', $project->getId(), $project
-        ->setAttribute('auths', $auths));
+            ->setAttribute('auths', $auths));

        $response->dynamic($project, Response::MODEL_PROJECT);
    });
@@ -23,9 +23,9 @@ use Appwrite\Utopia\Database\Validator\Queries\Memberships;
 use Appwrite\Utopia\Database\Validator\Queries\Teams;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
+use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumberUtil;
 use MaxMind\Db\Reader;
-use Utopia\Abuse\Abuse;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Auth\Proofs\Password;
@@ -103,6 +103,7 @@ App::post('/v1/teams')
                    Permission::update(Role::team($teamId, 'owner')),
                    Permission::delete(Role::team($teamId, 'owner')),
                ],
+                'labels' => [],
                'name' => $name,
                'total' => ($isPrivilegedUser || $isAppUser) ? 0 : 1,
                'prefs' => new \stdClass(),
@@ -432,15 +433,22 @@ App::delete('/v1/teams/:teamId')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove team from DB');
        }

+        // Sync delete
        $deletes = new Deletes();
        $deletes->deleteMemberships($getProjectDB, $team, $project);

+        // Async delete
        if ($project->getId() === 'console') {
            $queueForDeletes
                ->setType(DELETE_TYPE_TEAM_PROJECTS)
-                ->setDocument($team);
+                ->setDocument($team)
+                ->trigger();
        }

+        $queueForDeletes
+            ->setType(DELETE_TYPE_DOCUMENT)
+            ->setDocument($team);
+
        $queueForEvents
            ->setParam('teamId', $team->getId())
            ->setPayload($response->output($team, Response::MODEL_TEAM))
@@ -771,7 +779,7 @@ App::post('/v1/teams/:teamId/memberships')
                    ->setPreview($preview)
                    ->setRecipient($invitee->getAttribute('email'))
                    ->setName($invitee->getAttribute('name', ''))
-                    ->setVariables($emailVariables)
+                    ->appendVariables($emailVariables)
                    ->trigger();
            } elseif (!empty($phone)) {
                if (empty(System::getEnv('_APP_SMS_PROVIDER'))) {
@@ -801,26 +809,21 @@ App::post('/v1/teams/:teamId/memberships')
                    ->setRecipients([$phone])
                    ->setProviderType('SMS');

-                if (isset($plan['authPhone'])) {
-                    $timelimit = $timelimit('organization:{organizationId}', $plan['authPhone'], 30 * 24 * 60 * 60); // 30 days
-                    $timelimit
-                        ->setParam('{organizationId}', $project->getAttribute('teamId'));
+                $helper = PhoneNumberUtil::getInstance();
+                try {
+                    $countryCode = $helper->parse($phone)->getCountryCode();

-                    $abuse = new Abuse($timelimit);
-                    if ($abuse->check() && System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') {
-                        $helper = PhoneNumberUtil::getInstance();
-                        $countryCode = $helper->parse($phone)->getCountryCode();
-
-                        if (!empty($countryCode)) {
-                            $queueForStatsUsage
-                                ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
-                        }
+                    if (!empty($countryCode)) {
+                        $queueForStatsUsage
+                            ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                    }
-                    $queueForStatsUsage
-                        ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
-                        ->setProject($project)
-                        ->trigger();
+                } catch (NumberParseException $e) {
+                    // Ignore invalid phone number for country code stats
                }
+                $queueForStatsUsage
+                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
+                    ->setProject($project)
+                    ->trigger();
            }
        }

@@ -1471,7 +1474,8 @@ App::get('/v1/teams/:teamId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $teamId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('audit')
+    ->action(function (string $teamId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Audit $audit) {

        $team = $dbForProject->getDocument('teams', $teamId);

@@ -1485,9 +1489,12 @@ App::get('/v1/teams/:teamId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $audit = new Audit($dbForProject);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
        $resource = 'team/' . $team->getId();
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, offset: $offset, limit: $limit);

        $output = [];

@@ -1534,7 +1541,7 @@ App::get('/v1/teams/:teamId/logs')
            }
        }
        $response->dynamic(new Document([
-            'total' => $includeTotal ? $audit->countLogsByResource($resource, $queries) : 0,
+            'total' => $includeTotal ? $audit->countLogsByResource($resource) : 0,
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -945,7 +945,8 @@ App::get('/v1/users/:userId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $userId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('audit')
+    ->action(function (string $userId, array $queries, bool $includeTotal, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Audit $audit) {

        $user = $dbForProject->getDocument('users', $userId);

@@ -958,8 +959,11 @@ App::get('/v1/users/:userId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $audit = new Audit($dbForProject);
-        $logs = $audit->getLogsByUser($user->getSequence(), $queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? 25;
+        $offset = $grouped['offset'] ?? 0;
+
+        $logs = $audit->getLogsByUser($user->getSequence(), limit: $limit, offset: $offset);
        $output = [];
        foreach ($logs as $i => &$log) {
            $log['userAgent'] = (!empty($log['userAgent'])) ? $log['userAgent'] : 'UNKNOWN';
@@ -999,7 +1003,7 @@ App::get('/v1/users/:userId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $includeTotal ? $audit->countLogsByUser($user->getSequence(), $queries) : 0,
+            'total' => $includeTotal ? $audit->countLogsByUser($user->getSequence()) : 0,
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -306,6 +306,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                'resourceType' => $resourceCollection,
                'entrypoint' => $resource->getAttribute('entrypoint', ''),
                'buildCommands' => \implode(' && ', $commands),
+                'startCommand' => $resource->getAttribute('startCommand', ''),
                'buildOutput' => $resource->getAttribute('outputDirectory', ''),
                'adapter' => $resource->getAttribute('adapter', ''),
                'fallbackFile' => $resource->getAttribute('fallbackFile', ''),
@@ -6,6 +6,7 @@ use Ahc\Jwt\JWT;
 use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Key;
 use Appwrite\Event\Certificate;
+use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\StatsUsage;
@@ -59,7 +60,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, Log $log, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeleteEvent $queueForDeletes, int $executionsRetentionCount)
 {
    $host = $request->getHostname() ?? '';
    if (!empty($previewHostname)) {
@@ -802,6 +803,20 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            ->setProject($project)
            ->trigger();

+        /* cleanup */
+        if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
+            $resourceType = $type === 'function'
+                ? RESOURCE_TYPE_FUNCTIONS
+                : RESOURCE_TYPE_SITES;
+
+            $queueForDeletes
+                ->setProject($project)
+                ->setResourceType($resourceType)
+                ->setResource($resource->getSequence())
+                ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
+                ->trigger();
+        }
+
        return true;
    } elseif ($type === 'api') {
        return false;
@@ -812,8 +827,6 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
    } else {
        throw new AppwriteException(AppwriteException::GENERAL_SERVER_ERROR, 'Unknown resource type ' . $type, view: $errorView);
    }
-
-    return false;
 }

 App::init()
@@ -863,7 +876,9 @@ App::init()
    ->inject('apiKey')
    ->inject('cors')
    ->inject('authorization')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Func $queueForFunctions, Executor $executor, array $platform, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization) {
+    ->inject('queueForDeletes')
+    ->inject('executionsRetentionCount')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Func $queueForFunctions, Executor $executor, array $platform, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
        /*
        * Appwrite Router
        */
@@ -871,7 +886,7 @@ App::init()
        $platformHostnames = $platform['hostnames'] ?? [];
        // Only run Router when external domain
        if (!\in_array($hostname, $platformHostnames) || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1034,7 +1049,7 @@ App::init()
   ->inject('dbForPlatform')
   ->inject('queueForCertificates')
   ->inject('platform')
-   ->inject('authorization')
+    ->inject('authorization')
   ->action(function (Request $request, Document $console, Database $dbForPlatform, Certificate $queueForCertificates, array $platform, Authorization $authorization) {
       $hostname = $request->getHostname();
       $cache = Config::getParam('hostnames', []);
@@ -1050,80 +1065,77 @@ App::init()
       if (empty($domain->get()) || !$domain->isKnown() || $domain->isTest()) {
           $cache[$domain->get()] = false;
           Config::setParam('hostnames', $cache);
-           Console::warning($domain->get() . ' is not a publicly accessible domain. Skipping SSL certificate generation.');
           return;
       }

       if (str_starts_with($request->getURI(), '/.well-known/acme-challenge')) {
-           Console::warning('Skipping SSL certificates generation on ACME challenge.');
           return;
       }

       // 3. Check if domain is a main domain
       if (!in_array($domain->get(), $platformHostnames)) {
-           Console::warning($domain->get() . ' is not a main domain. Skipping SSL certificate generation.');
           return;
       }

       // 4. Check/create rule (requires DB access)
-       $authorization->disable();
-       try {
-           // TODO: (@Meldiron) Remove after 1.7.x migration
-           $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
-           $document = $isMd5
-               ? $dbForPlatform->getDocument('rules', md5($domain->get()))
-               : $dbForPlatform->findOne('rules', [
-                   Query::equal('domain', [$domain->get()]),
+       $authorization->skip(function () use ($dbForPlatform, $domain, $console, $queueForCertificates, &$cache) {
+           try {
+               // TODO: (@Meldiron) Remove after 1.7.x migration
+               $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
+               $document = $isMd5
+                   ? $dbForPlatform->getDocument('rules', md5($domain->get()))
+                   : $dbForPlatform->findOne('rules', [
+                       Query::equal('domain', [$domain->get()]),
+                   ]);
+
+               if (!$document->isEmpty()) {
+                   return;
+               }
+
+               // 5. Create new rule
+               $owner = '';
+               $fallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
+               $funcDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+               $siteDomain = System::getEnv('_APP_DOMAIN_SITES', '');
+
+               if (!empty($fallback) && \str_ends_with($domain->get(), $fallback)) {
+                   $funcDomain = $fallback;
+               }
+
+               if (
+                   (!empty($funcDomain) && \str_ends_with($domain->get(), $funcDomain)) ||
+                   (!empty($siteDomain) && \str_ends_with($domain->get(), $siteDomain))
+               ) {
+                   $owner = 'Appwrite';
+               }
+
+               $ruleId = $isMd5 ? md5($domain->get()) : ID::unique();
+               $document = new Document([
+                   '$id' => $ruleId,
+                   'domain' => $domain->get(),
+                   'type' => 'api',
+                   'status' => 'verifying',
+                   'projectId' => $console->getId(),
+                   'projectInternalId' => $console->getSequence(),
+                   'search' => implode(' ', [$ruleId, $domain->get()]),
+                   'owner' => $owner,
+                   'region' => $console->getAttribute('region')
               ]);

-           if (!$document->isEmpty()) {
-               return;
+               $dbForPlatform->createDocument('rules', $document);
+
+               Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');
+               $queueForCertificates
+                   ->setDomain($document)
+                   ->setSkipRenewCheck(true)
+                   ->trigger();
+           } catch (Duplicate $e) {
+               Console::info('Certificate already exists');
+           } finally {
+               $cache[$domain->get()] = true;
+               Config::setParam('hostnames', $cache);
           }
-
-           // 5. Create new rule
-           $owner = '';
-           $fallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
-           $funcDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-           $siteDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-
-           if (!empty($fallback) && \str_ends_with($domain->get(), $fallback)) {
-               $funcDomain = $fallback;
-           }
-
-           if (
-               (!empty($funcDomain) && \str_ends_with($domain->get(), $funcDomain)) ||
-               (!empty($siteDomain) && \str_ends_with($domain->get(), $siteDomain))
-           ) {
-               $owner = 'Appwrite';
-           }
-
-           $ruleId = $isMd5 ? md5($domain->get()) : ID::unique();
-           $document = new Document([
-               '$id' => $ruleId,
-               'domain' => $domain->get(),
-               'type' => 'api',
-               'status' => 'verifying',
-               'projectId' => $console->getId(),
-               'projectInternalId' => $console->getSequence(),
-               'search' => implode(' ', [$ruleId, $domain->get()]),
-               'owner' => $owner,
-               'region' => $console->getAttribute('region')
-           ]);
-
-           $dbForPlatform->createDocument('rules', $document);
-
-           Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');
-           $queueForCertificates
-               ->setDomain($document)
-               ->setSkipRenewCheck(true)
-               ->trigger();
-       } catch (Duplicate $e) {
-           Console::info('Certificate already exists');
-       } finally {
-           $cache[$domain->get()] = true;
-           Config::setParam('hostnames', $cache);
-           $authorization->reset();
-       }
+       });
   });

 App::options()
@@ -1147,14 +1159,16 @@ App::options()
    ->inject('apiKey')
    ->inject('cors')
    ->inject('authorization')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization) {
+    ->inject('queueForDeletes')
+    ->inject('executionsRetentionCount')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
        /*
        * Appwrite Router
        */
        $platformHostnames = $platform['hostnames'] ?? [];
        // Only run Router when external domain
        if (!in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1214,7 +1228,7 @@ App::error()
        }

        switch ($class) {
-            case 'Utopia\Exception':
+            case Utopia\Exception::class:
                $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, $code, $error);
                switch ($code) {
                    case 400:
@@ -1225,10 +1239,10 @@ App::error()
                        break;
                }
                break;
-            case 'Utopia\Database\Exception\Authorization':
+            case Utopia\Database\Exception\Authorization::class:
                $error = new AppwriteException(AppwriteException::USER_UNAUTHORIZED);
                break;
-            case 'Utopia\Database\Exception\Timeout':
+            case Utopia\Database\Exception\Timeout::class:
                $error = new AppwriteException(AppwriteException::DATABASE_TIMEOUT, previous: $error);
                break;
        }
@@ -1335,6 +1349,86 @@ App::error()
            $log->addExtra('trace', $error->getTraceAsString());
            $log->addExtra('roles', $authorization->getRoles());

+            try {
+                /* add queries to log */
+                $queries = $request->getParam('queries', []);
+                if (!empty($queries) && is_array($queries)) {
+                    $parsedQueries = Query::parseQueries($queries);
+
+                    // format query by removing sensitive values
+                    $formatQuery = function (array $queryArray) use (&$formatQuery): ?array {
+                        $method = $queryArray['method'] ?? '';
+                        $values = $queryArray['values'] ?? [];
+                        $attribute = $queryArray['attribute'] ?? '';
+
+                        if (!is_string($method) || $method === '') {
+                            return null;
+                        }
+
+                        // logical queries - recursively format nested queries
+                        if (in_array($method, [Query::TYPE_AND, Query::TYPE_OR], true)) {
+                            $nested = [];
+                            foreach ($values as $nestedArray) {
+                                if (is_array($nestedArray)) {
+                                    $formatted = $formatQuery($nestedArray);
+                                    if ($formatted !== null) {
+                                        $nested[] = $formatted;
+                                    }
+                                }
+                            }
+                            return empty($nested) ? null : [$method => $nested];
+                        }
+
+                        // select - show selected attributes
+                        if ($method === Query::TYPE_SELECT) {
+                            $attributes = array_values(array_filter($values, 'is_string'));
+                            return [$method => $attributes];
+                        }
+
+                        // pagination
+                        if (in_array($method, [
+                            Query::TYPE_LIMIT,
+                            Query::TYPE_OFFSET,
+                            Query::TYPE_CURSOR_AFTER,
+                            Query::TYPE_CURSOR_BEFORE
+                        ], true)) {
+                            return [$method => []];
+                        }
+
+                        // orders
+                        if (in_array($method, [
+                            Query::TYPE_ORDER_DESC,
+                            Query::TYPE_ORDER_ASC,
+                            Query::TYPE_ORDER_RANDOM
+                        ], true)) {
+                            return [$method => !empty($attribute) ? [$attribute] : []];
+                        }
+
+                        // filter
+                        if (!empty($attribute)) {
+                            return [$method => [$attribute]];
+                        }
+
+                        // fallback
+                        return [$method => []];
+                    };
+
+                    $formattedQueries = [];
+                    foreach ($parsedQueries as $query) {
+                        $formatted = $formatQuery($query->toArray());
+                        if ($formatted !== null) {
+                            $formattedQueries[] = $formatted;
+                        }
+                    }
+
+                    if (!empty($formattedQueries)) {
+                        $log->addExtra('queries', $formattedQueries);
+                    }
+                }
+            } catch (Throwable $_) {
+                // don't fail the error handler
+            }
+
            $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
            if (!empty($sdk)) {
                /** @var \Appwrite\SDK\Method $sdk */
@@ -1409,7 +1503,7 @@ App::error()
        $template = $error->getView() ?? (($route) ? $route->getLabel('error', null) : null);

        // TODO: Ideally use group 'api' here, but all wildcard routes seem to have 'api' at the moment
-        if (!\str_starts_with($route->getPath(), '/v1')) {
+        if (empty($route) || !\str_starts_with($route->getPath(), '/v1')) {
            $template = __DIR__ . '/../views/general/error.phtml';
        }

@@ -1458,13 +1552,15 @@ App::get('/robots.txt')
    ->inject('previewHostname')
    ->inject('apiKey')
    ->inject('authorization')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization) {
+    ->inject('queueForDeletes')
+    ->inject('executionsRetentionCount')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
        $platformHostnames = $platform['hostnames'] ?? [];
        if (in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
            $template = new View(__DIR__ . '/../views/general/robots.phtml');
            $response->text($template->render(false));
        } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1491,13 +1587,15 @@ App::get('/humans.txt')
    ->inject('previewHostname')
    ->inject('apiKey')
    ->inject('authorization')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization) {
+    ->inject('queueForDeletes')
+    ->inject('executionsRetentionCount')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
        $platformHostnames = $platform['hostnames'] ?? [];
        if (in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
            $template = new View(__DIR__ . '/../views/general/humans.phtml');
            $response->text($template->render(false));
        } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -191,7 +191,7 @@ App::post('/v1/mock/api-key-unprefixed')
            throw new Exception(Exception::PROJECT_NOT_FOUND);
        }

-        $scopes = array_keys(Config::getParam('scopes'));
+        $scopes = array_keys(Config::getParam('projectScopes'));

        $key = new Document([
            '$id' => ID::unique(),
@@ -200,8 +200,9 @@ App::post('/v1/mock/api-key-unprefixed')
                Permission::update(Role::any()),
                Permission::delete(Role::any()),
            ],
-            'projectInternalId' => $project->getSequence(),
-            'projectId' => $project->getId(),
+            'resourceInternalId' => $project->getSequence(),
+            'resourceId' => $project->getId(),
+            'resourceType' => 'projects',
            'name' => 'Outdated key',
            'scopes' => $scopes,
            'expire' => null,
@@ -10,12 +10,12 @@ use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
-use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Event\Webhook;
 use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
+use Appwrite\Functions\EventProcessor;
 use Appwrite\SDK\Method;
 use Appwrite\Utopia\Database\Documents\User;
 use Appwrite\Utopia\Request;
@@ -31,7 +31,6 @@ use Utopia\Database\Document;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Authorization\Input;
-use Utopia\Queue\Publisher;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter as Telemetry;
 use Utopia\Validator\WhiteList;
@@ -75,151 +74,6 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
    return $label;
 };

-/**
- * This isolated event handling for `users.*.create` which is based on a `Database::EVENT_DOCUMENT_CREATE` listener may look odd, but it is **intentional**.
- *
- * Accounts can be created in many ways beyond `createAccount`
- * (anonymous, OAuth, phone, etc.), and those flows are probably not covered in event tests; so we handle this here.
- */
-$eventDatabaseListener = function (Document $project, Document $document, Response $response, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
-    // Only trigger events for user creation with the database listener.
-    if ($document->getCollection() !== 'users') {
-        return;
-    }
-
-    $queueForEvents
-        ->setEvent('users.[userId].create')
-        ->setParam('userId', $document->getId())
-        ->setPayload($response->output($document, Response::MODEL_USER));
-
-    // Trigger functions, webhooks, and realtime events
-    $queueForFunctions
-        ->from($queueForEvents)
-        ->trigger();
-
-
-    /** Trigger webhooks events only if a project has them enabled */
-    if (!empty($project->getAttribute('webhooks'))) {
-        $queueForWebhooks
-            ->from($queueForEvents)
-            ->trigger();
-    }
-
-    /** Trigger realtime events only for non console events */
-    if ($queueForEvents->getProject()->getId() !== 'console') {
-        $queueForRealtime
-            ->from($queueForEvents)
-            ->trigger();
-    }
-};
-
-$usageDatabaseListener = function (string $event, Document $document, StatsUsage $queueForStatsUsage) {
-    $value = 1;
-
-    switch ($event) {
-        case Database::EVENT_DOCUMENT_DELETE:
-            $value = -1;
-            break;
-        case Database::EVENT_DOCUMENTS_DELETE:
-            $value = -1 * $document->getAttribute('modified', 0);
-            break;
-        case Database::EVENT_DOCUMENTS_CREATE:
-            $value = $document->getAttribute('modified', 0);
-            break;
-        case Database::EVENT_DOCUMENTS_UPSERT:
-            $value = $document->getAttribute('created', 0);
-            break;
-    }
-
-    switch (true) {
-        case $document->getCollection() === 'teams':
-            $queueForStatsUsage->addMetric(METRIC_TEAMS, $value); // per project
-            break;
-        case $document->getCollection() === 'users':
-            $queueForStatsUsage->addMetric(METRIC_USERS, $value); // per project
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage->addReduce($document);
-            }
-            break;
-        case $document->getCollection() === 'sessions': // sessions
-            $queueForStatsUsage->addMetric(METRIC_SESSIONS, $value); //per project
-            break;
-        case $document->getCollection() === 'databases': // databases
-            $queueForStatsUsage->addMetric(METRIC_DATABASES, $value); // per project
-
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage->addReduce($document);
-            }
-            break;
-        case str_starts_with($document->getCollection(), 'database_') && !str_contains($document->getCollection(), 'collection'): //collections
-            $parts = explode('_', $document->getCollection());
-            $databaseInternalId = $parts[1] ?? 0;
-            $queueForStatsUsage
-                ->addMetric(METRIC_COLLECTIONS, $value) // per project
-                ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_COLLECTIONS), $value);
-
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage->addReduce($document);
-            }
-            break;
-        case str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_'): //documents
-            $parts = explode('_', $document->getCollection());
-            $databaseInternalId   = $parts[1] ?? 0;
-            $collectionInternalId = $parts[3] ?? 0;
-            $queueForStatsUsage
-                ->addMetric(METRIC_DOCUMENTS, $value)  // per project
-                ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_DOCUMENTS), $value) // per database
-                ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS), $value);  // per collection
-            break;
-        case $document->getCollection() === 'buckets': //buckets
-            $queueForStatsUsage
-                ->addMetric(METRIC_BUCKETS, $value); // per project
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
-                    ->addReduce($document);
-            }
-            break;
-        case str_starts_with($document->getCollection(), 'bucket_'): // files
-            $parts = explode('_', $document->getCollection());
-            $bucketInternalId  = $parts[1];
-            $queueForStatsUsage
-                ->addMetric(METRIC_FILES, $value) // per project
-                ->addMetric(METRIC_FILES_STORAGE, $document->getAttribute('sizeOriginal') * $value) // per project
-                ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES), $value) // per bucket
-                ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES_STORAGE), $document->getAttribute('sizeOriginal') * $value); // per bucket
-            break;
-        case $document->getCollection() === 'functions':
-            $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);
-            }
-            break;
-        case $document->getCollection() === 'deployments':
-            $queueForStatsUsage
-                ->addMetric(METRIC_DEPLOYMENTS, $value) // per project
-                ->addMetric(METRIC_DEPLOYMENTS_STORAGE, $document->getAttribute('size') * $value) // per project
-                ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS), $value) // per function
-                ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value)
-                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS), $value) // per function
-                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value);
-            break;
-        default:
-            break;
-    }
-};
-
 App::init()
    ->groups(['api'])
    ->inject('utopia')
@@ -303,10 +157,6 @@ App::init()

        // Step 5: API Key Authentication
        if (!empty($apiKey)) {
-            // Verify no user session exists simultaneously
-            if (!$user->isEmpty()) {
-                throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
-            }
            // Check if key is expired
            if ($apiKey->isExpired()) {
                throw new Exception(Exception::PROJECT_KEY_EXPIRED);
@@ -335,23 +185,38 @@ App::init()
            }

            // For standard keys, update last accessed time
-            if ($apiKey->getType() === API_KEY_STANDARD) {
-                $dbKey = $project->find(
-                    key: 'secret',
-                    find: $request->getHeader('x-appwrite-key', ''),
-                    subject: 'keys'
-                );
+            if (\in_array($apiKey->getType(), [API_KEY_STANDARD, API_KEY_ORGANIZATION, API_KEY_ACCOUNT])) {
+                $dbKey = null;
+                if (!empty($apiKey->getProjectId())) {
+                    $dbKey = $project->find(
+                        key: 'secret',
+                        find: $request->getHeader('x-appwrite-key', ''),
+                        subject: 'keys'
+                    );
+                } elseif (!empty($apiKey->getUserId())) {
+                    $dbKey = $user->find(
+                        key: 'secret',
+                        find: $request->getHeader('x-appwrite-key', ''),
+                        subject: 'keys'
+                    );
+                } elseif (!empty($apiKey->getTeamId())) {
+                    $dbKey = $team->find(
+                        key: 'secret',
+                        find: $request->getHeader('x-appwrite-key', ''),
+                        subject: 'keys'
+                    );
+                }

                if (!$dbKey) {
                    throw new Exception(Exception::USER_UNAUTHORIZED);
                }

+                $updates = new Document();
+
                $accessedAt = $dbKey->getAttribute('accessedAt', 0);

                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());
+                    $updates->setAttribute('accessedAt', DateTime::now());
                }

                $sdkValidator = new WhiteList($servers, true);
@@ -362,12 +227,21 @@ App::init()

                    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());
+                        $updates->setAttribute('sdks', $sdks);
+                        $updates->setAttribute('accessedAt', Datetime::now());
+                    }
+                }
+
+                if (!$updates->isEmpty()) {
+                    $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->updateDocument('keys', $dbKey->getId(), $updates));
+
+                    if (!empty($apiKey->getProjectId())) {
+                        $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('projects', $project->getId()));
+                    } elseif (!empty($apiKey->getUserId())) {
+                        $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('users', $user->getId()));
+                    } elseif (!empty($apiKey->getTeamId())) {
+                        $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('teams', $team->getId()));
                    }
                }

@@ -489,9 +363,6 @@ App::init()
    ->inject('response')
    ->inject('project')
    ->inject('user')
-    ->inject('publisher')
-    ->inject('publisherFunctions')
-    ->inject('publisherWebhooks')
    ->inject('queueForEvents')
    ->inject('queueForMessaging')
    ->inject('queueForAudits')
@@ -501,7 +372,6 @@ App::init()
    ->inject('queueForStatsUsage')
    ->inject('queueForFunctions')
    ->inject('queueForMails')
-    ->inject('queueForMigrations')
    ->inject('dbForProject')
    ->inject('timelimit')
    ->inject('resourceToken')
@@ -512,7 +382,7 @@ App::init()
    ->inject('telemetry')
    ->inject('platform')
    ->inject('authorization')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Mail $queueForMails, Migration $queueForMigrations, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) use ($usageDatabaseListener, $eventDatabaseListener) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Mail $queueForMails, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) {

        $route = $utopia->getRoute();

@@ -632,28 +502,6 @@ App::init()
        $queueForBuilds->setPlatform($platform);
        $queueForMails->setPlatform($platform);

-        // Clone the queues, to prevent events triggered by the database listener
-        // from overwriting the events that are supposed to be triggered in the shutdown hook.
-        $queueForEventsClone = new Event($publisher);
-        $queueForFunctions = new Func($publisherFunctions);
-        $queueForWebhooks = new Webhook($publisherWebhooks);
-        $queueForRealtime = new Realtime();
-
-        $dbForProject
-            ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
-                $project,
-                $document,
-                $response,
-                $queueForEventsClone->from($queueForEvents),
-                $queueForFunctions->from($queueForEvents),
-                $queueForWebhooks->from($queueForEvents),
-                $queueForRealtime->from($queueForEvents)
-            ));

        $useCache = $route->getLabel('cache', false);
        $storageCacheOperationsCounter = $telemetry->createCounter('storage.cache.operations.load');
@@ -817,7 +665,9 @@ App::shutdown()
    ->inject('queueForRealtime')
    ->inject('dbForProject')
    ->inject('authorization')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Audit $queueForAudits, StatsUsage $queueForStatsUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization) use ($parseLabel) {
+    ->inject('timelimit')
+    ->inject('eventProcessor')
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Audit $queueForAudits, StatsUsage $queueForStatsUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor) use ($parseLabel) {

        $responsePayload = $response->getPayload();

@@ -826,9 +676,15 @@ App::shutdown()
                $queueForEvents->setPayload($responsePayload);
            }

-            $queueForFunctions
-                ->from($queueForEvents)
-                ->trigger();
+            // Get project and function/webhook events (cached)
+            $functionsEvents = $eventProcessor->getFunctionsEvents($project, $dbForProject);
+            $webhooksEvents = $eventProcessor->getWebhooksEvents($project);
+
+            // Generate events for this operation
+            $generatedEvents = Event::generateEvents(
+                $queueForEvents->getEvent(),
+                $queueForEvents->getParams()
+            );

            if ($project->getId() !== 'console') {
                $queueForRealtime
@@ -836,21 +692,69 @@ App::shutdown()
                    ->trigger();
            }

-            /** Trigger webhooks events only if a project has them enabled
-             * A future optimisation is to only trigger webhooks if the webhook is "enabled"
-             * But it might have performance implications on the API due to the number of webhooks etc.
-             * Some profiling is needed to see if this is a problem.
-            */
-            if (!empty($project->getAttribute('webhooks'))) {
-                $queueForWebhooks
-                    ->from($queueForEvents)
-                    ->trigger();
+            // Only trigger functions if there are matching function events
+            if (!empty($functionsEvents)) {
+                foreach ($generatedEvents as $event) {
+                    if (isset($functionsEvents[$event])) {
+                        $queueForFunctions
+                            ->from($queueForEvents)
+                            ->trigger();
+                        break;
+                    }
+                }
+            }
+
+            // Only trigger webhooks if there are matching webhook events
+            if (!empty($webhooksEvents)) {
+                foreach ($generatedEvents as $event) {
+                    if (isset($webhooksEvents[$event])) {
+                        $queueForWebhooks
+                            ->from($queueForEvents)
+                            ->trigger();
+                        break;
+                    }
+                }
            }
        }

        $route = $utopia->getRoute();
        $requestParams = $route->getParamsValues();

+        /**
+         * Abuse labels
+         */
+        $abuseEnabled = System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled';
+        $abuseResetCode = $route->getLabel('abuse-reset', []);
+        $abuseResetCode = \is_array($abuseResetCode) ? $abuseResetCode : [$abuseResetCode];
+
+        if ($abuseEnabled && \count($abuseResetCode) > 0 && \in_array($response->getStatusCode(), $abuseResetCode)) {
+            $abuseKeyLabel = $route->getLabel('abuse-key', 'url:{url},ip:{ip}');
+            $abuseKeyLabel = (!is_array($abuseKeyLabel)) ? [$abuseKeyLabel] : $abuseKeyLabel;
+
+            foreach ($abuseKeyLabel as $abuseKey) {
+                $start = $request->getContentRangeStart();
+                $end = $request->getContentRangeEnd();
+                $timeLimit = $timelimit($abuseKey, $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600));
+                $timeLimit
+                    ->setParam('{projectId}', $project->getId())
+                    ->setParam('{userId}', $user->getId())
+                    ->setParam('{userAgent}', $request->getUserAgent(''))
+                    ->setParam('{ip}', $request->getIP())
+                    ->setParam('{url}', $request->getHostname() . $route->getPath())
+                    ->setParam('{method}', $request->getMethod())
+                    ->setParam('{chunkId}', (int)($start / ($end + 1 - $start)));
+
+                foreach ($request->getParams() as $key => $value) { // Set request params as potential abuse keys
+                    if (!empty($value)) {
+                        $timeLimit->setParam('{param-' . $key . '}', (\is_array($value)) ? \json_encode($value) : $value);
+                    }
+                }
+
+                $abuse = new Abuse($timeLimit);
+                $abuse->reset();
+            }
+        }
+
        /**
         * Audit labels
         */
@@ -1,43 +0,0 @@
-<?php
-
-use Appwrite\Utopia\Request;
-use Appwrite\Utopia\Response;
-use Utopia\App;
-
-App::init()
-    ->groups(['web'])
-    ->inject('request')
-    ->inject('response')
-    ->action(function (Request $request, Response $response) {
-        $response
-            ->addHeader('X-Frame-Options', 'SAMEORIGIN') // Avoid console and homepage from showing in iframes
-            ->addHeader('X-XSS-Protection', '1; mode=block; report=/v1/xss?url=' . \urlencode($request->getURI()))
-            ->addHeader('X-UA-Compatible', 'IE=Edge') // Deny IE browsers from going into quirks mode
-        ;
-    });
-
-App::get('/')
-    ->alias('auth/*')
-    ->alias('/invite')
-    ->alias('/login')
-    ->alias('/mfa')
-    ->alias('/card/*')
-    ->alias('/recover')
-    ->alias('/register/*')
-    ->groups(['web'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('request')
-    ->inject('response')
-    ->action(function (Request $request, Response $response) {
-        $url = parse_url($request->getURI());
-        $target = "/console{$url['path']}";
-        $params = $request->getParams();
-        if (!empty($params)) {
-            $target .= "?" . \http_build_query($params);
-        }
-        if ($url['fragment'] ?? false) {
-            $target .= "#{$url['fragment']}";
-        }
-        $response->redirect($target);
-    });
@@ -12,6 +12,8 @@ use Swoole\Process;
 use Swoole\Table;
 use Swoole\Timer;
 use Utopia\App;
+use Utopia\Audit\Adapter\Database as AdapterDatabase;
+use Utopia\Audit\Adapter\SQL as AuditAdapterSQL;
 use Utopia\Audit\Audit;
 use Utopia\CLI\Console;
 use Utopia\Compression\Compression;
@@ -261,8 +263,9 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
        createDatabase($app, 'dbForPlatform', 'appwrite', $collections['console'], $pools, function (Database $dbForPlatform) use ($collections, $app) {
            $authorization = $app->getResource('authorization');

-            if ($dbForPlatform->getCollection(Audit::COLLECTION)->isEmpty()) {
-                $audit = new Audit($dbForPlatform);
+            if ($dbForPlatform->getCollection(AuditAdapterSQL::COLLECTION)->isEmpty()) {
+                $adapter = new AdapterDatabase($dbForPlatform);
+                $audit = new Audit($adapter);
                $audit->setup();
            }

@@ -390,8 +393,9 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                Console::success('[Setup] - Skip: metadata table already exists');
            }

-            if ($dbForProject->getCollection(Audit::COLLECTION)->isEmpty()) {
-                $audit = new Audit($dbForProject);
+            if ($dbForProject->getCollection(AuditAdapterSQL::COLLECTION)->isEmpty()) {
+                $adapter = new AdapterDatabase($dbForProject);
+                $audit = new Audit($adapter);
                $audit->setup();
            }

@@ -26,6 +26,7 @@ require_once __DIR__ . '/init/database/filters.php';
 require_once __DIR__ . '/init/database/formats.php';
 require_once __DIR__ . '/init/locales.php';
 require_once __DIR__ . '/init/registers.php';
+require_once __DIR__ . '/init/models.php';
 require_once __DIR__ . '/init/resources.php';

 \stream_context_set_default([ // Set global user agent and http settings
@@ -22,7 +22,9 @@ Config::load('collections', __DIR__ . '/../config/collections.php', $configAdapt
 Config::load('frameworks', __DIR__ . '/../config/frameworks.php', $configAdapter);
 Config::load('usage', __DIR__ . '/../config/usage.php', $configAdapter);
 Config::load('roles', __DIR__ . '/../config/roles.php', $configAdapter);  // User roles and scopes
-Config::load('scopes', __DIR__ . '/../config/scopes.php', $configAdapter);  // User roles and scopes
+Config::load('projectScopes', __DIR__ . '/../config/scopes/project.php', $configAdapter);
+Config::load('organizationScopes', __DIR__ . '/../config/scopes/organization.php', $configAdapter);
+Config::load('accountScopes', __DIR__ . '/../config/scopes/account.php', $configAdapter);
 Config::load('services', __DIR__ . '/../config/services.php', $configAdapter);  // List of services
 Config::load('variables', __DIR__ . '/../config/variables.php', $configAdapter);  // List of env variables
 Config::load('regions', __DIR__ . '/../config/regions.php', $configAdapter); // List of available regions
@@ -44,7 +44,7 @@ const APP_RESOURCE_TOKEN_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 = 4321;
-const APP_VERSION_STABLE = '1.8.0';
+const APP_VERSION_STABLE = '1.8.1';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -161,6 +161,9 @@ const ACTIVITY_TYPE_GUEST = 'guest';
 const MFA_RECENT_DURATION = 1800; // 30 mins


+// Database name
+const APP_DATABASE = 'appwrite';
+
 // Database Reconnect
 const DATABASE_RECONNECT_SLEEP = 2;
 const DATABASE_RECONNECT_MAX_ATTEMPTS = 10;
@@ -178,8 +181,10 @@ const BUILD_TYPE_DEPLOYMENT = 'deployment';
 const BUILD_TYPE_RETRY = 'retry';

 // Deletion Types
-const DELETE_TYPE_DATABASES = 'databases';

+const ENABLE_EXECUTIONS_LIMIT_ON_ROUTE = false;
+
+const DELETE_TYPE_DATABASES = 'databases';
 const DELETE_TYPE_DOCUMENT = 'document';
 const DELETE_TYPE_COLLECTIONS = 'collections';
 const DELETE_TYPE_TRANSACTION = 'transaction';
@@ -189,8 +194,10 @@ const DELETE_TYPE_SITES = 'sites';
 const DELETE_TYPE_FUNCTIONS = 'functions';
 const DELETE_TYPE_DEPLOYMENTS = 'deployments';
 const DELETE_TYPE_USERS = 'users';
+const DELETE_TYPE_TEAMS = 'teams';
 const DELETE_TYPE_TEAM_PROJECTS = 'teams_projects';
 const DELETE_TYPE_EXECUTIONS = 'executions';
+const DELETE_TYPE_EXECUTIONS_LIMIT = 'executionsLimit';
 const DELETE_TYPE_AUDIT = 'audit';
 const DELETE_TYPE_ABUSE = 'abuse';
 const DELETE_TYPE_USAGE = 'usage';
@@ -243,6 +250,8 @@ const MESSAGE_TYPE_PUSH = 'push';
 // API key types
 const API_KEY_STANDARD = 'standard';
 const API_KEY_DYNAMIC = 'dynamic';
+const API_KEY_ORGANIZATION = 'organization';
+const API_KEY_ACCOUNT = 'account';
 // Usage metrics
 const METRIC_TEAMS = 'teams';
 const METRIC_USERS = 'users';
@@ -135,7 +135,8 @@ Database::addFilter(
    function (mixed $value, Document $document, Database $database) {
        return $database->getAuthorization()->skip(fn () => $database
            ->find('keys', [
-                Query::equal('projectInternalId', [$document->getSequence()]),
+                Query::equal('resourceType', ['projects']),
+                Query::equal('resourceInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]));
    }
@@ -432,3 +433,34 @@ Database::addFilter(
        return $value;
    }
 );
+
+
+Database::addFilter(
+    'subQueryOrganizationKeys',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database->getAuthorization()->skip(fn () => $database
+            ->find('keys', [
+                Query::equal('resourceType', ['teams']),
+                Query::equal('resourceInternalId', [$document->getSequence()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryAccountKeys',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database->getAuthorization()->skip(fn () => $database
+            ->find('keys', [
+                Query::equal('resourceType', ['users']),
+                Query::equal('resourceInternalId', [$document->getSequence()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
@@ -0,0 +1,360 @@
+<?php
+
+use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Response\Model\Account;
+use Appwrite\Utopia\Response\Model\AlgoArgon2;
+use Appwrite\Utopia\Response\Model\AlgoBcrypt;
+use Appwrite\Utopia\Response\Model\AlgoMd5;
+use Appwrite\Utopia\Response\Model\AlgoPhpass;
+use Appwrite\Utopia\Response\Model\AlgoScrypt;
+use Appwrite\Utopia\Response\Model\AlgoScryptModified;
+use Appwrite\Utopia\Response\Model\AlgoSha;
+use Appwrite\Utopia\Response\Model\Any;
+use Appwrite\Utopia\Response\Model\Attribute;
+use Appwrite\Utopia\Response\Model\AttributeBoolean;
+use Appwrite\Utopia\Response\Model\AttributeDatetime;
+use Appwrite\Utopia\Response\Model\AttributeEmail;
+use Appwrite\Utopia\Response\Model\AttributeEnum;
+use Appwrite\Utopia\Response\Model\AttributeFloat;
+use Appwrite\Utopia\Response\Model\AttributeInteger;
+use Appwrite\Utopia\Response\Model\AttributeIP;
+use Appwrite\Utopia\Response\Model\AttributeLine;
+use Appwrite\Utopia\Response\Model\AttributeList;
+use Appwrite\Utopia\Response\Model\AttributeLongtext;
+use Appwrite\Utopia\Response\Model\AttributeMediumtext;
+use Appwrite\Utopia\Response\Model\AttributePoint;
+use Appwrite\Utopia\Response\Model\AttributePolygon;
+use Appwrite\Utopia\Response\Model\AttributeRelationship;
+use Appwrite\Utopia\Response\Model\AttributeString;
+use Appwrite\Utopia\Response\Model\AttributeText;
+use Appwrite\Utopia\Response\Model\AttributeURL;
+use Appwrite\Utopia\Response\Model\AttributeVarchar;
+use Appwrite\Utopia\Response\Model\AuthProvider;
+use Appwrite\Utopia\Response\Model\BaseList;
+use Appwrite\Utopia\Response\Model\Branch;
+use Appwrite\Utopia\Response\Model\Bucket;
+use Appwrite\Utopia\Response\Model\Collection;
+use Appwrite\Utopia\Response\Model\Column;
+use Appwrite\Utopia\Response\Model\ColumnBoolean;
+use Appwrite\Utopia\Response\Model\ColumnDatetime;
+use Appwrite\Utopia\Response\Model\ColumnEmail;
+use Appwrite\Utopia\Response\Model\ColumnEnum;
+use Appwrite\Utopia\Response\Model\ColumnFloat;
+use Appwrite\Utopia\Response\Model\ColumnIndex;
+use Appwrite\Utopia\Response\Model\ColumnInteger;
+use Appwrite\Utopia\Response\Model\ColumnIP;
+use Appwrite\Utopia\Response\Model\ColumnLine;
+use Appwrite\Utopia\Response\Model\ColumnList;
+use Appwrite\Utopia\Response\Model\ColumnLongtext;
+use Appwrite\Utopia\Response\Model\ColumnMediumtext;
+use Appwrite\Utopia\Response\Model\ColumnPoint;
+use Appwrite\Utopia\Response\Model\ColumnPolygon;
+use Appwrite\Utopia\Response\Model\ColumnRelationship;
+use Appwrite\Utopia\Response\Model\ColumnString;
+use Appwrite\Utopia\Response\Model\ColumnText;
+use Appwrite\Utopia\Response\Model\ColumnURL;
+use Appwrite\Utopia\Response\Model\ColumnVarchar;
+use Appwrite\Utopia\Response\Model\ConsoleVariables;
+use Appwrite\Utopia\Response\Model\Continent;
+use Appwrite\Utopia\Response\Model\Country;
+use Appwrite\Utopia\Response\Model\Currency;
+use Appwrite\Utopia\Response\Model\Database;
+use Appwrite\Utopia\Response\Model\Deployment;
+use Appwrite\Utopia\Response\Model\DetectionFramework;
+use Appwrite\Utopia\Response\Model\DetectionRuntime;
+use Appwrite\Utopia\Response\Model\DetectionVariable;
+use Appwrite\Utopia\Response\Model\DevKey;
+use Appwrite\Utopia\Response\Model\Document as ModelDocument;
+use Appwrite\Utopia\Response\Model\Error;
+use Appwrite\Utopia\Response\Model\ErrorDev;
+use Appwrite\Utopia\Response\Model\Execution;
+use Appwrite\Utopia\Response\Model\File;
+use Appwrite\Utopia\Response\Model\Framework;
+use Appwrite\Utopia\Response\Model\FrameworkAdapter;
+use Appwrite\Utopia\Response\Model\Func;
+use Appwrite\Utopia\Response\Model\Headers;
+use Appwrite\Utopia\Response\Model\HealthAntivirus;
+use Appwrite\Utopia\Response\Model\HealthCertificate;
+use Appwrite\Utopia\Response\Model\HealthQueue;
+use Appwrite\Utopia\Response\Model\HealthStatus;
+use Appwrite\Utopia\Response\Model\HealthTime;
+use Appwrite\Utopia\Response\Model\HealthVersion;
+use Appwrite\Utopia\Response\Model\Identity;
+use Appwrite\Utopia\Response\Model\Index;
+use Appwrite\Utopia\Response\Model\Installation;
+use Appwrite\Utopia\Response\Model\JWT;
+use Appwrite\Utopia\Response\Model\Key;
+use Appwrite\Utopia\Response\Model\Language;
+use Appwrite\Utopia\Response\Model\Locale;
+use Appwrite\Utopia\Response\Model\LocaleCode;
+use Appwrite\Utopia\Response\Model\Log;
+use Appwrite\Utopia\Response\Model\Membership;
+use Appwrite\Utopia\Response\Model\Message;
+use Appwrite\Utopia\Response\Model\Metric;
+use Appwrite\Utopia\Response\Model\MetricBreakdown;
+use Appwrite\Utopia\Response\Model\MFAChallenge;
+use Appwrite\Utopia\Response\Model\MFAFactors;
+use Appwrite\Utopia\Response\Model\MFARecoveryCodes;
+use Appwrite\Utopia\Response\Model\MFAType;
+use Appwrite\Utopia\Response\Model\Migration;
+use Appwrite\Utopia\Response\Model\MigrationFirebaseProject;
+use Appwrite\Utopia\Response\Model\MigrationReport;
+use Appwrite\Utopia\Response\Model\Mock;
+use Appwrite\Utopia\Response\Model\MockNumber;
+use Appwrite\Utopia\Response\Model\None;
+use Appwrite\Utopia\Response\Model\Phone;
+use Appwrite\Utopia\Response\Model\Platform;
+use Appwrite\Utopia\Response\Model\Preferences;
+use Appwrite\Utopia\Response\Model\Project;
+use Appwrite\Utopia\Response\Model\Provider;
+use Appwrite\Utopia\Response\Model\ProviderRepository;
+use Appwrite\Utopia\Response\Model\ProviderRepositoryFramework;
+use Appwrite\Utopia\Response\Model\ProviderRepositoryRuntime;
+use Appwrite\Utopia\Response\Model\ResourceToken;
+use Appwrite\Utopia\Response\Model\Row;
+use Appwrite\Utopia\Response\Model\Rule;
+use Appwrite\Utopia\Response\Model\Runtime;
+use Appwrite\Utopia\Response\Model\Session;
+use Appwrite\Utopia\Response\Model\Site;
+use Appwrite\Utopia\Response\Model\Specification;
+use Appwrite\Utopia\Response\Model\Subscriber;
+use Appwrite\Utopia\Response\Model\Table;
+use Appwrite\Utopia\Response\Model\Target;
+use Appwrite\Utopia\Response\Model\Team;
+use Appwrite\Utopia\Response\Model\TemplateEmail;
+use Appwrite\Utopia\Response\Model\TemplateFramework;
+use Appwrite\Utopia\Response\Model\TemplateFunction;
+use Appwrite\Utopia\Response\Model\TemplateRuntime;
+use Appwrite\Utopia\Response\Model\TemplateSite;
+use Appwrite\Utopia\Response\Model\TemplateSMS;
+use Appwrite\Utopia\Response\Model\TemplateVariable;
+use Appwrite\Utopia\Response\Model\Token;
+use Appwrite\Utopia\Response\Model\Topic;
+use Appwrite\Utopia\Response\Model\Transaction;
+use Appwrite\Utopia\Response\Model\UsageBuckets;
+use Appwrite\Utopia\Response\Model\UsageCollection;
+use Appwrite\Utopia\Response\Model\UsageDatabase;
+use Appwrite\Utopia\Response\Model\UsageDatabases;
+use Appwrite\Utopia\Response\Model\UsageFunction;
+use Appwrite\Utopia\Response\Model\UsageFunctions;
+use Appwrite\Utopia\Response\Model\UsageProject;
+use Appwrite\Utopia\Response\Model\UsageSite;
+use Appwrite\Utopia\Response\Model\UsageSites;
+use Appwrite\Utopia\Response\Model\UsageStorage;
+use Appwrite\Utopia\Response\Model\UsageTable;
+use Appwrite\Utopia\Response\Model\UsageUsers;
+use Appwrite\Utopia\Response\Model\User;
+use Appwrite\Utopia\Response\Model\Variable;
+use Appwrite\Utopia\Response\Model\VcsContent;
+use Appwrite\Utopia\Response\Model\Webhook;
+
+// General
+Response::setModel(new None());
+Response::setModel(new Any());
+Response::setModel(new Error());
+Response::setModel(new ErrorDev());
+
+// Lists
+Response::setModel(new BaseList('Rows List', Response::MODEL_ROW_LIST, 'rows', Response::MODEL_ROW));
+Response::setModel(new BaseList('Documents List', Response::MODEL_DOCUMENT_LIST, 'documents', Response::MODEL_DOCUMENT));
+Response::setModel(new BaseList('Tables List', Response::MODEL_TABLE_LIST, 'tables', Response::MODEL_TABLE));
+Response::setModel(new BaseList('Collections List', Response::MODEL_COLLECTION_LIST, 'collections', Response::MODEL_COLLECTION));
+Response::setModel(new BaseList('Databases List', Response::MODEL_DATABASE_LIST, 'databases', Response::MODEL_DATABASE));
+Response::setModel(new BaseList('Indexes List', Response::MODEL_INDEX_LIST, 'indexes', Response::MODEL_INDEX));
+Response::setModel(new BaseList('Column Indexes List', Response::MODEL_COLUMN_INDEX_LIST, 'indexes', Response::MODEL_COLUMN_INDEX));
+Response::setModel(new BaseList('Users List', Response::MODEL_USER_LIST, 'users', Response::MODEL_USER));
+Response::setModel(new BaseList('Sessions List', Response::MODEL_SESSION_LIST, 'sessions', Response::MODEL_SESSION));
+Response::setModel(new BaseList('Identities List', Response::MODEL_IDENTITY_LIST, 'identities', Response::MODEL_IDENTITY));
+Response::setModel(new BaseList('Logs List', Response::MODEL_LOG_LIST, 'logs', Response::MODEL_LOG));
+Response::setModel(new BaseList('Files List', Response::MODEL_FILE_LIST, 'files', Response::MODEL_FILE));
+Response::setModel(new BaseList('Buckets List', Response::MODEL_BUCKET_LIST, 'buckets', Response::MODEL_BUCKET));
+Response::setModel(new BaseList('Resource Tokens List', Response::MODEL_RESOURCE_TOKEN_LIST, 'tokens', Response::MODEL_RESOURCE_TOKEN));
+Response::setModel(new BaseList('Teams List', Response::MODEL_TEAM_LIST, 'teams', Response::MODEL_TEAM));
+Response::setModel(new BaseList('Memberships List', Response::MODEL_MEMBERSHIP_LIST, 'memberships', Response::MODEL_MEMBERSHIP));
+Response::setModel(new BaseList('Sites List', Response::MODEL_SITE_LIST, 'sites', Response::MODEL_SITE));
+Response::setModel(new BaseList('Site Templates List', Response::MODEL_TEMPLATE_SITE_LIST, 'templates', Response::MODEL_TEMPLATE_SITE));
+Response::setModel(new BaseList('Functions List', Response::MODEL_FUNCTION_LIST, 'functions', Response::MODEL_FUNCTION));
+Response::setModel(new BaseList('Function Templates List', Response::MODEL_TEMPLATE_FUNCTION_LIST, 'templates', Response::MODEL_TEMPLATE_FUNCTION));
+Response::setModel(new BaseList('Installations List', Response::MODEL_INSTALLATION_LIST, 'installations', Response::MODEL_INSTALLATION));
+Response::setModel(new BaseList('Framework Provider Repositories List', Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK_LIST, 'frameworkProviderRepositories', Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK));
+Response::setModel(new BaseList('Runtime Provider Repositories List', Response::MODEL_PROVIDER_REPOSITORY_RUNTIME_LIST, 'runtimeProviderRepositories', Response::MODEL_PROVIDER_REPOSITORY_RUNTIME));
+Response::setModel(new BaseList('Branches List', Response::MODEL_BRANCH_LIST, 'branches', Response::MODEL_BRANCH));
+Response::setModel(new BaseList('Frameworks List', Response::MODEL_FRAMEWORK_LIST, 'frameworks', Response::MODEL_FRAMEWORK));
+Response::setModel(new BaseList('Runtimes List', Response::MODEL_RUNTIME_LIST, 'runtimes', Response::MODEL_RUNTIME));
+Response::setModel(new BaseList('Deployments List', Response::MODEL_DEPLOYMENT_LIST, 'deployments', Response::MODEL_DEPLOYMENT));
+Response::setModel(new BaseList('Executions List', Response::MODEL_EXECUTION_LIST, 'executions', Response::MODEL_EXECUTION));
+Response::setModel(new BaseList('Projects List', Response::MODEL_PROJECT_LIST, 'projects', Response::MODEL_PROJECT, true, false));
+Response::setModel(new BaseList('Webhooks List', Response::MODEL_WEBHOOK_LIST, 'webhooks', Response::MODEL_WEBHOOK, true, false));
+Response::setModel(new BaseList('API Keys List', Response::MODEL_KEY_LIST, 'keys', Response::MODEL_KEY, true, true));
+Response::setModel(new BaseList('Dev Keys List', Response::MODEL_DEV_KEY_LIST, 'devKeys', Response::MODEL_DEV_KEY, true, false));
+Response::setModel(new BaseList('Auth Providers List', Response::MODEL_AUTH_PROVIDER_LIST, 'platforms', Response::MODEL_AUTH_PROVIDER, true, false));
+Response::setModel(new BaseList('Platforms List', Response::MODEL_PLATFORM_LIST, 'platforms', Response::MODEL_PLATFORM, true, false));
+Response::setModel(new BaseList('Countries List', Response::MODEL_COUNTRY_LIST, 'countries', Response::MODEL_COUNTRY));
+Response::setModel(new BaseList('Continents List', Response::MODEL_CONTINENT_LIST, 'continents', Response::MODEL_CONTINENT));
+Response::setModel(new BaseList('Languages List', Response::MODEL_LANGUAGE_LIST, 'languages', Response::MODEL_LANGUAGE));
+Response::setModel(new BaseList('Currencies List', Response::MODEL_CURRENCY_LIST, 'currencies', Response::MODEL_CURRENCY));
+Response::setModel(new BaseList('Phones List', Response::MODEL_PHONE_LIST, 'phones', Response::MODEL_PHONE));
+Response::setModel(new BaseList('Metric List', Response::MODEL_METRIC_LIST, 'metrics', Response::MODEL_METRIC, true, false));
+Response::setModel(new BaseList('Variables List', Response::MODEL_VARIABLE_LIST, 'variables', Response::MODEL_VARIABLE));
+Response::setModel(new BaseList('Status List', Response::MODEL_HEALTH_STATUS_LIST, 'statuses', Response::MODEL_HEALTH_STATUS));
+Response::setModel(new BaseList('Rule List', Response::MODEL_PROXY_RULE_LIST, 'rules', Response::MODEL_PROXY_RULE));
+Response::setModel(new BaseList('Locale codes list', Response::MODEL_LOCALE_CODE_LIST, 'localeCodes', Response::MODEL_LOCALE_CODE));
+Response::setModel(new BaseList('Provider list', Response::MODEL_PROVIDER_LIST, 'providers', Response::MODEL_PROVIDER));
+Response::setModel(new BaseList('Message list', Response::MODEL_MESSAGE_LIST, 'messages', Response::MODEL_MESSAGE));
+Response::setModel(new BaseList('Topic list', Response::MODEL_TOPIC_LIST, 'topics', Response::MODEL_TOPIC));
+Response::setModel(new BaseList('Subscriber list', Response::MODEL_SUBSCRIBER_LIST, 'subscribers', Response::MODEL_SUBSCRIBER));
+Response::setModel(new BaseList('Target list', Response::MODEL_TARGET_LIST, 'targets', Response::MODEL_TARGET));
+Response::setModel(new BaseList('Transaction List', Response::MODEL_TRANSACTION_LIST, 'transactions', Response::MODEL_TRANSACTION));
+Response::setModel(new BaseList('Migrations List', Response::MODEL_MIGRATION_LIST, 'migrations', Response::MODEL_MIGRATION));
+Response::setModel(new BaseList('Migrations Firebase Projects List', Response::MODEL_MIGRATION_FIREBASE_PROJECT_LIST, 'projects', Response::MODEL_MIGRATION_FIREBASE_PROJECT));
+Response::setModel(new BaseList('Specifications List', Response::MODEL_SPECIFICATION_LIST, 'specifications', Response::MODEL_SPECIFICATION));
+Response::setModel(new BaseList('VCS Content List', Response::MODEL_VCS_CONTENT_LIST, 'contents', Response::MODEL_VCS_CONTENT));
+
+// Entities
+Response::setModel(new Database());
+
+// Collection API Models
+Response::setModel(new Collection());
+Response::setModel(new Attribute());
+Response::setModel(new AttributeList());
+Response::setModel(new AttributeString());
+Response::setModel(new AttributeInteger());
+Response::setModel(new AttributeFloat());
+Response::setModel(new AttributeBoolean());
+Response::setModel(new AttributeEmail());
+Response::setModel(new AttributeEnum());
+Response::setModel(new AttributeIP());
+Response::setModel(new AttributeURL());
+Response::setModel(new AttributeDatetime());
+Response::setModel(new AttributeRelationship());
+Response::setModel(new AttributePoint());
+Response::setModel(new AttributeLine());
+Response::setModel(new AttributePolygon());
+Response::setModel(new AttributeVarchar());
+Response::setModel(new AttributeText());
+Response::setModel(new AttributeMediumtext());
+Response::setModel(new AttributeLongtext());
+
+// Table API Models
+Response::setModel(new Table());
+Response::setModel(new Column());
+Response::setModel(new ColumnList());
+Response::setModel(new ColumnString());
+Response::setModel(new ColumnInteger());
+Response::setModel(new ColumnFloat());
+Response::setModel(new ColumnBoolean());
+Response::setModel(new ColumnEmail());
+Response::setModel(new ColumnEnum());
+Response::setModel(new ColumnIP());
+Response::setModel(new ColumnURL());
+Response::setModel(new ColumnDatetime());
+Response::setModel(new ColumnRelationship());
+Response::setModel(new ColumnPoint());
+Response::setModel(new ColumnLine());
+Response::setModel(new ColumnPolygon());
+Response::setModel(new ColumnVarchar());
+Response::setModel(new ColumnText());
+Response::setModel(new ColumnMediumtext());
+Response::setModel(new ColumnLongtext());
+Response::setModel(new Index());
+Response::setModel(new ColumnIndex());
+Response::setModel(new Row());
+Response::setModel(new ModelDocument());
+Response::setModel(new Log());
+Response::setModel(new User());
+Response::setModel(new AlgoMd5());
+Response::setModel(new AlgoSha());
+Response::setModel(new AlgoPhpass());
+Response::setModel(new AlgoBcrypt());
+Response::setModel(new AlgoScrypt());
+Response::setModel(new AlgoScryptModified());
+Response::setModel(new AlgoArgon2());
+Response::setModel(new Account());
+Response::setModel(new Preferences());
+Response::setModel(new Session());
+Response::setModel(new Identity());
+Response::setModel(new Token());
+Response::setModel(new JWT());
+Response::setModel(new Locale());
+Response::setModel(new LocaleCode());
+Response::setModel(new File());
+Response::setModel(new Bucket());
+Response::setModel(new ResourceToken());
+Response::setModel(new Team());
+Response::setModel(new Membership());
+Response::setModel(new Site());
+Response::setModel(new TemplateSite());
+Response::setModel(new TemplateFramework());
+Response::setModel(new Func());
+Response::setModel(new TemplateFunction());
+Response::setModel(new TemplateRuntime());
+Response::setModel(new TemplateVariable());
+Response::setModel(new Installation());
+Response::setModel(new ProviderRepository());
+Response::setModel(new ProviderRepositoryFramework());
+Response::setModel(new ProviderRepositoryRuntime());
+Response::setModel(new DetectionFramework());
+Response::setModel(new DetectionRuntime());
+Response::setModel(new DetectionVariable());
+Response::setModel(new VcsContent());
+Response::setModel(new Branch());
+Response::setModel(new Runtime());
+Response::setModel(new Framework());
+Response::setModel(new FrameworkAdapter());
+Response::setModel(new Deployment());
+Response::setModel(new Execution());
+Response::setModel(new Project());
+Response::setModel(new Webhook());
+Response::setModel(new Key());
+Response::setModel(new DevKey());
+Response::setModel(new MockNumber());
+Response::setModel(new AuthProvider());
+Response::setModel(new Platform());
+Response::setModel(new Variable());
+Response::setModel(new Country());
+Response::setModel(new Continent());
+Response::setModel(new Language());
+Response::setModel(new Currency());
+Response::setModel(new Phone());
+Response::setModel(new HealthAntivirus());
+Response::setModel(new HealthQueue());
+Response::setModel(new HealthStatus());
+Response::setModel(new HealthCertificate());
+Response::setModel(new HealthTime());
+Response::setModel(new HealthVersion());
+Response::setModel(new Metric());
+Response::setModel(new MetricBreakdown());
+Response::setModel(new UsageDatabases());
+Response::setModel(new UsageDatabase());
+Response::setModel(new UsageTable());
+Response::setModel(new UsageCollection());
+Response::setModel(new UsageUsers());
+Response::setModel(new UsageStorage());
+Response::setModel(new UsageBuckets());
+Response::setModel(new UsageFunctions());
+Response::setModel(new UsageFunction());
+Response::setModel(new UsageSites());
+Response::setModel(new UsageSite());
+Response::setModel(new UsageProject());
+Response::setModel(new Headers());
+Response::setModel(new Specification());
+Response::setModel(new Rule());
+Response::setModel(new TemplateSMS());
+Response::setModel(new TemplateEmail());
+Response::setModel(new ConsoleVariables());
+Response::setModel(new MFAChallenge());
+Response::setModel(new MFARecoveryCodes());
+Response::setModel(new MFAType());
+Response::setModel(new MFAFactors());
+Response::setModel(new Provider());
+Response::setModel(new Message());
+Response::setModel(new Topic());
+Response::setModel(new Transaction());
+Response::setModel(new Subscriber());
+Response::setModel(new Target());
+Response::setModel(new Migration());
+Response::setModel(new MigrationReport());
+Response::setModel(new MigrationFirebaseProject());
+
+// Tests (keep last)
+Response::setModel(new Mock());
@@ -23,6 +23,8 @@ use Utopia\Logger\Adapter\LogOwl;
 use Utopia\Logger\Adapter\Raygun;
 use Utopia\Logger\Adapter\Sentry;
 use Utopia\Logger\Logger;
+use Utopia\Pools\Adapter\Stack as StackPool;
+use Utopia\Pools\Adapter\Swoole as SwoolePool;
 use Utopia\Pools\Group;
 use Utopia\Pools\Pool;
 use Utopia\Queue;
@@ -285,7 +287,9 @@ $register->set('pools', function () {
                default => throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Invalid scheme'),
            };

-            $pool = new Pool($name, $poolSize, function () use ($type, $resource, $dsn) {
+            $poolAdapter = System::getEnv('_APP_POOL_ADAPTER', default: 'stack') === 'swoole' ? new SwoolePool() : new StackPool();
+
+            $pool = new Pool($poolAdapter, $name, $poolSize, function () use ($type, $resource, $dsn) {
                // Get Adapter
                switch ($type) {
                    case 'database':
@@ -324,6 +328,12 @@ $register->set('pools', function () {
        Config::setParam('pools-' . $key, $config);
    }

+    $reconnectAttempts = (int) System::getEnv('_APP_CONNECTIONS_RECONNECT_ATTEMPTS', 5);
+    $reconnectSleep = (int) System::getEnv('_APP_CONNECTIONS_RECONNECT_SLEEP', 2);
+
+    $group->setReconnectAttempts($reconnectAttempts);
+    $group->setReconnectSleep($reconnectSleep);
+
    return $group;
 });

@@ -360,6 +370,8 @@ $register->set('smtp', function () {
    $mail->SMTPSecure = System::getEnv('_APP_SMTP_SECURE', '');
    $mail->SMTPAutoTLS = false;
    $mail->CharSet = 'UTF-8';
+    $mail->Timeout = 10; /* Connection timeout */
+    $mail->getSMTPInstance()->Timelimit = 30; /* Timeout for each individual SMTP command (e.g. HELO, EHLO, etc.) */

    $from = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
    $email = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
@@ -4,7 +4,7 @@ use Ahc\Jwt\JWT;
 use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Key;
 use Appwrite\Databases\TransactionState;
-use Appwrite\Event\Audit;
+use Appwrite\Event\Audit as AuditEvent;
 use Appwrite\Event\Build;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Database as EventDatabase;
@@ -15,10 +15,12 @@ use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
+use Appwrite\Event\Screenshot;
 use Appwrite\Event\StatsResources;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Event\Webhook;
 use Appwrite\Extend\Exception;
+use Appwrite\Functions\EventProcessor;
 use Appwrite\GraphQL\Schema;
 use Appwrite\Network\Cors;
 use Appwrite\Network\Platform;
@@ -30,6 +32,8 @@ use Appwrite\Utopia\Response;
 use Executor\Executor;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\App;
+use Utopia\Audit\Adapter\Database as AdapterDatabase;
+use Utopia\Audit\Audit;
 use Utopia\Auth\Hashes\Argon2;
 use Utopia\Auth\Hashes\Sha;
 use Utopia\Auth\Proofs\Code;
@@ -127,6 +131,9 @@ App::setResource('queueForMails', function (Publisher $publisher) {
 App::setResource('queueForBuilds', function (Publisher $publisher) {
    return new Build($publisher);
 }, ['publisher']);
+App::setResource('queueForScreenshots', function (Publisher $publisher) {
+    return new Screenshot($publisher);
+}, ['publisher']);
 App::setResource('queueForDatabase', function (Publisher $publisher) {
    return new EventDatabase($publisher);
 }, ['publisher']);
@@ -146,11 +153,14 @@ App::setResource('queueForStatsUsage', function (Publisher $publisher) {
    return new StatsUsage($publisher);
 }, ['publisher']);
 App::setResource('queueForAudits', function (Publisher $publisher) {
-    return new Audit($publisher);
+    return new AuditEvent($publisher);
 }, ['publisher']);
 App::setResource('queueForFunctions', function (Publisher $publisher) {
    return new Func($publisher);
 }, ['publisher']);
+App::setResource('eventProcessor', function () {
+    return new EventProcessor();
+}, []);
 App::setResource('queueForCertificates', function (Publisher $publisher) {
    return new Certificate($publisher);
 }, ['publisher']);
@@ -275,6 +285,7 @@ App::setResource('cors', fn (array $allowedHostnames) => new Cors(
        'X-Appwrite-ID',
        'X-Appwrite-Timestamp',
        'X-Appwrite-Session',
+        'X-Appwrite-Platform', // for `$platform` injection and SDK generator
        // SDK generator
        'X-SDK-Version',
        'X-SDK-Name',
@@ -332,6 +343,7 @@ App::setResource('user', function (string $mode, Document $project, Document $co
     * 5. Regardless of the results from steps 1-4, attempts to fetch the JWT token.
     * 6. If the JWT user has a valid session ID, updates the user variable with the user from `projectDB`,
     *    overwriting the previous value.
+     * 7. If account API key is passed, use user of the account API key as long as user ID header matches too
     */

    $authorization->setDefaultStatus(true);
@@ -408,12 +420,17 @@ App::setResource('user', function (string $mode, Document $project, Document $co
    // }
    $authJWT = $request->getHeader('x-appwrite-jwt', '');
    if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
+        if (!$user->isEmpty()) {
+            throw new Exception(Exception::USER_JWT_AND_COOKIE_SET);
+        }
+
        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
        try {
            $payload = $jwt->decode($authJWT);
        } catch (JWTException $error) {
            throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
        }
+
        $jwtUserId = $payload['userId'] ?? '';
        if (!empty($jwtUserId)) {
            if ($mode === APP_MODE_ADMIN) {
@@ -429,6 +446,34 @@ App::setResource('user', function (string $mode, Document $project, Document $co
            }
        }
    }
+
+    // Account based on account API key
+    $accountKey = $request->getHeader('x-appwrite-key', '');
+    $accountKeyUserId = $request->getHeader('x-appwrite-user', '');
+    if (!empty($accountKeyUserId) && !empty($accountKey)) {
+        if (!$user->isEmpty()) {
+            throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
+        }
+
+        $accountKeyUser = $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->getDocument('users', $accountKeyUserId));
+        if (!$accountKeyUser->isEmpty()) {
+            $key = $accountKeyUser->find(
+                key: 'secret',
+                find: $accountKey,
+                subject: 'keys'
+            );
+
+            if (!empty($key)) {
+                $expire = $key->getAttribute('expire');
+                if (!empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
+                    throw new Exception(Exception::ACCOUNT_KEY_EXPIRED);
+                }
+
+                $user = $accountKeyUser;
+            }
+        }
+    }
+
    $dbForProject->setMetadata('user', $user->getId());
    $dbForPlatform->setMetadata('user', $user->getId());

@@ -510,7 +555,7 @@ App::setResource('authorization', function () {
    return new Authorization();
 }, []);

-App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Authorization $authorization) {
+App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, StatsUsage $queueForStatsUsage, Authorization $authorization) {
    if ($project->isEmpty() || $project->getId() === 'console') {
        return $dbForPlatform;
    }
@@ -526,6 +571,7 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform
    $database = new Database($adapter, $cache);

    $database
+        ->setDatabase(APP_DATABASE)
        ->setAuthorization($authorization)
        ->setMetadata('host', \gethostname())
        ->setMetadata('project', $project->getId())
@@ -547,8 +593,209 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform
            ->setNamespace('_' . $project->getSequence());
    }

+    /**
+     * This isolated event handling for `users.*.create` which is based on a `Database::EVENT_DOCUMENT_CREATE` listener may look odd, but it is **intentional**.
+     *
+     * Accounts can be created in many ways beyond `createAccount`
+     * (anonymous, OAuth, phone, etc.), and those flows are probably not covered in event tests; so we handle this here.
+     */
+    $eventDatabaseListener = function (Document $project, Document $document, Response $response, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
+        // Only trigger events for user creation with the database listener.
+        if ($document->getCollection() !== 'users') {
+            return;
+        }
+
+        $queueForEvents
+            ->setEvent('users.[userId].create')
+            ->setParam('userId', $document->getId())
+            ->setPayload($response->output($document, Response::MODEL_USER));
+
+        // Trigger functions, webhooks, and realtime events
+        $queueForFunctions
+            ->from($queueForEvents)
+            ->trigger();
+
+
+        /** Trigger webhooks events only if a project has them enabled */
+        if (!empty($project->getAttribute('webhooks'))) {
+            $queueForWebhooks
+                ->from($queueForEvents)
+                ->trigger();
+        }
+
+        /** Trigger realtime events only for non console events */
+        if ($queueForEvents->getProject()->getId() !== 'console') {
+            $queueForRealtime
+                ->from($queueForEvents)
+                ->trigger();
+        }
+    };
+
+    /**
+     * Purge function events cache when functions are created, updated or deleted.
+     */
+    $functionsEventsCacheListener = function (string $event, Document $document, Document $project, Database $dbForProject) {
+
+
+        if ($document->getCollection() !== 'functions') {
+            return;
+        }
+
+        if ($project->isEmpty() || $project->getId() === 'console') {
+            return;
+        }
+
+        $hostname = $dbForProject->getAdapter()->getHostname();
+        $cacheKey = \sprintf(
+            '%s-cache-%s:%s:%s:project:%s:functions:events',
+            $dbForProject->getCacheName(),
+            $hostname ?? '',
+            $dbForProject->getNamespace(),
+            $dbForProject->getTenant(),
+            $project->getId()
+        );
+
+        $dbForProject->getCache()->purge($cacheKey);
+    };
+
+    $usageDatabaseListener = function (string $event, Document $document, StatsUsage $queueForStatsUsage) {
+        $value = 1;
+
+        switch ($event) {
+            case Database::EVENT_DOCUMENT_DELETE:
+                $value = -1;
+                break;
+            case Database::EVENT_DOCUMENTS_DELETE:
+                $value = -1 * $document->getAttribute('modified', 0);
+                break;
+            case Database::EVENT_DOCUMENTS_CREATE:
+                $value = $document->getAttribute('modified', 0);
+                break;
+            case Database::EVENT_DOCUMENTS_UPSERT:
+                $value = $document->getAttribute('created', 0);
+                break;
+        }
+
+        switch (true) {
+            case $document->getCollection() === 'teams':
+                $queueForStatsUsage->addMetric(METRIC_TEAMS, $value); // per project
+                break;
+            case $document->getCollection() === 'users':
+                $queueForStatsUsage->addMetric(METRIC_USERS, $value); // per project
+                if ($event === Database::EVENT_DOCUMENT_DELETE) {
+                    $queueForStatsUsage->addReduce($document);
+                }
+                break;
+            case $document->getCollection() === 'sessions': // sessions
+                $queueForStatsUsage->addMetric(METRIC_SESSIONS, $value); //per project
+                break;
+            case $document->getCollection() === 'databases': // databases
+                $queueForStatsUsage->addMetric(METRIC_DATABASES, $value); // per project
+
+                if ($event === Database::EVENT_DOCUMENT_DELETE) {
+                    $queueForStatsUsage->addReduce($document);
+                }
+                break;
+            case str_starts_with($document->getCollection(), 'database_') && !str_contains($document->getCollection(), 'collection'): //collections
+                $parts = explode('_', $document->getCollection());
+                $databaseInternalId = $parts[1] ?? 0;
+                $queueForStatsUsage
+                    ->addMetric(METRIC_COLLECTIONS, $value) // per project
+                    ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_COLLECTIONS), $value);
+
+                if ($event === Database::EVENT_DOCUMENT_DELETE) {
+                    $queueForStatsUsage->addReduce($document);
+                }
+                break;
+            case str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_'): //documents
+                $parts = explode('_', $document->getCollection());
+                $databaseInternalId   = $parts[1] ?? 0;
+                $collectionInternalId = $parts[3] ?? 0;
+                $queueForStatsUsage
+                    ->addMetric(METRIC_DOCUMENTS, $value)  // per project
+                    ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_DOCUMENTS), $value) // per database
+                    ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS), $value);  // per collection
+                break;
+            case $document->getCollection() === 'buckets': //buckets
+                $queueForStatsUsage
+                    ->addMetric(METRIC_BUCKETS, $value); // per project
+                if ($event === Database::EVENT_DOCUMENT_DELETE) {
+                    $queueForStatsUsage
+                        ->addReduce($document);
+                }
+                break;
+            case str_starts_with($document->getCollection(), 'bucket_'): // files
+                $parts = explode('_', $document->getCollection());
+                $bucketInternalId  = $parts[1];
+                $queueForStatsUsage
+                    ->addMetric(METRIC_FILES, $value) // per project
+                    ->addMetric(METRIC_FILES_STORAGE, $document->getAttribute('sizeOriginal') * $value) // per project
+                    ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES), $value) // per bucket
+                    ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES_STORAGE), $document->getAttribute('sizeOriginal') * $value); // per bucket
+                break;
+            case $document->getCollection() === 'functions':
+                $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);
+                }
+                break;
+            case $document->getCollection() === 'deployments':
+                $queueForStatsUsage
+                    ->addMetric(METRIC_DEPLOYMENTS, $value) // per project
+                    ->addMetric(METRIC_DEPLOYMENTS_STORAGE, $document->getAttribute('size') * $value) // per project
+                    ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS), $value) // per function
+                    ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value)
+                    ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS), $value) // per function
+                    ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value);
+                break;
+            default:
+                break;
+        }
+    };
+
+    // Clone the queues, to prevent events triggered by the database listener
+    // from overwriting the events that are supposed to be triggered in the shutdown hook.
+    $queueForEventsClone = new Event($publisher);
+    $queueForFunctions = new Func($publisherFunctions);
+    $queueForWebhooks = new Webhook($publisherWebhooks);
+    $queueForRealtime = new Realtime();
+
+
+    $database
+            ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
+                $project,
+                $document,
+                $response,
+                $queueForEventsClone->from($queueForEvents),
+                $queueForFunctions->from($queueForEvents),
+                $queueForWebhooks->from($queueForEvents),
+                $queueForRealtime->from($queueForEvents)
+            ))
+            ->on(Database::EVENT_DOCUMENT_CREATE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database))
+            ->on(Database::EVENT_DOCUMENT_UPDATE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database))
+            ->on(Database::EVENT_DOCUMENT_DELETE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database))
+    ;
+
+
    return $database;
-}, ['pools', 'dbForPlatform', 'cache', 'project', 'authorization']);
+}, ['pools', 'dbForPlatform', 'cache', 'project', 'response', 'publisher', 'publisherFunctions', 'publisherWebhooks', 'queueForEvents', 'queueForFunctions', 'queueForWebhooks', 'queueForRealtime', 'queueForStatsUsage', 'authorization']);

 App::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {

@@ -556,6 +803,7 @@ App::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authoriz
    $database = new Database($adapter, $cache);

    $database
+        ->setDatabase(APP_DATABASE)
        ->setAuthorization($authorization)
        ->setNamespace('_console')
        ->setMetadata('host', \gethostname())
@@ -585,6 +833,7 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

        $configure = (function (Database $database) use ($project, $dsn, $authorization) {
            $database
+                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
                ->setMetadata('host', \gethostname())
                ->setMetadata('project', $project->getId())
@@ -636,6 +885,7 @@ App::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorizatio
        $database = new Database($adapter, $cache);

        $database
+            ->setDatabase(APP_DATABASE)
            ->setAuthorization($authorization)
            ->setSharedTables(true)
            ->setNamespace('logsV1')
@@ -651,6 +901,11 @@ App::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorizatio
    };
 }, ['pools', 'cache', 'authorization']);

+App::setResource('audit', function ($dbForProject) {
+    $adapter = new AdapterDatabase($dbForProject);
+    return new Audit($adapter);
+}, ['dbForProject']);
+
 App::setResource('telemetry', fn () => new NoTelemetry());

 App::setResource('cache', function (Group $pools, Telemetry $telemetry) {
@@ -1006,7 +1261,7 @@ App::setResource('team', function (Document $project, Database $dbForPlatform, A
        $teamInternalId = $project->getAttribute('teamInternalId', '');
    } else {
        $route = $utopia->match($request);
-        $path = $route->getPath();
+        $path = !empty($route) ? $route->getPath() : $request->getURI();
        if (str_starts_with($path, '/v1/projects/:projectId')) {
            $uri = $request->getURI();
            $pid = explode('/', $uri)[3];
@@ -1061,15 +1316,39 @@ App::setResource('previewHostname', function (Request $request, ?Key $apiKey) {
    return '';
 }, ['request', 'apiKey']);

-App::setResource('apiKey', function (Request $request, Document $project): ?Key {
+App::setResource('apiKey', function (Request $request, Document $project, Document $team, Document $user): ?Key {
    $key = $request->getHeader('x-appwrite-key');

    if (empty($key)) {
        return null;
    }

-    return Key::decode($project, $key);
-}, ['request', 'project']);
+    $key = Key::decode($project, $team, $user, $key);
+
+    $userHeader = $request->getHeader('x-appwrite-user');
+    $organizationHeader = $request->getHeader('x-appwrite-organization');
+    $projectHeader = $request->getHeader('x-appwrite-project');
+
+    if (!empty($key->getProjectId())) {
+        if (empty($projectHeader) || $projectHeader !== $key->getProjectId()) {
+            throw new Exception(Exception::PROJECT_ID_MISSING);
+        }
+    }
+
+    if (!empty($key->getUserId())) {
+        if (empty($userHeader) || $userHeader !== $key->getUserId()) {
+            throw new Exception(Exception::USER_ID_MISSING);
+        }
+    }
+
+    if (!empty($key->getTeamId())) {
+        if (empty($organizationHeader) || $organizationHeader !== $key->getTeamId()) {
+            throw new Exception(Exception::ORGANIZATION_ID_MISSING);
+        }
+    }
+
+    return $key;
+}, ['request', 'project', 'team', 'user']);

 App::setResource('executor', fn () => new Executor());

@@ -1140,3 +1419,11 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request, A
 App::setResource('transactionState', function (Database $dbForProject, Authorization $authorization) {
    return new TransactionState($dbForProject, $authorization);
 }, ['dbForProject', 'authorization']);
+
+App::setResource('executionsRetentionCount', function (Document $project, array $plan) {
+    if ($project->getId() === 'console' || empty($plan)) {
+        return 0;
+    }
+
+    return (int) ($plan['executionsRetentionCount'] ?? 100);
+}, ['project', 'plan']);
@@ -29,6 +29,7 @@ use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
@@ -66,6 +67,7 @@ if (!function_exists('getConsoleDB')) {
        $adapter = new DatabasePool($pools->get('console'));
        $database = new Database($adapter, getCache());
        $database
+            ->setDatabase(APP_DATABASE)
            ->setNamespace('_console')
            ->setMetadata('host', \gethostname())
            ->setMetadata('project', '_console');
@@ -122,6 +124,7 @@ if (!function_exists('getProjectDB')) {
        }

        $database
+            ->setDatabase(APP_DATABASE)
            ->setMetadata('host', \gethostname())
            ->setMetadata('project', $project->getId());

@@ -471,9 +474,10 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,

                        $roles = $user->getRoles($database->getAuthorization());
                        $channels = $realtime->connections[$connection]['channels'];
+                        $queries = $realtime->connections[$connection]['queries'] ?? [];

                        $realtime->unsubscribe($connection);
-                        $realtime->subscribe($projectId, $connection, $roles, $channels);
+                        $realtime->subscribe($projectId, $connection, $roles, $channels, $queries);
                    }
                }

@@ -576,6 +580,11 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
        $roles = $user->getRoles($authorization);

        $channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId());
+        try {
+            $queries = Realtime::convertQueries($request->getQuery('queries', []));
+        } catch (QueryException $e) {
+            throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $e->getMessage());
+        }

        /**
         * Channels Check
@@ -584,7 +593,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
            throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing channels');
        }

-        $realtime->subscribe($project->getId(), $connection, $roles, $channels);
+        $realtime->subscribe($project->getId(), $connection, $roles, $channels, $queries);

        $realtime->connections[$connection]['authorization'] = $authorization;

@@ -594,6 +603,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
            'type' => 'connected',
            'data' => [
                'channels' => array_keys($channels),
+                'queries' => $queries,
                'user' => $user
            ]
        ]));
@@ -728,7 +738,8 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                // Preserve authorization before subscribe overwrites the connection array
                $authorization = $realtime->connections[$connection]['authorization'] ?? null;

-                $realtime->subscribe($realtime->connections[$connection]['projectId'], $connection, $roles, $channels);
+                $queries = $realtime->connections[$connection]['queries'];
+                $realtime->subscribe($realtime->connections[$connection]['projectId'], $connection, $roles, $channels, $queries);

                // Restore authorization after subscribe
                if ($authorization !== null) {
@@ -11,6 +11,7 @@ $httpsPort = $this->getParam('httpsPort', '');
 $version = $this->getParam('version', '');
 $organization = $this->getParam('organization', '');
 $image = $this->getParam('image', '');
+$enableAssistant = $this->getParam('enableAssistant', false);
 ?>services:
  traefik:
    image: traefik:2.11
@@ -164,6 +165,7 @@ $image = $this->getParam('image', '');
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_SMS_PROVIDER
      - _APP_SMS_FROM
+      - _APP_GRAPHQL_INTROSPECTION
      - _APP_GRAPHQL_MAX_BATCH_SIZE
      - _APP_GRAPHQL_MAX_COMPLEXITY
      - _APP_GRAPHQL_MAX_DEPTH
@@ -179,7 +181,7 @@ $image = $this->getParam('image', '');
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:7.4.7
+    image: <?php echo $organization; ?>/console:7.5.7
    restart: unless-stopped
    networks:
      - appwrite
@@ -848,6 +850,7 @@ $image = $this->getParam('image', '');
      - _APP_DB_USER
      - _APP_DB_PASS

+<?php if ($enableAssistant): ?>
  appwrite-assistant:
    image: appwrite/assistant:0.8.4
    container_name: appwrite-assistant
@@ -857,6 +860,7 @@ $image = $this->getParam('image', '');
      - appwrite
    environment:
      - _APP_ASSISTANT_OPENAI_API_KEY
+<?php endif; ?>

  appwrite-browser:
    image: appwrite/browser:0.3.2
@@ -14,6 +14,7 @@ use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
+use Appwrite\Event\Screenshot;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
@@ -21,6 +22,8 @@ use Appwrite\Utopia\Database\Documents\User;
 use Executor\Executor;
 use Swoole\Runtime;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
+use Utopia\Audit\Adapter\Database as AdapterDatabase;
+use Utopia\Audit\Audit as UtopiaAudit;
 use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
@@ -62,6 +65,7 @@ Server::setResource('dbForPlatform', function (Cache $cache, Registry $register,
    $dbForPlatform = new Database($adapter, $cache);

    $dbForPlatform
+        ->setDatabase(APP_DATABASE)
        ->setAuthorization($authorization)
        ->setNamespace('_console')
        ->setDocumentType('users', User::class)
@@ -115,6 +119,7 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
    }

    $database
+        ->setDatabase(APP_DATABASE)
        ->setAuthorization($authorization)
        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);

@@ -176,6 +181,7 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
        }

        $database
+            ->setDatabase(APP_DATABASE)
            ->setAuthorization($authorization)
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);

@@ -195,6 +201,7 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authoriza
        $database = new Database($adapter, $cache);

        $database
+            ->setDatabase(APP_DATABASE)
            ->setAuthorization($authorization)
            ->setSharedTables(true)
            ->setNamespace('logsV1')
@@ -321,6 +328,10 @@ Server::setResource('queueForBuilds', function (Publisher $publisher) {
    return new Build($publisher);
 }, ['publisher']);

+Server::setResource('queueForScreenshots', function (Publisher $publisher) {
+    return new Screenshot($publisher);
+}, ['publisher']);
+
 Server::setResource('queueForDeletes', function (Publisher $publisher) {
    return new Delete($publisher);
 }, ['publisher']);
@@ -466,6 +477,27 @@ Server::setResource('logError', function (Registry $register, Document $project)

 Server::setResource('executor', fn () => new Executor());

+Server::setResource('getAudit', function (Database $dbForPlatform, callable $getProjectDB) {
+    return function (Document $project) use ($dbForPlatform, $getProjectDB) {
+        if ($project->isEmpty() || $project->getId() === 'console') {
+            $adapter = new AdapterDatabase($dbForPlatform);
+            return new UtopiaAudit($adapter);
+        }
+
+        $dbForProject = $getProjectDB($project);
+        $adapter = new AdapterDatabase($dbForProject);
+        return new UtopiaAudit($adapter);
+    };
+}, ['dbForPlatform', 'getProjectDB']);
+
+Server::setResource('executionsRetentionCount', function (Document $project, array $plan) {
+    if ($project->getId() === 'console' || empty($plan)) {
+        return 0;
+    }
+
+    return (int) ($plan['executionsRetentionCount'] ?? 100);
+}, ['project', 'plan']);
+
 $pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');
@@ -546,9 +578,4 @@ $worker
        Console::error('[Error] Line: ' . $error->getLine());
    });

-$worker->workerStart()
-    ->action(function () use ($workerName) {
-        Console::info("Worker $workerName  started");
-    });
-
 $worker->start();
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php doctor $@
+exec php /usr/src/code/app/cli.php doctor "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php install $@
+exec php /usr/src/code/app/cli.php install "$@"
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec php /usr/src/code/app/cli.php interval "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php maintenance $@
+exec php /usr/src/code/app/cli.php maintenance "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php migrate $@
+exec php /usr/src/code/app/cli.php migrate "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php queue-count --type=failed $@
+exec php /usr/src/code/app/cli.php queue-count --type=failed "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php queue-count --type=processing $@
+exec php /usr/src/code/app/cli.php queue-count --type=processing "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php queue-count --type=success $@
+exec php /usr/src/code/app/cli.php queue-count --type=success "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php queue-retry $@
+exec php /usr/src/code/app/cli.php queue-retry "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/realtime.php $@
+exec php /usr/src/code/app/realtime.php "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php schedule-executions $@
+exec php /usr/src/code/app/cli.php schedule-executions "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php schedule-functions $@
+exec php /usr/src/code/app/cli.php schedule-functions "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php schedule-messages $@
+exec php /usr/src/code/app/cli.php schedule-messages "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php screenshot $@
+exec php /usr/src/code/app/cli.php screenshot "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php sdks $@
+exec php /usr/src/code/app/cli.php sdks "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php specs $@
+exec php /usr/src/code/app/cli.php specs "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php ssl $@
+exec php /usr/src/code/app/cli.php ssl "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php stats-resources $@
+exec php /usr/src/code/app/cli.php stats-resources "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-/usr/src/code/vendor/bin/phpunit --configuration /usr/src/code/phpunit.xml $@
+exec /usr/src/code/vendor/bin/phpunit --configuration /usr/src/code/phpunit.xml "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php upgrade $@
+exec php /usr/src/code/app/cli.php upgrade "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/cli.php vars $@
+exec php /usr/src/code/app/cli.php vars "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php audits $@
+exec php /usr/src/code/app/worker.php audits "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php builds $@
+exec php /usr/src/code/app/worker.php builds "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php certificates $@
+exec php /usr/src/code/app/worker.php certificates "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php databases $@
+exec php /usr/src/code/app/worker.php databases "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php deletes $@
+exec php /usr/src/code/app/worker.php deletes "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php functions $@
+exec php /usr/src/code/app/worker.php functions "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php mails $@
+exec php /usr/src/code/app/worker.php mails "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php messaging $@
+exec php /usr/src/code/app/worker.php messaging "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php migrations $@
+exec php /usr/src/code/app/worker.php migrations "$@"
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec php /usr/src/code/app/worker.php screenshots "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php stats-resources $@
+exec php /usr/src/code/app/worker.php stats-resources "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php stats-usage $@
+exec php /usr/src/code/app/worker.php stats-usage "$@"
@@ -1,3 +1,3 @@
 #!/bin/sh

-php /usr/src/code/app/worker.php webhooks $@
+exec php /usr/src/code/app/worker.php webhooks "$@"
@@ -38,7 +38,7 @@
        "ext-yaml": "*",
        "ext-dom": "*",
        "ext-redis": "*",
-        "ext-swoole": "*",
+        "ext-swoole": "6.*",
        "ext-pdo": "*",
        "ext-openssl": "*",
        "ext-zlib": "*",
@@ -47,32 +47,32 @@
        "appwrite/php-clamav": "2.0.*",
        "utopia-php/abuse": "1.*",
        "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "1.*",
+        "utopia-php/audit": "2.*",
        "utopia-php/auth": "0.5.*",
        "utopia-php/cache": "0.13.*",
        "utopia-php/cli": "0.15.*",
-        "utopia-php/config": "1.*.*",
+        "utopia-php/config": "1.*",
        "utopia-php/database": "4.*",
        "utopia-php/detector": "0.2.*",
-        "utopia-php/domains": "0.9.*",
+        "utopia-php/domains": "0.11.*",
        "utopia-php/emails": "0.6.*",
-        "utopia-php/dns": "1.4.*",
+        "utopia-php/dns": "1.5.*",
        "utopia-php/dsn": "0.2.1",
        "utopia-php/framework": "0.33.*",
-        "utopia-php/fetch": "0.4.*",
+        "utopia-php/fetch": "0.5.*",
        "utopia-php/image": "0.8.*",
        "utopia-php/locale": "0.8.*",
        "utopia-php/logger": "0.6.*",
        "utopia-php/messaging": "0.20.*",
-        "utopia-php/migration": "1.3.*",
+        "utopia-php/migration": "1.*",
        "utopia-php/orchestration": "0.9.*",
        "utopia-php/platform": "0.7.*",
-        "utopia-php/pools": "0.8.*",
+        "utopia-php/pools": "1.*",
        "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.11.*",
+        "utopia-php/queue": "0.15.*",
        "utopia-php/registry": "0.5.*",
        "utopia-php/storage": "0.18.*",
-        "utopia-php/swoole": "0.8.*",
+        "utopia-php/swoole": "1.*",
        "utopia-php/system": "0.9.*",
        "utopia-php/telemetry": "0.1.*",
        "utopia-php/vcs": "0.13.*",
@@ -91,7 +91,7 @@
        "ext-fileinfo": "*",
        "appwrite/sdk-generator": "*",
        "phpunit/phpunit": "9.*",
-        "swoole/ide-helper": "5.1.2",
+        "swoole/ide-helper": "6.*",
        "phpstan/phpstan": "1.8.*",
        "textalk/websocket": "1.5.*",
        "laravel/pint": "1.*",
@@ -98,6 +98,7 @@ services:
      - ./public:/usr/src/code/public
      - ./src:/usr/src/code/src
      - ./dev:/usr/src/code/dev
+      # - ./vendor/utopia-php/framework:/usr/src/code/vendor/utopia-php/framework
    depends_on:
      - mariadb
      - redis
@@ -111,7 +112,9 @@ services:
      - _APP_ENV
      - _APP_EDITION
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_LOCALE
+      - _APP_COMPRESSION_ENABLED
      - _APP_COMPRESSION_MIN_SIZE_BYTES
      - _APP_CONSOLE_WHITELIST_ROOT
      - _APP_CONSOLE_WHITELIST_EMAILS
@@ -200,6 +203,7 @@ services:
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_SMS_PROVIDER
      - _APP_SMS_FROM
+      - _APP_GRAPHQL_INTROSPECTION
      - _APP_GRAPHQL_MAX_BATCH_SIZE
      - _APP_GRAPHQL_MAX_COMPLEXITY
      - _APP_GRAPHQL_MAX_DEPTH
@@ -230,7 +234,7 @@ services:
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: appwrite/console:7.4.11
+    image: appwrite/console:7.5.7
    restart: unless-stopped
    networks:
      - appwrite
@@ -298,6 +302,7 @@ services:
      - _APP_LOGGING_CONFIG
      - _APP_LOGGING_CONFIG_REALTIME
      - _APP_DATABASE_SHARED_TABLES
+      - _APP_POOL_ADAPTER=swoole

  appwrite-worker-audits:
    entrypoint: worker-audits
@@ -315,6 +320,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
@@ -346,6 +352,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_EMAIL_SECURITY
      - _APP_DB_HOST
@@ -383,6 +390,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
@@ -440,6 +448,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
@@ -466,16 +475,15 @@ services:
      - 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:
      - redis
      - mariadb
    environment:
-      - _APP_BROWSER_HOST
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
@@ -529,6 +537,66 @@ services:
    extra_hosts:
      - "host.docker.internal:host-gateway"

+  appwrite-worker-screenshots:
+    entrypoint: worker-screenshots
+    <<: *x-logging
+    container_name: appwrite-worker-screenshots
+    image: appwrite-dev
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-uploads:/storage/uploads:rw
+      - ./app:/usr/src/code/app
+      - ./src:/usr/src/code/src
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      # Specific
+      - _APP_BROWSER_HOST
+      # Basic
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
+      - _APP_LOGGING_CONFIG
+      # Database
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_DATABASE_SHARED_TABLES
+      # Storage
+      - _APP_STORAGE_DEVICE
+      - _APP_STORAGE_S3_ACCESS_KEY
+      - _APP_STORAGE_S3_SECRET
+      - _APP_STORAGE_S3_REGION
+      - _APP_STORAGE_S3_BUCKET
+      - _APP_STORAGE_S3_ENDPOINT
+      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
+      - _APP_STORAGE_DO_SPACES_SECRET
+      - _APP_STORAGE_DO_SPACES_REGION
+      - _APP_STORAGE_DO_SPACES_BUCKET
+      - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
+      - _APP_STORAGE_BACKBLAZE_SECRET
+      - _APP_STORAGE_BACKBLAZE_REGION
+      - _APP_STORAGE_BACKBLAZE_BUCKET
+      - _APP_STORAGE_LINODE_ACCESS_KEY
+      - _APP_STORAGE_LINODE_SECRET
+      - _APP_STORAGE_LINODE_REGION
+      - _APP_STORAGE_LINODE_BUCKET
+      - _APP_STORAGE_WASABI_ACCESS_KEY
+      - _APP_STORAGE_WASABI_SECRET
+      - _APP_STORAGE_WASABI_REGION
+      - _APP_STORAGE_WASABI_BUCKET
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
  appwrite-worker-certificates:
    entrypoint: worker-certificates
    <<: *x-logging
@@ -547,6 +615,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET_CNAME
@@ -555,6 +624,7 @@ services:
      - _APP_DOMAIN_TARGET_CAA
      - _APP_DNS
      - _APP_DOMAIN_FUNCTIONS
+      - _APP_DOMAIN_SITES
      - _APP_EMAIL_CERTIFICATES
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
@@ -579,12 +649,16 @@ services:
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
    depends_on:
-      - redis
-      - mariadb
-      - openruntimes-executor
+      redis:
+        condition: service_started
+      mariadb:
+        condition: service_started
+      openruntimes-executor:
+        condition: service_healthy
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_OPTIONS_FORCE_HTTPS
@@ -628,6 +702,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_SYSTEM_EMAIL_NAME
      - _APP_SYSTEM_EMAIL_ADDRESS
@@ -662,6 +737,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
@@ -719,6 +795,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET_CNAME
@@ -753,10 +830,12 @@ services:
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
    depends_on:
+      - mariadb
      - redis
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET_CNAME
      - _APP_DOMAIN_TARGET_AAAA
@@ -785,6 +864,45 @@ services:
      - _APP_MAINTENANCE_START_TIME
      - _APP_DATABASE_SHARED_TABLES

+  appwrite-task-interval:
+    entrypoint: interval
+    <<: *x-logging
+    container_name: appwrite-task-interval
+    image: appwrite-dev
+    networks:
+      - appwrite
+    volumes:
+      - ./app:/usr/src/code/app
+      - ./src:/usr/src/code/src
+    depends_on:
+      - mariadb
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
+      - _APP_DOMAIN
+      - _APP_DOMAIN_TARGET_CNAME
+      - _APP_DOMAIN_TARGET_AAAA
+      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET_CAA
+      - _APP_DNS
+      - _APP_DOMAIN_FUNCTIONS
+      - _APP_DOMAIN_SITES
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_DATABASE_SHARED_TABLES
+      - _APP_INTERVAL_DOMAIN_VERIFICATION
+      - _APP_INTERVAL_CLEANUP_STALE_EXECUTIONS
+
  appwrite-task-stats-resources:
    container_name: appwrite-task-stats-resources
    entrypoint: stats-resources
@@ -801,6 +919,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_DB_HOST
      - _APP_DB_PORT
@@ -832,6 +951,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_DB_HOST
      - _APP_DB_PORT
@@ -863,6 +983,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_DB_HOST
      - _APP_DB_PORT
@@ -894,6 +1015,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
@@ -922,6 +1044,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
@@ -949,6 +1072,7 @@ services:
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
+      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
@@ -1027,27 +1151,12 @@ services:
      - OPR_EXECUTOR_STORAGE_WASABI_SECRET=$_APP_STORAGE_WASABI_SECRET
      - OPR_EXECUTOR_STORAGE_WASABI_REGION=$_APP_STORAGE_WASABI_REGION
      - OPR_EXECUTOR_STORAGE_WASABI_BUCKET=$_APP_STORAGE_WASABI_BUCKET
-
-  openruntimes-proxy:
-    container_name: openruntimes-proxy
-    hostname: proxy
-    <<: *x-logging
-    stop_signal: SIGINT
-    image: openruntimes/proxy:0.5.5
-    networks:
-      - appwrite
-      - runtimes
-    environment:
-      - OPR_PROXY_WORKER_PER_CORE=$_APP_WORKER_PER_CORE
-      - OPR_PROXY_ENV=$_APP_ENV
-      - OPR_PROXY_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_PROXY_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
-      - OPR_PROXY_ALGORITHM=random
-      - OPR_PROXY_EXECUTORS=exc1
-      - OPR_PROXY_HEALTHCHECK_INTERVAL=10000
-      - OPR_PROXY_MAX_TIMEOUT=600
-      - OPR_PROXY_HEALTHCHECK=enabled
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fsS -H \"Authorization: Bearer $$OPR_EXECUTOR_SECRET\" http://localhost/v1/health >/dev/null"]
+      interval: 5s
+      timeout: 3s
+      retries: 20
+      start_period: 5s

  mariadb:
    image: mariadb:10.11 # fix issues when upgrading using: mysql_upgrade -u root -p
@@ -1131,6 +1240,9 @@ services:
      - "traefik.http.routers.appwrite_maildev_https.rule=Host(`mail.localhost`)"
      - "traefik.http.routers.appwrite_maildev_https.service=appwrite_maildev"
      - "traefik.http.routers.appwrite_maildev_https.tls=true"
+    environment:
+      - MAILDEV_INCOMING_USER=${_APP_SMTP_USERNAME}
+      - MAILDEV_INCOMING_PASS=${_APP_SMTP_PASSWORD}

  request-catcher-webhook: # used mainly for dev tests (mock HTTP webhook)
    image: appwrite/requestcatcher:1.0.0
@@ -0,0 +1 @@
+appwrite health get-queue-audits
@@ -0,0 +1,3 @@
+appwrite projects update-labels \
+    --project-id <PROJECT_ID> \
+    --labels one two three
--- a/Show More
+++ b/Show More