lint.

.env

@@ -39,6 +39,7 @@ _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
 _APP_REDIS_USER=
+COMPOSE_PROFILES=mongodb
 _APP_DB_ADAPTER=mongodb
 _APP_DB_HOST=mongodb
 _APP_DB_PORT=27017
@@ -46,15 +47,6 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_DB_ADAPTER_DOCUMENTSDB=mongodb
-_APP_DB_HOST_DOCUMENTSDB=mongodb
-_APP_DB_PORT_DOCUMENTSDB=27017
-_APP_DB_ADAPTER_VECTORSDB=postgresql
-_APP_DB_HOST_VECTORSDB=postgresql
-_APP_DB_PORT_VECTORSDB=5432
-_APP_EMBEDDING_MODELS=embeddinggemma
-_APP_EMBEDDING_ENDPOINT='http://ollama:11434/api/embed'
-_APP_EMBEDDING_TIMEOUT=30000
 _APP_STORAGE_DEVICE=Local
 _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=

.github/workflows/ai-moderator.yml

@@ -5,6 +5,8 @@ on:
     types: [opened, edited]
   issue_comment:
     types: [created, edited]
+  pull_request:
+    types: [opened, edited]
   pull_request_review:
     types: [submitted, edited]
   pull_request_review_comment:

.github/workflows/benchmark.yml

@@ -0,0 +1,123 @@
+name: Benchmark
+concurrency:
+  group: '${{ github.workflow }}-${{ github.ref }}'
+  cancel-in-progress: true
+env:
+  COMPOSE_FILE: docker-compose.yml
+  IMAGE: appwrite-dev
+  CACHE_KEY: 'appwrite-dev-${{ github.event.pull_request.head.sha }}'
+'on':
+  - pull_request
+jobs:
+  setup:
+    name: Setup & Build Appwrite Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build Appwrite
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: false
+          tags: '${{ env.IMAGE }}'
+          load: true
+          cache-from: type=gha
+          cache-to: 'type=gha,mode=max'
+          outputs: 'type=docker,dest=/tmp/${{ env.IMAGE }}.tar'
+          target: development
+          build-args: |
+            DEBUG=false
+            TESTING=true
+            VERSION=dev
+      - name: Cache Docker Image
+        uses: actions/cache@v4
+        with:
+          key: '${{ env.CACHE_KEY }}'
+          path: '/tmp/${{ env.IMAGE }}.tar'
+  benchmarking:
+    name: Benchmark
+    runs-on: ubuntu-latest
+    needs: setup
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: '${{ env.CACHE_KEY }}'
+          path: '/tmp/${{ env.IMAGE }}.tar'
+          fail-on-cache-miss: true
+      - name: Load and Start Appwrite
+        run: |
+          sed -i 's/traefik/localhost/g' .env
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          sleep 10
+      - name: Install Oha
+        run: |
+          echo "deb [signed-by=/usr/share/keyrings/azlux-archive-keyring.gpg] http://packages.azlux.fr/debian/ stable main" | sudo tee /etc/apt/sources.list.d/azlux.list
+          sudo wget -O /usr/share/keyrings/azlux-archive-keyring.gpg https://azlux.fr/repo.gpg
+          sudo apt update
+          sudo apt install oha
+          oha --version
+      - name: Benchmark PR
+        run: 'oha -z 180s http://localhost/v1/health/version --output-format json > benchmark.json'
+      - name: Cleaning
+        run: docker compose down -v
+      - name: Installing latest version
+        run: |
+          rm docker-compose.yml
+          rm .env
+          curl https://appwrite.io/install/compose -o docker-compose.yml
+          curl https://appwrite.io/install/env -o .env
+          sed -i 's/_APP_OPTIONS_ABUSE=enabled/_APP_OPTIONS_ABUSE=disabled/g' .env
+          docker compose up -d
+          sleep 10
+      - name: Benchmark Latest
+        run: oha -z 180s http://localhost/v1/health/version --output-format json > benchmark-latest.json
+      - name: Prepare comment
+        run: |
+          echo '## :sparkles: Benchmark results' > benchmark.txt
+          echo ' ' >> benchmark.txt
+          echo "- Requests per second: $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
+          echo "- Requests with 200 status code: $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
+          echo "- P99 latency: $(jq -r '.latencyPercentiles.p99' benchmark.json )" >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo "## :zap:  Benchmark Comparison" >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo "| Metric | This PR | Latest version | "  >> benchmark.txt
+          echo "| --- | --- | --- | "  >> benchmark.txt
+          echo "| RPS | $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.summary.requestsPerSec|tonumber|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
+          echo "| 200 | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
+          echo "| P99 | $(jq -r '.latencyPercentiles.p99' benchmark.json ) | $(jq -r '.latencyPercentiles.p99' benchmark-latest.json ) | "  >> benchmark.txt
+      - name: Save results
+        uses: actions/upload-artifact@v6
+        if: '${{ !cancelled() }}'
+        with:
+          name: benchmark.json
+          path: benchmark.json
+          retention-days: 7
+      - name: Find Comment
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: '${{ github.event.pull_request.number }}'
+          comment-author: 'github-actions[bot]'
+          body-includes: Benchmark results
+      - name: Comment on PR
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: '${{ steps.fc.outputs.comment-id }}'
+          issue-number: '${{ github.event.pull_request.number }}'
+          body-path: benchmark.txt
+          edit-mode: replace

.github/workflows/check-dependencies.yml

@@ -0,0 +1,19 @@
+name: Check dependencies
+
+# Adapted from https://google.github.io/osv-scanner/github-action/#scan-on-pull-request
+
+on:
+  pull_request:
+    branches: [main, 1.*.x]
+  merge_group:
+    branches: [main, 1.*.x]
+
+permissions:
+  # Require writing security events to upload SARIF file to security tab
+  security-events: write
+  # Only need to read contents
+  contents: read
+
+jobs:
+  scan-pr:
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.7.1"

.github/workflows/ci.yml

@@ -1,654 +0,0 @@
-name: CI
-
-concurrency:
-  group: ci-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  COMPOSE_FILE: docker-compose.yml
-  IMAGE: appwrite-dev
-
-on:
-  pull_request:
-  workflow_dispatch:
-    inputs:
-      response_format:
-        description: 'Response format version to test (e.g., 1.5.0, 1.4.0)'
-        required: false
-        type: string
-        default: ''
-
-jobs:
-  dependencies:
-    name: Checks / Dependencies
-    if: github.event_name == 'pull_request'
-    permissions:
-      actions: read
-      security-events: write
-      contents: read
-    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@v2.3.3"
-
-  security:
-    name: Checks / Image
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      security-events: write
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: 'recursive'
-
-      - name: Build the Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: false
-          load: true
-          tags: pr_image:${{ github.sha }}
-          target: production
-
-      - name: Run Trivy vulnerability scanner on image
-        uses: aquasecurity/trivy-action@0.35.0
-        with:
-          image-ref: 'pr_image:${{ github.sha }}'
-          format: 'sarif'
-          output: 'trivy-image-results.sarif'
-          severity: 'CRITICAL,HIGH'
-
-      - name: Run Trivy vulnerability scanner on source code
-        uses: aquasecurity/trivy-action@0.35.0
-        with:
-          scan-type: 'fs'
-          scan-ref: '.'
-          format: 'sarif'
-          output: 'trivy-fs-results.sarif'
-          severity: 'CRITICAL,HIGH'
-          skip-setup-trivy: true
-
-      - name: Upload image scan results
-        uses: github/codeql-action/upload-sarif@v4
-        if: always() && hashFiles('trivy-image-results.sarif') != ''
-        with:
-          sarif_file: 'trivy-image-results.sarif'
-          category: 'trivy-image'
-
-      - name: Upload source code scan results
-        uses: github/codeql-action/upload-sarif@v4
-        if: always() && hashFiles('trivy-fs-results.sarif') != ''
-        with:
-          sarif_file: 'trivy-fs-results.sarif'
-          category: 'trivy-source'
-
-  composer:
-    name: Checks / Composer
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          tools: composer:v2
-          coverage: none
-
-      - name: Validate
-        run: composer validate
-
-      - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --ignore-platform-reqs
-
-      - name: Audit
-        env:
-          COMPOSER_NO_AUDIT: 0
-        run: composer audit
-
-  format:
-    name: Checks / Format
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 2
-
-      - run: git checkout HEAD^2
-        if: github.event_name == 'pull_request'
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --ignore-platform-reqs
-
-      - name: Run Linter
-        run: composer lint
-
-  analyze:
-    name: Checks / Analyze
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v6
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --ignore-platform-reqs
-
-      - name: Run PHPStan
-        run: composer analyze
-
-  locale:
-    name: Checks / Locale
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v6
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-
-      - name: Run Locale check
-        run: node .github/workflows/static-analysis/locale/index.js
-
-  matrix:
-    name: Tests / Matrix
-    runs-on: ubuntu-latest
-    outputs:
-      databases: ${{ steps.generate.outputs.databases }}
-      modes: ${{ steps.generate.outputs.modes }}
-      services: ${{ steps.generate.outputs.services }}
-    steps:
-      - name: Generate matrix
-        id: generate
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const databases = [
-              { name: 'MariaDB',    env: '.env,compose/mariadb.env',    compose: 'docker-compose.yml:compose/mariadb.yml' },
-              { name: 'PostgreSQL', env: '.env,compose/postgresql.env', compose: 'docker-compose.yml:compose/postgresql.yml' },
-              { name: 'MongoDB',    env: '.env',                        compose: 'docker-compose.yml' },
-            ];
-            const modes = ['dedicated', 'shared_v1', 'shared_v2'];
-
-            const services = [
-              { name: 'Account',           parallel: true },
-              { name: 'Avatars',           parallel: true,  runner: 'blacksmith-4vcpu-ubuntu-2404' },
-              { name: 'Databases',                          runner: 'blacksmith-4vcpu-ubuntu-2404' },
-              { name: 'TablesDB',                           runner: 'blacksmith-4vcpu-ubuntu-2404' },
-              { name: 'Functions',                          runner: 'blacksmith-4vcpu-ubuntu-2404' },
-              { name: 'FunctionsSchedule', parallel: true },
-              { name: 'GraphQL',           parallel: true },
-              { name: 'Projects',          parallel: true },
-              { name: 'Realtime',                           runner: 'blacksmith-4vcpu-ubuntu-2404' },
-              { name: 'Sites',             parallel: true,  runner: 'blacksmith-4vcpu-ubuntu-2404' },
-              { name: 'Teams',             parallel: true },
-              { name: 'Users',             parallel: true },
-              { name: 'ProjectWebhooks',   parallel: true },
-              { name: 'Migrations',        parallel: true },
-              { name: 'Project',           parallel: true },
-            ];
-            core.setOutput('services', JSON.stringify(services));
-
-            const defaultDatabases = [databases.find(d => d.name === 'MongoDB')];
-            const defaultModes = ['dedicated'];
-
-            const pr = context.payload.pull_request;
-            if (!pr) {
-              core.setOutput('databases', JSON.stringify(databases));
-              core.setOutput('modes', JSON.stringify(modes));
-              return;
-            }
-
-            const getContent = (ref) => github.rest.repos.getContent({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              path: 'composer.lock',
-              ref,
-            });
-
-            const getDbVersion = (lock) => lock.packages?.find(p => p.name === 'utopia-php/database')?.version;
-
-            const [{ data: base }, { data: head }] = await Promise.all([
-              getContent(pr.base.sha),
-              getContent(pr.head.sha),
-            ]);
-
-            const decode = (content) => JSON.parse(Buffer.from(content, 'base64').toString());
-            const databaseChanged = getDbVersion(decode(base.content)) !== getDbVersion(decode(head.content));
-
-            core.setOutput('databases', JSON.stringify(databaseChanged ? databases : defaultDatabases));
-            core.setOutput('modes', JSON.stringify(databaseChanged ? modes : defaultModes));
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-
-      - name: Build Appwrite
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: false
-          tags: ${{ env.IMAGE }}
-          load: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          outputs: type=docker,dest=/tmp/${{ env.IMAGE }}.tar
-          target: development
-          build-args: |
-            DEBUG=false
-            TESTING=true
-            VERSION=dev
-
-      - name: Upload Docker Image
-        uses: actions/upload-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp/${{ env.IMAGE }}.tar
-          retention-days: 1
-
-  unit:
-    name: Tests / Unit
-    runs-on: ubuntu-latest
-    needs: build
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: checkout
-        uses: actions/checkout@v6
-
-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Load and Start Appwrite
-        timeout-minutes: 5
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose pull --quiet --ignore-buildable
-          docker compose up -d --quiet-pull --wait
-
-      - name: Environment Variables
-        run: docker compose exec -T appwrite vars
-
-      - name: Run Unit Tests
-        timeout-minutes: 15
-        run: >-
-          docker compose exec
-          -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}"
-          appwrite test /usr/src/code/tests/unit
-
-  e2e_general:
-    name: Tests / E2E / ${{ matrix.database.name }} (${{ matrix.mode }}) / General
-    runs-on: ubuntu-latest
-    needs: [build, matrix]
-    env:
-      COMPOSE_FILE: ${{ matrix.database.compose }}
-      COMPOSE_ENV_FILES: ${{ matrix.database.env }}
-    permissions:
-      contents: read
-      pull-requests: write
-    strategy:
-      fail-fast: false
-      matrix:
-        database: ${{ fromJSON(needs.matrix.outputs.databases) }}
-        mode: ${{ fromJSON(needs.matrix.outputs.modes) }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Load and Start Appwrite
-        timeout-minutes: 5
-        env:
-          _APP_BROWSER_HOST: http://invalid-browser/v1
-          _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
-          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose pull --quiet --ignore-buildable
-          docker compose up -d --quiet-pull --wait
-
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
-      - name: Run tests
-        timeout-minutes: 20
-        run: >-
-          docker compose exec -T
-          -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}"
-          appwrite vendor/bin/paratest --processes $(nproc) --functional --testsuite GeneralGroup --exclude-group abuseEnabled --exclude-group screenshots
-
-      - name: Failure Logs
-        if: failure()
-        run: |
-          echo "=== Appwrite Logs ==="
-          docker compose logs
-
-  e2e_service:
-    name: Tests / E2E / ${{ matrix.database.name }} (${{ matrix.mode }}) / ${{ matrix.service.name }}
-    runs-on: ${{ matrix.service.runner || 'ubuntu-latest' }}
-    needs: [build, matrix]
-    env:
-      COMPOSE_FILE: ${{ matrix.database.compose }}
-      COMPOSE_ENV_FILES: ${{ matrix.database.env }}
-    permissions:
-      contents: read
-      pull-requests: write
-    strategy:
-      fail-fast: false
-      matrix:
-        database: ${{ fromJSON(needs.matrix.outputs.databases) }}
-        mode: ${{ fromJSON(needs.matrix.outputs.modes) }}
-        service: ${{ fromJSON(needs.matrix.outputs.services) }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Load and Start Appwrite
-        timeout-minutes: 5
-        env:
-          _APP_BROWSER_HOST: http://invalid-browser/v1
-          _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
-          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose pull --quiet --ignore-buildable
-          docker compose up -d --quiet-pull --wait
-
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
-      - name: Run tests
-        timeout-minutes: 20
-        run: |
-          docker compose exec -T \
-            -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-            appwrite vendor/bin/paratest --processes $(nproc) ${{ matrix.service.parallel && '--functional' || '' }} --testsuite ${{ matrix.service.name }} --exclude-group abuseEnabled --exclude-group screenshots
-
-      - name: Failure Logs
-        if: failure()
-        run: |
-          echo "=== Appwrite Logs ==="
-          docker compose logs
-
-  e2e_abuse:
-    name: Tests / E2E / Abuse (${{ matrix.mode }})
-    runs-on: ubuntu-latest
-    needs: [build, matrix]
-    permissions:
-      contents: read
-      pull-requests: write
-    strategy:
-      fail-fast: false
-      matrix:
-        mode: ${{ fromJSON(needs.matrix.outputs.modes) }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Load and Start Appwrite
-        timeout-minutes: 5
-        env:
-          _APP_OPTIONS_ABUSE: enabled
-          _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
-          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose pull --quiet --ignore-buildable
-          docker compose up -d --quiet-pull --wait
-
-      - name: Run tests
-        timeout-minutes: 15
-        run: >-
-          docker compose exec -T
-          -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}"
-          appwrite test /usr/src/code/tests/e2e --group=abuseEnabled
-
-      - name: Failure Logs
-        if: failure()
-        run: |
-          echo "=== Appwrite Logs ==="
-          docker compose logs
-
-  e2e_screenshots:
-    name: Tests / E2E / Screenshots (${{ matrix.mode }})
-    runs-on: ubuntu-latest
-    needs: [build, matrix]
-    permissions:
-      contents: read
-      pull-requests: write
-    strategy:
-      fail-fast: false
-      matrix:
-        mode: ${{ fromJSON(needs.matrix.outputs.modes) }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Load and Start Appwrite
-        timeout-minutes: 5
-        env:
-          _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
-          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose pull --quiet --ignore-buildable
-          docker compose up -d --quiet-pull --wait
-
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
-      - name: Run tests
-        timeout-minutes: 15
-        run: >-
-          docker compose exec -T
-          -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}"
-          appwrite test /usr/src/code/tests/e2e/Services/Sites --group=screenshots
-
-      - name: Failure Logs
-        if: failure()
-        run: |
-          echo "=== Appwrite Logs ==="
-          docker compose logs
-
-  benchmark:
-    name: Benchmark
-    runs-on: ubuntu-latest
-    needs: build
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v4
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Load and Start Appwrite
-        run: |
-          sed -i 's/traefik/localhost/g' .env
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose up -d
-          sleep 10
-
-      - name: Install Oha
-        run: |
-          echo "deb [signed-by=/usr/share/keyrings/azlux-archive-keyring.gpg] http://packages.azlux.fr/debian/ stable main" | sudo tee /etc/apt/sources.list.d/azlux.list
-          sudo wget -O /usr/share/keyrings/azlux-archive-keyring.gpg https://azlux.fr/repo.gpg
-          sudo apt update
-          sudo apt install oha
-          oha --version
-
-      - name: Benchmark PR
-        run: 'oha -z 180s http://localhost/v1/health/version --output-format json > benchmark.json'
-
-      - name: Cleaning
-        run: docker compose down -v
-
-      - name: Installing latest version
-        run: |
-          rm docker-compose.yml
-          rm .env
-          curl https://appwrite.io/install/compose -o docker-compose.yml
-          curl https://appwrite.io/install/env -o .env
-          sed -i 's/_APP_OPTIONS_ABUSE=enabled/_APP_OPTIONS_ABUSE=disabled/g' .env
-          docker compose up -d
-          sleep 10
-
-      - name: Benchmark Latest
-        run: oha -z 180s http://localhost/v1/health/version --output-format json > benchmark-latest.json
-
-      - name: Prepare comment
-        run: |
-          echo '## :sparkles: Benchmark results' > benchmark.txt
-          echo ' ' >> benchmark.txt
-          echo "- Requests per second: $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
-          echo "- Requests with 200 status code: $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
-          echo "- P99 latency: $(jq -r '.latencyPercentiles.p99' benchmark.json )" >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo "## :zap:  Benchmark Comparison" >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo "| Metric | This PR | Latest version | "  >> benchmark.txt
-          echo "| --- | --- | --- | "  >> benchmark.txt
-          echo "| RPS | $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.summary.requestsPerSec|tonumber|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
-          echo "| 200 | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
-          echo "| P99 | $(jq -r '.latencyPercentiles.p99' benchmark.json ) | $(jq -r '.latencyPercentiles.p99' benchmark-latest.json ) | "  >> benchmark.txt
-
-      - name: Save results
-        uses: actions/upload-artifact@v7
-        if: ${{ !cancelled() }}
-        with:
-          name: benchmark.json
-          path: benchmark.json
-          retention-days: 7
-
-      - name: Find Comment
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        uses: peter-evans/find-comment@v3
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-          body-includes: Benchmark results
-
-      - name: Comment on PR
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          body-path: benchmark.txt
-          edit-mode: replace

.github/workflows/linter.yml

@@ -0,0 +1,28 @@
+name: "Linter"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on: [pull_request]
+jobs:
+  lint:
+    name: Linter
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v6
+      with:
+        fetch-depth: 2
+
+    - run: git checkout HEAD^2
+
+    - name: Validate composer.json and composer.lock
+      run: |
+        docker run --rm -v $PWD:/app composer:2.8 sh -c \
+        "composer validate"
+    - name: Run Linter
+      run: |
+        docker run --rm -v $PWD:/app composer:2.8 sh -c \
+        "composer install --profile --ignore-platform-reqs && composer lint"

.github/workflows/nightly.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Build the Docker image
         run: DOCKER_BUILDKIT=1 docker build . --target production -t appwrite_image:latest
       - name: Run Trivy vulnerability scanner on image
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+        uses: aquasecurity/trivy-action@0.20.0
         with:
           image-ref: 'appwrite_image:latest'
           format: 'sarif'
@@ -35,7 +35,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v6
       - name: Run Trivy vulnerability scanner on filesystem
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+        uses: aquasecurity/trivy-action@0.20.0
         with:
           scan-type: 'fs'
           format: 'sarif'

.github/workflows/pr-scan.yml

@@ -0,0 +1,106 @@
+name: PR Security Scan
+on: 
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+ 
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+    - name: Check out code 
+      uses: actions/checkout@v6
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+        submodules: 'recursive'
+
+    - name: Build the Docker image
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        push: false
+        load: true
+        tags: pr_image:${{ github.sha }}
+        target: production
+
+    - name: Run Trivy vulnerability scanner on image
+      uses: aquasecurity/trivy-action@0.20.0
+      with:
+        image-ref: 'pr_image:${{ github.sha }}'
+        format: 'json'
+        output: 'trivy-image-results.json'
+        severity: 'CRITICAL,HIGH'
+
+    - name: Run Trivy vulnerability scanner on source code
+      uses: aquasecurity/trivy-action@0.20.0
+      with:
+        scan-type: 'fs'
+        scan-ref: '.'
+        format: 'json'
+        output: 'trivy-fs-results.json'
+        severity: 'CRITICAL,HIGH'
+
+    - name: Process Trivy scan results
+      id: process-results
+      uses: actions/github-script@v8
+      with:
+        script: |
+          const fs = require('fs');
+          let commentBody = '## Security Scan Results for PR\n\n';
+          
+          function processResults(results, title) {
+            let sectionBody = `### ${title}\n\n`;
+            if (results.Results && results.Results.some(result => result.Vulnerabilities && result.Vulnerabilities.length > 0)) {
+              sectionBody += '| Package | Version | Vulnerability | Severity |\n';
+              sectionBody += '|---------|---------|----------------|----------|\n';
+              
+              const uniqueVulns = new Set();
+              results.Results.forEach(result => {
+                if (result.Vulnerabilities) {
+                  result.Vulnerabilities.forEach(vuln => {
+                    const vulnKey = `${vuln.PkgName}-${vuln.InstalledVersion}-${vuln.VulnerabilityID}`;
+                    if (!uniqueVulns.has(vulnKey)) {
+                      uniqueVulns.add(vulnKey);
+                      sectionBody += `| ${vuln.PkgName} | ${vuln.InstalledVersion} | [${vuln.VulnerabilityID}](https://nvd.nist.gov/vuln/detail/${vuln.VulnerabilityID}) | ${vuln.Severity} |\n`;
+                    }
+                  });
+                }
+              });
+            } else {
+              sectionBody += '🎉 No vulnerabilities found!\n';
+            }
+            return sectionBody;
+          }
+          
+          try {
+            const imageResults = JSON.parse(fs.readFileSync('trivy-image-results.json', 'utf8'));
+            const fsResults = JSON.parse(fs.readFileSync('trivy-fs-results.json', 'utf8'));
+            
+            commentBody += processResults(imageResults, "Docker Image Scan Results");
+            commentBody += '\n';
+            commentBody += processResults(fsResults, "Source Code Scan Results");
+            
+          } catch (error) {
+            commentBody += `There was an error while running the security scan: ${error.message}\n`;
+            commentBody += 'Please contact the core team for assistance.';
+          }
+          
+          core.setOutput('comment-body', commentBody);
+    - name: Find Comment
+      uses: peter-evans/find-comment@v3
+      id: fc
+      with:
+        issue-number: ${{ github.event.pull_request.number }}
+        comment-author: 'github-actions[bot]'
+        body-includes: Security Scan Results for PR
+
+    - name: Create or update comment
+      uses: peter-evans/create-or-update-comment@v3
+      with:
+        issue-number: ${{ github.event.pull_request.number }}
+        comment-id: ${{ steps.fc.outputs.comment-id }}
+        body: ${{ steps.process-results.outputs.comment-body }}
+        edit-mode: replace

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: "This issue has been labeled as a 'question', indicating that it requires additional information from the requestor. It has been inactive for 7 days. If no further activity occurs, this issue will be closed in 14 days."

.github/workflows/static-analysis.yml

@@ -0,0 +1,21 @@
+name: "Static code analysis"
+
+on: [pull_request]
+jobs:
+  lint:
+    name: CodeQL
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v6
+
+    - name: Run CodeQL
+      run: |
+        docker run --rm -v $PWD:/app composer:2.8 sh -c \
+        "composer install --profile --ignore-platform-reqs && composer check"
+    
+    - name: Run Locale check
+      run: |
+        docker run --rm -v $PWD:/app node:24-alpine sh -c \
+        "cd /app/.github/workflows/static-analysis/locale && node index.js"

.github/workflows/tests.yml

@@ -0,0 +1,691 @@
+name: "Tests"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  COMPOSE_FILE: docker-compose.yml
+  IMAGE: appwrite-dev
+  CACHE_KEY: appwrite-dev-${{ github.event.pull_request.head.sha }}
+
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      response_format:
+        description: 'Response format version to test (e.g., 1.5.0, 1.4.0)'
+        required: false
+        type: string
+        default: ''
+
+jobs:
+  check_database_changes:
+    name: Check if utopia-php/database changed
+    runs-on: ubuntu-latest
+    outputs:
+      database_changed: ${{ steps.check.outputs.database_changed }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Fetch base branch
+        run: git fetch origin ${{ github.event.pull_request.base.ref }}
+
+      - name: Check for utopia-php/database changes
+        id: check
+        run: |
+          if git diff origin/${{ github.event.pull_request.base.ref }} HEAD -- composer.lock | grep -q '"name": "utopia-php/database"'; then
+            echo "Database version changed, going to run all mode tests."
+            echo "database_changed=true" >> "$GITHUB_ENV"
+            echo "database_changed=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "database_changed=false" >> "$GITHUB_ENV"
+            echo "database_changed=false" >> "$GITHUB_OUTPUT"
+          fi
+
+  setup:
+    name: Setup & Build Appwrite Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Appwrite
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: false
+          tags: ${{ env.IMAGE }}
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          outputs: type=docker,dest=/tmp/${{ env.IMAGE }}.tar
+          target: development
+          build-args: |
+            DEBUG=false
+            TESTING=true
+            VERSION=dev
+
+      - name: Cache Docker Image
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+
+  unit_test:
+    name: Unit Test
+    runs-on: ubuntu-latest
+    needs: setup
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        timeout-minutes: 3
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
+            echo "Waiting for Appwrite to be ready..."
+            sleep 2
+          done
+
+      - name: Environment Variables
+        run: docker compose exec -T appwrite vars
+
+      - name: Run Unit Tests
+        uses: itznotabug/php-retry@v3
+        with:
+          max_attempts: 2
+          retry_wait_seconds: 300
+          timeout_minutes: 15
+          job_id: ${{ job.check_run_id }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          test_dir: tests/unit
+          command: >-
+            docker compose exec
+            -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}"
+            appwrite test /usr/src/code/tests/unit
+
+  e2e_general_test:
+    name: E2E General Test
+    runs-on: ubuntu-latest
+    needs: setup
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        timeout-minutes: 3
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
+            echo "Waiting for Appwrite to be ready..."
+            sleep 2
+          done
+
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
+
+      - name: Run General Tests
+        uses: itznotabug/php-retry@v3
+        with:
+          max_attempts: 2
+          retry_wait_seconds: 300
+          timeout_minutes: 15
+          job_id: ${{ job.check_run_id }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          test_dir: tests/e2e/General
+          command: >-
+            docker compose exec -T
+            -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}"
+            appwrite test /usr/src/code/tests/e2e/General --debug
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Logs ==="
+          docker compose logs
+
+  e2e_service_test:
+    name: E2E Service Test
+    runs-on: ubuntu-latest
+    needs: setup
+    permissions:
+      contents: read
+      pull-requests: write
+    strategy:
+      fail-fast: false
+      matrix:
+        db_adapter: [
+          MARIADB,
+          POSTGRESQL,
+          MONGODB
+        ]
+        service: [
+          Account,
+          Avatars,
+          Console,
+          Databases,
+          Functions,
+          FunctionsSchedule,
+          GraphQL,
+          Health,
+          Locale,
+          Projects,
+          Realtime,
+          Sites,
+          Proxy,
+          Storage,
+          Tokens,
+          Teams,
+          Users,
+          Webhooks,
+          VCS,
+          Messaging,
+          Migrations
+        ]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Set DB Adapter environment
+        id: set-db-env
+        run: |
+          DB_ADAPTER_LOWER=$(echo "${{ matrix.db_adapter }}" | tr 'A-Z' 'a-z')
+          echo "COMPOSE_PROFILES=${DB_ADAPTER_LOWER}" >> $GITHUB_ENV
+          
+          if [ "${{ matrix.db_adapter }}" = "MARIADB" ]; then
+            echo "_APP_DB_ADAPTER=mariadb" >> $GITHUB_ENV
+            echo "_APP_DB_HOST=mariadb" >> $GITHUB_ENV
+            echo "_APP_DB_PORT=3306" >> $GITHUB_ENV
+          elif [ "${{ matrix.db_adapter }}" = "MONGODB" ]; then
+            echo "_APP_DB_ADAPTER=mongodb" >> $GITHUB_ENV
+            echo "_APP_DB_HOST=mongodb" >> $GITHUB_ENV
+            echo "_APP_DB_PORT=27017" >> $GITHUB_ENV
+          elif [ "${{ matrix.db_adapter }}" = "POSTGRESQL" ]; then
+            echo "_APP_DB_ADAPTER=postgresql" >> $GITHUB_ENV
+            echo "_APP_DB_HOST=postgresql" >> $GITHUB_ENV
+            echo "_APP_DB_PORT=5432" >> $GITHUB_ENV
+          fi
+
+      - name: Load and Start Appwrite
+        timeout-minutes: 3
+        env:
+          _APP_BROWSER_HOST: http://invalid-browser/v1
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
+            echo "Waiting for Appwrite to be ready..."
+            sleep 2
+          done
+
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
+
+      - name: Run ${{ matrix.service }} tests with Project table mode
+        uses: itznotabug/php-retry@v3
+        with:
+          max_attempts: 2
+          retry_wait_seconds: 300
+          timeout_minutes: 20
+          job_id: ${{ job.check_run_id }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          test_dir: tests/e2e/Services/${{ matrix.service }}
+          command: |
+            echo "Using project tables"
+            SERVICE_PATH="/usr/src/code/tests/e2e/Services/${{ matrix.service }}"
+
+            # Services that rely on sequential test method execution (shared static state)
+            FUNCTIONAL_FLAG="--functional"
+            case "${{ matrix.service }}" in
+              Databases|Functions|Realtime) FUNCTIONAL_FLAG="" ;;
+            esac
+
+            echo "Running with paratest (parallel) for: ${{ matrix.service }} ${FUNCTIONAL_FLAG:+(functional)}"
+            docker compose exec -T \
+              -e _APP_DATABASE_SHARED_TABLES="" \
+              -e _APP_DATABASE_SHARED_TABLES_V1="" \
+              -e _APP_DB_ADAPTER="${{ env._APP_DB_ADAPTER }}" \
+              -e _APP_DB_HOST="${{ env._APP_DB_HOST }}" \
+              -e _APP_DB_PORT="${{ env._APP_DB_PORT }}" \
+              -e _APP_DB_SCHEMA=appwrite \
+              -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
+              appwrite vendor/bin/paratest --processes $(nproc) $FUNCTIONAL_FLAG "$SERVICE_PATH" --exclude-group abuseEnabled --exclude-group screenshots --exclude-group ciIgnore --log-junit tests/e2e/Services/${{ matrix.service }}/junit.xml
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Logs ==="
+          docker compose logs
+
+  e2e_shared_mode_test:
+    name: E2E Shared Mode Service Test
+    runs-on: ubuntu-latest
+    needs: [ setup, check_database_changes ]
+    if: needs.check_database_changes.outputs.database_changed == 'true'
+    permissions:
+      contents: read
+      pull-requests: write
+    strategy:
+      fail-fast: false
+      matrix:
+        service:
+          [
+            Account,
+            Avatars,
+            Console,
+            Databases,
+            Functions,
+            FunctionsSchedule,
+            GraphQL,
+            Health,
+            Locale,
+            Projects,
+            Realtime,
+            Sites,
+            Proxy,
+            Storage,
+            Teams,
+            Users,
+            Webhooks,
+            VCS,
+            Messaging,
+            Migrations,
+            Tokens
+          ]
+        tables-mode: [
+          'Shared V1',
+          'Shared V2',
+        ]
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        timeout-minutes: 3
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
+            echo "Waiting for Appwrite to be ready..."
+            sleep 2
+          done
+
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
+
+      - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
+        uses: itznotabug/php-retry@v3
+        with:
+          max_attempts: 2
+          retry_wait_seconds: 300
+          timeout_minutes: 20
+          job_id: ${{ job.check_run_id }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          test_dir: tests/e2e/Services/${{ matrix.service }}
+          command: |
+            if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
+              echo "Using shared tables V1"
+              export _APP_DATABASE_SHARED_TABLES=database_db_main
+              export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
+            elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
+              echo "Using shared tables V2"
+              export _APP_DATABASE_SHARED_TABLES=database_db_main
+              export _APP_DATABASE_SHARED_TABLES_V1=
+            fi
+
+            SERVICE_PATH="/usr/src/code/tests/e2e/Services/${{ matrix.service }}"
+
+            # Services that rely on sequential test method execution (shared static state)
+            FUNCTIONAL_FLAG="--functional"
+            case "${{ matrix.service }}" in
+              Databases|Functions|Realtime) FUNCTIONAL_FLAG="" ;;
+            esac
+
+            docker compose exec -T \
+              -e _APP_DATABASE_SHARED_TABLES \
+              -e _APP_DATABASE_SHARED_TABLES_V1 \
+              -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
+              appwrite vendor/bin/paratest --processes $(nproc) $FUNCTIONAL_FLAG "$SERVICE_PATH" --exclude-group abuseEnabled --exclude-group screenshots --exclude-group ciIgnore --log-junit tests/e2e/Services/${{ matrix.service }}/junit.xml
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  e2e_abuse_enabled:
+    name: E2E Service Test (Abuse enabled)
+    runs-on: ubuntu-latest
+    needs: setup
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        timeout-minutes: 3
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
+          docker compose up -d
+          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
+            echo "Waiting for Appwrite to be ready..."
+            sleep 2
+          done
+
+      - name: Run Projects tests in dedicated table mode
+        uses: itznotabug/php-retry@v3
+        with:
+          max_attempts: 2
+          retry_wait_seconds: 300
+          timeout_minutes: 15
+          job_id: ${{ job.check_run_id }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          test_dir: tests/e2e/Services/Projects
+          command: |
+            echo "Using project tables"
+            export _APP_DATABASE_SHARED_TABLES=
+            export _APP_DATABASE_SHARED_TABLES_V1=
+
+            docker compose exec -T \
+              -e _APP_DATABASE_SHARED_TABLES \
+              -e _APP_DATABASE_SHARED_TABLES_V1 \
+              -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
+              appwrite vendor/bin/paratest --processes $(nproc) /usr/src/code/tests/e2e/Services/Projects --group abuseEnabled
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  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'
+    permissions:
+      contents: read
+      pull-requests: write
+    strategy:
+      fail-fast: false
+      matrix:
+        tables-mode: [
+          'Shared V1',
+          'Shared V2',
+        ]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        timeout-minutes: 3
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
+          docker compose up -d
+          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
+            echo "Waiting for Appwrite to be ready..."
+            sleep 2
+          done
+
+      - name: Run Projects tests in ${{ matrix.tables-mode }} table mode
+        uses: itznotabug/php-retry@v3
+        with:
+          max_attempts: 2
+          retry_wait_seconds: 300
+          timeout_minutes: 15
+          job_id: ${{ job.check_run_id }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          test_dir: tests/e2e/Services/Projects
+          command: |
+            if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
+              echo "Using shared tables V1"
+              export _APP_DATABASE_SHARED_TABLES=database_db_main
+              export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
+            elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
+              echo "Using shared tables V2"
+              export _APP_DATABASE_SHARED_TABLES=database_db_main
+              export _APP_DATABASE_SHARED_TABLES_V1=
+            fi
+
+            docker compose exec -T \
+              -e _APP_DATABASE_SHARED_TABLES \
+              -e _APP_DATABASE_SHARED_TABLES_V1 \
+              -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
+              appwrite vendor/bin/paratest --processes $(nproc) /usr/src/code/tests/e2e/Services/Projects --group abuseEnabled
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  e2e_screenshots:
+    name: E2E Service Test (Site Screenshots)
+    runs-on: ubuntu-latest
+    needs: setup
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        timeout-minutes: 3
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
+          docker compose up -d
+          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
+            echo "Waiting for Appwrite to be ready..."
+            sleep 2
+          done
+
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
+
+      - name: Run Site tests with browser connected in dedicated table mode
+        uses: itznotabug/php-retry@v3
+        with:
+          max_attempts: 2
+          retry_wait_seconds: 300
+          timeout_minutes: 15
+          job_id: ${{ job.check_run_id }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          test_dir: tests/e2e/Services/Sites
+          command: |
+            echo "Keeping original value of _APP_BROWSER_HOST"
+            echo "Using project tables"
+            export _APP_DATABASE_SHARED_TABLES=
+            export _APP_DATABASE_SHARED_TABLES_V1=
+
+            docker compose exec -T \
+              -e _APP_DATABASE_SHARED_TABLES \
+              -e _APP_DATABASE_SHARED_TABLES_V1 \
+              -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
+              appwrite vendor/bin/paratest --processes $(nproc) /usr/src/code/tests/e2e/Services/Sites --group screenshots
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
+
+  e2e_screenshots_shared_mode:
+    name: E2E Shared Mode Service Test (Site Screenshots)
+    runs-on: ubuntu-latest
+    needs: [ setup, check_database_changes ]
+    if: needs.check_database_changes.outputs.database_changed == 'true'
+    permissions:
+      contents: read
+      pull-requests: write
+    strategy:
+      fail-fast: false
+      matrix:
+        tables-mode: [
+          'Shared V1',
+          'Shared V2',
+        ]
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+
+      - name: Load and Start Appwrite
+        timeout-minutes: 3
+        run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
+          docker compose up -d
+          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
+            echo "Waiting for Appwrite to be ready..."
+            sleep 2
+          done
+
+      - name: Wait for Open Runtimes
+        timeout-minutes: 3
+        run: |
+          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
+            echo "Waiting for Executor to come online"
+            sleep 1
+          done
+
+      - name: Run Site tests with browser connected in ${{ matrix.tables-mode }} table mode
+        uses: itznotabug/php-retry@v3
+        with:
+          max_attempts: 2
+          retry_wait_seconds: 300
+          timeout_minutes: 15
+          job_id: ${{ job.check_run_id }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          test_dir: tests/e2e/Services/Sites
+          command: |
+            echo "Keeping original value of _APP_BROWSER_HOST"
+            if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
+              echo "Using shared tables V1"
+              export _APP_DATABASE_SHARED_TABLES=database_db_main
+              export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
+            elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
+              echo "Using shared tables V2"
+              export _APP_DATABASE_SHARED_TABLES=database_db_main
+              export _APP_DATABASE_SHARED_TABLES_V1=
+            fi
+
+            docker compose exec -T \
+              -e _APP_DATABASE_SHARED_TABLES \
+              -e _APP_DATABASE_SHARED_TABLES_V1 \
+              -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
+              appwrite vendor/bin/paratest --processes $(nproc) /usr/src/code/tests/e2e/Services/Sites --group screenshots
+
+      - name: Failure Logs
+        if: failure()
+        run: |
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor

.gitignore

@@ -26,4 +26,9 @@ test-results
 docker-compose.web-installer.yml
 .env.web-installer
 docker-compose.web-installer.yml.**.backup
+
+# local installer output dir
+appwrite/
+
+# screenshots
 tests/playwright/screenshots

AGENTS.md

@@ -1,120 +1,77 @@
-# Appwrite
+# AGENTS.md
 
-Self-hosted Backend-as-a-Service platform. Hybrid monolithic-microservice architecture built with PHP 8.3+ on Swoole, delivered as Docker containers.
+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.
 
-## Commands
+## Project Overview
 
-| Command | Purpose |
-|---------|---------|
-| `docker compose up -d --force-recreate --build` | Build and start all services |
-| `docker compose exec appwrite test tests/e2e/Services/[Service]` | Run E2E tests for a service |
-| `docker compose exec appwrite test tests/e2e/Services/[Service] --filter=[Method]` | Run a single test method |
-| `docker compose exec appwrite test tests/unit/` | Run unit tests |
-| `composer format` | Auto-format code (Pint, PSR-12) |
-| `composer format <file>` | Format a specific file |
-| `composer lint <file>` | Check formatting of a file |
-| `composer analyze` | Static analysis (PHPStan level 3) |
-| `composer check` | Same as `analyze` |
+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.
 
-## Stack
+**Key Technologies:**
+- **Backend:** PHP 8.3+, Swoole
+- **Libraries:** Utopia PHP
+- **Database:** MariaDB, Redis
+- **Cache:** Redis
+- **Queue:** Redis
+- **Containers:** Docker
 
-- PHP 8.3+, Swoole 6.x (async runtime, replaces PHP-FPM)
-- Utopia PHP framework (HTTP routing, CLI, DI, queue)
-- MongoDB (default), MariaDB, PostgreSQL (adapters via utopia-php/database; use `compose/mariadb.yml` or `compose/postgresql.yml` overlays to switch)
-- Redis (cache, queue, pub/sub)
-- Docker + Traefik (reverse proxy)
-- PHPUnit 12, Pint (PSR-12), PHPStan level 3
+## Development Commands
 
-## Project layout
+```bash
+# Run Appwrite
+docker compose up -d --force-recreate --build
 
-- **src/Appwrite/Platform/Modules/** -- feature modules (Account, Avatars, Compute, Console, Databases, Functions, Health, Project, Projects, Proxy, Sites, Storage, Teams, Tokens, VCS, Webhooks)
-- **src/Appwrite/Platform/Workers/** -- background job workers
-- **src/Appwrite/Platform/Tasks/** -- CLI tasks
-- **app/init.php** -- bootstrap (registers services, resources, listeners)
-- **app/init/** -- configs, constants, locales, models, registers, resources, span, database filters/formats
-- **bin/** -- CLI entry points: `worker-*` (14 workers), `schedule-*`, `queue-*`, plus `doctor`, `install`, `migrate`, `realtime`, `upgrade`, `ssl`, `vars`, `maintenance`, `interval`, `specs`, `sdks`, etc.
-- **tests/e2e/** -- end-to-end tests per service
-- **tests/unit/** -- unit tests
-- **public/** -- static assets and generated SDKs
+# Run specific test
+docker compose exec appwrite test /usr/src/code/tests/e2e/Services/[ServiceName] --filter=[FunctionName]
 
-## Module structure
-
-Each module under `src/Appwrite/Platform/Modules/{Name}/` contains:
-
-```
-Module.php           -- registers all services for the module
-Services/Http.php    -- registers HTTP endpoints
-Services/Workers.php -- registers background workers
-Services/Tasks.php   -- registers CLI tasks
-Http/{Service}/      -- endpoint actions (Create.php, Get.php, Update.php, Delete.php, XList.php)
-Workers/             -- worker implementations
-Tasks/               -- CLI task implementations
+# Format code
+composer format
 ```
 
-HTTP endpoint nesting reflects the URL path. Sub-resources get subdirectories. For example, within the Functions module:
-`Http/Deployments/Template/Create.php` -> `POST /v1/functions/:functionId/deployments/template`
+## Code Style Guidelines
 
-File names in Http directories must only be `Get.php`, `Create.php`, `Update.php`, `Delete.php`, or `XList.php`. For non-CRUD operations, model the endpoint as a property update. For example, updating a team membership status lives at `Teams/Http/Memberships/Status/Update.php` (`PATCH /v1/teams/:teamId/memberships/:membershipId/status`).
+- 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
 
-Register new modules in `src/Appwrite/Platform/Appwrite.php`. Detailed module guide: `src/Appwrite/Platform/AGENTS.md`.
+### Naming Conventions
 
-## Action pattern (HTTP endpoints)
+#### `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
-class Create extends Action
-{
-    public static function getName(): string { return 'createTeam'; }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/teams')
-            ->desc('Create team')
-            ->groups(['api', 'teams'])
-            ->label('event', 'teams.[teamId].create')
-            ->label('scope', 'teams.write')
-            ->param('teamId', '', new CustomId(), 'Team ID.')
-            ->param('name', null, new Text(128), 'Team name.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('queueForEvents')
-            ->callback($this->action(...));
-    }
-
-    public function action(
-        string $teamId,
-        string $name,
-        Response $response,
-        Database $dbForProject,
-        Event $queueForEvents,
-    ): void {
-        // implementation
-    }
-}
+'resourceType' => 'functions'
+'resourceType' => 'sites'
+'resourceType' => 'deployments'
 ```
 
-Common injections: `$response`, `$request`, `$dbForProject`, `$dbForPlatform`, `$user`, `$project`, `$queueForEvents`, `$queueForMails`, `$queueForDeletes`.
+## Security Considerations
 
-## Conventions
+### Critical Security Practices
 
-- PSR-12 formatting enforced by Pint. PSR-4 autoloading.
-- `resourceType` values are always **plural**: `'functions'`, `'sites'`, `'deployments'`.
-- When updating documents, pass only changed attributes as a sparse Document:
-  ```php
-  // correct
-  $dbForProject->updateDocument('users', $user->getId(), new Document([
-      'name' => $name,
-  ]));
-  // incorrect -- passing full document is inefficient
-  $user->setAttribute('name', $name);
-  $dbForProject->updateDocument('users', $user->getId(), $user);
-  ```
-  Exceptions: migrations, `array_merge()` with `getArrayCopy()`, updates where nearly all attributes change, complex nested relationship logic requiring full document state.
-- Avoid introducing dependencies outside the `utopia-php` ecosystem.
-- Never hardcode credentials -- use environment variables.
-- Code changes may require container restart. No central log location -- check relevant containers.
+- **Never hardcode credentials** - Use environment variables
+- **Rate limiting** - Respect abuse prevention mechanisms
 
-## Cross-repo context
+## Dependencies
 
-Appwrite is the base server for `appwrite/cloud`. Changes to the Action pattern, module structure, DI system, or response models affect cloud. The `feat-dedicated-db` feature spans cloud, edge, and console.
+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

CHANGES.md

@@ -1,133 +1,100 @@
-# Version 1.9.0
+# Version 1.8.1
 
 ## What's Changed
 
 ### Notable changes
 
-* Add PostgreSQL database adapter in [#9772](https://github.com/appwrite/appwrite/pull/9772) and [#11293](https://github.com/appwrite/appwrite/pull/11293)
-* Add MongoDB support in [#11312](https://github.com/appwrite/appwrite/pull/11312)
-* Add new webhooks API in [#11033](https://github.com/appwrite/appwrite/pull/11033) and [#11566](https://github.com/appwrite/appwrite/pull/11566)
-* Add schedules API endpoints in [#11331](https://github.com/appwrite/appwrite/pull/11331)
-* Add project labels in [#11056](https://github.com/appwrite/appwrite/pull/11056) and project status attribute in [#11291](https://github.com/appwrite/appwrite/pull/11291)
-* Add resource-based API key structure in [#11003](https://github.com/appwrite/appwrite/pull/11003) with custom ID support in [#11277](https://github.com/appwrite/appwrite/pull/11277) and list queries in [#11278](https://github.com/appwrite/appwrite/pull/11278)
-* Add string types (varchar, text, mediumtext, longtext) for attributes in [#11174](https://github.com/appwrite/appwrite/pull/11174)
-* Add encrypt parameter to string attribute types in [#11334](https://github.com/appwrite/appwrite/pull/11334)
-* Add int64 format support for integer attributes in [#11123](https://github.com/appwrite/appwrite/pull/11123)
-* Add collection and row storage size in [#11254](https://github.com/appwrite/appwrite/pull/11254) and [#11069](https://github.com/appwrite/appwrite/pull/11069)
-* Add totalSize on list responses in [#11102](https://github.com/appwrite/appwrite/pull/11102)
-* Add custom start command for sites and functions in [#10842](https://github.com/appwrite/appwrite/pull/10842)
-* Add separate build/runtime specifications in [#10849](https://github.com/appwrite/appwrite/pull/10849)
-* Add deployment retention for sites and functions in [#10959](https://github.com/appwrite/appwrite/pull/10959)
-* Add auto-delete old deployments in [#10959](https://github.com/appwrite/appwrite/pull/10959)
-* Add custom JWT duration in [#11009](https://github.com/appwrite/appwrite/pull/11009)
-* Add multiple application domains support in [#10911](https://github.com/appwrite/appwrite/pull/10911)
-* Add GraphQL introspection in [#11159](https://github.com/appwrite/appwrite/pull/11159)
-* Add realtime query subscriptions in [#11202](https://github.com/appwrite/appwrite/pull/11202) and [#11237](https://github.com/appwrite/appwrite/pull/11237)
-* Add realtime metrics for connections, messages, and bandwidth in [#11438](https://github.com/appwrite/appwrite/pull/11438) and [#11488](https://github.com/appwrite/appwrite/pull/11488)
-* Add messaging resource migration support in [#11495](https://github.com/appwrite/appwrite/pull/11495)
-* Add cached documents list in [#10832](https://github.com/appwrite/appwrite/pull/10832)
-* Add project queries support in [#10990](https://github.com/appwrite/appwrite/pull/10990)
-* Add batch document creation in [#10894](https://github.com/appwrite/appwrite/pull/10894)
-* Add async screenshots in [#11110](https://github.com/appwrite/appwrite/pull/11110)
-* Add new file parameters (encryption, compression) in [#11135](https://github.com/appwrite/appwrite/pull/11135)
-* Add new site templates in [#10031](https://github.com/appwrite/appwrite/pull/10031)
-* Add VCS repository authorized field in [#11421](https://github.com/appwrite/appwrite/pull/11421)
-* Add trusted console projects in [#11248](https://github.com/appwrite/appwrite/pull/11248)
-
-### Refactoring
-
-* Refactor to Utopia Platform modules architecture in [#11035](https://github.com/appwrite/appwrite/pull/11035), [#11049](https://github.com/appwrite/appwrite/pull/11049), [#11057](https://github.com/appwrite/appwrite/pull/11057), [#11103](https://github.com/appwrite/appwrite/pull/11103), [#11208](https://github.com/appwrite/appwrite/pull/11208), and [#11398](https://github.com/appwrite/appwrite/pull/11398)
-* Refactor auth to single instance in [#10872](https://github.com/appwrite/appwrite/pull/10872) and [#11130](https://github.com/appwrite/appwrite/pull/11130)
-* Refactor usage metrics to stateless publisher pattern in [#11449](https://github.com/appwrite/appwrite/pull/11449)
-* Refactor messaging and queue in [#10961](https://github.com/appwrite/appwrite/pull/10961)
-* Refactor functions schedule in [#10913](https://github.com/appwrite/appwrite/pull/10913)
-* Refactor make Bus dispatch synchronous in [#11449](https://github.com/appwrite/appwrite/pull/11449)
-* Remove proxy container in [#11039](https://github.com/appwrite/appwrite/pull/11039)
-
-### Performance
-
-* Optimize updateDocument() calls to use sparse documents in [#11465](https://github.com/appwrite/appwrite/pull/11465)
-* Optimize Dockerfile in [#10947](https://github.com/appwrite/appwrite/pull/10947)
-* Improve domain caching in [#11346](https://github.com/appwrite/appwrite/pull/11346)
-* Improve memory usage in [#11345](https://github.com/appwrite/appwrite/pull/11345)
-* Fix memory leak in [#11067](https://github.com/appwrite/appwrite/pull/11067) and [#11241](https://github.com/appwrite/appwrite/pull/11241)
-* Improve realtime performance in [#11251](https://github.com/appwrite/appwrite/pull/11251)
-* Enable SMTP keep-alive to reuse connections across mail jobs in [#11496](https://github.com/appwrite/appwrite/pull/11496)
+* 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 blocked user/resource errors from 401 to 403 in [#11469](https://github.com/appwrite/appwrite/pull/11469)
-* Fix OAuth for custom domains in [#10967](https://github.com/appwrite/appwrite/pull/10967) and [#11269](https://github.com/appwrite/appwrite/pull/11269)
-* Fix OAuth redirect custom scheme in [#11292](https://github.com/appwrite/appwrite/pull/11292)
-* Fix OAuth verified emails in [#10986](https://github.com/appwrite/appwrite/pull/10986)
-* Fix MFA recovery code validation in [#10925](https://github.com/appwrite/appwrite/pull/10925)
-* Fix users allow updating phone number to empty in [#11521](https://github.com/appwrite/appwrite/pull/11521)
-* Fix users optional name error in [#11413](https://github.com/appwrite/appwrite/pull/11413)
-* Fix file permissions in [#11026](https://github.com/appwrite/appwrite/pull/11026)
-* Fix bulk insert webhook validation in [#11022](https://github.com/appwrite/appwrite/pull/11022)
-* Fix execution status update in [#11134](https://github.com/appwrite/appwrite/pull/11134)
-* Fix execution timeout status in [#11400](https://github.com/appwrite/appwrite/pull/11400)
-* Fix CORS wildcard in [#10956](https://github.com/appwrite/appwrite/pull/10956)
-* Fix preflight requests in [#10943](https://github.com/appwrite/appwrite/pull/10943)
-* Fix SMTP auth check in [#10939](https://github.com/appwrite/appwrite/pull/10939)
-* Fix scheduled executions trigger in [#10922](https://github.com/appwrite/appwrite/pull/10922)
-* Fix schedule executions bug in [#10916](https://github.com/appwrite/appwrite/pull/10916)
-* Fix deployment enum missing canceled value in [#11179](https://github.com/appwrite/appwrite/pull/11179)
-* Fix invalid chunk total in [#11270](https://github.com/appwrite/appwrite/pull/11270)
-* Fix sites domains in [#11240](https://github.com/appwrite/appwrite/pull/11240) and [#11355](https://github.com/appwrite/appwrite/pull/11355)
-* Fix rule domains in [#11355](https://github.com/appwrite/appwrite/pull/11355) and [#11276](https://github.com/appwrite/appwrite/pull/11276)
-* Fix rules deletion in [#11575](https://github.com/appwrite/appwrite/pull/11575)
-* Fix VCS template flow in [#11275](https://github.com/appwrite/appwrite/pull/11275)
-* Fix VCS comment empty in [#11490](https://github.com/appwrite/appwrite/pull/11490)
-* Fix DSN VCS error in [#11364](https://github.com/appwrite/appwrite/pull/11364)
-* Fix email URL params encoding in [#11369](https://github.com/appwrite/appwrite/pull/11369)
-* Fix missing email warning in [#11378](https://github.com/appwrite/appwrite/pull/11378)
-* Fix race condition in builds worker in [#11336](https://github.com/appwrite/appwrite/pull/11336)
-* Fix realtime regions in [#11414](https://github.com/appwrite/appwrite/pull/11414)
-* Fix realtime errors in [#11573](https://github.com/appwrite/appwrite/pull/11573)
-* Fix realtime TablesDB channels in [#11404](https://github.com/appwrite/appwrite/pull/11404) and [#11430](https://github.com/appwrite/appwrite/pull/11430)
-* Fix database shared table reconciliation in [#11578](https://github.com/appwrite/appwrite/pull/11578)
-* Fix PostgreSQL race condition in shared mode project creation in [#11536](https://github.com/appwrite/appwrite/pull/11536)
-* Fix compression enabled env in [#11171](https://github.com/appwrite/appwrite/pull/11171)
-* Fix deletes bug in [#10965](https://github.com/appwrite/appwrite/pull/10965)
-* Fix devkey scopes in [#10984](https://github.com/appwrite/appwrite/pull/10984)
-* Fix phone auth limit in [#11143](https://github.com/appwrite/appwrite/pull/11143)
-* Fix relationship document ID validation in [#11193](https://github.com/appwrite/appwrite/pull/11193)
-* Fix stale project overwrites OAuth in [#11461](https://github.com/appwrite/appwrite/pull/11461)
-* Fix storage health error swallowing in [#11492](https://github.com/appwrite/appwrite/pull/11492)
-* Fix Origin validator type error in [#11297](https://github.com/appwrite/appwrite/pull/11297)
-* Fix getScreenshot image format in [#11017](https://github.com/appwrite/appwrite/pull/11017)
-* Fix migration error handling in [#11457](https://github.com/appwrite/appwrite/pull/11457)
-* Fix deprecation warnings in [#11227](https://github.com/appwrite/appwrite/pull/11227)
-
-### Installer
-
-* New installer UI in [#11175](https://github.com/appwrite/appwrite/pull/11175) and [#11247](https://github.com/appwrite/appwrite/pull/11247)
+* 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 audits upgrade in [#10953](https://github.com/appwrite/appwrite/pull/10953)
-* Add graceful workers shutdown in [#11104](https://github.com/appwrite/appwrite/pull/11104)
-* Add pool resilience in [#11139](https://github.com/appwrite/appwrite/pull/11139)
-* Add function queue job TTL in [#11226](https://github.com/appwrite/appwrite/pull/11226)
-* Add cleanup stale executions in [#11146](https://github.com/appwrite/appwrite/pull/11146)
-* Add success abuse reset in [#11085](https://github.com/appwrite/appwrite/pull/11085)
-* Add SMTP connection validation in [#11079](https://github.com/appwrite/appwrite/pull/11079)
-* Add allow custom email sender in [#10945](https://github.com/appwrite/appwrite/pull/10945)
-* Add array domains env support in [#11213](https://github.com/appwrite/appwrite/pull/11213)
-* Add file create after success hook in [#11054](https://github.com/appwrite/appwrite/pull/11054)
-* Add delete subscribers in [#11115](https://github.com/appwrite/appwrite/pull/11115)
-* Add cursor plugin in [#11371](https://github.com/appwrite/appwrite/pull/11371)
-* Add observability spans in [#11320](https://github.com/appwrite/appwrite/pull/11320), [#11306](https://github.com/appwrite/appwrite/pull/11306), and [#11228](https://github.com/appwrite/appwrite/pull/11228)
-* Upgrade PHPStan to v2 with full codebase coverage in [#11550](https://github.com/appwrite/appwrite/pull/11550)
-* Upgrade Traefik in [#11265](https://github.com/appwrite/appwrite/pull/11265)
-* Upgrade utopia-php/queue in [#11239](https://github.com/appwrite/appwrite/pull/11239)
-* Upgrade spomky-labs/otphp in [#11263](https://github.com/appwrite/appwrite/pull/11263)
-* Bump utopia-php/database to stable 5.3.15 in [#11573](https://github.com/appwrite/appwrite/pull/11573)
-* Bump utopia-php/migration to 1.6.3 in [#11443](https://github.com/appwrite/appwrite/pull/11443)
-* Consolidate CI workflows in [#11531](https://github.com/appwrite/appwrite/pull/11531) and [#11551](https://github.com/appwrite/appwrite/pull/11551)
-* Hide deprecated methods from docs in [#10933](https://github.com/appwrite/appwrite/pull/10933)
-* Deprecate project-level attributes in [#11203](https://github.com/appwrite/appwrite/pull/11203)
+* 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
 

CLAUDE.md

@@ -1 +0,0 @@
-@AGENTS.md

CONTRIBUTING.md

@@ -111,7 +111,7 @@ $ git push origin [name_of_your_new_branch]
 
 ## Setup From Source
 
-To set up a working **development environment**, just fork the project git repository and install the backend and frontend dependencies using the proper package manager and run the docker-compose stack.
+To set up a working **development environment**, just fork the project git repository and install the backend and frontend dependencies using the proper package manager and create run the docker-compose stack.
 
 > If you just want to install Appwrite for day-to-day use and not as a contributor, you can reference the [installation guide](https://github.com/appwrite/appwrite#installation), the [getting started guide](https://appwrite.io/docs/quick-starts), or the main [README](README.md) file.
 
@@ -173,12 +173,12 @@ Learn more at our [Technology Stack](#technology-stack) section.
 - [MVVM](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel) - Appwrite console architecture
 
 ##### Container Namespace Conventions
-To keep our services easy to understand within Docker we follow a naming convention for all our containers depending on its intended use.
+To keep our services easy to understand within Docker we follow a naming convention for all our containers depending on it's intended use.
 
 `appwrite-worker-X` - Workers (`src/Appwrite/Platform/Workers/*`)
 `appwrite-task-X` - Tasks (`src/Appwrite/Platform/Tasks/*`)
 
-Other containers should be named the same as their service, for example `redis` should just be called `redis`.
+Other containes should be named the same as their service, for example `redis` should just be called `redis`.
 
 ##### Security
 
@@ -189,7 +189,7 @@ Other containers should be named the same as their service, for example `redis`
 
 ## Modules
 
-As Appwrite grows, we noticed approach of having all service endpoints in `app/controllers/api/[service].php` is not maintainable. Not only it creates massive files, it also doesn't contain all product's features such as workers or tasks. While there might still be some occurrences of those controller files, we avoid it in all new development, and gradually migrate existing controllers to **HTTP modules**.
+As Appwrite grows, we noticed approach of having all service endpoints in `app/controllers/api/[service].php` is not maintainable. Not only it creates massive files, it also doesnt contain all product's features such as workers or tasks. While there might still be some occurances of those controller files, we avoid it in all new development, and gradually migrate existing controllers to **HTTP modules**.
 
 ### HTTP Endpoints
 
@@ -204,7 +204,7 @@ Tips and tricks:
 1. If endpoint doesn't have resource, use service name as resource name too
 > Example: `Modules/Sites/Http/Sites/Get.php`
 
-2. If there are multiple resources, use them all in folder structure
+2. If there are multiple resources, use then all in folder structure
 > Example: `Modules/Sites/Http/Deployments/Builds/Create.php`
 
 3. Action can only be `Get`, `Create`, `Update`, `Delete` or `XList`
@@ -296,7 +296,7 @@ Appwrite stack is a combination of a variety of open-source technologies and too
 ### Other Technologies
 
 - Redis - for managing cache and in-memory data (currently, we do not use Redis for persistent data).
-- MongoDB - default database for storage and queries (MariaDB and PostgreSQL also supported via compose overlays).
+- MariaDB - for database storage and queries.
 - InfluxDB - for managing stats and time-series based data
 - Statsd - for sending data over UDP protocol (using Telegraf)
 - ClamAV - for validating and scanning storage files.
@@ -395,7 +395,7 @@ These are the current metrics we collect usage stats for:
 
 > Note: The curly brackets in the metric name represents a template and is replaced with a value when the metric is processed.
 
-Metrics are collected within 3 scopes Daily, monthly, and infinity. Adding new usage metric in order to aggregate usage stats is very simple, but very much dependent on where do you want to collect
+Metrics are collected within 3 scopes Daily, monthly, an infinity. Adding new usage metric in order to aggregate usage stats is very simple, but very much dependent on where do you want to collect
 statistics ,via API or via background worker. For both cases you will need to add a `const` variable in `app/init.php` under the usage metrics list using the naming convention `METRIC_<RESOURCE_NAME>` as shown below.
 
 ```php
@@ -409,16 +409,14 @@ Next follow the appropriate steps below depending on whether you're adding the m
 
 **API**
 
-In file `app/controllers/shared/api.php` On the database listener, add to an existing or create a new switch case. Accumulate metrics in the usage context like so:
+In file `app/controllers/shared/api.php` On the database listener, add to an existing or create a new switch case. Add a call to the usage worker with your new metric const like so:
 
 ```php
       case $document->getCollection() === 'teams':
-            $usage->addMetric(METRIC_TEAMS, $value); // per project
+            $queueForStatsUsage
+                ->addMetric(METRIC_TEAMS, $value); // per project
             break;
 ```
-
-The metrics will be automatically published by the shutdown hook at the end of the request. There is no need to manually trigger or publish.
-
 There are cases when you need to handle metric that has a parent entity, like buckets.
 Files are linked to a parent bucket, you should verify you remove the files stats when you delete a bucket.
 
@@ -427,13 +425,14 @@ In that case you need also to handle children removal using addReduce() method c
 ```php
 
  case $document->getCollection() === 'buckets': //buckets
-            $usage->addMetric(METRIC_BUCKETS, $value); // per project
+            $queueForStatsUsage
+                ->addMetric(METRIC_BUCKETS, $value); // per project
             if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $usage
+                $queueForStatsUsage
                     ->addReduce($document);
             }
             break;
-
+  
 ```
 
 In addition, you will also need to add some logic to the `reduce()` method of the Usage worker located in `/src/Appwrite/Platform/Workers/Usage.php`, like so:
@@ -461,12 +460,8 @@ case $document->getCollection() === 'buckets':
 
 **Background worker**
 
-You need to inject the usage context and publisher in the desired worker on the constructor method
+You need to inject the usage queue in the desired worker on the constructor method
 ```php
-use Appwrite\Usage\Context;
-use Appwrite\Event\Publisher\Usage as UsagePublisher;
-use Appwrite\Event\Message\Usage as UsageMessage;
-
 /**
 * @throws Exception
 */
@@ -479,32 +474,24 @@ public function __construct()
       ->inject('dbForProject')
       ->inject('queueForFunctions')
       ->inject('queueForEvents')
-      ->inject('usage')
-      ->inject('publisherForUsage')
+      ->inject('queueForStatsUsage')
       ->inject('log')
-      ->callback(fn (Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, Context $usage, UsagePublisher $publisherForUsage, Log $log) => $this->action($message, $dbForProject, $queueForFunctions, $queueForEvents, $usage, $publisherForUsage, $log));
+      ->callback(fn (Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, StatsUsage $queueForStatsUsage, Log $log) => $this->action($message, $dbForProject, $queueForFunctions, $queueForEvents, $queueForStatsUsage, $log));
 }
 ```
 
-and then accumulate metrics, create a message, and publish like so:
+and then trigger the queue with the new metric like so: 
 
 ```php
-$usage
+$queueForStatsUsage
   ->addMetric(METRIC_BUILDS, 1)
   ->addMetric(METRIC_BUILDS_STORAGE, $build->getAttribute('size', 0))
   ->addMetric(METRIC_BUILDS_COMPUTE, (int)$build->getAttribute('duration', 0) * 1000)
-  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS), 1)
+  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS), 1) 
   ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS_STORAGE), $build->getAttribute('size', 0))
-  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS_COMPUTE), (int)$build->getAttribute('duration', 0) * 1000);
-
-// Publish the accumulated metrics (workers don't have shutdown hooks)
-$message = new UsageMessage(
-    project: $project,
-    metrics: $usage->getMetrics(),
-    reduce: $usage->getReduce()
-);
-$publisherForUsage->enqueue($message);
-$usage->reset();
+  ->addMetric(str_replace('{functionInternalId}', $function->getSequence(), METRIC_FUNCTION_ID_BUILDS_COMPUTE), (int)$build->getAttribute('duration', 0) * 1000)
+  ->setProject($project)
+  ->trigger();
 ```
 
 
@@ -674,7 +661,7 @@ docker compose exec redis redis-cli FLUSHALL
 
 ## Using preview domains locally
 
-Appwrite Functions are automatically given a domain you can visit to execute the function. This domain has format `[SOMETHING].functions.localhost` unless you changed `_APP_DOMAIN_FUNCTIONS` environment variable. This default value works great when running Appwrite locally, but it can be impossible to use preview domains with Cloud workspaces such as Gitpod or GitHub Codespaces.
+Appwrite Functions are automatically given a domain you can visit to execute the function. This domain has format `[SOMETHING].functions.localhost` unless you changed `_APP_DOMAIN_FUNCTIONS` environment variable. This default value works great when running Appwrite locally, but it can be impossible to use preview domains with Cloud woekspaces such as Gitpod or GitHub Codespaces.
 
 To use preview domains on Cloud workspaces, you can visit hostname provided by them, and supply function's preview domain as URL parameter:
 

Dockerfile

@@ -70,7 +70,6 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/sdks && \
     chmod +x /usr/local/bin/specs && \
     chmod +x /usr/local/bin/ssl && \
-    chmod +x /usr/local/bin/task-time-travel && \
     chmod +x /usr/local/bin/screenshot && \
     chmod +x /usr/local/bin/test && \
     chmod +x /usr/local/bin/upgrade && \

README-CN.md

@@ -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.9.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.9.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.9.0
+    appwrite/appwrite:1.8.1
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。

README.md

@@ -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.9.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.9.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.9.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.

app/cli.php

@@ -4,13 +4,11 @@ require_once __DIR__ . '/init.php';
 
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
-use Appwrite\Event\Event;
 use Appwrite\Event\Func;
-use Appwrite\Event\Publisher\Usage as UsagePublisher;
 use Appwrite\Event\StatsResources;
+use Appwrite\Event\StatsUsage;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
-use Appwrite\Usage\Context as UsageContext;
 use Appwrite\Utopia\Database\Documents\User;
 use Executor\Executor;
 use Swoole\Runtime;
@@ -31,7 +29,6 @@ use Utopia\Platform\Service;
 use Utopia\Pools\Group;
 use Utopia\Queue\Broker\Pool as BrokerPool;
 use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter\None as NoTelemetry;
@@ -50,7 +47,7 @@ $platform = new Appwrite();
 $args = $platform->getEnv('argv');
 
 \array_shift($args);
-if (! isset($args[0])) {
+if (!isset($args[0])) {
     Console::error('Missing task name');
     Console::exit(1);
 }
@@ -88,7 +85,6 @@ $setResource('pools', function (Registry $register) {
 $setResource('authorization', function () {
     $authorization = new Authorization();
     $authorization->disable();
-
     return $authorization;
 }, []);
 
@@ -117,7 +113,7 @@ $setResource('dbForPlatform', function ($pools, $cache, $authorization) {
             $collections = Config::getParam('collections', [])['console'];
             $last = \array_key_last($collections);
 
-            if (! ($dbForPlatform->exists($dbForPlatform->getDatabase(), $last))) { /** TODO cache ready variable using registry */
+            if (!($dbForPlatform->exists($dbForPlatform->getDatabase(), $last))) { /** TODO cache ready variable using registry */
                 throw new Exception('Tables not ready yet.');
             }
 
@@ -126,10 +122,10 @@ $setResource('dbForPlatform', function ($pools, $cache, $authorization) {
             Console::warning($err->getMessage());
             sleep($sleep);
         }
-    } while ($attempts < $maxAttempts && ! $ready);
+    } while ($attempts < $maxAttempts && !$ready);
 
-    if (! $ready) {
-        throw new Exception('Console is not ready yet. Please try again later.');
+    if (!$ready) {
+        throw new Exception("Console is not ready yet. Please try again later.");
     }
 
     return $dbForPlatform;
@@ -167,7 +163,7 @@ $setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $c
             if (\in_array($dsn->getHost(), $sharedTables)) {
                 $database
                     ->setSharedTables(true)
-                    ->setTenant($project->getSequence())
+                    ->setTenant((int)$project->getSequence())
                     ->setNamespace($dsn->getParam('namespace'));
             } else {
                 $database
@@ -188,7 +184,7 @@ $setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $c
         if (\in_array($dsn->getHost(), $sharedTables)) {
             $database
                 ->setSharedTables(true)
-                ->setTenant($project->getSequence())
+                ->setTenant((int)$project->getSequence())
                 ->setNamespace($dsn->getParam('namespace'));
         } else {
             $database
@@ -212,7 +208,7 @@ $setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $a
 
     return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
         if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getSequence());
+            $database->setTenant((int)$project->getSequence());
             return $database;
         }
 
@@ -229,7 +225,7 @@ $setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $a
 
         // set tenant
         if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getSequence());
+            $database->setTenant((int)$project->getSequence());
         }
 
         return $database;
@@ -247,16 +243,15 @@ $setResource('publisherFunctions', function (BrokerPool $publisher) {
 $setResource('publisherMigrations', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
+$setResource('publisherStatsUsage', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
 $setResource('publisherMessaging', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$setResource('usage', function () {
-    return new UsageContext();
-}, []);
-$setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
-), ['publisher']);
+$setResource('queueForStatsUsage', function (Publisher $publisher) {
+    return new StatsUsage($publisher);
+}, ['publisher']);
 $setResource('queueForStatsResources', function (Publisher $publisher) {
     return new StatsResources($publisher);
 }, ['publisher']);
@@ -323,10 +318,6 @@ $setResource('logError', function (Registry $register) {
 
 $setResource('executor', fn () => new Executor(), []);
 
-$setResource('bus', function (Registry $register) use ($cli) {
-    return $register->get('bus')->setResolver(fn (string $name) => $cli->getResource($name));
-}, ['register']);
-
 $setResource('telemetry', fn () => new NoTelemetry(), []);
 
 $cli

app/config/collections.php

@@ -4,7 +4,6 @@
 $common = include __DIR__ . '/collections/common.php';
 $projects = include __DIR__ . '/collections/projects.php';
 $databases = include __DIR__ . '/collections/databases.php';
-$vectorsdb = include __DIR__ . '/collections/vectorsdb.php';
 $platform = include __DIR__ . '/collections/platform.php';
 $logs = include __DIR__ . '/collections/logs.php';
 
@@ -27,7 +26,6 @@ unset($common['files']);
 $collections = [
     'buckets' => $buckets,
     'databases' => $databases,
-    'vectorsdb' => $vectorsdb,
     'projects' => array_merge_recursive($projects, $common),
     'console' => array_merge_recursive($platform, $common),
     'logs' => $logs,

app/config/collections/common.php

@@ -419,17 +419,6 @@ return [
                 'array' => false,
                 'filters' => [],
             ],
-            [
-                '$id' => ID::custom('impersonator'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => false,
-                'default' => false,
-                'array' => false,
-            ],
         ],
         'indexes' => [
             [
@@ -502,13 +491,6 @@ return [
                 'lengths' => [],
                 'orders' => [],
             ],
-            [
-                '$id' => ID::custom('impersonator'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => [ID::custom('impersonator')],
-                'lengths' => [],
-                'orders' => [],
-            ],
         ],
     ],
 

app/config/collections/projects.php

@@ -61,15 +61,6 @@ return [
                 'array' => false,
                 'filters' => [],
             ],
-            [
-                '$id' => ID::custom('database'),
-                'type' => Database::VAR_STRING,
-                'size' => 2000,
-                'required' => false,
-                'signed' => true,
-                'array' => false,
-                'filters' => [],
-            ]
         ],
         'indexes' => [
             [
@@ -786,7 +777,6 @@ return [
                 'filters' => [],
             ],
             [
-                // At the moment, always empty (no runtime supports it yet)
                 'array' => false,
                 '$id' => ID::custom('startCommand'),
                 'type' => Database::VAR_STRING,
@@ -2200,6 +2190,13 @@ return [
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_function_internal_id'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceInternalId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
             [
                 '$id' => ID::custom('_key_resourceType'),
                 'type' => Database::INDEX_KEY,

app/config/collections/vectorsdb.php

@@ -1,165 +0,0 @@
-<?php
-
-use Utopia\Database\Database;
-use Utopia\Database\Helpers\ID;
-
-return [
-    'collections' => [
-        '$collection' => ID::custom('databases'),
-        '$id' => ID::custom('collections'),
-        'name' => 'Collections',
-        'attributes' => [
-            [
-                '$id' => ID::custom('databaseInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('databaseId'),
-                'type' => Database::VAR_STRING,
-                'signed' => true,
-                'size' => Database::LENGTH_KEY,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'default' => null,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('name'),
-                'type' => Database::VAR_STRING,
-                'size' => 256,
-                'required' => true,
-                'signed' => true,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('dimension'),
-                'type' => Database::VAR_INTEGER,
-                'size' => 0,
-                'required' => true,
-                'signed' => false,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('enabled'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'default' => null,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('documentSecurity'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'default' => null,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('attributes'),
-                'type' => Database::VAR_STRING,
-                'size' => 1000000,
-                'required' => false,
-                'signed' => true,
-                'array' => false,
-                'filters' => ['subQueryAttributes'],
-            ],
-            [
-                '$id' => ID::custom('indexes'),
-                'type' => Database::VAR_STRING,
-                'size' => 1000000,
-                'required' => false,
-                'signed' => true,
-                'array' => false,
-                'filters' => ['subQueryIndexes'],
-            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-        ],
-        'defaultAttributes' => [
-            [
-                '$id' => ID::custom('embeddings'),
-                'type' => Database::VAR_VECTOR,
-                'required' => true,
-                'signed' => false,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('metadata'),
-                'type' => Database::VAR_OBJECT,
-                'default' => [],
-                'required' => false,
-                'size' => 0,
-                'signed' => false,
-                'array' => false,
-                'filters' => [],
-            ],
-        ],
-        'indexes' => [
-            [
-                '$id' => ID::custom('_fulltext_search'),
-                'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['search'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_name'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['name'],
-                'lengths' => [256],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_enabled'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['enabled'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_documentSecurity'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['documentSecurity'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
-        ],
-        'defaultIndexes' => [
-            // not creating default indexes on the embeddings as it depends on the type of query users using the most
-            [
-                '$id' => ID::custom('_key_metadata'),
-                'type' => Database::INDEX_OBJECT,
-                'attributes' => ['metadata'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-        ]
-    ]
-];

app/config/cors.php

@@ -28,9 +28,6 @@ return [
         'X-Appwrite-Timestamp',
         'X-Appwrite-Session',
         'X-Appwrite-Platform',
-        'X-Appwrite-Impersonate-User-Id',
-        'X-Appwrite-Impersonate-User-Email',
-        'X-Appwrite-Impersonate-User-Phone',
         // SDK generator
         'X-SDK-Version',
         'X-SDK-Name',

app/config/errors.php

@@ -27,7 +27,7 @@ return [
     Exception::GENERAL_RESOURCE_BLOCKED => [
         'name' => Exception::GENERAL_RESOURCE_BLOCKED,
         'description' => 'Access to this resource is blocked.',
-        'code' => 403,
+        'code' => 401,
     ],
     Exception::GENERAL_UNKNOWN_ORIGIN => [
         'name' => Exception::GENERAL_UNKNOWN_ORIGIN,
@@ -168,8 +168,8 @@ return [
     ],
     Exception::USER_BLOCKED => [
         'name' => Exception::USER_BLOCKED,
-        'description' => 'The current user has been blocked.',
-        'code' => 403,
+        'description' => 'The current user has been blocked. You can unblock the user by making a request to the User API\'s "Update User Status" endpoint or in the Appwrite Console\'s Auth section.',
+        'code' => 401,
     ],
     Exception::USER_INVALID_TOKEN => [
         'name' => Exception::USER_INVALID_TOKEN,
@@ -1144,11 +1144,6 @@ return [
         'description' => 'Webhook with the requested ID could not be found.',
         'code' => 404,
     ],
-    Exception::WEBHOOK_ALREADY_EXISTS => [
-        'name' => Exception::WEBHOOK_ALREADY_EXISTS,
-        'description' => 'Webhook with the same ID already exists. Try again with a different ID.',
-        'code' => 409,
-    ],
     Exception::KEY_NOT_FOUND => [
         'name' => Exception::KEY_NOT_FOUND,
         'description' => 'Key with the requested ID could not be found.',
@@ -1206,11 +1201,6 @@ return [
         'description' => 'Migration is already in progress. You can check the status of the migration in your Appwrite Console\'s "Settings" > "Migrations".',
         'code' => 409,
     ],
-    Exception::MIGRATION_DATABASE_TYPE_UNSUPPORTED => [
-        'name' => Exception::MIGRATION_DATABASE_TYPE_UNSUPPORTED,
-        'description' => 'The specified database type is not supported for CSV import or export operations.',
-        'code' => 400,
-    ],
 
     /** Realtime */
     Exception::REALTIME_MESSAGE_FORMAT_INVALID => [

app/config/roles.php

@@ -62,8 +62,6 @@ $admins = [
     'devKeys.write',
     'webhooks.read',
     'webhooks.write',
-    'project.read',
-    'project.write',
     'locale.read',
     'avatars.read',
     'health.read',

app/config/scopes/organization.php

@@ -31,4 +31,12 @@ return [
         "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",
+    ],
 ];

app/config/scopes/project.php

@@ -172,20 +172,4 @@ return [ // List of publicly visible scopes
     'tokens.write' => [
         'description' => 'Access to create, update, and delete your project\'s tokens',
     ],
-    "webhooks.read" => [
-        "description" =>
-            "Access to read project\'s webhooks",
-    ],
-    "webhooks.write" => [
-        "description" =>
-            "Access to create, update, and delete project\'s webhooks",
-    ],
-    "project.read" => [
-        "description" =>
-            "Access to read project\'s information",
-    ],
-    "project.write" => [
-        "description" =>
-            "Access to update project\'s information",
-    ],
 ];

app/config/sdks.php

@@ -231,7 +231,7 @@ return [
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://www.npmjs.com/package/appwrite-cli',
                 'enabled' => true,
-                'beta' => false,
+                'beta' => true,
                 'dev' => false,
                 'hidden' => false,
                 'family' => APP_SDK_PLATFORM_CONSOLE,
@@ -250,16 +250,26 @@ return [
                     ],
                 ],
             ],
-        ],
-    ],
-
-    APP_SDK_PLATFORM_STATIC => [
-        'key' => APP_SDK_PLATFORM_STATIC,
-        'name' => 'Static',
-        'description' => 'SDK artifacts for Appwrite integrations that do not require a generated platform API specification.',
-        'enabled' => true,
-        'beta' => false,
-        'sdks' => [
+            [
+                'key' => 'markdown',
+                'name' => 'Markdown',
+                'version' => '0.3.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'),
+            ],
             [
                 'key' => 'agent-skills',
                 'name' => 'AgentSkills',
@@ -269,10 +279,9 @@ return [
                 'beta' => false,
                 'dev' => false,
                 'hidden' => false,
-                'spec' => 'static',
-                'family' => APP_SDK_PLATFORM_STATIC,
+                'family' => APP_SDK_PLATFORM_CONSOLE,
                 'prism' => 'agent-skills',
-                'source' => \realpath(__DIR__ . '/../sdks/static-agent-skills'),
+                'source' => \realpath(__DIR__ . '/../sdks/console-agent-skills'),
                 'gitUrl' => 'git@github.com:appwrite/agent-skills.git',
                 'gitRepoName' => 'agent-skills',
                 'gitUserName' => 'appwrite',
@@ -289,10 +298,9 @@ return [
                 'beta' => false,
                 'dev' => false,
                 'hidden' => false,
-                'spec' => 'static',
-                'family' => APP_SDK_PLATFORM_STATIC,
+                'family' => APP_SDK_PLATFORM_CONSOLE,
                 'prism' => 'cursor-plugin',
-                'source' => \realpath(__DIR__ . '/../sdks/static-cursor-plugin'),
+                'source' => \realpath(__DIR__ . '/../sdks/console-cursor-plugin'),
                 'gitUrl' => 'git@github.com:appwrite/cursor-plugin.git',
                 'gitRepoName' => 'cursor-plugin',
                 'gitUserName' => 'appwrite',
@@ -486,25 +494,6 @@ return [
                 'gitBranch' => 'dev',
                 'changelog' => \realpath(__DIR__ . '/../../docs/sdks/swift/CHANGELOG.md'),
             ],
-            [
-                'key' => 'rust',
-                'name' => 'Rust',
-                'version' => '0.1.0',
-                'url' => 'https://github.com/appwrite/sdk-for-rust',
-                'package' => 'https://crates.io/crates/appwrite',
-                'enabled' => true,
-                'beta' => true,
-                'dev' => true,
-                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
-                'prism' => 'rust',
-                'source' => \realpath(__DIR__ . '/../sdks/server-rust'),
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-rust.git',
-                'gitRepoName' => 'sdk-for-rust',
-                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
-                'changelog' => \realpath(__DIR__ . '/../../docs/sdks/rust/CHANGELOG.md'),
-            ],
             [
                 'key' => 'graphql',
                 'name' => 'GraphQL',

app/controllers/api/account.php

@@ -14,8 +14,10 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
+use Appwrite\Event\StatsUsage;
 use Appwrite\Extend\Exception;
 use Appwrite\Hooks\Hooks;
+use Appwrite\Network\Validator\Email as EmailValidator;
 use Appwrite\Network\Validator\Redirect;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\SDK\AuthType;
@@ -26,7 +28,6 @@ use Appwrite\SDK\MethodType;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Template\Template;
 use Appwrite\URL\URL as URLParser;
-use Appwrite\Usage\Context;
 use Appwrite\Utopia\Database\Documents\User;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Identities;
@@ -59,7 +60,6 @@ use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\UID;
 use Utopia\Emails\Email;
-use Utopia\Emails\Validator\Email as EmailValidator;
 use Utopia\Http\Http;
 use Utopia\Locale\Locale;
 use Utopia\Storage\Validator\FileName;
@@ -209,22 +209,6 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, arr
 
 $createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, Authorization $authorization) {
 
-    // Attempt to decode secret as a JWT (used by OAuth2 token flow to carry provider info)
-    $oauthProvider = null;
-    try {
-        $jwtDecoder = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 60, 0);
-        $payload = $jwtDecoder->decode($secret);
-
-        if (empty($payload['provider'])) {
-            throw new Exception(Exception::USER_INVALID_TOKEN);
-        }
-
-        $oauthProvider = $payload['provider'];
-        $secret = $payload['secret'];
-    } catch (\Ahc\Jwt\JWTException) {
-        // Not a JWT — use secret as-is (non-OAuth flows)
-    }
-
     /** @var Appwrite\Utopia\Database\Documents\User $userFromRequest */
     $userFromRequest = $authorization->skip(fn () => $dbForProject->getDocument('users', $userId));
 
@@ -236,12 +220,6 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         ?: $userFromRequest->tokenVerify(null, $secret, $proofForCode);
 
     if (!$verifiedToken) {
-        // Could mean invalid/expired JWT, or expired secret
-        throw new Exception(Exception::USER_INVALID_TOKEN);
-    }
-
-    // OAuth2 tokens must have a provider from the JWT
-    if ($verifiedToken->getAttribute('type') === TOKEN_TYPE_OAUTH2 && $oauthProvider === null) {
         throw new Exception(Exception::USER_INVALID_TOKEN);
     }
 
@@ -267,7 +245,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         TOKEN_TYPE_INVITE => SESSION_PROVIDER_EMAIL,
         TOKEN_TYPE_MAGIC_URL => SESSION_PROVIDER_MAGIC_URL,
         TOKEN_TYPE_PHONE => SESSION_PROVIDER_PHONE,
-        TOKEN_TYPE_OAUTH2 => $oauthProvider,
+        TOKEN_TYPE_OAUTH2 => SESSION_PROVIDER_OAUTH2,
         default => SESSION_PROVIDER_TOKEN,
     };
     $session = new Document(array_merge(
@@ -310,10 +288,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
     }
 
     try {
-        $dbForProject->updateDocument('users', $user->getId(), new Document([
-            'emailVerification' => $user->getAttribute('emailVerification'),
-            'phoneVerification' => $user->getAttribute('phoneVerification'),
-        ]));
+        $dbForProject->updateDocument('users', $user->getId(), $user);
     } catch (\Throwable $th) {
         throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed saving user to DB');
     }
@@ -1057,11 +1032,7 @@ Http::post('/v1/account/sessions/email')
                 ->setAttribute('password', $proofForPasswordUpdated->hash($password))
                 ->setAttribute('hash', $proofForPasswordUpdated->getHash()->getName())
                 ->setAttribute('hashOptions', $proofForPasswordUpdated->getHash()->getOptions());
-            $dbForProject->updateDocument('users', $user->getId(), new Document([
-                'password' => $user->getAttribute('password'),
-                'hash' => $user->getAttribute('hash'),
-                'hashOptions' => $user->getAttribute('hashOptions'),
-            ]));
+            $dbForProject->updateDocument('users', $user->getId(), $user);
         }
 
         $dbForProject->purgeCachedDocument('users', $user->getId());
@@ -1851,11 +1822,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                 ->setAttribute('providerAccessToken', $accessToken)
                 ->setAttribute('providerRefreshToken', $refreshToken)
                 ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int) $accessTokenExpiry));
-            $dbForProject->updateDocument('identities', $identity->getId(), new Document([
-                'providerAccessToken' => $identity->getAttribute('providerAccessToken'),
-                'providerRefreshToken' => $identity->getAttribute('providerRefreshToken'),
-                'providerAccessTokenExpiry' => $identity->getAttribute('providerAccessTokenExpiry'),
-            ]));
+            $dbForProject->updateDocument('identities', $identity->getId(), $identity);
         }
 
         if (empty($user->getAttribute('email'))) {
@@ -1921,12 +1888,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                 ->setParam('tokenId', $token->getId())
             ;
 
-            // Wrap secret in a JWT that also carries the provider name
-            $jwtEncoder = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 60, 0);
-            $query['secret'] = $jwtEncoder->encode([
-                'secret' => $secret,
-                'provider' => $provider,
-            ]);
+            $query['secret'] = $secret;
             $query['userId'] = $user->getId();
 
             // If the `token` param is not set, we persist the session in a cookie
@@ -1998,10 +1960,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                     ->setAttribute('sessionId', $session->getId())
                     ->setAttribute('sessionInternalId', $session->getSequence());
 
-                $dbForProject->updateDocument('targets', $target->getId(), new Document([
-                    'sessionId' => $target->getAttribute('sessionId'),
-                    'sessionInternalId' => $target->getAttribute('sessionInternalId'),
-                ]));
+                $dbForProject->updateDocument('targets', $target->getId(), $target);
             }
         }
 
@@ -2828,12 +2787,12 @@ Http::post('/v1/account/tokens/phone')
     ->inject('queueForMessaging')
     ->inject('locale')
     ->inject('timelimit')
-    ->inject('usage')
+    ->inject('queueForStatsUsage')
     ->inject('plan')
     ->inject('store')
     ->inject('proofForCode')
     ->inject('authorization')
-    ->action(function (string $userId, string $phone, Request $request, Response $response, User $user, Document $project, array $platform, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Locale $locale, callable $timelimit, Context $usage, array $plan, Store $store, ProofsCode $proofForCode, Authorization $authorization) {
+    ->action(function (string $userId, string $phone, Request $request, Response $response, User $user, Document $project, array $platform, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Locale $locale, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan, Store $store, ProofsCode $proofForCode, Authorization $authorization) {
         if (empty(System::getEnv('_APP_SMS_PROVIDER'))) {
             throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
         }
@@ -2982,12 +2941,16 @@ Http::post('/v1/account/tokens/phone')
                 $countryCode = $helper->parse($phone)->getCountryCode();
 
                 if (!empty($countryCode)) {
-                    $usage->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
+                    $queueForStatsUsage
+                        ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                 }
             } catch (NumberParseException $e) {
                 // Ignore invalid phone number for country code stats
             }
-            $usage->addMetric(METRIC_AUTH_METHOD_PHONE, 1);
+            $queueForStatsUsage
+                ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
+                ->setProject($project)
+                ->trigger();
         }
 
         $token->setAttribute('secret', $secret);
@@ -3182,9 +3145,7 @@ Http::patch('/v1/account/name')
 
         $user->setAttribute('name', $name);
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document([
-            'name' => $user->getAttribute('name'),
-        ]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -3837,15 +3798,13 @@ Http::put('/v1/account/recovery')
 
         $hooks->trigger('passwordValidator', [$dbForProject, $project, $password, &$user, true]);
 
-        $profile = $dbForProject->updateDocument('users', $profile->getId(), new Document(
-            [
-                'password' => $newPassword,
-                'passwordHistory' => $history,
-                'passwordUpdate' => DateTime::now(),
-                'hash' => $proofForPassword->getHash()->getName(),
-                'hashOptions' => $proofForPassword->getHash()->getOptions(),
-                'emailVerification' => true]
-        ));
+        $profile = $dbForProject->updateDocument('users', $profile->getId(), $profile
+                ->setAttribute('password', $newPassword)
+                ->setAttribute('passwordHistory', $history)
+                ->setAttribute('passwordUpdate', DateTime::now())
+                ->setAttribute('hash', $proofForPassword->getHash()->getName())
+                ->setAttribute('hashOptions', $proofForPassword->getHash()->getOptions())
+                ->setAttribute('emailVerification', true));
 
         $user->setAttributes($profile->getArrayCopy());
 
@@ -4167,7 +4126,7 @@ Http::put('/v1/account/verifications/email')
 
         $authorization->addRole(Role::user($profile->getId())->toString());
 
-        $profile = $dbForProject->updateDocument('users', $profile->getId(), new Document(['emailVerification' => true]));
+        $profile = $dbForProject->updateDocument('users', $profile->getId(), $profile->setAttribute('emailVerification', true));
 
         $user->setAttributes($profile->getArrayCopy());
 
@@ -4222,11 +4181,11 @@ Http::post('/v1/account/verifications/phone')
     ->inject('project')
     ->inject('locale')
     ->inject('timelimit')
-    ->inject('usage')
+    ->inject('queueForStatsUsage')
     ->inject('plan')
     ->inject('proofForCode')
                 ->inject('authorization')
-    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Document $project, Locale $locale, callable $timelimit, Context $usage, array $plan, ProofsCode $proofForCode, Authorization $authorization) {
+    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Document $project, Locale $locale, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan, ProofsCode $proofForCode, Authorization $authorization) {
         if (empty(System::getEnv('_APP_SMS_PROVIDER'))) {
             throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
         }
@@ -4311,12 +4270,16 @@ Http::post('/v1/account/verifications/phone')
                 $countryCode = $helper->parse($phone)->getCountryCode();
 
                 if (!empty($countryCode)) {
-                    $usage->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
+                    $queueForStatsUsage
+                        ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                 }
             } catch (NumberParseException $e) {
                 // Ignore invalid phone number for country code stats
             }
-            $usage->addMetric(METRIC_AUTH_METHOD_PHONE, 1);
+            $queueForStatsUsage
+                ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
+                ->setProject($project)
+                ->trigger();
         }
 
         $verification->setAttribute('secret', $secret);
@@ -4379,7 +4342,7 @@ Http::put('/v1/account/verifications/phone')
 
         $authorization->addRole(Role::user($profile->getId())->toString());
 
-        $profile = $dbForProject->updateDocument('users', $profile->getId(), new Document(['phoneVerification' => true]));
+        $profile = $dbForProject->updateDocument('users', $profile->getId(), $profile->setAttribute('phoneVerification', true));
 
         $user->setAttributes($profile->getArrayCopy());
 
@@ -4537,11 +4500,7 @@ Http::put('/v1/account/targets/:targetId/push')
 
         $target->setAttribute('name', "{$device['deviceBrand']} {$device['deviceModel']}");
 
-        $target = $dbForProject->updateDocument('targets', $target->getId(), new Document([
-            'identifier' => $target->getAttribute('identifier'),
-            'expired' => $target->getAttribute('expired'),
-            'name' => $target->getAttribute('name'),
-        ]));
+        $target = $dbForProject->updateDocument('targets', $target->getId(), $target);
 
         $dbForProject->purgeCachedDocument('users', $user->getId());
 

app/controllers/api/graphql.php

@@ -28,18 +28,12 @@ use Utopia\Validator\Text;
 Http::init()
     ->groups(['graphql'])
     ->inject('project')
-    ->inject('user')
-    ->inject('request')
-    ->inject('response')
     ->inject('authorization')
-    ->action(function (Document $project, User $user, Request $request, Response $response, Authorization $authorization) {
-        $response->setUser($user);
-        $request->setUser($user);
-
+    ->action(function (Document $project, Authorization $authorization) {
         if (
             array_key_exists('graphql', $project->getAttribute('apis', []))
             && !$project->getAttribute('apis', [])['graphql']
-            && !($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
         ) {
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
         }

app/controllers/api/messaging.php

@@ -8,6 +8,7 @@ use Appwrite\Event\Event;
 use Appwrite\Event\Messaging;
 use Appwrite\Extend\Exception;
 use Appwrite\Messaging\Status as MessageStatus;
+use Appwrite\Network\Validator\Email;
 use Appwrite\Permission;
 use Appwrite\Role;
 use Appwrite\SDK\AuthType;
@@ -42,7 +43,6 @@ use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\Roles;
 use Utopia\Database\Validator\UID;
-use Utopia\Emails\Validator\Email;
 use Utopia\Http\Http;
 use Utopia\Locale\Locale;
 use Utopia\System\System;

app/controllers/api/migrations.php

@@ -43,16 +43,6 @@ use Utopia\Validator\WhiteList;
 
 include_once __DIR__ . '/../shared/api.php';
 
-function getDatabaseTransferResourceServices(string $databaseType)
-{
-    return match($databaseType) {
-        DATABASE_TYPE_LEGACY,
-        DATABASE_TYPE_TABLESDB => Transfer::GROUP_DATABASES_TABLES_DB,
-        DATABASE_TYPE_VECTORSDB => Transfer::GROUP_DATABASES_VECTOR_DB,
-        DATABASE_TYPE_DOCUMENTSDB => Transfer::GROUP_DATABASES_DOCUMENTS_DB
-    };
-}
-
 Http::post('/v1/migrations/appwrite')
     ->groups(['api', 'migrations'])
     ->desc('Create Appwrite migration')
@@ -437,16 +427,8 @@ Http::post('/v1/migrations/csv/imports')
             throw new \Exception('Unable to copy file');
         }
 
-        // getting databasetype
-        $resources = explode(':', $resourceId);
-        $databaseId = $resources[0];
-        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
-        $databaseType = $database->getAttribute('type');
-        if (!in_array($databaseType, CSV_ALLOWED_DATABASE_TYPES)) {
-            throw new Exception(Exception::MIGRATION_DATABASE_TYPE_UNSUPPORTED, 'Database type not supported for csv');
-        }
         $fileSize = $deviceForMigrations->getFileSize($newPath);
-        $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
+        $resources = Transfer::extractServices([Transfer::GROUP_DATABASES]);
 
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => $migrationId,
@@ -575,23 +557,13 @@ Http::post('/v1/migrations/csv/exports')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
         }
 
-        // getting databasetype
-        $resources = explode(':', $resourceId);
-        $databaseId = $resources[0];
-        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
-        $databaseType = $database->getAttribute('type');
-        if (!in_array($databaseType, CSV_ALLOWED_DATABASE_TYPES)) {
-            throw new Exception(Exception::MIGRATION_DATABASE_TYPE_UNSUPPORTED, 'Database type not supported for csv');
-        }
-        $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
-
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
             'stage' => 'init',
             'source' => Appwrite::getName(),
             'destination' => CSV::getName(),
-            'resources' => $resources,
+            'resources' => Transfer::extractServices([Transfer::GROUP_DATABASES]),
             'resourceId' => $resourceId,
             'resourceType' => Resource::TYPE_DATABASE,
             'statusCounters' => '{}',
@@ -741,17 +713,26 @@ Http::get('/v1/migrations/appwrite/report')
     ->param('projectID', '', new Text(512), "Source's Project ID")
     ->param('key', '', new Text(512), "Source's API Key")
     ->inject('response')
-    ->inject('getDatabasesDB')
-    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response, callable $getDatabasesDB) {
+    ->inject('dbForProject')
+    ->inject('project')
+    ->inject('user')
+    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
+
+        $appwrite = new Appwrite($projectID, $endpoint, $key);
 
         try {
-            $appwrite = new Appwrite($projectID, $endpoint, $key, $getDatabasesDB);
             $report = $appwrite->report($resources);
         } catch (\Throwable $e) {
-            throw new Exception(
-                Exception::MIGRATION_PROVIDER_ERROR,
-                'Unable to connect to the migration source. Please verify your credentials and ensure the source is reachable from this server. Check for network restrictions such as firewalls, IP allowlists, or outbound connectivity limits.'
-            );
+            switch ($e->getCode()) {
+                case 401:
+                    throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, 'Source Error: ' . $e->getMessage());
+                case 429:
+                    throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Source Error: Rate Limit Exceeded, Is your Cloud Provider blocking Appwrite\'s IP?');
+                case 500:
+                    throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
+            }
+
+            throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
         }
 
         $response
@@ -790,14 +771,21 @@ Http::get('/v1/migrations/firebase/report')
             throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Invalid Service Account JSON');
         }
 
+        $firebase = new Firebase($serviceAccount);
+
         try {
-            $firebase = new Firebase($serviceAccount);
             $report = $firebase->report($resources);
         } catch (\Throwable $e) {
-            throw new Exception(
-                Exception::MIGRATION_PROVIDER_ERROR,
-                'Unable to connect to the migration source. Please verify your credentials and ensure the source is reachable from this server. Check for network restrictions such as firewalls, IP allowlists, or outbound connectivity limits.'
-            );
+            switch ($e->getCode()) {
+                case 401:
+                    throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, 'Source Error: ' . $e->getMessage());
+                case 429:
+                    throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Source Error: Rate Limit Exceeded, Is your Cloud Provider blocking Appwrite\'s IP?');
+                case 500:
+                    throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
+            }
+
+            throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
         }
 
         $response
@@ -832,14 +820,21 @@ Http::get('/v1/migrations/supabase/report')
     ->inject('response')
     ->inject('dbForProject')
     ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response) {
+        $supabase = new Supabase($endpoint, $apiKey, $databaseHost, 'postgres', $username, $password, $port);
+
         try {
-            $supabase = new Supabase($endpoint, $apiKey, $databaseHost, 'postgres', $username, $password, $port);
             $report = $supabase->report($resources);
         } catch (\Throwable $e) {
-            throw new Exception(
-                Exception::MIGRATION_PROVIDER_ERROR,
-                'Unable to connect to the migration source. Please verify your credentials and ensure the source is reachable from this server. Check for network restrictions such as firewalls, IP allowlists, or outbound connectivity limits.'
-            );
+            switch ($e->getCode()) {
+                case 401:
+                    throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, 'Source Error: ' . $e->getMessage());
+                case 429:
+                    throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Source Error: Rate Limit Exceeded, Is your Cloud Provider blocking Appwrite\'s IP?');
+                case 500:
+                    throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
+            }
+
+            throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
         }
 
         $response
@@ -874,14 +869,21 @@ Http::get('/v1/migrations/nhost/report')
     ->param('port', 5432, new Integer(true), 'Source\'s Database Port.', true)
     ->inject('response')
     ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response) {
+        $nhost = new NHost($subdomain, $region, $adminSecret, $database, $username, $password, $port);
+
         try {
-            $nhost = new NHost($subdomain, $region, $adminSecret, $database, $username, $password, $port);
             $report = $nhost->report($resources);
         } catch (\Throwable $e) {
-            throw new Exception(
-                Exception::MIGRATION_PROVIDER_ERROR,
-                'Unable to connect to the migration source. Please verify your credentials and ensure the source is reachable from this server. Check for network restrictions such as firewalls, IP allowlists, or outbound connectivity limits.'
-            );
+            switch ($e->getCode()) {
+                case 401:
+                    throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, 'Source Error: ' . $e->getMessage());
+                case 429:
+                    throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Source Error: Rate Limit Exceeded, Is your Cloud Provider blocking Appwrite\'s IP?');
+                case 500:
+                    throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
+            }
+
+            throw new Exception(Exception::MIGRATION_PROVIDER_ERROR, 'Source Error: ' . $e->getMessage());
         }
 
         $response

app/controllers/api/project.php

@@ -1,15 +1,25 @@
 <?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\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate as DuplicateException;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
+use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DateTimeValidator;
+use Utopia\Database\Validator\UID;
 use Utopia\Http\Http;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Nullable;
+use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
 Http::get('/v1/project/usage')
@@ -52,33 +62,16 @@ Http::get('/v1/project/usage')
                 METRIC_EXECUTIONS_MB_SECONDS,
                 METRIC_BUILDS_MB_SECONDS,
                 METRIC_DOCUMENTS,
-                METRIC_DOCUMENTS_DOCUMENTSDB,
                 METRIC_DATABASES,
-                METRIC_DATABASES_DOCUMENTSDB,
                 METRIC_USERS,
                 METRIC_BUCKETS,
                 METRIC_FILES_STORAGE,
                 METRIC_DATABASES_STORAGE,
-                METRIC_DATABASES_STORAGE_DOCUMENTSDB,
                 METRIC_DEPLOYMENTS_STORAGE,
                 METRIC_BUILDS_STORAGE,
                 METRIC_DATABASES_OPERATIONS_READS,
-                METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB,
                 METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB,
                 METRIC_FILES_IMAGES_TRANSFORMED,
-                // VectorsDB totals
-                METRIC_DATABASES_VECTORSDB,
-                METRIC_COLLECTIONS_VECTORSDB,
-                METRIC_DOCUMENTS_VECTORSDB,
-                METRIC_DATABASES_STORAGE_VECTORSDB,
-                METRIC_DATABASES_OPERATIONS_READS_VECTORSDB,
-                METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB,
-                // Embeddings totals
-                METRIC_EMBEDDINGS_TEXT,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR
             ],
             'period' => [
                 METRIC_NETWORK_REQUESTS,
@@ -87,26 +80,11 @@ Http::get('/v1/project/usage')
                 METRIC_USERS,
                 METRIC_EXECUTIONS,
                 METRIC_DATABASES_STORAGE,
-                METRIC_DATABASES_STORAGE_DOCUMENTSDB,
                 METRIC_EXECUTIONS_MB_SECONDS,
                 METRIC_BUILDS_MB_SECONDS,
                 METRIC_DATABASES_OPERATIONS_READS,
-                METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB,
                 METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB,
                 METRIC_FILES_IMAGES_TRANSFORMED,
-                // VectorsDB time series
-                METRIC_DATABASES_VECTORSDB,
-                METRIC_COLLECTIONS_VECTORSDB,
-                METRIC_DOCUMENTS_VECTORSDB,
-                METRIC_DATABASES_STORAGE_VECTORSDB,
-                METRIC_DATABASES_OPERATIONS_READS_VECTORSDB,
-                METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB,
-                // Embeddings time series
-                METRIC_EMBEDDINGS_TEXT,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR
             ]
         ];
 
@@ -379,11 +357,8 @@ Http::get('/v1/project/usage')
             'buildsMbSecondsTotal' => $total[METRIC_BUILDS_MB_SECONDS],
             'documentsTotal' => $total[METRIC_DOCUMENTS],
             'rowsTotal' => $total[METRIC_DOCUMENTS],
-            'documentsdbDocumentsTotal' => $total[METRIC_DOCUMENTS_DOCUMENTSDB],
             'databasesTotal' => $total[METRIC_DATABASES],
-            'documentsdbTotal' => $total[METRIC_DATABASES_DOCUMENTSDB],
             'databasesStorageTotal' => $total[METRIC_DATABASES_STORAGE],
-            'documentsdbDatabasesStorageTotal' => $total[METRIC_DATABASES_STORAGE_DOCUMENTSDB],
             'usersTotal' => $total[METRIC_USERS],
             'bucketsTotal' => $total[METRIC_BUCKETS],
             'filesStorageTotal' => $total[METRIC_FILES_STORAGE],
@@ -392,27 +367,10 @@ Http::get('/v1/project/usage')
             'deploymentsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE],
             'databasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS],
             'databasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES],
-            'documentsdbDatabasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB],
-            'documentsdbDatabasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB],
-            'vectorsdbDatabasesTotal' => $total[METRIC_DATABASES_VECTORSDB] ?? 0,
-            'vectorsdbCollectionsTotal' => $total[METRIC_COLLECTIONS_VECTORSDB] ?? 0,
-            'vectorsdbDocumentsTotal' => $total[METRIC_DOCUMENTS_VECTORSDB] ?? 0,
-            'vectorsdbDatabasesStorageTotal' => $total[METRIC_DATABASES_STORAGE_VECTORSDB] ?? 0,
-            'vectorsdbDatabasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS_VECTORSDB] ?? 0,
-            'vectorsdbDatabasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB] ?? 0,
             'executionsBreakdown' => $executionsBreakdown,
             'bucketsBreakdown' => $bucketsBreakdown,
             'databasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS],
             'databasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES],
-            'documentsdbDatabasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB],
-            'documentsdbDatabasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB],
-            'documentsdbDatabasesStorage' => $usage[METRIC_DATABASES_STORAGE_DOCUMENTSDB],
-            'vectorsdbDatabases' => $usage[METRIC_DATABASES_VECTORSDB] ?? [],
-            'vectorsdbCollections' => $usage[METRIC_COLLECTIONS_VECTORSDB] ?? [],
-            'vectorsdbDocuments' => $usage[METRIC_DOCUMENTS_VECTORSDB] ?? [],
-            'vectorsdbDatabasesStorage' => $usage[METRIC_DATABASES_STORAGE_VECTORSDB] ?? [],
-            'vectorsdbDatabasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS_VECTORSDB] ?? [],
-            'vectorsdbDatabasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB] ?? [],
             'databasesStorageBreakdown' => $databasesStorageBreakdown,
             'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
             'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
@@ -422,13 +380,230 @@ Http::get('/v1/project/usage')
             'authPhoneCountryBreakdown' => $authPhoneCountryBreakdown,
             'imageTransformations' => $usage[METRIC_FILES_IMAGES_TRANSFORMED],
             'imageTransformationsTotal' => $total[METRIC_FILES_IMAGES_TRANSFORMED],
-            'embeddingsText' => $usage[METRIC_EMBEDDINGS_TEXT] ?? [],
-            'embeddingsTextTokens' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS] ?? [],
-            'embeddingsTextDuration' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION] ?? [],
-            'embeddingsTextErrors' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR] ?? [],
-            'embeddingsTextTotal' => $total[METRIC_EMBEDDINGS_TEXT] ?? 0,
-            'embeddingsTextTokensTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS] ?? 0,
-            'embeddingsTextDurationTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION] ?? 0,
-            'embeddingsTextErrorsTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR] ?? 0,
         ]), Response::MODEL_USAGE_PROJECT);
     });
+
+
+// Variables
+Http::post('/v1/project/variables')
+    ->desc('Create variable')
+    ->groups(['api'])
+    ->label('scope', 'projects.write')
+    ->label('audits.event', 'variable.create')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'createVariable',
+        description: '/docs/references/project/create-variable.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_CREATED,
+                model: Response::MODEL_VARIABLE,
+            )
+        ]
+    ))
+    ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
+    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
+    ->param('secret', true, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
+    ->inject('project')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('dbForPlatform')
+    ->action(function (string $key, string $value, bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+        $variableId = ID::unique();
+
+        $variable = new Document([
+            '$id' => $variableId,
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::any()),
+                Permission::delete(Role::any()),
+            ],
+            'resourceInternalId' => '',
+            'resourceId' => '',
+            'resourceType' => 'project',
+            'key' => $key,
+            'value' => $value,
+            'secret' => $secret,
+            'search' => implode(' ', [$variableId, $key, 'project']),
+        ]);
+
+        try {
+            $variable = $dbForProject->createDocument('variables', $variable);
+        } catch (DuplicateException $th) {
+            throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
+        }
+
+        $functions = $dbForProject->find('functions', [
+            Query::limit(APP_LIMIT_SUBQUERY)
+        ]);
+
+        foreach ($functions as $function) {
+            $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+        }
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($variable, Response::MODEL_VARIABLE);
+    });
+
+Http::get('/v1/project/variables')
+    ->desc('List variables')
+    ->groups(['api'])
+    ->label('scope', 'projects.read')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'listVariables',
+        description: '/docs/references/project/list-variables.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_VARIABLE_LIST,
+            )
+        ]
+    ))
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (Response $response, Database $dbForProject) {
+        $variables = $dbForProject->find('variables', [
+            Query::equal('resourceType', ['project']),
+            Query::limit(APP_LIMIT_SUBQUERY)
+        ]);
+
+        $response->dynamic(new Document([
+            'variables' => $variables,
+            'total' => \count($variables),
+        ]), Response::MODEL_VARIABLE_LIST);
+    });
+
+Http::get('/v1/project/variables/:variableId')
+    ->desc('Get variable')
+    ->groups(['api'])
+    ->label('scope', 'projects.read')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'getVariable',
+        description: '/docs/references/project/get-variable.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_VARIABLE,
+            )
+        ]
+    ))
+    ->param('variableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Variable unique ID.', false, ['dbForProject'])
+    ->inject('response')
+    ->inject('project')
+    ->inject('dbForProject')
+    ->action(function (string $variableId, Response $response, Document $project, Database $dbForProject) {
+        $variable = $dbForProject->getDocument('variables', $variableId);
+        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
+            throw new Exception(Exception::VARIABLE_NOT_FOUND);
+        }
+
+        $response->dynamic($variable, Response::MODEL_VARIABLE);
+    });
+
+Http::put('/v1/project/variables/:variableId')
+    ->desc('Update variable')
+    ->groups(['api'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'updateVariable',
+        description: '/docs/references/project/update-variable.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_VARIABLE,
+            )
+        ]
+    ))
+    ->param('variableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Variable unique ID.', false, ['dbForProject'])
+    ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
+    ->param('value', null, new Nullable(new Text(8192, 0)), 'Variable value. Max length: 8192 chars.', true)
+    ->param('secret', null, new Nullable(new Boolean()), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
+    ->inject('project')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('dbForPlatform')
+    ->action(function (string $variableId, string $key, ?string $value, ?bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+        $variable = $dbForProject->getDocument('variables', $variableId);
+        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
+            throw new Exception(Exception::VARIABLE_NOT_FOUND);
+        }
+
+        if ($variable->getAttribute('secret') === true && $secret === false) {
+            throw new Exception(Exception::VARIABLE_CANNOT_UNSET_SECRET);
+        }
+
+        $variable
+            ->setAttribute('key', $key)
+            ->setAttribute('value', $value ?? $variable->getAttribute('value'))
+            ->setAttribute('secret', $secret ?? $variable->getAttribute('secret'))
+            ->setAttribute('search', implode(' ', [$variableId, $key, 'project']));
+
+        try {
+            $dbForProject->updateDocument('variables', $variable->getId(), $variable);
+        } catch (DuplicateException $th) {
+            throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
+        }
+
+        $functions = $dbForProject->find('functions', [
+            Query::limit(APP_LIMIT_SUBQUERY)
+        ]);
+
+        foreach ($functions as $function) {
+            $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+        }
+
+        $response->dynamic($variable, Response::MODEL_VARIABLE);
+    });
+
+Http::delete('/v1/project/variables/:variableId')
+    ->desc('Delete variable')
+    ->groups(['api'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'deleteVariable',
+        description: '/docs/references/project/delete-variable.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_NOCONTENT,
+                model: Response::MODEL_NONE,
+            )
+        ],
+        contentType: ContentType::NONE
+    ))
+    ->param('variableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Variable unique ID.', false, ['dbForProject'])
+    ->inject('project')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (string $variableId, Document $project, Response $response, Database $dbForProject) {
+        $variable = $dbForProject->getDocument('variables', $variableId);
+        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
+            throw new Exception(Exception::VARIABLE_NOT_FOUND);
+        }
+
+        $dbForProject->deleteDocument('variables', $variable->getId());
+
+        $functions = $dbForProject->find('functions', [
+            Query::limit(APP_LIMIT_SUBQUERY)
+        ]);
+
+        foreach ($functions as $function) {
+            $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+        }
+
+        $response->noContent();
+    });

app/controllers/api/projects.php

@@ -4,8 +4,10 @@ use Ahc\Jwt\JWT;
 use Appwrite\Auth\Validator\MockNumber;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Mail;
+use Appwrite\Event\Validator\Event;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Platform;
+use Appwrite\Network\Validator\Email;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Deprecated;
@@ -28,7 +30,7 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Datetime as DatetimeValidator;
 use Utopia\Database\Validator\Query\Cursor;
 use Utopia\Database\Validator\UID;
-use Utopia\Emails\Validator\Email;
+use Utopia\Domains\Validator\PublicDomain;
 use Utopia\Http\Http;
 use Utopia\Locale\Locale;
 use Utopia\System\System;
@@ -36,9 +38,11 @@ use Utopia\Validator\ArrayList;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Hostname;
 use Utopia\Validator\Integer;
+use Utopia\Validator\Multiple;
 use Utopia\Validator\Nullable;
 use Utopia\Validator\Range;
 use Utopia\Validator\Text;
+use Utopia\Validator\URL;
 use Utopia\Validator\WhiteList;
 
 Http::init()
@@ -769,6 +773,312 @@ Http::delete('/v1/projects/:projectId')
         $response->noContent();
     });
 
+// Webhooks
+
+Http::post('/v1/projects/:projectId/webhooks')
+    ->desc('Create webhook')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'webhooks',
+        name: 'createWebhook',
+        description: '/docs/references/projects/create-webhook.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_CREATED,
+                model: Response::MODEL_WEBHOOK,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('name', null, new Text(128), 'Webhook name. Max length: 128 chars.')
+    ->param('enabled', true, new Boolean(true), 'Enable or disable a webhook.', true)
+    ->param('events', null, new ArrayList(new Event(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
+    ->param('url', '', fn ($request) => new Multiple([new URL(['http', 'https']), new PublicDomain()], Multiple::TYPE_STRING), 'Webhook URL.', false, ['request'])
+    ->param('security', false, new Boolean(true), 'Certificate verification, false for disabled or true for enabled.')
+    ->param('httpUser', '', new Text(256), 'Webhook HTTP user. Max length: 256 chars.', true)
+    ->param('httpPass', '', new Text(256), 'Webhook HTTP password. Max length: 256 chars.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $name, bool $enabled, array $events, string $url, bool $security, string $httpUser, string $httpPass, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $security = (bool) filter_var($security, FILTER_VALIDATE_BOOLEAN);
+
+        $webhook = new Document([
+            '$id' => ID::unique(),
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::any()),
+                Permission::delete(Role::any()),
+            ],
+            'projectInternalId' => $project->getSequence(),
+            'projectId' => $project->getId(),
+            'name' => $name,
+            'events' => $events,
+            'url' => $url,
+            'security' => $security,
+            'httpUser' => $httpUser,
+            'httpPass' => $httpPass,
+            'signatureKey' => \bin2hex(\random_bytes(64)),
+            'enabled' => $enabled,
+        ]);
+
+        $webhook = $dbForPlatform->createDocument('webhooks', $webhook);
+
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($webhook, Response::MODEL_WEBHOOK);
+    });
+
+Http::get('/v1/projects/:projectId/webhooks')
+    ->desc('List webhooks')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.read')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'webhooks',
+        name: 'listWebhooks',
+        description: '/docs/references/projects/list-webhooks.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_WEBHOOK_LIST,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, bool $includeTotal, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $webhooks = $dbForPlatform->find('webhooks', [
+            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::limit(5000),
+        ]);
+
+        $response->dynamic(new Document([
+            'webhooks' => $webhooks,
+            'total' => $includeTotal ? count($webhooks) : 0,
+        ]), Response::MODEL_WEBHOOK_LIST);
+    });
+
+Http::get('/v1/projects/:projectId/webhooks/:webhookId')
+    ->desc('Get webhook')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.read')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'webhooks',
+        name: 'getWebhook',
+        description: '/docs/references/projects/get-webhook.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_WEBHOOK,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForPlatform'])
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $webhook = $dbForPlatform->findOne('webhooks', [
+            Query::equal('$id', [$webhookId]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($webhook->isEmpty()) {
+            throw new Exception(Exception::WEBHOOK_NOT_FOUND);
+        }
+
+        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
+    });
+
+Http::put('/v1/projects/:projectId/webhooks/:webhookId')
+    ->desc('Update webhook')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'webhooks',
+        name: 'updateWebhook',
+        description: '/docs/references/projects/update-webhook.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_WEBHOOK,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForPlatform'])
+    ->param('name', null, new Text(128), 'Webhook name. Max length: 128 chars.')
+    ->param('enabled', true, new Boolean(true), 'Enable or disable a webhook.', true)
+    ->param('events', null, new ArrayList(new Event(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
+    ->param('url', '', fn ($request) => new Multiple([new URL(['http', 'https']), new PublicDomain()], Multiple::TYPE_STRING), 'Webhook URL.', false, ['request'])
+    ->param('security', false, new Boolean(true), 'Certificate verification, false for disabled or true for enabled.')
+    ->param('httpUser', '', new Text(256), 'Webhook HTTP user. Max length: 256 chars.', true)
+    ->param('httpPass', '', new Text(256), 'Webhook HTTP password. Max length: 256 chars.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $webhookId, string $name, bool $enabled, array $events, string $url, bool $security, string $httpUser, string $httpPass, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $security = ($security === '1' || $security === 'true' || $security === 1 || $security === true);
+
+        $webhook = $dbForPlatform->findOne('webhooks', [
+            Query::equal('$id', [$webhookId]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($webhook->isEmpty()) {
+            throw new Exception(Exception::WEBHOOK_NOT_FOUND);
+        }
+
+        $webhook
+            ->setAttribute('name', $name)
+            ->setAttribute('events', $events)
+            ->setAttribute('url', $url)
+            ->setAttribute('security', $security)
+            ->setAttribute('httpUser', $httpUser)
+            ->setAttribute('httpPass', $httpPass)
+            ->setAttribute('enabled', $enabled);
+
+        if ($enabled) {
+            $webhook->setAttribute('attempts', 0);
+        }
+
+        $dbForPlatform->updateDocument('webhooks', $webhook->getId(), $webhook);
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
+    });
+
+Http::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
+    ->desc('Update webhook signature key')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'webhooks',
+        name: 'updateWebhookSignature',
+        description: '/docs/references/projects/update-webhook-signature.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_WEBHOOK,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForPlatform'])
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $webhook = $dbForPlatform->findOne('webhooks', [
+            Query::equal('$id', [$webhookId]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($webhook->isEmpty()) {
+            throw new Exception(Exception::WEBHOOK_NOT_FOUND);
+        }
+
+        $webhook->setAttribute('signatureKey', \bin2hex(\random_bytes(64)));
+
+        $dbForPlatform->updateDocument('webhooks', $webhook->getId(), $webhook);
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
+    });
+
+Http::delete('/v1/projects/:projectId/webhooks/:webhookId')
+    ->desc('Delete webhook')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'webhooks',
+        name: 'deleteWebhook',
+        description: '/docs/references/projects/delete-webhook.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_NOCONTENT,
+                model: Response::MODEL_NONE,
+            )
+        ],
+        contentType: ContentType::NONE
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForPlatform'])
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $webhook = $dbForPlatform->findOne('webhooks', [
+            Query::equal('$id', [$webhookId]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($webhook->isEmpty()) {
+            throw new Exception(Exception::WEBHOOK_NOT_FOUND);
+        }
+
+        $dbForPlatform->deleteDocument('webhooks', $webhook->getId());
+
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response->noContent();
+    });
+
 // Keys
 
 Http::post('/v1/projects/:projectId/keys')

app/controllers/api/users.php

@@ -15,6 +15,7 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
 use Appwrite\Hooks\Hooks;
+use Appwrite\Network\Validator\Email as EmailValidator;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Deprecated;
@@ -59,7 +60,6 @@ use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\UID;
 use Utopia\Emails\Email;
-use Utopia\Emails\Validator\Email as EmailValidator;
 use Utopia\Http\Http;
 use Utopia\Locale\Locale;
 use Utopia\System\System;
@@ -1161,7 +1161,7 @@ Http::patch('/v1/users/:userId/status')
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document(['status' => (bool) $status]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('status', (bool) $status));
 
         $queueForEvents
             ->setParam('userId', $user->getId());
@@ -1204,48 +1204,7 @@ Http::put('/v1/users/:userId/labels')
 
         $user->setAttribute('labels', (array) \array_values(\array_unique($labels)));
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document(['labels' => $user->getAttribute('labels')]));
-
-        $queueForEvents
-            ->setParam('userId', $user->getId());
-
-        $response->dynamic($user, Response::MODEL_USER);
-    });
-
-Http::patch('/v1/users/:userId/impersonator')
-    ->desc('Update user impersonator capability')
-    ->groups(['api', 'users'])
-    ->label('event', 'users.[userId].update.impersonator')
-    ->label('scope', 'users.write')
-    ->label('audits.event', 'user.update')
-    ->label('audits.resource', 'user/{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'users',
-        group: 'users',
-        name: 'updateImpersonator',
-        description: '/docs/references/users/update-user-impersonator.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_USER,
-            )
-        ]
-    ))
-    ->param('userId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'User ID.', false, ['dbForProject'])
-    ->param('impersonator', false, new Boolean(true), 'Whether the user can impersonate other users. When true, the user can browse project users to choose a target and can pass impersonation headers to act as that user. Internal audit logs still attribute impersonated actions to the original impersonator and store the target user details only in internal audit payload data.')
-    ->inject('response')
-    ->inject('dbForProject')
-    ->inject('queueForEvents')
-    ->action(function (string $userId, bool $impersonator, Response $response, Database $dbForProject, Event $queueForEvents) {
-
-        $user = $dbForProject->getDocument('users', $userId);
-
-        if ($user->isEmpty()) {
-            throw new Exception(Exception::USER_NOT_FOUND);
-        }
-
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document(['impersonator' => $impersonator]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents
             ->setParam('userId', $user->getId());
@@ -1286,7 +1245,7 @@ Http::patch('/v1/users/:userId/verification/phone')
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document(['phoneVerification' => $phoneVerification]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('phoneVerification', $phoneVerification));
 
         $queueForEvents
             ->setParam('userId', $user->getId());
@@ -1330,7 +1289,7 @@ Http::patch('/v1/users/:userId/name')
 
         $user->setAttribute('name', $name);
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document(['name' => $user->getAttribute('name')]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -1385,10 +1344,7 @@ Http::patch('/v1/users/:userId/password')
                 ->setAttribute('password', '')
                 ->setAttribute('passwordUpdate', DateTime::now());
 
-            $user = $dbForProject->updateDocument('users', $user->getId(), new Document([
-                'password' => $user->getAttribute('password'),
-                'passwordUpdate' => $user->getAttribute('passwordUpdate'),
-            ]));
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
             $queueForEvents->setParam('userId', $user->getId());
             $response->dynamic($user, Response::MODEL_USER);
         }
@@ -1421,13 +1377,7 @@ Http::patch('/v1/users/:userId/password')
             ->setAttribute('hash', $hasher->getName())
             ->setAttribute('hashOptions', $hasher->getOptions());
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document([
-            'password' => $user->getAttribute('password'),
-            'passwordHistory' => $user->getAttribute('passwordHistory'),
-            'passwordUpdate' => $user->getAttribute('passwordUpdate'),
-            'hash' => $user->getAttribute('hash'),
-            'hashOptions' => $user->getAttribute('hashOptions'),
-        ]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $sessions = $user->getAttribute('sessions', []);
         $invalidate = $project->getAttribute('auths', default: [])['invalidateSessions'] ?? false;
@@ -1519,15 +1469,7 @@ Http::patch('/v1/users/:userId/email')
         ;
 
         try {
-            $user = $dbForProject->updateDocument('users', $user->getId(), new Document([
-                'email' => $user->getAttribute('email'),
-                'emailVerification' => $user->getAttribute('emailVerification'),
-                'emailCanonical' => $user->getAttribute('emailCanonical'),
-                'emailIsCanonical' => $user->getAttribute('emailIsCanonical'),
-                'emailIsCorporate' => $user->getAttribute('emailIsCorporate'),
-                'emailIsDisposable' => $user->getAttribute('emailIsDisposable'),
-                'emailIsFree' => $user->getAttribute('emailIsFree'),
-            ]));
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
             /**
              * @var Document $oldTarget
              */
@@ -1535,8 +1477,7 @@ Http::patch('/v1/users/:userId/email')
 
             if ($oldTarget instanceof Document && !$oldTarget->isEmpty()) {
                 if (\strlen($email) !== 0) {
-                    $dbForProject->updateDocument('targets', $oldTarget->getId(), new Document(['identifier' => $email]));
-                    $oldTarget->setAttribute('identifier', $email);
+                    $dbForProject->updateDocument('targets', $oldTarget->getId(), $oldTarget->setAttribute('identifier', $email));
                 } else {
                     $dbForProject->deleteDocument('targets', $oldTarget->getId());
                 }
@@ -1601,15 +1542,12 @@ Http::patch('/v1/users/:userId/phone')
 
         $oldPhone = $user->getAttribute('phone');
 
-        // Store null instead of empty string so unique constraint allows multiple users without phone
-        $phoneValue = $number !== '' ? $number : null;
-
         $user
-            ->setAttribute('phone', $phoneValue)
+            ->setAttribute('phone', $number)
             ->setAttribute('phoneVerification', false)
         ;
 
-        if ($number !== '') {
+        if (\strlen($number) !== 0) {
             $target = $dbForProject->findOne('targets', [
                 Query::equal('identifier', [$number]),
             ]);
@@ -1620,24 +1558,20 @@ Http::patch('/v1/users/:userId/phone')
         }
 
         try {
-            $user = $dbForProject->updateDocument('users', $user->getId(), new Document([
-                'phone' => $phoneValue,
-                'phoneVerification' => $user->getAttribute('phoneVerification'),
-            ]));
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
             /**
              * @var Document $oldTarget
              */
             $oldTarget = $user->find('identifier', $oldPhone, 'targets');
 
             if ($oldTarget instanceof Document && !$oldTarget->isEmpty()) {
-                if ($number !== '') {
-                    $dbForProject->updateDocument('targets', $oldTarget->getId(), new Document(['identifier' => $number]));
-                    $oldTarget->setAttribute('identifier', $number);
+                if (\strlen($number) !== 0) {
+                    $dbForProject->updateDocument('targets', $oldTarget->getId(), $oldTarget->setAttribute('identifier', $number));
                 } else {
                     $dbForProject->deleteDocument('targets', $oldTarget->getId());
                 }
             } else {
-                if ($number !== '') {
+                if (\strlen($number) !== 0) {
                     $target = $dbForProject->createDocument('targets', new Document([
                         '$permissions' => [
                             Permission::read(Role::user($user->getId())),
@@ -1696,7 +1630,7 @@ Http::patch('/v1/users/:userId/verification')
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document(['emailVerification' => $emailVerification]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', $emailVerification));
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -1734,7 +1668,7 @@ Http::patch('/v1/users/:userId/prefs')
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document(['prefs' => $prefs]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('prefs', $prefs));
 
         $queueForEvents
             ->setParam('userId', $user->getId());
@@ -1834,13 +1768,7 @@ Http::patch('/v1/users/:userId/targets/:targetId')
             $target->setAttribute('name', $name);
         }
 
-        $target = $dbForProject->updateDocument('targets', $target->getId(), new Document([
-            'identifier' => $target->getAttribute('identifier'),
-            'expired' => $target->getAttribute('expired'),
-            'providerId' => $target->getAttribute('providerId'),
-            'providerInternalId' => $target->getAttribute('providerInternalId'),
-            'name' => $target->getAttribute('name'),
-        ]));
+        $target = $dbForProject->updateDocument('targets', $target->getId(), $target);
         $dbForProject->purgeCachedDocument('users', $user->getId());
 
         $queueForEvents
@@ -1908,7 +1836,7 @@ Http::patch('/v1/users/:userId/mfa')
 
         $user->setAttribute('mfa', $mfa);
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), new Document(['mfa' => $user->getAttribute('mfa')]));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -2096,7 +2024,7 @@ Http::patch('/v1/users/:userId/mfa/recovery-codes')
 
         $mfaRecoveryCodes = Type::generateBackupCodes();
         $user->setAttribute('mfaRecoveryCodes', $mfaRecoveryCodes);
-        $dbForProject->updateDocument('users', $user->getId(), new Document(['mfaRecoveryCodes' => $mfaRecoveryCodes]));
+        $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -2168,7 +2096,7 @@ Http::put('/v1/users/:userId/mfa/recovery-codes')
 
         $mfaRecoveryCodes = Type::generateBackupCodes();
         $user->setAttribute('mfaRecoveryCodes', $mfaRecoveryCodes);
-        $dbForProject->updateDocument('users', $user->getId(), new Document(['mfaRecoveryCodes' => $mfaRecoveryCodes]));
+        $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents->setParam('userId', $user->getId());
 

app/controllers/general.php

@@ -5,11 +5,11 @@ require_once __DIR__ . '/../init.php';
 use Ahc\Jwt\JWT;
 use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Key;
-use Appwrite\Bus\Events\ExecutionCompleted;
-use Appwrite\Bus\Events\RequestCompleted;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
+use Appwrite\Event\Execution;
+use Appwrite\Event\StatsUsage;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Network\Cors;
 use Appwrite\Platform\Appwrite;
@@ -30,14 +30,11 @@ use Appwrite\Utopia\Response\Filters\V16 as ResponseV16;
 use Appwrite\Utopia\Response\Filters\V17 as ResponseV17;
 use Appwrite\Utopia\Response\Filters\V18 as ResponseV18;
 use Appwrite\Utopia\Response\Filters\V19 as ResponseV19;
-use Appwrite\Utopia\Response\Filters\V20 as ResponseV20;
-use Appwrite\Utopia\Response\Filters\V21 as ResponseV21;
 use Appwrite\Utopia\View;
 use Executor\Executor;
 use MaxMind\Db\Reader;
 use Swoole\Http\Request as SwooleRequest;
 use Swoole\Table;
-use Utopia\Bus\Bus;
 use Utopia\Config\Config;
 use Utopia\Console;
 use Utopia\Database\Database;
@@ -65,7 +62,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeleteEvent $queueForDeletes, int $executionsRetentionCount)
+function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, StatsUsage $queueForStatsUsage, Execution $queueForExecutions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeleteEvent $queueForDeletes, int $executionsRetentionCount)
 {
     $host = $request->getHostname() ?? '';
     if (!empty($previewHostname)) {
@@ -118,7 +115,8 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             }
         }
 
-        if (!in_array($host, $platformHostnames)) {
+        $routerProtectionEnabled = System::getEnv('_APP_OPTIONS_ROUTER_PROTECTION', 'disabled') === 'enabled';
+        if ($routerProtectionEnabled && !in_array($host, $platformHostnames)) {
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Router protection does not allow accessing Appwrite over this domain. Please add it as custom domain to your project or disable _APP_OPTIONS_ROUTER_PROTECTION environment variable.', view: $errorView);
         }
 
@@ -134,9 +132,8 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
     if (!$project->isEmpty() && $project->getId() !== 'console') {
         $accessedAt = $project->getAttribute('accessedAt', 0);
         if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
-            $authorization->skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), new Document([
-                'accessedAt' => DateTime::now()
-            ])));
+            $project->setAttribute('accessedAt', DateTime::now());
+            $authorization->skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
         }
 
         /**
@@ -324,7 +321,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         };
 
         $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-        $spec = Config::getParam('specifications')[$resource->getAttribute('runtimeSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)];
+        $spec = Config::getParam('specifications')[$resource->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)];
 
         $runtime = match ($type) {
             'function' => $runtimes[$resource->getAttribute('runtime')] ?? null,
@@ -554,10 +551,6 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
                 }
             }
 
-            if (!empty($deployment->getAttribute('startCommand', ''))) {
-                $startCommand = 'cd /usr/local/server/src/function/ && ' . str_replace(['"', '`', '$'], ['\\"', '\\`', '\\$'], $deployment->getAttribute('startCommand', ''));
-            }
-
             $runtimeEntrypoint = match ($version) {
                 'v2' => '',
                 default => "cp /tmp/code.$extension /mnt/code/code.$extension && nohup helpers/start.sh \"$startCommand\"",
@@ -714,12 +707,10 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             }
         } finally {
             if ($type === 'function' || $type === 'site') {
-                $bus->dispatch(new ExecutionCompleted(
-                    execution: $execution->getArrayCopy(),
-                    project: $project->getArrayCopy(),
-                    spec: $spec,
-                    resource: $resource->getArrayCopy(),
-                ));
+                $queueForExecutions
+                    ->setExecution($execution)
+                    ->setProject($project)
+                    ->trigger();
             }
         }
 
@@ -764,12 +755,70 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             ->setStatusCode($execution['responseStatusCode'] ?? 200)
             ->send($body);
 
-        $bus->dispatch(new RequestCompleted(
-            project: $project->getArrayCopy(),
-            request: $request,
-            response: $response,
-            deployment: $deployment->getArrayCopy(),
-        ));
+        $fileSize = 0;
+        $file = $request->getFiles('file');
+        if (!empty($file)) {
+            $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
+        }
+
+        if (!empty($apiKey) && !empty($apiKey->getDisabledMetrics())) {
+            foreach ($apiKey->getDisabledMetrics() as $key) {
+                $queueForStatsUsage->disableMetric($key);
+            }
+        }
+
+        $metricTypeExecutions = str_replace(['{resourceType}'], [$deployment->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_EXECUTIONS);
+        $metricTypeIdExecutions = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS);
+        $metricTypeExecutionsCompute = str_replace(['{resourceType}'], [$deployment->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_EXECUTIONS_COMPUTE);
+        $metricTypeIdExecutionsCompute = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_COMPUTE);
+        $metricTypeExecutionsMbSeconds = str_replace(['{resourceType}'], [$deployment->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_EXECUTIONS_MB_SECONDS);
+        $metricTypeIdExecutionsMBSeconds = str_replace(['{resourceType}', '{resourceInternalId}'], [$deployment->getAttribute('resourceType'), $resource->getSequence()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
+        if ($deployment->getAttribute('resourceType') === 'sites') {
+            $queueForStatsUsage
+                ->disableMetric(METRIC_NETWORK_REQUESTS)
+                ->disableMetric(METRIC_NETWORK_INBOUND)
+                ->disableMetric(METRIC_NETWORK_OUTBOUND);
+            if ($resource->getAttribute('adapter') !== 'ssr') {
+                $queueForStatsUsage
+                    ->disableMetric(METRIC_EXECUTIONS)
+                    ->disableMetric(METRIC_EXECUTIONS_COMPUTE)
+                    ->disableMetric(METRIC_EXECUTIONS_MB_SECONDS)
+                    ->disableMetric($metricTypeExecutions)
+                    ->disableMetric($metricTypeIdExecutions)
+                    ->disableMetric($metricTypeExecutionsCompute)
+                    ->disableMetric($metricTypeIdExecutionsCompute)
+                    ->disableMetric($metricTypeExecutionsMbSeconds)
+                    ->disableMetric($metricTypeIdExecutionsMBSeconds);
+            }
+
+            $queueForStatsUsage
+                ->addMetric(METRIC_SITES_REQUESTS, 1)
+                ->addMetric(METRIC_SITES_INBOUND, $request->getSize() + $fileSize)
+                ->addMetric(METRIC_SITES_OUTBOUND, $response->getSize())
+                ->addMetric(str_replace('{siteInternalId}', $resource->getSequence(), METRIC_SITES_ID_REQUESTS), 1)
+                ->addMetric(str_replace('{siteInternalId}', $resource->getSequence(), METRIC_SITES_ID_INBOUND), $request->getSize() + $fileSize)
+                ->addMetric(str_replace('{siteInternalId}', $resource->getSequence(), METRIC_SITES_ID_OUTBOUND), $response->getSize())
+            ;
+        }
+
+
+        $compute = (int)($execution->getAttribute('duration') * 1000);
+        $mbSeconds = (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT));
+        $queueForStatsUsage
+            ->addMetric(METRIC_NETWORK_REQUESTS, 1)
+            ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
+            ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
+            ->addMetric(METRIC_EXECUTIONS, 1)
+            ->addMetric($metricTypeExecutions, 1)
+            ->addMetric($metricTypeIdExecutions, 1)
+            ->addMetric(METRIC_EXECUTIONS_COMPUTE, $compute) // per project
+            ->addMetric($metricTypeExecutionsCompute, $compute) // per function
+            ->addMetric($metricTypeIdExecutionsCompute, $compute) // per function
+            ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, $mbSeconds)
+            ->addMetric($metricTypeExecutionsMbSeconds, $mbSeconds)
+            ->addMetric($metricTypeIdExecutionsMBSeconds, $mbSeconds)
+            ->setProject($project)
+            ->trigger();
 
         /* cleanup */
         if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
@@ -833,8 +882,9 @@ Http::init()
     ->inject('locale')
     ->inject('localeCodes')
     ->inject('geodb')
+    ->inject('queueForStatsUsage')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForExecutions')
     ->inject('executor')
     ->inject('platform')
     ->inject('isResourceBlocked')
@@ -845,7 +895,7 @@ Http::init()
     ->inject('authorization')
     ->inject('queueForDeletes')
     ->inject('executionsRetentionCount')
-    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, Reader $geodb, Event $queueForEvents, Bus $bus, Executor $executor, array $platform, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
+    ->action(function (Http $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, Execution $queueForExecutions, Executor $executor, array $platform, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
         /*
         * Appwrite Router
         */
@@ -853,7 +903,7 @@ Http::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, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForExecutions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
                 $utopia->getRoute()?->label('router', true);
             }
         }
@@ -939,23 +989,17 @@ Http::init()
          */
         $responseFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
         if ($responseFormat) {
-            if (version_compare($responseFormat, '1.9.0', '<')) {
-                $response->addFilter(new ResponseV21());
-            }
-            if (version_compare($responseFormat, '1.8.0', '<')) {
-                $response->addFilter(new ResponseV20());
-            }
-            if (version_compare($responseFormat, '1.7.0', '<')) {
-                $response->addFilter(new ResponseV19());
-            }
-            if (version_compare($responseFormat, '1.6.0', '<')) {
-                $response->addFilter(new ResponseV18());
+            if (version_compare($responseFormat, '1.4.0', '<')) {
+                $response->addFilter(new ResponseV16());
             }
             if (version_compare($responseFormat, '1.5.0', '<')) {
                 $response->addFilter(new ResponseV17());
             }
-            if (version_compare($responseFormat, '1.4.0', '<')) {
-                $response->addFilter(new ResponseV16());
+            if (version_compare($responseFormat, '1.6.0', '<')) {
+                $response->addFilter(new ResponseV18());
+            }
+            if (version_compare($responseFormat, '1.7.0', '<')) {
+                $response->addFilter(new ResponseV19());
             }
             if (version_compare($responseFormat, APP_VERSION_STABLE, '>')) {
                 $warnings[] = "The current SDK is built for Appwrite " . $responseFormat . ". However, the current Appwrite server version is " . APP_VERSION_STABLE . ". Please downgrade your SDK to match the Appwrite version: https://appwrite.io/docs/sdks";
@@ -1135,7 +1179,8 @@ Http::options()
     ->inject('dbForPlatform')
     ->inject('getProjectDB')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForStatsUsage')
+    ->inject('queueForExecutions')
     ->inject('executor')
     ->inject('geodb')
     ->inject('isResourceBlocked')
@@ -1148,14 +1193,14 @@ Http::options()
     ->inject('authorization')
     ->inject('queueForDeletes')
     ->inject('executionsRetentionCount')
-    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
+    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Execution $queueForExecutions, 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, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForExecutions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
                 $utopia->getRoute()?->label('router', true);
             }
         }
@@ -1171,11 +1216,12 @@ Http::options()
         /** OPTIONS requests in utopia do not execute shutdown handlers, as a result we need to track the OPTIONS requests explicitly
          * @see https://github.com/utopia-php/http/blob/0.33.16/src/App.php#L825-L855
          */
-        $bus->dispatch(new RequestCompleted(
-            project: $project->getArrayCopy(),
-            request: $request,
-            response: $response,
-        ));
+        $queueForStatsUsage
+            ->addMetric(METRIC_NETWORK_REQUESTS, 1)
+            ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize())
+            ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
+            ->setProject($project)
+            ->trigger();
     });
 
 Http::error()
@@ -1186,19 +1232,10 @@ Http::error()
     ->inject('project')
     ->inject('logger')
     ->inject('log')
-    ->inject('bus')
+    ->inject('queueForStatsUsage')
     ->inject('devKey')
     ->inject('authorization')
-    ->action(function (Throwable $error, Http $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, Bus $bus, Document $devKey, Authorization $authorization) {
-        $trace = $error->getTrace();
-
-        foreach (array_slice($trace, 0, 100) as $index => $traceEntry) {
-            $file = isset($traceEntry['file']) ? $traceEntry['file'] : '[internal function]';
-            $line = isset($traceEntry['line']) ? $traceEntry['line'] : '';
-            $function = isset($traceEntry['function']) ? $traceEntry['function'] : '';
-            Console::error("[$index] $file : $line -> $function()");
-        }
-
+    ->action(function (Throwable $error, Http $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, StatsUsage $queueForStatsUsage, Document $devKey, Authorization $authorization) {
         $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
         $route = $utopia->getRoute();
         $class = \get_class($error);
@@ -1270,22 +1307,22 @@ Http::error()
          * If not a publishable error, track usage stats. Publishable errors are >= 500 or those explicitly marked as publish=true in errors.php
          */
         if (!$publish && $project->getId() !== 'console') {
-            $errorUser = new DBUser();
-            try {
-                $resolvedUser = $utopia->getResource('user');
-                if ($resolvedUser instanceof DBUser) {
-                    $errorUser = $resolvedUser;
+            if (!DBUser::isPrivileged($authorization->getRoles())) {
+                $fileSize = 0;
+                $file = $request->getFiles('file');
+                if (!empty($file)) {
+                    $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
                 }
-            } catch (\Throwable) {
-                // User resource may not be available in error context
-            }
-            if (!$errorUser->isPrivileged($authorization->getRoles())) {
-                $bus->dispatch(new RequestCompleted(
-                    project: $project->getArrayCopy(),
-                    request: $request,
-                    response: $response,
-                ));
+
+                $queueForStatsUsage
+                    ->addMetric(METRIC_NETWORK_REQUESTS, 1)
+                    ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
+                    ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize());
             }
+
+            $queueForStatsUsage
+                ->setProject($project)
+                ->trigger();
         }
 
         if ($logger && $publish) {
@@ -1417,9 +1454,6 @@ Http::error()
             $sdk = $route?->getLabel("sdk", false);
             $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
             if (!empty($sdk)) {
-                if (\is_array($sdk)) {
-                    $sdk = $sdk[0];
-                }
                 /** @var \Appwrite\SDK\Method $sdk */
                 $action = $sdk->getNamespace() . '.' . $sdk->getMethodName();
             } elseif ($route === null) {
@@ -1535,7 +1569,8 @@ Http::get('/robots.txt')
     ->inject('dbForPlatform')
     ->inject('getProjectDB')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForStatsUsage')
+    ->inject('queueForExecutions')
     ->inject('executor')
     ->inject('geodb')
     ->inject('isResourceBlocked')
@@ -1545,13 +1580,13 @@ Http::get('/robots.txt')
     ->inject('authorization')
     ->inject('queueForDeletes')
     ->inject('executionsRetentionCount')
-    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
+    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Execution $queueForExecutions, 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, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForExecutions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
                 $utopia->getRoute()?->label('router', true);
             }
         }
@@ -1569,7 +1604,8 @@ Http::get('/humans.txt')
     ->inject('dbForPlatform')
     ->inject('getProjectDB')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForStatsUsage')
+    ->inject('queueForExecutions')
     ->inject('executor')
     ->inject('geodb')
     ->inject('isResourceBlocked')
@@ -1579,13 +1615,13 @@ Http::get('/humans.txt')
     ->inject('authorization')
     ->inject('queueForDeletes')
     ->inject('executionsRetentionCount')
-    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
+    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Execution $queueForExecutions, 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, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForExecutions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
                 $utopia->getRoute()?->label('router', true);
             }
         }
@@ -1683,10 +1719,7 @@ Http::get('/v1/ping')
             ->setAttribute('pingedAt', $pingedAt);
 
         $authorization->skip(function () use ($dbForPlatform, $project) {
-            $dbForPlatform->updateDocument('projects', $project->getId(), new Document([
-                'pingCount' => $project->getAttribute('pingCount'),
-                'pingedAt' => $project->getAttribute('pingedAt')
-            ]));
+            $dbForPlatform->updateDocument('projects', $project->getId(), $project);
         });
 
         $queueForEvents

app/controllers/shared/api.php

@@ -2,7 +2,6 @@
 
 use Appwrite\Auth\Key;
 use Appwrite\Auth\MFA\Type\TOTP;
-use Appwrite\Bus\Events\RequestCompleted;
 use Appwrite\Event\Audit;
 use Appwrite\Event\Build;
 use Appwrite\Event\Database as EventDatabase;
@@ -10,21 +9,18 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\Mail;
-use Appwrite\Event\Message\Usage as UsageMessage;
 use Appwrite\Event\Messaging;
-use Appwrite\Event\Publisher\Usage as UsagePublisher;
 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\Usage\Context;
 use Appwrite\Utopia\Database\Documents\User;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Utopia\Abuse\Abuse;
-use Utopia\Bus\Bus;
 use Utopia\Cache\Adapter\Filesystem;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
@@ -55,7 +51,7 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
         $replace = $parts[1] ?? '';
 
         $params = match ($namespace) {
-            'user' => (array) $user,
+            'user' => (array)$user,
             'request' => $requestParams,
             default => $responsePayload,
         };
@@ -63,13 +59,13 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
         if (array_key_exists($replace, $params)) {
             $replacement = $params[$replace];
             // Convert to string if it's not already a string
-            if (! is_string($replacement)) {
+            if (!is_string($replacement)) {
                 if (is_array($replacement)) {
                     $replacement = json_encode($replacement);
                 } elseif (is_object($replacement) && method_exists($replacement, '__toString')) {
-                    $replacement = (string) $replacement;
+                    $replacement = (string)$replacement;
                 } elseif (is_scalar($replacement)) {
-                    $replacement = (string) $replacement;
+                    $replacement = (string)$replacement;
                 } else {
                     throw new Exception(Exception::GENERAL_SERVER_ERROR, "The server encountered an error while parsing the label: $label. Please create an issue on GitHub to allow us to investigate further https://github.com/appwrite/appwrite/issues/new/choose");
                 }
@@ -77,7 +73,6 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
             $label = \str_replace($find, $replacement, $label);
         }
     }
-
     return $label;
 };
 
@@ -96,7 +91,7 @@ Http::init()
     ->inject('team')
     ->inject('apiKey')
     ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
+    ->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, Document $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
         $route = $utopia->getRoute();
 
         /**
@@ -163,7 +158,7 @@ Http::init()
         $scopes = $roles[$role]['scopes'];
 
         // Step 5: API Key Authentication
-        if (! empty($apiKey)) {
+        if (!empty($apiKey)) {
             // Check if key is expired
             if ($apiKey->isExpired()) {
                 throw new Exception(Exception::PROJECT_KEY_EXPIRED);
@@ -173,6 +168,7 @@ Http::init()
             $role = $apiKey->getRole();
             $scopes = $apiKey->getScopes();
 
+
             // Handle special app role case
             if ($apiKey->getRole() === User::ROLE_APPS) {
                 // Disable authorization checks for project API keys
@@ -195,19 +191,19 @@ Http::init()
             // For standard keys, update last accessed time
             if (\in_array($apiKey->getType(), [API_KEY_STANDARD, API_KEY_ORGANIZATION, API_KEY_ACCOUNT])) {
                 $dbKey = null;
-                if (! empty($apiKey->getProjectId())) {
+                if (!empty($apiKey->getProjectId())) {
                     $dbKey = $project->find(
                         key: 'secret',
                         find: $request->getHeader('x-appwrite-key', ''),
                         subject: 'keys'
                     );
-                } elseif (! empty($apiKey->getUserId())) {
+                } elseif (!empty($apiKey->getUserId())) {
                     $dbKey = $user->find(
                         key: 'secret',
                         find: $request->getHeader('x-appwrite-key', ''),
                         subject: 'keys'
                     );
-                } elseif (! empty($apiKey->getTeamId())) {
+                } elseif (!empty($apiKey->getTeamId())) {
                     $dbKey = $team->find(
                         key: 'secret',
                         find: $request->getHeader('x-appwrite-key', ''),
@@ -233,7 +229,7 @@ Http::init()
                 if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
                     $sdks = $dbKey->getAttribute('sdks', []);
 
-                    if (! in_array($sdk, $sdks)) {
+                    if (!in_array($sdk, $sdks)) {
                         $sdks[] = $sdk;
 
                         $updates->setAttribute('sdks', $sdks);
@@ -241,14 +237,14 @@ Http::init()
                     }
                 }
 
-                if (! $updates->isEmpty()) {
+                if (!$updates->isEmpty()) {
                     $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->updateDocument('keys', $dbKey->getId(), $updates));
 
-                    if (! empty($apiKey->getProjectId())) {
+                    if (!empty($apiKey->getProjectId())) {
                         $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('projects', $project->getId()));
-                    } elseif (! empty($apiKey->getUserId())) {
+                    } elseif (!empty($apiKey->getUserId())) {
                         $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('users', $user->getId()));
-                    } elseif (! empty($apiKey->getTeamId())) {
+                    } elseif (!empty($apiKey->getTeamId())) {
                         $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('teams', $team->getId()));
                     }
                 }
@@ -285,7 +281,7 @@ Http::init()
                 }
             }
         } // Admin User Authentication
-        elseif (($project->getId() === 'console' && ! $team->isEmpty() && ! $user->isEmpty()) || ($project->getId() !== 'console' && ! $user->isEmpty() && $mode === APP_MODE_ADMIN)) {
+        elseif (($project->getId() === 'console' && !$team->isEmpty() && !$user->isEmpty()) || ($project->getId() !== 'console' && !$user->isEmpty() && $mode === APP_MODE_ADMIN)) {
             $teamId = $team->getId();
             $adminRoles = [];
             $memberships = $user->getAttribute('memberships', []);
@@ -310,7 +306,7 @@ Http::init()
             // Useful for those who have project-specific roles but don't have team-wide role.
             $scopes = ['teams.read', 'projects.read'];
             foreach ($adminRoles as $adminRole) {
-                $isTeamWideRole = ! str_starts_with($adminRole, 'project-');
+                $isTeamWideRole = !str_starts_with($adminRole, 'project-');
                 $isProjectSpecificRole = $projectId !== 'console' && str_starts_with($adminRole, 'project-' . $projectId);
 
                 if ($isTeamWideRole || $isProjectSpecificRole) {
@@ -338,19 +334,6 @@ Http::init()
 
         $scopes = \array_unique($scopes);
 
-        // Intentional: impersonators get users.read so they can discover a target user
-        // before impersonation starts, and keep that access while impersonating.
-        if (
-            !$user->isEmpty()
-            && (
-                $user->getAttribute('impersonator', false)
-                || $user->getAttribute('impersonatorUserId')
-            )
-        ) {
-            $scopes[] = 'users.read';
-            $scopes = \array_unique($scopes);
-        }
-
         $authorization->addRole($role);
         foreach ($user->getRoles($authorization) as $authRole) {
             $authorization->addRole($authRole);
@@ -361,42 +344,34 @@ Http::init()
          * But, for actions on resources (sites, functions, etc.) in a non-console project, we explicitly check
          * whether the admin user has necessary permission on the project (sites, functions, etc. don't have permissions associated to them).
          */
-        if (empty($apiKey) && ! $user->isEmpty() && $project->getId() !== 'console' && $mode === APP_MODE_ADMIN) {
+        if (empty($apiKey) && !$user->isEmpty() && $project->getId() !== 'console' && $mode === APP_MODE_ADMIN) {
             $input = new Input(Database::PERMISSION_READ, $project->getPermissionsByType(Database::PERMISSION_READ));
             $initialStatus = $authorization->getStatus();
             $authorization->enable();
-            if (! $authorization->isValid($input)) {
+            if (!$authorization->isValid($input)) {
                 throw new Exception(Exception::PROJECT_NOT_FOUND);
             }
             $authorization->setStatus($initialStatus);
         }
 
         // Step 6: Update project and user last activity
-        if (! $project->isEmpty() && $project->getId() !== 'console') {
+        if (!$project->isEmpty() && $project->getId() !== 'console') {
             $accessedAt = $project->getAttribute('accessedAt', 0);
             if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
-                $authorization->skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), new Document([
-                    'accessedAt' => DateTime::now()
-                ])));
+                $project->setAttribute('accessedAt', DateTime::now());
+                $authorization->skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
             }
         }
 
-        if (! empty($user->getId())) {
-            $impersonatorUserId = $user->getAttribute('impersonatorUserId');
+        if (!empty($user->getId())) {
             $accessedAt = $user->getAttribute('accessedAt', 0);
-
-            // Skip updating accessedAt for impersonated requests so we don't attribute activity to the target user.
-            if (! $impersonatorUserId && DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
+            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
                 $user->setAttribute('accessedAt', DateTime::now());
 
-                if ($project->getId() !== 'console' && $mode !== APP_MODE_ADMIN) {
-                    $dbForProject->updateDocument('users', $user->getId(), new Document([
-                        'accessedAt' => $user->getAttribute('accessedAt')
-                    ]));
+                if ($project->getId() !== 'console' && APP_MODE_ADMIN !== $mode) {
+                    $dbForProject->updateDocument('users', $user->getId(), $user);
                 } else {
-                    $authorization->skip(fn () => $dbForPlatform->updateDocument('users', $user->getId(), new Document([
-                        'accessedAt' => $user->getAttribute('accessedAt')
-                    ])));
+                    $authorization->skip(fn () => $dbForPlatform->updateDocument('users', $user->getId(), $user));
                 }
             }
         }
@@ -413,26 +388,26 @@ Http::init()
             $method = $method[0];
         }
 
-        if (! empty($method)) {
+        if (!empty($method)) {
             $namespace = $method->getNamespace();
 
             if (
                 array_key_exists($namespace, $project->getAttribute('services', []))
-                && ! $project->getAttribute('services', [])[$namespace]
-                && ! ($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+                && !$project->getAttribute('services', [])[$namespace]
+                && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
             ) {
                 throw new Exception(Exception::GENERAL_SERVICE_DISABLED);
             }
         }
 
         // Step 9: Validate scope permissions
-        $allowed = (array) $route->getLabel('scope', 'none');
+        $allowed = (array)$route->getLabel('scope', 'none');
         if (empty(\array_intersect($allowed, $scopes))) {
             throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, $user->getAttribute('email', 'User') . ' (role: ' . \strtolower($roles[$role]['label']) . ') missing scopes (' . \json_encode($allowed) . ')');
         }
 
         // Step 10: Check if user is blocked
-        if ($user->getAttribute('status') === false) { // Account is blocked
+        if (false === $user->getAttribute('status')) { // Account is blocked
             throw new Exception(Exception::USER_BLOCKED);
         }
 
@@ -450,7 +425,7 @@ Http::init()
         $minimumFactors = ($mfaEnabled && $hasMoreFactors) ? 2 : 1;
 
         // Step 13: Handle Multi-Factor Authentication
-        if (! in_array('mfa', $route->getGroups())) {
+        if (!in_array('mfa', $route->getGroups())) {
             if ($session && \count($session->getAttribute('factors', [])) < $minimumFactors) {
                 throw new Exception(Exception::USER_MORE_FACTORS_REQUIRED);
             }
@@ -470,7 +445,7 @@ Http::init()
     ->inject('queueForDeletes')
     ->inject('queueForDatabase')
     ->inject('queueForBuilds')
-    ->inject('usage')
+    ->inject('queueForStatsUsage')
     ->inject('queueForFunctions')
     ->inject('queueForMails')
     ->inject('dbForProject')
@@ -483,23 +458,14 @@ Http::init()
     ->inject('telemetry')
     ->inject('platform')
     ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Context $usage, Func $queueForFunctions, Mail $queueForMails, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) {
-
-        $response->setUser($user);
-        $request->setUser($user);
+    ->action(function (Http $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();
-        $path = $route->getMatchedPath();
-        $databaseType = match (true) {
-            str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
-            str_contains($path, '/vectorsdb') => DATABASE_TYPE_VECTORSDB,
-            default => '',
-        };
 
         if (
             array_key_exists('rest', $project->getAttribute('apis', []))
-            && ! $project->getAttribute('apis', [])['rest']
-            && ! ($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+            && !$project->getAttribute('apis', [])['rest']
+            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
         ) {
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
         }
@@ -511,7 +477,7 @@ Http::init()
         $abuseKeyLabel = $route->getLabel('abuse-key', 'url:{url},ip:{ip}');
         $timeLimitArray = [];
 
-        $abuseKeyLabel = (! is_array($abuseKeyLabel)) ? [$abuseKeyLabel] : $abuseKeyLabel;
+        $abuseKeyLabel = (!is_array($abuseKeyLabel)) ? [$abuseKeyLabel] : $abuseKeyLabel;
 
         foreach ($abuseKeyLabel as $abuseKey) {
             $start = $request->getContentRangeStart();
@@ -524,19 +490,19 @@ Http::init()
                 ->setParam('{ip}', $request->getIP())
                 ->setParam('{url}', $request->getHostname() . $route->getPath())
                 ->setParam('{method}', $request->getMethod())
-                ->setParam('{chunkId}', (int) ($start / ($end + 1 - $start)));
+                ->setParam('{chunkId}', (int)($start / ($end + 1 - $start)));
             $timeLimitArray[] = $timeLimit;
         }
 
         $closestLimit = null;
 
         $roles = $authorization->getRoles();
-        $isPrivilegedUser = $user->isPrivileged($roles);
-        $isAppUser = $user->isApp($roles);
+        $isPrivilegedUser = User::isPrivileged($roles);
+        $isAppUser = User::isApp($roles);
 
         foreach ($timeLimitArray as $timeLimit) {
             foreach ($request->getParams() as $key => $value) { // Set request params as potential abuse keys
-                if (! empty($value)) {
+                if (!empty($value)) {
                     $timeLimit->setParam('{param-' . $key . '}', (\is_array($value)) ? \json_encode($value) : $value);
                 }
             }
@@ -559,8 +525,8 @@ Http::init()
 
             if (
                 $enabled                // Abuse is enabled
-                && ! $isAppUser          // User is not API key
-                && ! $isPrivilegedUser   // User is not an admin
+                && !$isAppUser          // User is not API key
+                && !$isPrivilegedUser   // User is not an admin
                 && $devKey->isEmpty()  // request doesn't not contain development key
                 && $abuse->check()      // Route is rate-limited
             ) {
@@ -589,13 +555,19 @@ Http::init()
             ->setProject($project);
 
         /* If a session exists, use the user associated with the session */
-        if (! $user->isEmpty()) {
+        if (!$user->isEmpty()) {
             $userClone = clone $user;
             // $user doesn't support `type` and can cause unintended effects.
             $userClone->setAttribute('type', ACTIVITY_TYPE_USER);
             $queueForAudits->setUser($userClone);
         }
 
+        if (!empty($apiKey) && !empty($apiKey->getDisabledMetrics())) {
+            foreach ($apiKey->getDisabledMetrics() as $key) {
+                $queueForStatsUsage->disableMetric($key);
+            }
+        }
+
         /* Auto-set projects */
         $queueForDeletes->setProject($project);
         $queueForDatabase->setProject($project);
@@ -609,70 +581,73 @@ Http::init()
         $queueForBuilds->setPlatform($platform);
         $queueForMails->setPlatform($platform);
 
+
         $useCache = $route->getLabel('cache', false);
         $storageCacheOperationsCounter = $telemetry->createCounter('storage.cache.operations.load');
         if ($useCache) {
             $route = $utopia->match($request);
             $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
-            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && ! $user->isPrivileged($authorization->getRoles());
+            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && !User::isPrivileged($authorization->getRoles());
 
             $key = $request->cacheIdentifier();
-            $cacheLog = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
+            $cacheLog  = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
             $cache = new Cache(
                 new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
             );
             $timestamp = 60 * 60 * 24 * 180; // Temporarily increase the TTL to 180 day to ensure files in the cache are still fetched.
             $data = $cache->load($key, $timestamp);
 
-            if (! empty($data) && ! $cacheLog->isEmpty()) {
+            if (!empty($data) && !$cacheLog->isEmpty()) {
+                $usageMetric = $route->getLabel('usage.metric', null);
+                if ($usageMetric === METRIC_AVATARS_SCREENSHOTS_GENERATED) {
+                    $queueForStatsUsage->disableMetric(METRIC_AVATARS_SCREENSHOTS_GENERATED);
+                }
                 $parts = explode('/', $cacheLog->getAttribute('resourceType', ''));
                 $type = $parts[0] ?? null;
 
-                if ($type === 'bucket' && (! $isImageTransformation || ! $isDisabled)) {
+                if ($type === 'bucket' && (!$isImageTransformation || !$isDisabled)) {
                     $bucketId = $parts[1] ?? null;
                     $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
-                    $isToken = ! $resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
-                    $isPrivilegedUser = $user->isPrivileged($authorization->getRoles());
+                    $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
+                    $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
 
-                    if ($bucket->isEmpty() || (! $bucket->getAttribute('enabled') && ! $isAppUser && ! $isPrivilegedUser)) {
+                    if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAppUser && !$isPrivilegedUser)) {
                         throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                     }
 
-                    if (! $bucket->getAttribute('transformations', true) && ! $isAppUser && ! $isPrivilegedUser) {
+                    if (!$bucket->getAttribute('transformations', true) && !$isAppUser && !$isPrivilegedUser) {
                         throw new Exception(Exception::STORAGE_BUCKET_TRANSFORMATIONS_DISABLED);
                     }
 
                     $fileSecurity = $bucket->getAttribute('fileSecurity', false);
                     $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
-                    if (! $fileSecurity && ! $valid && ! $isToken) {
+                    if (!$fileSecurity && !$valid && !$isToken) {
                         throw new Exception(Exception::USER_UNAUTHORIZED);
                     }
 
                     $parts = explode('/', $cacheLog->getAttribute('resource'));
                     $fileId = $parts[1] ?? null;
 
-                    if ($fileSecurity && ! $valid && ! $isToken) {
+                    if ($fileSecurity && !$valid && !$isToken) {
                         $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
                     } else {
                         $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
                     }
 
-                    if (! $resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
+                    if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
                         throw new Exception(Exception::USER_UNAUTHORIZED);
                     }
 
                     if ($file->isEmpty()) {
                         throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                     }
-                    // Do not update transformedAt if it's a console user
-                    if (! $user->isPrivileged($authorization->getRoles())) {
+                    //Do not update transformedAt if it's a console user
+                    if (!User::isPrivileged($authorization->getRoles())) {
                         $transformedAt = $file->getAttribute('transformedAt', '');
                         if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
                             $file->setAttribute('transformedAt', DateTime::now());
-                            $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), new Document([
-                                'transformedAt' => $file->getAttribute('transformedAt')
-                            ])));
+                            $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
                         }
                     }
                 }
@@ -682,7 +657,7 @@ Http::init()
                     ->addHeader('X-Appwrite-Cache', 'hit')
                     ->setContentType($cacheLog->getAttribute('mimeType'));
                 $storageCacheOperationsCounter->add(1, ['result' => 'hit']);
-                if (! $isImageTransformation || ! $isDisabled) {
+                if (!$isImageTransformation || !$isDisabled) {
                     $response->send($data);
                 }
             } else {
@@ -700,12 +675,12 @@ Http::init()
     ->groups(['session'])
     ->inject('user')
     ->inject('request')
-    ->action(function (User $user, Request $request) {
+    ->action(function (Document $user, Request $request) {
         if (\str_contains($request->getURI(), 'oauth2')) {
             return;
         }
 
-        if (! $user->isEmpty()) {
+        if (!$user->isEmpty()) {
             throw new Exception(Exception::USER_SESSION_ALREADY_EXISTS);
         }
     });
@@ -759,8 +734,7 @@ Http::shutdown()
     ->inject('user')
     ->inject('queueForEvents')
     ->inject('queueForAudits')
-    ->inject('usage')
-    ->inject('publisherForUsage')
+    ->inject('queueForStatsUsage')
     ->inject('queueForDeletes')
     ->inject('queueForDatabase')
     ->inject('queueForBuilds')
@@ -772,13 +746,11 @@ Http::shutdown()
     ->inject('authorization')
     ->inject('timelimit')
     ->inject('eventProcessor')
-    ->inject('bus')
-    ->inject('apiKey')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Audit $queueForAudits, Context $usage, UsagePublisher $publisherForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor, Bus $bus, ?Key $apiKey) use ($parseLabel) {
+    ->action(function (Http $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();
 
-        if (! empty($queueForEvents->getEvent())) {
+        if (!empty($queueForEvents->getEvent())) {
             if (empty($queueForEvents->getPayload())) {
                 $queueForEvents->setPayload($responsePayload);
             }
@@ -800,7 +772,7 @@ Http::shutdown()
             }
 
             // Only trigger functions if there are matching function events
-            if (! empty($functionsEvents)) {
+            if (!empty($functionsEvents)) {
                 foreach ($generatedEvents as $event) {
                     if (isset($functionsEvents[$event])) {
                         $queueForFunctions
@@ -812,7 +784,7 @@ Http::shutdown()
             }
 
             // Only trigger webhooks if there are matching webhook events
-            if (! empty($webhooksEvents)) {
+            if (!empty($webhooksEvents)) {
                 foreach ($generatedEvents as $event) {
                     if (isset($webhooksEvents[$event])) {
                         $queueForWebhooks
@@ -836,7 +808,7 @@ Http::shutdown()
 
         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;
+            $abuseKeyLabel = (!is_array($abuseKeyLabel)) ? [$abuseKeyLabel] : $abuseKeyLabel;
 
             foreach ($abuseKeyLabel as $abuseKey) {
                 $start = $request->getContentRangeStart();
@@ -849,10 +821,10 @@ Http::shutdown()
                     ->setParam('{ip}', $request->getIP())
                     ->setParam('{url}', $request->getHostname() . $route->getPath())
                     ->setParam('{method}', $request->getMethod())
-                    ->setParam('{chunkId}', (int) ($start / ($end + 1 - $start)));
+                    ->setParam('{chunkId}', (int)($start / ($end + 1 - $start)));
 
                 foreach ($request->getParams() as $key => $value) { // Set request params as potential abuse keys
-                    if (! empty($value)) {
+                    if (!empty($value)) {
                         $timeLimit->setParam('{param-' . $key . '}', (\is_array($value)) ? \json_encode($value) : $value);
                     }
                 }
@@ -866,14 +838,14 @@ Http::shutdown()
          * Audit labels
          */
         $pattern = $route->getLabel('audits.resource', null);
-        if (! empty($pattern)) {
+        if (!empty($pattern)) {
             $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user);
-            if (! empty($resource) && $resource !== $pattern) {
+            if (!empty($resource) && $resource !== $pattern) {
                 $queueForAudits->setResource($resource);
             }
         }
 
-        if (! $user->isEmpty()) {
+        if (!$user->isEmpty()) {
             $userClone = clone $user;
             // $user doesn't support `type` and can cause unintended effects.
             $userClone->setAttribute('type', ACTIVITY_TYPE_USER);
@@ -899,13 +871,13 @@ Http::shutdown()
             $queueForAudits->setUser($user);
         }
 
-        if (! empty($queueForAudits->getResource()) && ! $queueForAudits->getUser()->isEmpty()) {
+        if (!empty($queueForAudits->getResource()) && !$queueForAudits->getUser()->isEmpty()) {
             /**
              * audits.payload is switched to default true
              * in order to auto audit payload for all endpoints
              */
             $pattern = $route->getLabel('audits.payload', true);
-            if (! empty($pattern)) {
+            if (!empty($pattern)) {
                 $queueForAudits->setPayload($responsePayload);
             }
 
@@ -916,19 +888,19 @@ Http::shutdown()
             $queueForAudits->trigger();
         }
 
-        if (! empty($queueForDeletes->getType())) {
+        if (!empty($queueForDeletes->getType())) {
             $queueForDeletes->trigger();
         }
 
-        if (! empty($queueForDatabase->getType())) {
+        if (!empty($queueForDatabase->getType())) {
             $queueForDatabase->trigger();
         }
 
-        if (! empty($queueForBuilds->getType())) {
+        if (!empty($queueForBuilds->getType())) {
             $queueForBuilds->trigger();
         }
 
-        if (! empty($queueForMessaging->getType())) {
+        if (!empty($queueForMessaging->getType())) {
             $queueForMessaging->trigger();
         }
 
@@ -937,14 +909,14 @@ Http::shutdown()
         if ($useCache) {
             $resource = $resourceType = null;
             $data = $response->getPayload();
-            if (! empty($data['payload'])) {
+            if (!empty($data['payload'])) {
                 $pattern = $route->getLabel('cache.resource', null);
-                if (! empty($pattern)) {
+                if (!empty($pattern)) {
                     $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user);
                 }
 
                 $pattern = $route->getLabel('cache.resourceType', null);
-                if (! empty($pattern)) {
+                if (!empty($pattern)) {
                     $resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user);
                 }
 
@@ -954,7 +926,7 @@ Http::shutdown()
 
                 $key = $request->cacheIdentifier();
                 $signature = md5($data['payload']);
-                $cacheLog = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
+                $cacheLog  =  $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
                 $accessedAt = $cacheLog->getAttribute('accessedAt', 0);
                 $now = DateTime::now();
                 if ($cacheLog->isEmpty()) {
@@ -973,9 +945,7 @@ Http::shutdown()
                     }
                 } elseif (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_CACHE_UPDATE)) > $accessedAt) {
                     $cacheLog->setAttribute('accessedAt', $now);
-                    $authorization->skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), new Document([
-                        'accessedAt' => $cacheLog->getAttribute('accessedAt')
-                    ])));
+                    $authorization->skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), $cacheLog));
                     // Overwrite the file every APP_CACHE_UPDATE seconds to update the file modified time that is used in the TTL checks in cache->load()
                     $cache->save($key, $data['payload']);
                 }
@@ -987,40 +957,22 @@ Http::shutdown()
         }
 
         if ($project->getId() !== 'console') {
-            if (! $user->isPrivileged($authorization->getRoles())) {
-                $bus->dispatch(new RequestCompleted(
-                    project: $project->getArrayCopy(),
-                    request: $request,
-                    response: $response,
-                ));
-            }
-
-            // Publish usage metrics if context has data
-            if (! $usage->isEmpty()) {
-                $metrics = $usage->getMetrics();
-
-                // Filter out API key disabled metrics using suffix pattern matching
-                $disabledMetrics = $apiKey?->getDisabledMetrics() ?? [];
-                if (! empty($disabledMetrics)) {
-                    $metrics = array_values(array_filter($metrics, function ($metric) use ($disabledMetrics) {
-                        foreach ($disabledMetrics as $pattern) {
-                            if (str_ends_with($metric['key'], $pattern)) {
-                                return false;
-                            }
-                        }
-
-                        return true;
-                    }));
+            if (!User::isPrivileged($authorization->getRoles())) {
+                $fileSize = 0;
+                $file = $request->getFiles('file');
+                if (!empty($file)) {
+                    $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
                 }
 
-                $message = new UsageMessage(
-                    project: $project,
-                    metrics: $metrics,
-                    reduce: $usage->getReduce()
-                );
-
-                $publisherForUsage->enqueue($message);
+                $queueForStatsUsage
+                    ->addMetric(METRIC_NETWORK_REQUESTS, 1)
+                    ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
+                    ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize());
             }
+
+            $queueForStatsUsage
+                ->setProject($project)
+                ->trigger();
         }
     });
 

app/controllers/shared/api/auth.php

@@ -36,9 +36,8 @@ Http::init()
     ->inject('request')
     ->inject('project')
     ->inject('geodb')
-    ->inject('user')
     ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Document $project, Reader $geodb, User $user, Authorization $authorization) {
+    ->action(function (Http $utopia, Request $request, Document $project, Reader $geodb, Authorization $authorization) {
         $denylist = System::getEnv('_APP_CONSOLE_COUNTRIES_DENYLIST', '');
         if (!empty($denylist && $project->getId() === 'console')) {
             $countries = explode(',', $denylist);
@@ -51,8 +50,8 @@ Http::init()
 
         $route = $utopia->match($request);
 
-        $isPrivilegedUser = $user->isPrivileged($authorization->getRoles());
-        $isAppUser = $user->isApp($authorization->getRoles());
+        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAppUser = User::isApp($authorization->getRoles());
 
         if ($isAppUser || $isPrivilegedUser) { // Skip limits for app and console devs
             return;

app/http.php

@@ -103,7 +103,7 @@ function dispatch(Server $server, int $fd, int $type, $data = null): int
         $lines = explode("\n", $data, 3);
         $request = $lines[0];
         if (count($lines) > 1) {
-            $domain = trim(explode('Host: ', $lines[1])[1] ?? '');
+            $domain = trim(explode('Host: ', $lines[1])[1]);
         }
 
         // Sync executions are considered risky
@@ -188,16 +188,10 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server) {
     Console::success('Reload completed...');
 });
 
-Http::setResource('bus', function ($register, $utopia) {
-    return $register->get('bus')->setResolver(fn (string $name) => $utopia->getResource($name));
-}, ['register', 'utopia']);
-
 include __DIR__ . '/controllers/general.php';
 
 function createDatabase(Http $app, string $resourceKey, string $dbName, array $collections, mixed $pools, ?callable $extraSetup = null): void
 {
-    $max = 15;
-    $sleep = 2;
     $max = 15;
     $sleep = 2;
     $attempts = 0;
@@ -411,29 +405,13 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $tot
         });
 
         $projectCollections = $collections['projects'];
-
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
         $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
         $sharedTablesV2 = \array_diff($sharedTables, $sharedTablesV1);
 
-        $documentsSharedTables = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''));
-        $documentsSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1', ''));
-        $documentsSharedTablesV2 = \array_diff($documentsSharedTables, $documentsSharedTablesV1);
-
-        $vectorSharedTables = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''));
-        $vectorSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES_V1', ''));
-        $vectorSharedTablesV2 = \array_diff($vectorSharedTables, $vectorSharedTablesV1);
-
         $cache = $app->getResource('cache');
 
-        // All shared tables V2 pools that need project metadata collections
-        $sharedTablesV2All = \array_values(\array_unique(\array_filter([
-            ...$sharedTablesV2,
-            ...$documentsSharedTablesV2,
-            ...$vectorSharedTablesV2,
-        ])));
-
-        foreach ($sharedTablesV2All as $hostname) {
+        foreach ($sharedTablesV2 as $hostname) {
             Span::init('database.setup');
             Span::add('database.hostname', $hostname);
 
@@ -599,9 +577,6 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
 
             $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
             if (!empty($sdk)) {
-                if (\is_array($sdk)) {
-                    $sdk = $sdk[0];
-                }
                 /** @var Appwrite\SDK\Method $sdk */
                 $action = $sdk->getNamespace() . '.' . $sdk->getMethodName();
             } elseif ($route === null) {

app/init/constants.php

@@ -47,7 +47,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.9.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';
@@ -93,11 +93,9 @@ const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=
 const APP_COMPUTE_CPUS_DEFAULT = 0.5;
 const APP_COMPUTE_MEMORY_DEFAULT = 512;
 const APP_COMPUTE_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
-const APP_COMPUTE_DEPLOYMENT_MAX_RETENTION = 100 * 365; // 100 years
 const APP_SDK_PLATFORM_SERVER = 'server';
 const APP_SDK_PLATFORM_CLIENT = 'client';
 const APP_SDK_PLATFORM_CONSOLE = 'console';
-const APP_SDK_PLATFORM_STATIC = 'static';
 const APP_VCS_GITHUB_USERNAME = 'Appwrite';
 const APP_VCS_GITHUB_EMAIL = 'team@appwrite.io';
 const APP_VCS_GITHUB_URL = 'https://github.com/TeamAppwrite';
@@ -289,45 +287,6 @@ const METRIC_DATABASES_OPERATIONS_READS  = 'databases.operations.reads';
 const METRIC_DATABASE_ID_OPERATIONS_READS = '{databaseInternalId}.databases.operations.reads';
 const METRIC_DATABASES_OPERATIONS_WRITES  = 'databases.operations.writes';
 const METRIC_DATABASE_ID_OPERATIONS_WRITES = '{databaseInternalId}.databases.operations.writes';
-
-// documentsdb
-const METRIC_DATABASES_DOCUMENTSDB = 'documentsdb.databases';
-const METRIC_COLLECTIONS_DOCUMENTSDB = 'documentsdb.collections';
-const METRIC_DATABASES_STORAGE_DOCUMENTSDB = 'documentsdb.databases.storage';
-const METRIC_DATABASE_ID_COLLECTIONS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.collections';
-const METRIC_DATABASE_ID_STORAGE_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.storage';
-const METRIC_DOCUMENTS_DOCUMENTSDB = 'documentsdb.documents';
-const METRIC_DATABASE_ID_DOCUMENTS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.{collectionInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.{collectionInternalId}.databases.storage';
-const METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB  = 'documentsdb.databases.operations.reads';
-const METRIC_DATABASE_ID_OPERATIONS_READS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.operations.reads';
-const METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB  = 'documentsdb.databases.operations.writes';
-const METRIC_DATABASE_ID_OPERATIONS_WRITES_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.operations.writes';
-
-// vectorsdb
-const METRIC_DATABASES_VECTORSDB = 'vectorsdb.databases';
-const METRIC_COLLECTIONS_VECTORSDB = 'vectorsdb.collections';
-const METRIC_DATABASES_STORAGE_VECTORSDB = 'vectorsdb.databases.storage';
-const METRIC_DATABASE_ID_COLLECTIONS_VECTORSDB = 'vectorsdb.{databaseInternalId}.collections';
-const METRIC_DATABASE_ID_STORAGE_VECTORSDB = 'vectorsdb.{databaseInternalId}.databases.storage';
-const METRIC_DOCUMENTS_VECTORSDB = 'vectorsdb.documents';
-const METRIC_DATABASE_ID_DOCUMENTS_VECTORSDB = 'vectorsdb.{databaseInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS_VECTORSDB = 'vectorsdb.{databaseInternalId}.{collectionInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE_VECTORSDB = 'vectorsdb.{databaseInternalId}.{collectionInternalId}.databases.storage';
-const METRIC_DATABASES_OPERATIONS_READS_VECTORSDB  = 'vectorsdb.databases.operations.reads';
-const METRIC_DATABASE_ID_OPERATIONS_READS_VECTORSDB = 'vectorsdb.{databaseInternalId}.databases.operations.reads';
-const METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB  = 'vectorsdb.databases.operations.writes';
-const METRIC_DATABASE_ID_OPERATIONS_WRITES_VECTORSDB = 'vectorsdb.{databaseInternalId}.databases.operations.writes';
-const METRIC_EMBEDDINGS_TEXT = 'embeddings.text';
-const METRIC_EMBEDDINGS_MODEL_TEXT = 'embeddings.text.{embeddingModel}';
-const METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR = 'embeddings.text.totalErrors';
-const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_ERROR = 'embeddings.text.{embeddingModel}.totalErrors';
-const METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION = 'embeddings.text.totalDuration';
-const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_DURATION = 'embeddings.text.{embeddingModel}.totalDuration';
-const METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS = 'embeddings.text.totalTokens';
-const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_TOKENS = 'embeddings.text.{embeddingModel}.totalTokens';
-
 const METRIC_BUCKETS = 'buckets';
 const METRIC_FILES  = 'files';
 const METRIC_FILES_STORAGE  = 'files.storage';
@@ -402,12 +361,6 @@ const METRIC_AVATARS_SCREENSHOTS_GENERATED = 'avatars.screenshotsGenerated';
 const METRIC_FUNCTIONS_RUNTIME = 'functions.runtimes.{runtime}';
 const METRIC_SITES_FRAMEWORK = 'sites.frameworks.{framework}';
 
-// Realtime metrics
-const METRIC_REALTIME_CONNECTIONS = 'realtime.connections';
-const METRIC_REALTIME_CONNECTIONS_MESSAGES_SENT = 'realtime.messages.sent';
-const METRIC_REALTIME_INBOUND = 'realtime.inbound';
-const METRIC_REALTIME_OUTBOUND = 'realtime.outbound';
-
 // Resource types
 const RESOURCE_TYPE_PROJECTS = 'projects';
 const RESOURCE_TYPE_FUNCTIONS = 'functions';
@@ -420,7 +373,6 @@ const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers';
 const RESOURCE_TYPE_MESSAGES = 'messages';
 const RESOURCE_TYPE_EXECUTIONS = 'executions';
 const RESOURCE_TYPE_VCS = 'vcs';
-const RESOURCE_TYPE_EMBEDDINGS_TEXT = 'embeddingsText';
 
 // Resource types for Tokens
 const TOKENS_RESOURCE_TYPE_FILES = 'files';
@@ -440,18 +392,8 @@ const COOKIE_NAME_PREVIEW = 'a_jwt_console';
 const CACHE_RECONNECT_MAX_RETRIES = 2;
 const CACHE_RECONNECT_RETRY_DELAY = 1000;
 
+/* Web installer */
+const LOCAL_API_TIMEOUT = 30 * 1000; // 30 seconds
+
 // Project status
 const PROJECT_STATUS_ACTIVE = 'active';
-
-// Database types
-const DATABASE_TYPE_LEGACY = 'legacy';
-const DATABASE_TYPE_TABLESDB = 'tablesdb';
-const DATABASE_TYPE_DOCUMENTSDB = 'documentsdb';
-const DATABASE_TYPE_VECTORSDB = 'vectorsdb';
-
-// CSV import/export allowed database types
-const CSV_ALLOWED_DATABASE_TYPES = [
-    DATABASE_TYPE_LEGACY,
-    DATABASE_TYPE_TABLESDB,
-    DATABASE_TYPE_VECTORSDB
-];

app/init/database/formats.php

@@ -1,9 +1,9 @@
 <?php
 
+use Appwrite\Network\Validator\Email;
 use Utopia\Database\Database;
 use Utopia\Database\Validator\Datetime as DatetimeValidator;
 use Utopia\Database\Validator\Structure;
-use Utopia\Emails\Validator\Email;
 use Utopia\Validator\IP;
 use Utopia\Validator\Range;
 use Utopia\Validator\URL;

app/init/models.php

@@ -22,7 +22,6 @@ 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\AttributeObject;
 use Appwrite\Utopia\Response\Model\AttributePoint;
 use Appwrite\Utopia\Response\Model\AttributePolygon;
 use Appwrite\Utopia\Response\Model\AttributeRelationship;
@@ -30,7 +29,6 @@ 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\AttributeVector;
 use Appwrite\Utopia\Response\Model\AuthProvider;
 use Appwrite\Utopia\Response\Model\BaseList;
 use Appwrite\Utopia\Response\Model\Branch;
@@ -67,7 +65,6 @@ 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\Embedding;
 use Appwrite\Utopia\Response\Model\Error;
 use Appwrite\Utopia\Response\Model\ErrorDev;
 use Appwrite\Utopia\Response\Model\Execution;
@@ -139,8 +136,6 @@ 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\UsageDocumentsDB;
-use Appwrite\Utopia\Response\Model\UsageDocumentsDBs;
 use Appwrite\Utopia\Response\Model\UsageFunction;
 use Appwrite\Utopia\Response\Model\UsageFunctions;
 use Appwrite\Utopia\Response\Model\UsageProject;
@@ -149,12 +144,9 @@ 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\UsageVectorsDB;
-use Appwrite\Utopia\Response\Model\UsageVectorsDBs;
 use Appwrite\Utopia\Response\Model\User;
 use Appwrite\Utopia\Response\Model\Variable;
 use Appwrite\Utopia\Response\Model\VcsContent;
-use Appwrite\Utopia\Response\Model\VectorsDBCollection;
 use Appwrite\Utopia\Response\Model\Webhook;
 
 // General
@@ -193,7 +185,7 @@ Response::setModel(new BaseList('Runtimes List', Response::MODEL_RUNTIME_LIST, '
 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, true));
+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));
@@ -219,12 +211,9 @@ Response::setModel(new BaseList('Migrations List', Response::MODEL_MIGRATION_LIS
 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));
-Response::setModel(new BaseList('VectorsDB Collections List', Response::MODEL_VECTORSDB_COLLECTION_LIST, 'collections', Response::MODEL_VECTORSDB_COLLECTION));
-Response::setModel(new BaseList('Embedding list', Response::MODEL_EMBEDDING_LIST, 'embeddings', Response::MODEL_EMBEDDING));
 
 // Entities
 Response::setModel(new Database());
-Response::setModel(new Embedding());
 
 // Collection API Models
 Response::setModel(new Collection());
@@ -248,17 +237,6 @@ Response::setModel(new AttributeText());
 Response::setModel(new AttributeMediumtext());
 Response::setModel(new AttributeLongtext());
 
-// DocumentsDB API Models
-Response::setModel(new UsageDocumentsDBs());
-Response::setModel(new UsageDocumentsDB());
-
-// VectorsDB API Models
-Response::setModel(new VectorsDBCollection());
-Response::setModel(new AttributeObject());
-Response::setModel(new AttributeVector());
-Response::setModel(new UsageVectorsDBs());
-Response::setModel(new UsageVectorsDB());
-
 // Table API Models
 Response::setModel(new Table());
 Response::setModel(new Column());

app/init/registers.php

@@ -160,6 +160,7 @@ $register->set('pools', function () {
         'pass' => System::getEnv('_APP_DB_PASS', ''),
         'path' => System::getEnv('_APP_DB_SCHEMA', ''),
     ]);
+
     $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([
         'scheme' => 'redis',
         'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
@@ -168,23 +169,6 @@ $register->set('pools', function () {
         'pass' => System::getEnv('_APP_REDIS_PASS', ''),
     ]);
 
-    $fallbackForDocumentsDB = 'db_main=' . AppwriteURL::unparse([
-        'scheme' => System::getEnv('_APP_DB_ADAPTER_DOCUMENTSDB', 'mongodb'),
-        'host' => System::getEnv('_APP_DB_HOST_DOCUMENTSDB', 'mongodb'),
-        'port' => System::getEnv('_APP_DB_PORT_DOCUMENTSDB', '27017'),
-        'user' => System::getEnv('_APP_DB_USER', ''),
-        'pass' => System::getEnv('_APP_DB_PASS', ''),
-        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
-    ]);
-    $fallbackForVectorsDB = 'db_main=' . AppwriteURL::unparse([
-        'scheme' => System::getEnv('_APP_DB_ADAPTER_VECTORSDB', 'postgresql'),
-        'host' => System::getEnv('_APP_DB_HOST_VECTORSDB', 'postgresql'),
-        'port' => System::getEnv('_APP_DB_PORT_VECTORSDB', '5432'),
-        'user' => System::getEnv('_APP_DB_USER', ''),
-        'pass' => System::getEnv('_APP_DB_PASS', ''),
-        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
-    ]);
-
     $connections = [
         'console' => [
             'type' => 'database',
@@ -196,25 +180,13 @@ $register->set('pools', function () {
             'type' => 'database',
             'dsns' => $fallbackForDB,
             'multiple' => true,
-            'schemes' => ['mongodb','mariadb', 'mysql','postgresql'],
-        ],
-        'documentsdb' => [
-            'type' => 'database',
-            'dsns' => System::getEnv('_APP_CONNECTIONS_DATABASE_DOCUMENTSDB', $fallbackForDocumentsDB),
-            'multiple' => true,
-            'schemes' => ['mongodb'],
-        ],
-        'vectorsdb' => [
-            'type' => 'database',
-            'dsns' => System::getEnv('_APP_CONNECTIONS_DATABASE_VECTORSDB', $fallbackForVectorsDB),
-            'multiple' => true,
-            'schemes' => ['postgresql'],
+            'schemes' => ['mariadb', 'mongodb', 'mysql', 'postgresql'],
         ],
         'logs' => [
             'type' => 'database',
             'dsns' => System::getEnv('_APP_CONNECTIONS_DB_LOGS', $fallbackForDB),
             'multiple' => false,
-            'schemes' => ['mongodb','mariadb', 'mysql','postgresql'],
+            'schemes' => ['mariadb', 'mongodb', 'mysql', 'postgresql'],
         ],
         'publisher' => [
             'type' => 'publisher',
@@ -448,7 +420,6 @@ $register->set('smtp', function () {
     $mail->Password = $password;
     $mail->SMTPSecure = System::getEnv('_APP_SMTP_SECURE', '');
     $mail->SMTPAutoTLS = false;
-    $mail->SMTPKeepAlive = true;
     $mail->CharSet = 'UTF-8';
     $mail->Timeout = 10; /* Connection timeout */
     $mail->getSMTPInstance()->Timelimit = 30; /* Timeout for each individual SMTP command (e.g. HELO, EHLO, etc.) */
@@ -478,11 +449,3 @@ $register->set('promiseAdapter', function () {
 $register->set('hooks', function () {
     return new Hooks();
 });
-$listeners = require __DIR__ . '/../listeners.php';
-$register->set('bus', function () use ($listeners) {
-    $bus = new \Utopia\Bus\Bus();
-    foreach ($listeners as $listener) {
-        $bus->subscribe($listener);
-    }
-    return $bus;
-});

app/init/span.php

@@ -5,9 +5,4 @@ use Utopia\Span\Span;
 use Utopia\Span\Storage;
 
 Span::setStorage(new Storage\Coroutine());
-Span::addExporter(new Exporter\Pretty(), function (Span $span): bool {
-    if (\str_starts_with($span->getAction(), 'listener.')) {
-        return $span->getError() !== null;
-    }
-    return true;
-});
+Span::addExporter(new Exporter\Pretty());

app/listeners.php

@@ -1,9 +0,0 @@
-<?php
-
-use Appwrite\Bus\Listeners\Log;
-use Appwrite\Bus\Listeners\Usage;
-
-return [
-    new Log(),
-    new Usage(),
-];

app/realtime.php

@@ -50,16 +50,6 @@ require_once __DIR__ . '/init.php';
 
 Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
 
-// Log uncaught exceptions in one line instead of relying on Swoole's full backtrace dump
-set_exception_handler(function (\Throwable $e) {
-    Console::error(sprintf(
-        'Realtime uncaught exception: %s in %s:%d',
-        $e->getMessage(),
-        $e->getFile(),
-        $e->getLine()
-    ));
-});
-
 // Allows overriding
 if (!function_exists('getConsoleDB')) {
     function getConsoleDB(): Database
@@ -125,7 +115,7 @@ if (!function_exists('getProjectDB')) {
         if (\in_array($dsn->getHost(), $sharedTables)) {
             $database
                 ->setSharedTables(true)
-                ->setTenant($project->getSequence())
+                ->setTenant((int)$project->getSequence())
                 ->setNamespace($dsn->getParam('namespace'));
         } else {
             $database
@@ -234,13 +224,6 @@ if (!function_exists('getTelemetry')) {
     }
 }
 
-if (!function_exists('triggerStats')) {
-    function triggerStats(array $event, string $projectId): void
-    {
-        return;
-    }
-}
-
 $realtime = getRealtime();
 
 /**
@@ -373,10 +356,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
                     ->setAttribute('timestamp', DateTime::now())
                     ->setAttribute('value', json_encode($payload));
 
-                $database->getAuthorization()->skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), new Document([
-                    'timestamp' => $statsDocument->getAttribute('timestamp'),
-                    'value' => $statsDocument->getAttribute('value')
-                ])));
+                $database->getAuthorization()->skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
             } catch (Throwable $th) {
                 logError($th, "updateWorkerDocument");
             }
@@ -518,7 +498,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                         $project = $consoleDatabase->getAuthorization()->skip(fn () => $consoleDatabase->getDocument('projects', $projectId));
                         $database = getProjectDB($project);
 
-                        /** @var User $user */
+                        /** @var Appwrite\Utopia\Database\Documents\User $user */
                         $user = $database->getDocument('users', $userId);
 
                         $roles = $user->getRoles($database->getAuthorization());
@@ -565,41 +545,20 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                 }
 
                 $total = 0;
-                $outboundBytes = 0;
-
                 foreach ($groups as $group) {
                     $data = $event['data'];
                     $data['subscriptions'] = $group['subscriptions'];
 
-                    $payloadJson = json_encode([
+                    $server->send($group['ids'], json_encode([
                         'type' => 'event',
                         'data' => $data
-                    ]);
-
-                    $server->send($group['ids'], $payloadJson);
-
-                    $count = count($group['ids']);
-                    $total += $count;
-                    $outboundBytes += strlen($payloadJson) * $count;
+                    ]));
+                    $total += count($group['ids']);
                 }
 
                 if ($total > 0) {
                     $register->get('telemetry.messageSentCounter')->add($total);
                     $stats->incr($event['project'], 'messages', $total);
-
-                    $projectId = $event['project'] ?? null;
-
-                    if (!empty($projectId)) {
-                        $metrics = [
-                            METRIC_REALTIME_CONNECTIONS_MESSAGES_SENT => $total,
-                        ];
-
-                        if ($outboundBytes > 0) {
-                            $metrics[METRIC_REALTIME_OUTBOUND] = $outboundBytes;
-                        }
-
-                        triggerStats($metrics, $projectId);
-                    }
                 }
             });
         } catch (Throwable $th) {
@@ -642,14 +601,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing or unknown project ID');
         }
 
-        $timelimit = $app->getResource('timelimit');
-        $user = $app->getResource('user'); /** @var User $user */
-        $logUser = $user;
-
         if (
             array_key_exists('realtime', $project->getAttribute('apis', []))
             && !$project->getAttribute('apis', [])['realtime']
-            && !($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
         ) {
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
         }
@@ -660,6 +615,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Project is not accessible in this region. Please make sure you are using the correct endpoint');
         }
 
+        $timelimit = $app->getResource('timelimit');
+        $user = $app->getResource('user'); /** @var User $user */
+        $logUser = $user;
+
         /*
          * Abuse Check
          *
@@ -676,12 +635,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new Exception(Exception::REALTIME_TOO_MANY_MESSAGES, 'Too many requests');
         }
 
-        $rawSize = $request->getSize();
-
-        triggerStats([
-            METRIC_REALTIME_INBOUND => $rawSize,
-        ], $project->getId());
-
         /*
          * Validate Client Domain - Check to avoid CSRF attack.
          * Adding Appwrite API domains to allow XDOMAIN communication.
@@ -736,16 +689,14 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
 
         $user = empty($user->getId()) ? null : $response->output($user, Response::MODEL_ACCOUNT);
 
-        $connectedPayloadJson = json_encode([
+        $server->send([$connection], json_encode([
             'type' => 'connected',
             'data' => [
                 'channels' => $names,
                 'subscriptions' => $mapping,
                 'user' => $user
             ]
-        ]);
-
-        $server->send([$connection], $connectedPayloadJson);
+        ]));
 
         $register->get('telemetry.connectionCounter')->add(1);
         $register->get('telemetry.connectionCreatedCounter')->add(1);
@@ -756,12 +707,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         ]);
         $stats->incr($project->getId(), 'connections');
         $stats->incr($project->getId(), 'connectionsTotal');
-
-        $connectedOutboundBytes = \strlen($connectedPayloadJson);
-
-        triggerStats([METRIC_REALTIME_CONNECTIONS => 1, METRIC_REALTIME_OUTBOUND => $connectedOutboundBytes], $project->getId());
-
-
     } catch (Throwable $th) {
         logError($th, 'realtime', project: $project, user: $logUser, authorization: $authorization);
 
@@ -803,7 +748,6 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
     $authorization = null;
 
     try {
-        $rawSize = \strlen($message);
         $response = new Response(new SwooleResponse());
         $projectId = $realtime->connections[$connection]['projectId'] ?? null;
 
@@ -816,7 +760,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
         $database = getConsoleDB();
         $database->setAuthorization($authorization);
 
-        if (!empty($projectId) && $projectId !== 'console') {
+        if ($projectId !== 'console') {
             $project = $authorization->skip(fn () => $database->getDocument('projects', $projectId));
 
             $database = getProjectDB($project);
@@ -842,41 +786,17 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
             throw new Exception(Exception::REALTIME_TOO_MANY_MESSAGES, 'Too many messages.');
         }
 
-        // Record realtime inbound bytes for this project
-        if ($project !== null && !$project->isEmpty()) {
-            triggerStats([
-                METRIC_REALTIME_INBOUND => $rawSize,
-            ], $project->getId());
-        }
-
         $message = json_decode($message, true);
 
         if (is_null($message) || (!array_key_exists('type', $message) && !array_key_exists('data', $message))) {
             throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Message format is not valid.');
         }
 
-        // Ping does not require project context; other messages do (e.g. after unsubscribe during auth)
-        if (empty($projectId) && ($message['type'] ?? '') !== 'ping') {
-            throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing project context. Reconnect to the project first.');
-        }
-
         switch ($message['type']) {
             case 'ping':
-                $pongPayloadJson = json_encode([
+                $server->send([$connection], json_encode([
                     'type' => 'pong'
-                ]);
-
-                $server->send([$connection], $pongPayloadJson);
-
-                if ($project !== null && !$project->isEmpty()) {
-                    $pongOutboundBytes = \strlen($pongPayloadJson);
-
-                    if ($pongOutboundBytes > 0) {
-                        triggerStats([
-                            METRIC_REALTIME_OUTBOUND => $pongOutboundBytes,
-                        ], $project->getId());
-                    }
-                }
+                ]));
 
                 break;
             case 'authentication':
@@ -937,27 +857,14 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                 }
 
                 $user = $response->output($user, Response::MODEL_ACCOUNT);
-
-                $authResponsePayloadJson = json_encode([
+                $server->send([$connection], json_encode([
                     'type' => 'response',
                     'data' => [
                         'to' => 'authentication',
                         'success' => true,
                         'user' => $user
                     ]
-                ]);
-
-                $server->send([$connection], $authResponsePayloadJson);
-
-                if ($project !== null && !$project->isEmpty()) {
-                    $authOutboundBytes = \strlen($authResponsePayloadJson);
-
-                    if ($authOutboundBytes > 0) {
-                        triggerStats([
-                            METRIC_REALTIME_OUTBOUND => $authOutboundBytes,
-                        ], $project->getId());
-                    }
-                }
+                ]));
 
                 break;
 
@@ -995,21 +902,9 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
 });
 
 $server->onClose(function (int $connection) use ($realtime, $stats, $register) {
-    try {
-        if (array_key_exists($connection, $realtime->connections)) {
-            $stats->decr($realtime->connections[$connection]['projectId'], 'connectionsTotal');
-            $register->get('telemetry.connectionCounter')->add(-1);
-
-            $projectId = $realtime->connections[$connection]['projectId'];
-
-            triggerStats([
-                METRIC_REALTIME_CONNECTIONS => -1,
-            ], $projectId);
-        }
-    } catch (\Throwable $th) {
-        // Log only; do not rethrow. If we let this bubble, Swoole dumps full coroutine
-        // backtraces and unsubscribe() below would never run (connection cleanup would fail).
-        Console::error('Realtime onClose error: ' . $th->getMessage());
+    if (array_key_exists($connection, $realtime->connections)) {
+        $stats->decr($realtime->connections[$connection]['projectId'], 'connectionsTotal');
+        $register->get('telemetry.connectionCounter')->add(-1);
     }
     $realtime->unsubscribe($connection);
 

app/views/install/compose.phtml

@@ -13,7 +13,7 @@ $organization = $this->getParam('organization', '');
 $image = $this->getParam('image', '');
 $enableAssistant = $this->getParam('enableAssistant', false);
 $dbService = $this->getParam('database', 'mongodb');
-$allowedDbServices = ['mariadb', 'mongodb'];
+$allowedDbServices = ['mariadb', 'mongodb', 'postgresql'];
 if (!\in_array($dbService, $allowedDbServices, true)) {
     $dbService = 'mongodb';
 }
@@ -68,7 +68,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - traefik.http.routers.appwrite_api_https.tls=true
     volumes:
 <?php if ($version === 'local' && !empty($hostPath)): ?>
-      - "<?php echo $hostPath; ?>:/usr/src/code:rw"
+      - <?php echo $hostPath; ?>:/usr/src/code:rw
 <?php endif; ?>
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-imports:/storage/imports:rw
@@ -79,10 +79,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService  . "\n" ?>
 #      - clamav
     environment:
       - _APP_ENV
@@ -194,7 +192,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:7.8.26
+    image: <?php echo $organization; ?>/console:7.6.4
     restart: unless-stopped
     networks:
       - appwrite
@@ -236,10 +234,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -269,10 +265,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -299,10 +293,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -331,10 +323,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     volumes:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -398,10 +388,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -428,10 +416,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     volumes:
       - appwrite-functions:/storage/functions:rw
       - appwrite-sites:/storage/sites:rw
@@ -500,10 +486,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     volumes:
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
@@ -541,12 +525,9 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
-      openruntimes-executor:
-        condition: service_started
+      - redis
+      - <?= $dbService . "\n" ?>
+      - openruntimes-executor
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -585,10 +566,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -626,10 +605,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     volumes:
       - appwrite-uploads:/storage/uploads:rw
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -682,8 +659,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     volumes:
       - appwrite-imports:/storage/imports:rw
     depends_on:
-      <?= $dbService ?>:
-        condition: service_healthy
+      - <?= $dbService . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -719,10 +695,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -763,10 +737,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -796,10 +768,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -828,10 +798,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
+      - redis
+      - <?= $dbService . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -860,10 +828,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      <?= $dbService ?>:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+      - <?= $dbService . "\n" ?>
+      - redis
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -889,10 +855,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      <?= $dbService ?>:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+      - <?= $dbService . "\n" ?>
+      - redis
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -918,10 +882,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      <?= $dbService ?>:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+      - <?= $dbService . "\n" ?>
+      - redis
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1026,12 +988,6 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - MYSQL_PASSWORD=${_APP_DB_PASS}
       - MARIADB_AUTO_UPGRADE=1
     command: 'mysqld --innodb-flush-method=fsync'
-    healthcheck:
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
-      interval: 10s
-      timeout: 10s
-      retries: 10
-      start_period: 30s
 
 <?php elseif ($dbService === 'mongodb'): ?>
 
@@ -1144,12 +1100,6 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     volumes:
       - appwrite-redis:/data:rw
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
 
   # clamav:
   #   image: appwrite/clamav:1.2.0

app/views/install/env.phtml

@@ -3,10 +3,6 @@
 $vars = $this->getParam('vars');
 
 foreach ($vars as $key => $value) {
-    if ($value === null || $value === '') {
-        echo $key . "=\n";
-    } else {
-        echo $key . '="' . addcslashes((string) $value, '"\\$`') . '"' . "\n";
-    }
+    echo $key.'='.$value."\n";
 }
 ?>

app/views/install/installer.phtml

@@ -7,13 +7,14 @@ $defaultHttpsPort = $defaultHttpsPort ?? '443';
 $defaultAppDomain = $vars['_APP_DOMAIN']['default'] ?? 'localhost';
 $defaultAppDomain = ($defaultAppDomain === 'traefik') ? 'localhost' : $defaultAppDomain;
 $defaultEmailCertificates = $defaultEmailCertificates ?? '';
+$defaultSecretKey = $vars['_APP_OPENSSL_KEY_V1']['default'] ?? '';
+$defaultAssistantOpenAIKey = $vars['_APP_ASSISTANT_OPENAI_API_KEY']['default'] ?? '';
 $defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'mongodb';
 $lockedDatabase = $isUpgrade && empty($lockedDatabase) ? $defaultDatabase : $lockedDatabase;
-$enabledDatabases = $enabledDatabases ?? ['mongodb', 'mariadb', 'postgresql'];
 $isLocalInstall = $isLocalInstall ?? false;
 
 
-$cardStep = ($step === 5) ? 4 : $step;
+$cardStep = min(4, $step);
 $stepFile = __DIR__ . "/installer/templates/steps/step-{$cardStep}.phtml";
 if (!is_file($stepFile)) {
     $stepFile = __DIR__ . "/installer/templates/steps/step-1.phtml";
@@ -62,10 +63,9 @@ $installerVersion = @filemtime(__DIR__ . '/installer/js/installer.js') ?: time()
     data-default-https-port="<?php echo htmlspecialchars((string) $defaultHttpsPort, ENT_QUOTES, 'UTF-8'); ?>"
     data-default-app-domain="<?php echo htmlspecialchars((string) $defaultAppDomain, ENT_QUOTES, 'UTF-8'); ?>"
     data-default-email-certificates="<?php echo htmlspecialchars((string) $defaultEmailCertificates, ENT_QUOTES, 'UTF-8'); ?>"
-    data-default-secret-key=""
-    data-default-assistant-openai-key=""
+    data-default-secret-key="<?php echo htmlspecialchars((string) $defaultSecretKey, ENT_QUOTES, 'UTF-8'); ?>"
+    data-default-assistant-openai-key="<?php echo htmlspecialchars((string) $defaultAssistantOpenAIKey, ENT_QUOTES, 'UTF-8'); ?>"
     data-default-database="<?php echo htmlspecialchars((string) $defaultDatabase, ENT_QUOTES, 'UTF-8'); ?>"
-    data-enabled-databases="<?php echo htmlspecialchars(json_encode(array_values($enabledDatabases)), ENT_QUOTES, 'UTF-8'); ?>"
     <?php if ($isLocalInstall) { ?>
         data-dev-mode="true"
     <?php } ?>

app/views/install/installer/css/styles.css

@@ -11,13 +11,9 @@
     --neutral-300: rgba(173, 173, 176, 1);
     --neutral-400: rgba(151, 151, 155, 1);
     --neutral-500: rgba(129, 129, 134, 1);
-    --neutral-600: rgba(108, 108, 113, 1);
     --neutral-700: rgba(86, 86, 92, 1);
-    --neutral-750: rgba(65, 65, 70, 1);
     --neutral-800: rgba(45, 45, 49, 1);
-    --neutral-850: rgba(29, 29, 33, 1);
     --neutral-900: rgba(25, 25, 28, 1);
-    --neutral-250: rgba(195, 195, 198, 1);
 
     /* Warning colors */
     --web-orange-200: rgba(255, 213, 194, 1);
@@ -176,44 +172,6 @@
     --fgColor-neutral-weak: var(--fgcolor-neutral-weak);
     --fgColor-accent: var(--fgcolor-accent);
     --fgColor-on-accent: var(--fgcolor-on-accent);
-
-    color-scheme: light dark;
-}
-
-@media (prefers-color-scheme: dark) {
-    :root {
-        --bgcolor-neutral-default: var(--neutral-900);
-        --bgcolor-neutral-primary: var(--neutral-850);
-        --bgcolor-neutral-secondary: var(--neutral-800);
-        --bgcolor-neutral-tertiary: var(--neutral-800);
-        --bgcolor-neutral-invert-weaker: var(--neutral-400);
-        --bgcolor-neutral-invert-weak: var(--neutral-300);
-        --bgcolor-success-weak: rgba(16, 185, 129, 0.12);
-        --bgcolor-warning-weaker: rgba(254, 124, 67, 0.08);
-        --bgcolor-warning-weak: rgba(254, 124, 67, 0.12);
-        --bgcolor-error-weaker: rgba(255, 69, 58, 0.08);
-
-        --fgcolor-neutral-primary: var(--neutral-50);
-        --fgcolor-neutral-secondary: var(--neutral-250);
-        --fgcolor-neutral-tertiary: var(--neutral-500);
-        --fgcolor-neutral-weak: var(--neutral-600);
-        --fgcolor-on-accent: var(--neutral-0);
-        --fgcolor-on-invert: var(--neutral-900);
-        --fgcolor-on-success-weak: rgba(52, 211, 153, 1);
-        --fgcolor-warning: var(--web-orange-500);
-        --fgcolor-on-warning-weak: var(--web-orange-500);
-        --fgcolor-error: var(--web-red-500);
-        --fgcolor-on-error: var(--neutral-0);
-
-        --border-neutral: var(--neutral-800);
-        --border-neutral-strong: var(--neutral-750);
-        --border-neutral-stronger: var(--neutral-600);
-        --border-focus: var(--neutral-600);
-
-        --overlay-neutral-hover: rgba(255, 255, 255, 0.04);
-        --overlay-neutral-pressed: rgba(255, 255, 255, 0.08);
-        --overlay-scrim: rgba(0, 0, 0, 0.48);
-    }
 }
 
 .installer-toast-stack {
@@ -478,10 +436,6 @@ body {
     overflow: hidden;
 }
 
-.installer-page[data-upgrade='true'] .installer-step {
-    min-height: 0;
-}
-
 .action-shell {
     display: flex;
     flex-direction: column;
@@ -695,19 +649,6 @@ body {
     transform: translateY(10px);
 }
 
-.install-counter {
-    margin-left: auto;
-    opacity: 0;
-    transition: opacity 0.2s ease;
-    white-space: nowrap;
-    user-select: none;
-    color: var(--fgcolor-neutral-secondary);
-}
-
-.install-row[data-status='in-progress'] .install-counter:not(:empty) {
-    opacity: 1;
-}
-
 .install-row-toggle {
     margin-left: auto;
     width: 32px;
@@ -914,17 +855,6 @@ body {
     gap: var(--gap-m);
 }
 
-.install-global-actions {
-    display: flex;
-    justify-content: center;
-    gap: var(--gap-m);
-    padding: var(--space-4) 0;
-}
-
-.install-global-actions.is-hidden {
-    display: none;
-}
-
 .install-error-details .button {
     align-self: center;
     margin-top: 0;
@@ -1424,7 +1354,6 @@ body {
     align-items: center;
     justify-content: center;
     line-height: 0;
-    color: var(--fgcolor-neutral-weak);
 }
 
 .step-indicator svg {
@@ -1812,92 +1741,3 @@ body {
         gap: var(--gap-s);
     }
 }
-
-.migration-option {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: var(--gap-l);
-    padding: var(--space-6);
-    background: var(--bgcolor-neutral-default);
-    border-radius: var(--border-radius-m);
-    outline: var(--border-width-s) solid var(--border-neutral);
-    outline-offset: calc(var(--border-width-s) * -1);
-    cursor: pointer;
-    transition: outline-color 0.15s ease-in-out;
-}
-
-.migration-option:hover {
-    outline-color: var(--border-neutral-stronger);
-}
-
-.migration-option-content {
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
-}
-
-.migration-switch {
-    flex-shrink: 0;
-}
-
-.migration-switch-track {
-    position: relative;
-    display: block;
-    width: 32px;
-    height: 20px;
-    border-radius: 10px;
-    background: var(--bgcolor-neutral-invert-weaker);
-    transition: background 0.15s ease-in-out;
-}
-
-.migration-switch-thumb {
-    position: absolute;
-    top: 2px;
-    left: 2px;
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background: var(--bgcolor-neutral-primary);
-    transition: transform 0.15s ease-in-out;
-}
-
-#run-migration:checked ~ .migration-switch-track {
-    background: var(--bgcolor-neutral-invert-weak);
-}
-
-#run-migration:checked ~ .migration-switch-track .migration-switch-thumb {
-    transform: translateX(12px);
-}
-
-#run-migration:focus-visible ~ .migration-switch-track {
-    box-shadow: 0 0 0 var(--border-width-l) var(--border-focus);
-}
-
-.migration-hint {
-    display: flex;
-    align-items: flex-start;
-    gap: var(--gap-s);
-    padding: 0 var(--space-2);
-}
-
-.migration-hint-icon {
-    flex-shrink: 0;
-    width: 16px;
-    height: 16px;
-    color: var(--fgcolor-neutral-tertiary);
-    margin-top: 1px;
-}
-
-.migration-hint-icon svg {
-    width: 100%;
-    height: 100%;
-}
-
-.migration-code {
-    padding: 1px 4px;
-    border-radius: var(--border-radius-xs, 4px);
-    background: var(--bgcolor-neutral-secondary);
-    font-family: monospace;
-    font-size: inherit;
-}

app/views/install/installer/icons/appwrite-logo.svg

@@ -1,13 +1,13 @@
 <svg width="131" height="25" viewBox="0 0 131 25" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <path d="M38.2643 19.5087C40.4069 19.5087 41.49 18.3947 41.9609 17.6362H42.1728C42.267 18.4421 42.832 19.2006 43.9386 19.2006H46.0341V16.8304H45.4926C45.1159 16.8304 44.9275 16.617 44.9275 16.2852V6.78055H42.1492V8.29751H41.9373C41.3958 7.53903 40.2656 6.47242 38.1937 6.47242C34.8974 6.47242 32.4487 9.2219 32.4487 12.9906C32.4487 16.7593 34.9445 19.5087 38.2643 19.5087ZM38.7588 16.8067C36.8045 16.8067 35.2741 15.3608 35.2741 13.0143C35.2741 10.7151 36.7574 9.15079 38.7352 9.15079C40.6188 9.15079 42.1963 10.5492 42.1963 13.0143C42.1963 15.1238 40.8543 16.8067 38.7588 16.8067Z" fill="currentColor"/>
-    <path d="M47.6745 24.0166H50.4528V17.6362H50.6647C51.1826 18.3947 52.2893 19.5087 54.4789 19.5087C57.7752 19.5087 60.1768 16.7118 60.1768 12.9906C60.1768 9.2456 57.6104 6.47242 54.2906 6.47242C52.1715 6.47242 51.1356 7.63384 50.6411 8.2738H50.4292V6.78055H47.6745V24.0166ZM53.8903 16.8778C51.9832 16.8778 50.4057 15.4556 50.4057 12.9906C50.4057 10.8811 51.7477 9.10339 53.8432 9.10339C55.7974 9.10339 57.3279 10.644 57.3279 12.9906C57.3279 15.2897 55.8445 16.8778 53.8903 16.8778Z" fill="currentColor"/>
-    <path d="M61.6104 24.0166H64.3887V17.6362H64.6006C65.1186 18.3947 66.2252 19.5087 68.4149 19.5087C71.7112 19.5087 73.8839 16.7118 73.8839 12.9906C73.8839 9.2456 71.5464 6.47242 68.2265 6.47242C66.1075 6.47242 65.0715 7.63384 64.5771 8.2738H64.3652V6.78055H61.6104V24.0166ZM67.8263 16.8778C65.9191 16.8778 64.3416 15.4556 64.3416 12.9906C64.3416 10.8811 65.6837 9.10339 67.7792 9.10339C69.7334 9.10339 71.2638 10.644 71.2638 12.9906C71.2638 15.2897 69.7805 16.8778 67.8263 16.8778Z" fill="currentColor"/>
-    <path d="M77.5565 19.489H81.4885L83.7252 9.74733H83.8665L86.1033 19.489H90.0117L93.1415 7.06896H90.3414L88.1046 16.8343H87.8927L85.6559 7.06896H81.9594L79.6991 16.8343H79.4872L77.2739 7.06896H74.3073L77.5565 19.489Z" fill="currentColor"/>
-    <path d="M94.549 19.489H97.3273V13.3501C97.3273 11.0036 98.4104 9.55771 100.435 9.55771H101.66V6.76083H100.741C99.1638 6.76083 97.963 7.85114 97.4921 8.89405H97.3038V7.06896H94.549V19.489Z" fill="currentColor"/>
-    <path d="M115.447 19.489H117.613V17.0003H115.47C114.623 17.0003 114.27 16.621 114.27 15.744V9.53401H117.754V7.06896H114.27V3.58472H111.633V7.06896H109.325V9.53401H111.468V15.7677C111.468 18.3987 113.045 19.489 115.447 19.489Z" fill="currentColor"/>
-    <path d="M125.067 19.5087C127.633 19.5087 129.893 18.2288 130.694 15.6452L128.151 15.029C127.704 16.4037 126.409 17.1148 125.043 17.1148C123.018 17.1148 121.676 15.7875 121.653 13.7016H131V12.9195C131 9.2219 128.716 6.47242 124.949 6.47242C121.629 6.47242 118.78 9.10339 118.78 13.0143C118.78 16.8067 121.3 19.5087 125.067 19.5087ZM121.676 11.6632C121.841 10.17 123.183 8.91377 124.949 8.91377C126.644 8.91377 128.033 9.98037 128.175 11.6632H121.676Z" fill="currentColor"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M108.09 19.489H105.312V9.53401H103.145V7.06896H108.09V19.489Z" fill="currentColor"/>
-    <path d="M106.494 5.34533C107.507 5.34533 108.26 4.58686 108.26 3.59136C108.26 2.61956 107.507 1.86108 106.494 1.86108C105.482 1.86108 104.729 2.61956 104.729 3.59136C104.729 4.58686 105.482 5.34533 106.494 5.34533Z" fill="currentColor"/>
+    <path d="M38.2643 19.5087C40.4069 19.5087 41.49 18.3947 41.9609 17.6362H42.1728C42.267 18.4421 42.832 19.2006 43.9386 19.2006H46.0341V16.8304H45.4926C45.1159 16.8304 44.9275 16.617 44.9275 16.2852V6.78055H42.1492V8.29751H41.9373C41.3958 7.53903 40.2656 6.47242 38.1937 6.47242C34.8974 6.47242 32.4487 9.2219 32.4487 12.9906C32.4487 16.7593 34.9445 19.5087 38.2643 19.5087ZM38.7588 16.8067C36.8045 16.8067 35.2741 15.3608 35.2741 13.0143C35.2741 10.7151 36.7574 9.15079 38.7352 9.15079C40.6188 9.15079 42.1963 10.5492 42.1963 13.0143C42.1963 15.1238 40.8543 16.8067 38.7588 16.8067Z" fill="#19191D"/>
+    <path d="M47.6745 24.0166H50.4528V17.6362H50.6647C51.1826 18.3947 52.2893 19.5087 54.4789 19.5087C57.7752 19.5087 60.1768 16.7118 60.1768 12.9906C60.1768 9.2456 57.6104 6.47242 54.2906 6.47242C52.1715 6.47242 51.1356 7.63384 50.6411 8.2738H50.4292V6.78055H47.6745V24.0166ZM53.8903 16.8778C51.9832 16.8778 50.4057 15.4556 50.4057 12.9906C50.4057 10.8811 51.7477 9.10339 53.8432 9.10339C55.7974 9.10339 57.3279 10.644 57.3279 12.9906C57.3279 15.2897 55.8445 16.8778 53.8903 16.8778Z" fill="#19191D"/>
+    <path d="M61.6104 24.0166H64.3887V17.6362H64.6006C65.1186 18.3947 66.2252 19.5087 68.4149 19.5087C71.7112 19.5087 73.8839 16.7118 73.8839 12.9906C73.8839 9.2456 71.5464 6.47242 68.2265 6.47242C66.1075 6.47242 65.0715 7.63384 64.5771 8.2738H64.3652V6.78055H61.6104V24.0166ZM67.8263 16.8778C65.9191 16.8778 64.3416 15.4556 64.3416 12.9906C64.3416 10.8811 65.6837 9.10339 67.7792 9.10339C69.7334 9.10339 71.2638 10.644 71.2638 12.9906C71.2638 15.2897 69.7805 16.8778 67.8263 16.8778Z" fill="#19191D"/>
+    <path d="M77.5565 19.489H81.4885L83.7252 9.74733H83.8665L86.1033 19.489H90.0117L93.1415 7.06896H90.3414L88.1046 16.8343H87.8927L85.6559 7.06896H81.9594L79.6991 16.8343H79.4872L77.2739 7.06896H74.3073L77.5565 19.489Z" fill="#19191D"/>
+    <path d="M94.549 19.489H97.3273V13.3501C97.3273 11.0036 98.4104 9.55771 100.435 9.55771H101.66V6.76083H100.741C99.1638 6.76083 97.963 7.85114 97.4921 8.89405H97.3038V7.06896H94.549V19.489Z" fill="#19191D"/>
+    <path d="M115.447 19.489H117.613V17.0003H115.47C114.623 17.0003 114.27 16.621 114.27 15.744V9.53401H117.754V7.06896H114.27V3.58472H111.633V7.06896H109.325V9.53401H111.468V15.7677C111.468 18.3987 113.045 19.489 115.447 19.489Z" fill="#19191D"/>
+    <path d="M125.067 19.5087C127.633 19.5087 129.893 18.2288 130.694 15.6452L128.151 15.029C127.704 16.4037 126.409 17.1148 125.043 17.1148C123.018 17.1148 121.676 15.7875 121.653 13.7016H131V12.9195C131 9.2219 128.716 6.47242 124.949 6.47242C121.629 6.47242 118.78 9.10339 118.78 13.0143C118.78 16.8067 121.3 19.5087 125.067 19.5087ZM121.676 11.6632C121.841 10.17 123.183 8.91377 124.949 8.91377C126.644 8.91377 128.033 9.98037 128.175 11.6632H121.676Z" fill="#19191D"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M108.09 19.489H105.312V9.53401H103.145V7.06896H108.09V19.489Z" fill="#19191D"/>
+    <path d="M106.494 5.34533C107.507 5.34533 108.26 4.58686 108.26 3.59136C108.26 2.61956 107.507 1.86108 106.494 1.86108C105.482 1.86108 104.729 2.61956 104.729 3.59136C104.729 4.58686 105.482 5.34533 106.494 5.34533Z" fill="#19191D"/>
     <path d="M24.2577 16.4436V21.9248H10.6705C6.71194 21.9248 3.25559 19.7204 1.40636 16.4436C1.13754 15.9672 0.90225 15.4674 0.704883 14.9487C0.31744 13.9322 0.0738912 12.8415 0 11.7034V10.2214C0.0160422 9.96781 0.0413207 9.71617 0.0743773 9.46752C0.141949 8.95727 0.244035 8.45799 0.378206 7.97265C1.64748 3.37143 5.77469 0 10.6705 0C15.5662 0 19.693 3.37143 20.9622 7.97265H15.1526C14.1988 6.47279 12.5479 5.4812 10.6705 5.4812C8.79305 5.4812 7.14216 6.47279 6.18839 7.97265C5.89768 8.42859 5.67212 8.93136 5.52434 9.46752C5.39308 9.94289 5.32308 10.4442 5.32308 10.9624C5.32308 12.5335 5.96768 13.9497 7.00119 14.9487C7.95886 15.876 9.25 16.4436 10.6705 16.4436H24.2577Z" fill="#FD366E"/>
     <path d="M24.2578 9.46753V14.9487H14.3398C15.3733 13.9497 16.018 12.5335 16.018 10.9624C16.018 10.4442 15.9479 9.9429 15.8167 9.46753H24.2578Z" fill="#FD366E"/>
 </svg>

app/views/install/installer/icons/indicator-inactive.svg

@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <path d="M5 8C5 6.34315 6.34315 5 8 5C9.65685 5 11 6.34315 11 8C11 9.65685 9.65685 11 8 11C6.34315 11 5 9.65685 5 8Z" fill="currentColor"/>
+    <path d="M5 8C5 6.34315 6.34315 5 8 5C9.65685 5 11 6.34315 11 8C11 9.65685 9.65685 11 8 11C6.34315 11 5 9.65685 5 8Z" fill="#D8D8DB"/>
 </svg>

app/views/install/installer/js/installer.js

@@ -12,7 +12,7 @@
     const { validateInstallRequest } = window.InstallerStepsProgress || {};
 
     const isUpgrade = document.body?.dataset.upgrade === 'true';
-    const stepFlow = isUpgrade ? [1, 6, 4, 5] : [1, 2, 3, 4, 5];
+    const stepFlow = isUpgrade ? [1, 4, 5] : [1, 2, 3, 4, 5];
     const cardSteps = stepFlow.filter((step) => step !== 5);
 
     const normalizeStep = (step) => {
@@ -53,7 +53,7 @@
     let pendingStep = null;
     let pendingPushState = false;
 
-    const clampStep = (step) => Math.max(1, Math.min(6, step));
+    const clampStep = (step) => Math.max(1, Math.min(5, step));
     const isInstallLocked = () => Boolean(window.InstallerSteps?.isInstallLocked?.());
 
     const scrollToFirstError = (panel) => {
@@ -399,18 +399,11 @@
                 }
             }
         }
-        if (action === 'next' && String(target) === '5') {
-            if (typeof validateInstallRequest === 'function') {
-                const isValid = await validateInstallRequest();
-                if (!isValid) {
-                    return;
-                }
+        if (action === 'next' && String(target) === '5' && typeof validateInstallRequest === 'function') {
+            const isValid = await validateInstallRequest();
+            if (!isValid) {
+                return;
             }
-            // Clear stale install data from previous runs so initStep5
-            // starts a fresh install instead of trying to resume.
-            const { clearInstallLock, clearInstallId } = window.InstallerStepsState || {};
-            clearInstallLock?.();
-            clearInstallId?.();
         }
         if (isInstallLocked() && Number(target) !== 5) {
             requestStep(5, true);

app/views/install/installer/js/modules/context.js

@@ -2,21 +2,13 @@
     const getBodyDataset = () => document.body?.dataset ?? {};
     const isUpgradeMode = () => getBodyDataset().upgrade === 'true';
     const getLockedDatabase = () => getBodyDataset().lockedDatabase || '';
-    const getEnabledDatabases = () => {
-        const raw = getBodyDataset().enabledDatabases;
-        if (!raw) return ['mongodb', 'mariadb', 'postgresql'];
-        try { return JSON.parse(raw); } catch (e) { return ['mongodb', 'mariadb', 'postgresql']; }
-    };
 
     const STEP_IDS = Object.freeze({
         CONFIG_FILES: 'config-files',
         DOCKER_COMPOSE: 'docker-compose',
         ENV_VARS: 'env-vars',
         DOCKER_CONTAINERS: 'docker-containers',
-        ACCOUNT_SETUP: 'account-setup',
-        MIGRATION: 'migration',
-        SSL_CERTIFICATE: 'ssl-certificate',
-        REDIRECT: 'redirect'
+        ACCOUNT_SETUP: 'account-setup'
     });
 
     const STATUS = Object.freeze({
@@ -53,11 +45,6 @@
             id: STEP_IDS.DOCKER_CONTAINERS,
             inProgress: 'Restarting Docker containers...',
             done: 'Docker containers restarted'
-        },
-        {
-            id: STEP_IDS.MIGRATION,
-            inProgress: 'Running database migration...',
-            done: 'Database migration completed'
         }
     ] : [
         {
@@ -83,7 +70,7 @@
         {
             id: STEP_IDS.ACCOUNT_SETUP,
             inProgress: 'Creating Appwrite account...',
-            done: 'Appwrite account created'
+            done: 'Appwrite account created (redirecting...)'
         }
     ]);
 
@@ -101,14 +88,13 @@
     const clampStep = (step) => {
         const numeric = Number(step);
         if (Number.isNaN(numeric)) return 1;
-        return Math.max(1, Math.min(6, numeric));
+        return Math.max(1, Math.min(5, numeric));
     };
 
     window.InstallerStepsContext = Object.freeze({
         getBodyDataset,
         isUpgradeMode,
         getLockedDatabase,
-        getEnabledDatabases,
         STEP_IDS,
         STATUS,
         SSE_EVENTS,

app/views/install/installer/js/modules/progress.js

@@ -3,7 +3,6 @@
         INSTALLATION_STEPS,
         TIMINGS,
         getBodyDataset,
-        isUpgradeMode,
         STEP_IDS,
         STATUS,
         SSE_EVENTS
@@ -21,13 +20,12 @@
         storeInstallId,
         clearInstallId
     } = window.InstallerStepsState || {};
-    const { extractHostname, isLocalHost, isIPAddress } = window.InstallerStepsValidation || {};
+    const { extractHostname, isLocalHost } = window.InstallerStepsValidation || {};
     const { generateSecretKey } = window.InstallerStepsUI || {};
     const { showToast } = window.InstallerToast || {};
 
     let activeInstall = null;
     let unloadGuard = null;
-    let sseSessionDetails = null;
     const csrfToken = document.querySelector('meta[name="appwrite-installer-csrf"]')?.getAttribute('content') || '';
 
     const withCsrfHeader = (headers = {}) => {
@@ -111,10 +109,10 @@
             return normalized.summary || 'Installation failed.';
         }
         if (status === STATUS.COMPLETED) return step.done;
-        return message || step.inProgress;
+        return step.inProgress;
     };
 
-    const updateInstallRow = (row, step, status, message, details) => {
+    const updateInstallRow = (row, step, status, message) => {
         if (!row || !step) return;
         row.dataset.status = status;
         row.dataset.step = step.id;
@@ -138,15 +136,6 @@
             }
         }
 
-        const counter = row.querySelector('[data-install-counter]');
-        if (counter) {
-            const started = details?.containerStarted ?? 0;
-            const total = details?.containerTotal;
-            counter.textContent = (status === STATUS.IN_PROGRESS && total > 0 && started < total)
-                ? `${started}/${total}`
-                : '';
-        }
-
         // Show/hide "Navigate to Console" button for account setup errors
         const consoleBtn = row.querySelector('[data-install-console]');
         if (consoleBtn) {
@@ -260,7 +249,7 @@
         return Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('');
     };
 
-    const buildRedirectUrl = (protocol) => {
+    const buildRedirectUrl = () => {
         const dataset = getBodyDataset?.() ?? {};
         const rawDomain = (formState?.appDomain || dataset.defaultAppDomain || '').trim();
         if (!rawDomain) return '';
@@ -275,53 +264,22 @@
         } else if (normalizedHost === 'traefik') {
             host = rawDomain.replace(hostForProtocol, 'localhost');
         }
-        const port = protocol === 'https' ? httpsPort : httpPort;
-        const defaultPort = protocol === 'https' ? '443' : '80';
-        if (!hasPort && port && port !== defaultPort) {
+        let protocol = 'http';
+        let port = httpPort;
+        if (httpsPort && httpsPort !== '0' && !isLocalHost?.(normalizedHost)) {
+            protocol = 'https';
+            port = httpsPort;
+        }
+        if (!hasPort && port && ((protocol === 'http' && port !== '80') || (protocol === 'https' && port !== '443'))) {
             host = `${host}:${port}`;
         }
         return `${protocol}://${host}`;
     };
 
-    const normalizeHostname = (rawDomain) => {
-        const hostname = extractHostname?.(rawDomain)?.toLowerCase?.() ?? '';
-        if (hostname === '0.0.0.0' || hostname === 'traefik') return 'localhost';
-        return hostname;
-    };
-
-    const canUseHttps = () => {
-        const dataset = getBodyDataset?.() ?? {};
-        const rawDomain = (formState?.appDomain || dataset.defaultAppDomain || '').trim();
-        const httpsPort = (formState?.httpsPort || dataset.defaultHttpsPort || '').trim();
-        if (!httpsPort || httpsPort === '0') return false;
-        const hostname = normalizeHostname(rawDomain);
-        return !isLocalHost?.(hostname) && !isIPAddress?.(hostname);
-    };
-
-    const pollCertificate = async (domain, port, maxAttempts, intervalMs) => {
-        for (let i = 0; i < maxAttempts; i++) {
-            try {
-                const response = await fetch(
-                    `/install/certificate?domain=${encodeURIComponent(domain)}&port=${encodeURIComponent(port)}`,
-                    { cache: 'no-store' }
-                );
-                if (response.ok) {
-                    const data = await response.json();
-                    if (data.ready) return true;
-                }
-            } catch {
-                // Installer server may have shut down
-            }
-            if (i < maxAttempts - 1) {
-                await new Promise((resolve) => setTimeout(resolve, intervalMs));
-            }
-        }
-        return false;
-    };
-
-    const redirectToApp = (protocol) => {
-        const url = buildRedirectUrl(protocol);
+    const redirectToApp = () => {
+        const url = buildRedirectUrl();
         if (!url) return;
+        // Fire-and-forget: tell the installer server it can shut down
         fetch('/install/shutdown', { method: 'POST', headers: withCsrfHeader() }).catch(() => {});
         window.location.href = url;
     };
@@ -352,13 +310,13 @@
 
     const buildInstallPayload = (installId) => {
         const normalizedSecret = (formState?.opensslKey || '').trim();
-        if (!normalizedSecret && generateSecretKey && !isUpgradeMode?.()) {
+        if (!normalizedSecret && generateSecretKey) {
             formState.opensslKey = generateSecretKey();
         }
         const normalizedDomain = (formState?.appDomain || '').trim() || 'localhost';
         const normalizedHttpPort = (formState?.httpPort || '').trim() || '80';
         const normalizedHttpsPort = (formState?.httpsPort || '').trim() || '443';
-        const normalizedEmail = (formState?.emailCertificates || '').trim() || (formState?.accountEmail || '').trim();
+        const normalizedEmail = (formState?.emailCertificates || '').trim();
         const normalizedAssistantKey = (formState?.assistantOpenAIKey || '').trim();
         const normalizedAccountEmail = (formState?.accountEmail || '').trim();
         const normalizedAccountPassword = (formState?.accountPassword || '').trim();
@@ -373,8 +331,7 @@
             opensslKey: (formState?.opensslKey || '').trim(),
             assistantOpenAIKey: normalizedAssistantKey,
             accountEmail: normalizedAccountEmail,
-            accountPassword: normalizedAccountPassword,
-            migrate: formState?.migrate ?? false
+            accountPassword: normalizedAccountPassword
         };
     };
 
@@ -447,7 +404,6 @@
 
     const initStep5 = (root) => {
         if (!root) return;
-        let resolvedProtocol = 'http';
 
         if (activeInstall?.controller) {
             activeInstall.controller.abort();
@@ -539,7 +495,7 @@
                     if (!state) return;
                     const row = ensureRow(step);
                     if (row) {
-                        updateInstallRow(row, step, state.status || STATUS.IN_PROGRESS, state.message, state.details);
+                        updateInstallRow(row, step, state.status || STATUS.IN_PROGRESS, state.message);
                         if (state.status === STATUS?.ERROR) {
                             updateInstallErrorDetails(row, {
                                 message: state.message,
@@ -567,9 +523,6 @@
                 inProgress: payload.message || payload.step,
                 done: payload.message || payload.step
             };
-            if (step.id === STEP_IDS.ACCOUNT_SETUP && payload.details?.sessionSecret) {
-                sseSessionDetails = payload.details;
-            }
             progressState.set(step.id, {
                 status: payload.status || STATUS.IN_PROGRESS,
                 message: payload.message,
@@ -589,9 +542,6 @@
                     }
                 }
             }
-            if (payload.status === STATUS.ERROR) {
-                showGlobalActions();
-            }
             scheduleFallback();
         };
 
@@ -629,7 +579,6 @@
 
         const applySnapshot = (snapshot) => {
             if (!snapshot || !snapshot.steps) return;
-            let hasErrors = false;
             INSTALLATION_STEPS.forEach((step) => {
                 const detail = snapshot.steps[step.id];
                 if (!detail) return;
@@ -638,14 +587,8 @@
                     message: detail.message,
                     details: snapshot.details?.[step.id]
                 });
-                if (detail.status === STATUS.ERROR) {
-                    hasErrors = true;
-                }
             });
             renderProgress();
-            if (hasErrors) {
-                showGlobalActions();
-            }
         };
 
         const checkAllCompleted = () => {
@@ -655,9 +598,10 @@
             });
             if (!allDone) return;
             const accountState = progressState.get(STEP_IDS.ACCOUNT_SETUP);
-            const sessionDetails = sseSessionDetails || accountState?.details;
             finalizeInstall();
-            startSslCheck(sessionDetails);
+            notifyInstallComplete(activeInstall?.installId, accountState?.details).finally(() => {
+                setTimeout(() => redirectToApp(), TIMINGS?.redirectDelay ?? 0);
+            });
         };
 
         const startPolling = () => {
@@ -694,78 +638,6 @@
             }
             stopSyncedSpinnerRotation();
             setUnloadGuard(false);
-            clearInstallLock?.();
-        };
-
-        const SSL_STEP = {
-            id: STEP_IDS.SSL_CERTIFICATE,
-            inProgress: 'Generating SSL certificate...',
-            done: 'SSL certificate verified'
-        };
-
-        const REDIRECT_STEP = {
-            id: STEP_IDS.REDIRECT,
-            inProgress: 'Redirecting to console...',
-            done: 'Redirecting to console...'
-        };
-
-        const showRedirectStep = (sessionDetails, protocol) => {
-            animatePanelHeight(() => {
-                progressState.set(REDIRECT_STEP.id, {
-                    status: STATUS.IN_PROGRESS,
-                    message: REDIRECT_STEP.inProgress
-                });
-                const row = ensureRow(REDIRECT_STEP);
-                if (row) {
-                    updateInstallRow(row, REDIRECT_STEP, STATUS.IN_PROGRESS, REDIRECT_STEP.inProgress);
-                }
-            });
-            startSyncedSpinnerRotation(list);
-
-            const completeId = activeInstall?.installId || getStoredInstallId?.();
-            notifyInstallComplete(completeId, sessionDetails).finally(() => {
-                setTimeout(() => redirectToApp(protocol), TIMINGS?.redirectDelay ?? 0);
-            });
-        };
-
-        const startSslCheck = (sessionDetails) => {
-            if (!canUseHttps()) {
-                showRedirectStep(sessionDetails, 'http');
-                return;
-            }
-
-            animatePanelHeight(() => {
-                progressState.set(SSL_STEP.id, {
-                    status: STATUS.IN_PROGRESS,
-                    message: SSL_STEP.inProgress
-                });
-                const row = ensureRow(SSL_STEP);
-                if (row) {
-                    updateInstallRow(row, SSL_STEP, STATUS.IN_PROGRESS, SSL_STEP.inProgress);
-                }
-            });
-            startSyncedSpinnerRotation(list);
-
-            const dataset = getBodyDataset?.() ?? {};
-            const rawDomain = (formState?.appDomain || dataset.defaultAppDomain || '').trim();
-            const httpsPort = (formState?.httpsPort || dataset.defaultHttpsPort || '443').trim();
-            const domain = normalizeHostname(rawDomain);
-            pollCertificate(domain, httpsPort, 15, 2000).then((ready) => {
-                stopSyncedSpinnerRotation();
-                const certMessage = ready ? SSL_STEP.done : 'Certificate not ready, continuing over HTTP';
-                animatePanelHeight(() => {
-                    progressState.set(SSL_STEP.id, {
-                        status: STATUS.COMPLETED,
-                        message: certMessage
-                    });
-                    const row = ensureRow(SSL_STEP);
-                    if (row) {
-                        updateInstallRow(row, SSL_STEP, STATUS.COMPLETED, certMessage);
-                    }
-                });
-                resolvedProtocol = ready ? 'https' : 'http';
-                showRedirectStep(sessionDetails, resolvedProtocol);
-            });
         };
 
         const startInstallStream = async (installId, options = {}) => {
@@ -851,24 +723,26 @@
                         });
                         renderProgress();
 
-                        // If any step ended in error (e.g. account creation
-                        // failed), stay on the progress screen so the user can
-                        // see the error and choose to retry or navigate to the
-                        // console manually — don't auto-redirect.
-                        const hasErrors = INSTALLATION_STEPS.some((step) => {
-                            const state = progressState.get(step.id);
-                            return state && state.status === STATUS.ERROR;
-                        });
-
-                        if (hasErrors) {
+                        const accountState = progressState.get(STEP_IDS.ACCOUNT_SETUP);
+                        const accountRequired = INSTALLATION_STEPS.some((step) => step.id === STEP_IDS.ACCOUNT_SETUP);
+                        if (accountRequired && accountState?.status === STATUS.ERROR) {
+                            finalizeInstall();
+                            return;
+                        }
+                        const sessionDetails = accountState?.details;
+                        if (accountRequired && !(sessionDetails?.sessionSecret || sessionDetails?.secret)) {
+                            handleProgress({
+                                step: STEP_IDS.ACCOUNT_SETUP,
+                                status: STATUS.ERROR,
+                                message: 'Account creation did not complete. Please retry.'
+                            });
                             finalizeInstall();
                             return;
                         }
-
-                        const accountState = progressState.get(STEP_IDS.ACCOUNT_SETUP);
-                        const sessionDetails = sseSessionDetails || accountState?.details;
                         finalizeInstall();
-                        startSslCheck(sessionDetails);
+                        notifyInstallComplete(activeInstall?.installId, sessionDetails).finally(() => {
+                            setTimeout(() => redirectToApp(), TIMINGS?.redirectDelay ?? 0);
+                        });
                         return;
                     }
                     if (event === SSE_EVENTS.ERROR) {
@@ -912,29 +786,9 @@
             }
         };
 
-        const isSnapshotTerminal = (snapshot) => {
-            if (!snapshot?.steps) return 'empty';
-            const stepEntries = Object.values(snapshot.steps);
-            if (stepEntries.length === 0) return 'empty';
-            const hasError = stepEntries.some((s) => s.status === STATUS.ERROR);
-            if (hasError) return 'error';
-            const allCompleted = INSTALLATION_STEPS.every((step) => {
-                const detail = snapshot.steps[step.id];
-                return detail && detail.status === STATUS.COMPLETED;
-            });
-            if (allCompleted) return 'completed';
-            return false;
-        };
-
         const resumeInstall = async (installId) => {
             const snapshot = await fetchInstallStatus(installId);
-            const terminal = isSnapshotTerminal(snapshot);
-            if (!snapshot || terminal) {
-                if (terminal === 'completed') {
-                    return 'completed';
-                }
-                return false;
-            }
+            if (!snapshot) return false;
             activeInstall = {
                 installId,
                 controller: new AbortController(),
@@ -997,7 +851,15 @@
             const retryButton = event.target.closest('[data-install-retry]');
 
             if (consoleButton) {
-                redirectToApp(resolvedProtocol);
+                fetch('/install/cleanup', {
+                    method: 'POST',
+                    headers: withCsrfHeader({
+                        'Content-Type': 'application/json'
+                    })
+                }).catch(() => {});
+
+                // Redirect immediately
+                redirectToApp();
                 return;
             }
 
@@ -1008,60 +870,6 @@
             }
         });
 
-        const globalActions = root.querySelector('[data-install-global-actions]');
-
-        const showGlobalActions = () => {
-            if (globalActions) {
-                globalActions.classList.remove('is-hidden');
-            }
-        };
-
-        const performReset = async (hard) => {
-            const installId = activeInstall?.installId || getInstallLock?.()?.installId || getStoredInstallId?.();
-
-            try {
-                const res = await fetch('/install/reset', {
-                    method: 'POST',
-                    headers: withCsrfHeader({ 'Content-Type': 'application/json' }),
-                    body: JSON.stringify({ installId: installId || '', hard })
-                });
-                if (hard && !res.ok) {
-                    const data = await res.json().catch(() => ({}));
-                    showToast?.({
-                        status: 'error',
-                        title: 'Reset failed',
-                        description: data?.message || 'Could not stop containers. Try running "docker compose down -v" manually.',
-                        dismissible: true
-                    });
-                    return;
-                }
-            } catch (e) {
-                console.error('Reset request failed:', e);
-            }
-
-            clearInstallLock?.();
-            clearInstallId?.();
-            cleanupInstallFlow();
-            window.location.href = '/?step=1';
-        };
-
-        const startOverButton = root.querySelector('[data-install-start-over]');
-        if (startOverButton) {
-            startOverButton.addEventListener('click', () => performReset(false));
-        }
-
-        const hardResetButton = root.querySelector('[data-install-hard-reset]');
-        if (hardResetButton) {
-            hardResetButton.addEventListener('click', () => {
-                const confirmed = window.confirm(
-                    'This will stop all containers, remove all volumes (including database data, uploads, and certificates), and delete configuration files.\n\nThis action cannot be undone. Continue?'
-                );
-                if (confirmed) {
-                    performReset(true);
-                }
-            });
-        }
-
         // When the user switches back to this tab, check if installation
         // finished while the tab was in the background.
         document.addEventListener('visibilitychange', () => {
@@ -1070,45 +878,22 @@
             }
         });
 
-        const startFreshInstall = () => {
-            clearInstallId?.();
-            clearInstallLock?.();
-            const newInstallId = generateInstallId();
-            storeInstallId?.(newInstallId);
-            startInstallStream(newInstallId);
-        };
-
-        const recoverToLastStep = () => {
-            clearInstallId?.();
-            clearInstallLock?.();
-            const url = new URL(window.location.href);
-            const lastStep = url.searchParams.get('step');
-            // Stay on the current URL so the user keeps their place;
-            // only navigate away if we're already on step 5 (the
-            // progress screen) since there's nothing to show.
-            if (!lastStep || String(lastStep) === '5') {
-                window.location.href = '/?step=1';
-            }
-        };
-
         const lock = getInstallLock?.();
         const existingInstallId = lock?.installId || getStoredInstallId?.();
         if (existingInstallId) {
-            resumeInstall(existingInstallId).then((result) => {
-                if (result === 'completed') {
-                    // Install already finished — redirect to console
-                    // instead of bouncing back to step 1.
-                    stopSyncedSpinnerRotation();
-                    setUnloadGuard(false);
-                    clearInstallLock?.();
+            resumeInstall(existingInstallId).then((resumed) => {
+                if (!resumed) {
                     clearInstallId?.();
-                    startSslCheck(null);
-                } else if (!result) {
-                    recoverToLastStep();
+                    clearInstallLock?.();
+                    const newInstallId = generateInstallId();
+                    storeInstallId?.(newInstallId);
+                    startInstallStream(newInstallId);
                 }
             });
         } else {
-            startFreshInstall();
+            const newInstallId = generateInstallId();
+            storeInstallId?.(newInstallId);
+            startInstallStream(newInstallId);
         }
     };
 

app/views/install/installer/js/modules/state.js

@@ -7,8 +7,6 @@
 
     const INSTALL_LOCK_KEY = 'appwrite-install-lock';
     const INSTALL_ID_KEY = 'appwrite-install-id';
-    const INSTALL_LOCK_LOCAL_KEY = 'appwrite-install-lock-backup';
-    const INSTALL_ID_LOCAL_KEY = 'appwrite-install-id-backup';
 
     const formState = {
         appDomain: null,
@@ -57,44 +55,24 @@
     const getInstallLock = () => {
         try {
             const raw = sessionStorage.getItem(INSTALL_LOCK_KEY);
-            if (raw) {
-                const parsed = JSON.parse(raw);
-                if (parsed && typeof parsed === 'object') return parsed;
-            }
-        } catch (error) {}
-
-        try {
-            const raw = localStorage.getItem(INSTALL_LOCK_LOCAL_KEY);
-            if (raw) {
-                const parsed = JSON.parse(raw);
-                if (parsed && typeof parsed === 'object') {
-                    sessionStorage.setItem(INSTALL_LOCK_KEY, raw);
-                    return parsed;
-                }
-            }
-        } catch (error) {}
-
-        return null;
+            if (!raw) return null;
+            const parsed = JSON.parse(raw);
+            if (!parsed || typeof parsed !== 'object') return null;
+            return parsed;
+        } catch (error) {
+            return null;
+        }
     };
 
     const setInstallLock = (installId, payload) => {
-        const sanitizedPayload = payload ? { ...payload } : null;
-        if (sanitizedPayload) {
-            delete sanitizedPayload.opensslKey;
-            delete sanitizedPayload.accountPassword;
-            delete sanitizedPayload.assistantOpenAIKey;
-        }
         const lock = {
             installId,
-            payload: sanitizedPayload,
+            payload: payload || null,
             startedAt: Date.now()
         };
         try {
             sessionStorage.setItem(INSTALL_LOCK_KEY, JSON.stringify(lock));
         } catch (error) {}
-        try {
-            localStorage.setItem(INSTALL_LOCK_LOCAL_KEY, JSON.stringify(lock));
-        } catch (error) {}
         if (document.body) {
             document.body.dataset.installLocked = 'true';
         }
@@ -105,9 +83,6 @@
         try {
             sessionStorage.removeItem(INSTALL_LOCK_KEY);
         } catch (error) {}
-        try {
-            localStorage.removeItem(INSTALL_LOCK_LOCAL_KEY);
-        } catch (error) {}
         if (document.body) {
             delete document.body.dataset.installLocked;
         }
@@ -135,36 +110,30 @@
         setStateIfEmpty('httpPort', payload.httpPort);
         setStateIfEmpty('httpsPort', payload.httpsPort);
         setStateIfEmpty('emailCertificates', payload.emailCertificates);
+        setStateIfEmpty('opensslKey', payload.opensslKey);
+        setStateIfEmpty('assistantOpenAIKey', payload.assistantOpenAIKey);
         setStateIfEmpty('accountEmail', payload.accountEmail);
+        setStateIfEmpty('accountPassword', payload.accountPassword);
     };
 
     const getStoredInstallId = () => {
         try {
-            const val = sessionStorage.getItem(INSTALL_ID_KEY);
-            if (val) return val;
-        } catch (error) {}
-        try {
-            return localStorage.getItem(INSTALL_ID_LOCAL_KEY);
-        } catch (error) {}
-        return null;
+            return sessionStorage.getItem(INSTALL_ID_KEY);
+        } catch (error) {
+            return null;
+        }
     };
 
     const storeInstallId = (installId) => {
         try {
             sessionStorage.setItem(INSTALL_ID_KEY, installId);
         } catch (error) {}
-        try {
-            localStorage.setItem(INSTALL_ID_LOCAL_KEY, installId);
-        } catch (error) {}
     };
 
     const clearInstallId = () => {
         try {
             sessionStorage.removeItem(INSTALL_ID_KEY);
         } catch (error) {}
-        try {
-            localStorage.removeItem(INSTALL_ID_LOCAL_KEY);
-        } catch (error) {}
     };
 
     window.InstallerStepsState = {

app/views/install/installer/js/modules/ui.js

@@ -240,9 +240,6 @@
             if (key === 'database') {
                 value = toDatabaseLabel(formState?.database);
             }
-            if (key === 'emailCertificates' && !value) {
-                value = formState?.accountEmail;
-            }
             if (value) {
                 node.textContent = value;
             }

app/views/install/installer/js/modules/validation.js

@@ -106,18 +106,12 @@
         return LOCAL_HOSTS.has(normalized);
     };
 
-    const isIPAddress = (host) => {
-        if (!host) return false;
-        return isValidIPv4(host) || isValidIPv6(host);
-    };
-
     window.InstallerStepsValidation = {
         isValidEmail,
         isValidPort,
         isValidPassword,
         isValidHostnameInput,
         extractHostname,
-        isLocalHost,
-        isIPAddress
+        isLocalHost
     };
 })();

app/views/install/installer/js/steps.js

@@ -8,9 +8,7 @@
 
     const {
         INSTALLATION_STEPS,
-        clampStep,
-        isUpgradeMode,
-        getEnabledDatabases
+        clampStep
     } = Context;
 
     const {
@@ -80,19 +78,6 @@
         }
     };
 
-    const applyEnabledDatabases = (root) => {
-        const enabled = getEnabledDatabases?.() || [];
-        const radios = root.querySelectorAll('input[name="database"]');
-        radios.forEach((radio) => {
-            if (!enabled.includes(radio.value)) {
-                const card = radio.closest('.selector-card');
-                if (card) {
-                    card.remove();
-                }
-            }
-        });
-    };
-
     const bindDatabaseSelection = (root) => {
         const radios = root.querySelectorAll('input[name="database"]');
         radios.forEach((radio) => {
@@ -153,8 +138,6 @@
             return;
         }
 
-        applyEnabledDatabases(root);
-
         const lockedDatabase = getLockedDatabase?.() || '';
         if (lockedDatabase) {
             lockDatabaseSelection(root, lockedDatabase);
@@ -211,7 +194,7 @@
         applyLockPayload?.();
         applyBodyDefaults?.();
         hydrateStep2State(root);
-        if (!isUpgradeMode?.() && (!formState.opensslKey || !formState.opensslKey.trim())) {
+        if (!formState.opensslKey || !formState.opensslKey.trim()) {
             formState.opensslKey = generateSecretKey?.();
             dispatchStateChange?.('opensslKey');
         }
@@ -329,30 +312,6 @@
         }
     };
 
-    const initStep6 = (root) => {
-        if (!root) return;
-        syncInstallLockFlag?.();
-        applyLockPayload?.();
-        applyBodyDefaults?.();
-
-        const checkbox = root.querySelector('#run-migration');
-        if (checkbox) {
-            if (formState.migrate !== undefined) {
-                checkbox.checked = formState.migrate;
-            } else {
-                formState.migrate = checkbox.checked;
-            }
-            checkbox.addEventListener('change', () => {
-                formState.migrate = checkbox.checked;
-                dispatchStateChange?.('migrate');
-            });
-        }
-
-        if (isInstallLocked?.()) {
-            disableControls?.(root);
-        }
-    };
-
     const initStep = (step, container) => {
         if (!container) return;
         const root = container.querySelector('.step-layout') || container;
@@ -370,7 +329,6 @@
         if (normalized === 3) initStep3(root);
         if (normalized === 4) initStep4(root);
         if (normalized === 5) Progress.initStep5?.(root);
-        if (normalized === 6) initStep6(root);
     };
 
     window.InstallerSteps = {
@@ -415,7 +373,10 @@
                 if (!parsePort(httpPort, 'HTTP')) valid = false;
                 if (!parsePort(httpsPort, 'HTTPS')) valid = false;
 
-                if (sslEmail && sslEmail.value.trim() && !isValidEmail?.(sslEmail.value.trim())) {
+                if (!sslEmail || !sslEmail.value.trim()) {
+                    setFieldError?.(sslEmail, 'Please enter an email address for SSL certificates');
+                    valid = false;
+                } else if (!isValidEmail?.(sslEmail.value.trim())) {
                     setFieldError?.(sslEmail, 'Please enter a valid email address');
                     valid = false;
                 }

app/views/install/installer/templates/steps/step-1.phtml

@@ -7,12 +7,8 @@ $defaultHttpsPort = $defaultHttpsPort ?? '443';
 $defaultEmailCertificates = $defaultEmailCertificates ?? '';
 $defaultAssistantOpenAIKey = $defaultAssistantOpenAIKey ?? '';
 $defaultDatabase = $defaultDatabase ?? 'mongodb';
-$enabledDatabases = $enabledDatabases ?? ['mongodb', 'mariadb', 'postgresql'];
 $selectedDatabase = $lockedDatabase ?: $defaultDatabase;
 $isDatabaseLocked = !empty($lockedDatabase);
-$mongoEnabled = in_array('mongodb', $enabledDatabases, true);
-$mariaEnabled = in_array('mariadb', $enabledDatabases, true);
-$postgresEnabled = in_array('postgresql', $enabledDatabases, true);
 $mongoDisabled = $isDatabaseLocked && $selectedDatabase !== 'mongodb';
 $mariaDisabled = $isDatabaseLocked && $selectedDatabase !== 'mariadb';
 $postgresDisabled = $isDatabaseLocked && $selectedDatabase !== 'postgresql';
@@ -47,7 +43,6 @@ $assistantOpenAIKeyValue = htmlspecialchars((string) $defaultAssistantOpenAIKey,
             <div class="input-group stack-xs">
                 <label class="label-text typography-text-m-500 text-neutral-secondary">Database</label>
                 <div class="selector-group<?php echo $isDatabaseLocked ? ' is-locked' : ''; ?>">
-                    <?php if ($mongoEnabled) { ?>
                     <label class="selector-card <?php echo ($selectedDatabase === 'mongodb') ? 'selected' : ''; ?><?php echo $mongoDisabled ? ' is-disabled has-tooltip' : ''; ?>"<?php echo $mongoDisabled ? ' aria-disabled="true"' : ''; ?>>
                         <input type="radio" name="database" value="mongodb" <?php echo ($selectedDatabase === 'mongodb') ? 'checked' : ''; ?> class="sr-only" <?php echo $mongoDisabled ? 'disabled' : ''; ?>>
                         <div class="selector-content">
@@ -59,9 +54,7 @@ $assistantOpenAIKeyValue = htmlspecialchars((string) $defaultAssistantOpenAIKey,
                             <span class="tooltip tooltip-db-locked typography-text-m-400 text-on-invert" role="tooltip" data-tooltip-portal="true">Database cannot be changed after initial setup.</span>
                         <?php } ?>
                     </label>
-                    <?php } ?>
 
-                    <?php if ($mariaEnabled) { ?>
                     <label class="selector-card <?php echo ($selectedDatabase === 'mariadb') ? 'selected' : ''; ?><?php echo $mariaDisabled ? ' is-disabled has-tooltip' : ''; ?>"<?php echo $mariaDisabled ? ' aria-disabled="true"' : ''; ?>>
                         <input type="radio" name="database" value="mariadb" <?php echo ($selectedDatabase === 'mariadb') ? 'checked' : ''; ?> class="sr-only" <?php echo $mariaDisabled ? 'disabled' : ''; ?>>
                         <div class="selector-content">
@@ -73,9 +66,7 @@ $assistantOpenAIKeyValue = htmlspecialchars((string) $defaultAssistantOpenAIKey,
                             <span class="tooltip tooltip-db-locked typography-text-m-400 text-on-invert" role="tooltip" data-tooltip-portal="true">Database cannot be changed after initial setup.</span>
                         <?php } ?>
                     </label>
-                    <?php } ?>
 
-                    <?php if ($postgresEnabled) { ?>
                     <label class="selector-card <?php echo ($selectedDatabase === 'postgresql') ? 'selected' : ''; ?><?php echo $postgresDisabled ? ' is-disabled has-tooltip' : ''; ?>"<?php echo $postgresDisabled ? ' aria-disabled="true"' : ''; ?>>
                         <input type="radio" name="database" value="postgresql" <?php echo ($selectedDatabase === 'postgresql') ? 'checked' : ''; ?> class="sr-only" <?php echo $postgresDisabled ? 'disabled' : ''; ?>>
                         <div class="selector-content">
@@ -87,7 +78,6 @@ $assistantOpenAIKeyValue = htmlspecialchars((string) $defaultAssistantOpenAIKey,
                             <span class="tooltip tooltip-db-locked typography-text-m-400 text-on-invert" role="tooltip" data-tooltip-portal="true">Database cannot be changed after initial setup.</span>
                         <?php } ?>
                     </label>
-                    <?php } ?>
                 </div>
             </div>
 

app/views/install/installer/templates/steps/step-4.phtml

@@ -62,14 +62,12 @@ $badgeClass = $defaultSecretKey !== '' ? 'badge-success' : 'badge-warning';
                         <span class="badge badge-neutral typography-text-xs-400" data-review-assistant-badge>Disabled</span>
                         <div class="review-label typography-text-xs-400 text-neutral-tertiary">Appwrite Assistant</div>
                     </div>
-                    <?php if (!$isUpgrade) { ?>
                     <div class="review-row">
                         <span class="badge <?php echo $badgeClass; ?> typography-text-xs-400" data-review-badge>
                             <?php echo htmlspecialchars((string) $badgeLabel, ENT_QUOTES, 'UTF-8'); ?>
                         </span>
                         <div class="review-label typography-text-xs-400 text-neutral-tertiary">Secret API key</div>
                     </div>
-                    <?php } ?>
                 </div>
             </div>
         </div>

app/views/install/installer/templates/steps/step-5.phtml

@@ -6,7 +6,7 @@ $isUpgrade = $isUpgrade ?? false;
         <div class="install-panel">
             <div class="install-header">
                 <div class="typography-text-m-400 text-neutral-primary">
-                    <?php echo $isUpgrade ? 'Updating Appwrite…' : 'Installing Appwrite…'; ?>
+                    <?php echo $isUpgrade ? 'Updating your app…' : 'Installing your app…'; ?>
                 </div>
             </div>
             <div class="install-list" data-install-list></div>
@@ -30,7 +30,6 @@ $isUpgrade = $isUpgrade ?? false;
                     </span>
                     <span class="install-text typography-text-m-400 text-neutral-primary" data-install-text></span>
                 </div>
-                <span class="install-counter typography-text-xs-400" data-install-counter></span>
                 <button type="button" class="install-row-toggle" aria-expanded="false" data-install-toggle>
                     <?php include __DIR__ . '/../../icons/chevron-down.svg'; ?>
                 </button>
@@ -51,13 +50,4 @@ $isUpgrade = $isUpgrade ?? false;
             </div>
         </div>
     </template>
-
-    <div class="install-global-actions is-hidden" data-install-global-actions>
-        <button type="button" class="button secondary" data-install-start-over>
-            <span class="button-text typography-text-m-500">Start Over</span>
-        </button>
-        <button type="button" class="button secondary" data-install-hard-reset>
-            <span class="button-text typography-text-m-500">Reset Everything</span>
-        </button>
-    </div>
 </div>

app/views/install/installer/templates/steps/step-6.phtml

@@ -1,37 +0,0 @@
-<?php
-$isUpgrade = $isUpgrade ?? false;
-?>
-<div class="step-layout" data-step="6">
-    <div class="stack-xl">
-        <div class="stack-xxxs">
-            <h1 class="typography-title-s text-neutral-primary">Database migration</h1>
-            <p class="typography-text-m-400 text-neutral-secondary">
-                Run database migration after the update to apply schema changes.
-            </p>
-        </div>
-
-        <div class="stack-xl">
-            <label class="migration-option" for="run-migration">
-                <span class="migration-option-content">
-                    <span class="typography-text-m-500 text-neutral-primary">Run migration automatically</span>
-                    <span class="typography-text-xs-400 text-neutral-tertiary">Recommended when upgrading to a new version</span>
-                </span>
-                <span class="migration-switch">
-                    <input type="checkbox" id="run-migration" name="migrate" class="sr-only" checked>
-                    <span class="migration-switch-track" aria-hidden="true">
-                        <span class="migration-switch-thumb"></span>
-                    </span>
-                </span>
-            </label>
-
-            <div class="migration-hint">
-                <span class="migration-hint-icon">
-                    <?php include __DIR__ . '/../../icons/info.svg'; ?>
-                </span>
-                <span class="typography-text-xs-400 text-neutral-tertiary">
-                    To run manually later: <code class="migration-code">docker compose exec appwrite migrate</code>
-                </span>
-            </div>
-        </div>
-    </div>
-</div>

app/worker.php

@@ -9,16 +9,16 @@ use Appwrite\Event\Certificate;
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Execution;
 use Appwrite\Event\Func;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
-use Appwrite\Event\Publisher\Usage as UsagePublisher;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\Screenshot;
+use Appwrite\Event\StatsUsage;
 use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
-use Appwrite\Usage\Context;
 use Appwrite\Utopia\Database\Documents\User;
 use Executor\Executor;
 use Swoole\Runtime;
@@ -43,7 +43,6 @@ use Utopia\Pools\Group;
 use Utopia\Queue\Broker\Pool as BrokerPool;
 use Utopia\Queue\Message;
 use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
 use Utopia\Queue\Server;
 use Utopia\Registry\Registry;
 use Utopia\Storage\Device\Telemetry as TelemetryDevice;
@@ -60,8 +59,7 @@ Server::setResource('register', fn () => $register);
 Server::setResource('authorization', function () {
     $authorization = new Authorization();
     $authorization->disable();
-
-    return $authorization;
+    return  $authorization;
 }, []);
 
 Server::setResource('dbForPlatform', function (Cache $cache, Registry $register, Authorization $authorization) {
@@ -73,7 +71,9 @@ Server::setResource('dbForPlatform', function (Cache $cache, Registry $register,
         ->setDatabase(APP_DATABASE)
         ->setAuthorization($authorization)
         ->setNamespace('_console')
-        ->setDocumentType('users', User::class);
+        ->setDocumentType('users', User::class)
+    ;
+
 
     return $dbForPlatform;
 }, ['cache', 'register', 'authorization']);
@@ -112,7 +112,7 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
     if (\in_array($dsn->getHost(), $sharedTables)) {
         $database
             ->setSharedTables(true)
-            ->setTenant($project->getSequence())
+            ->setTenant((int)$project->getSequence())
             ->setNamespace($dsn->getParam('namespace'));
     } else {
         $database
@@ -152,7 +152,7 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
             if (\in_array($dsn->getHost(), $sharedTables)) {
                 $database
                     ->setSharedTables(true)
-                    ->setTenant($project->getSequence())
+                    ->setTenant((int)$project->getSequence())
                     ->setNamespace($dsn->getParam('namespace'));
             } else {
                 $database
@@ -174,7 +174,7 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
         if (\in_array($dsn->getHost(), $sharedTables)) {
             $database
                 ->setSharedTables(true)
-                ->setTenant($project->getSequence())
+                ->setTenant((int)$project->getSequence())
                 ->setNamespace($dsn->getParam('namespace'));
         } else {
             $database
@@ -194,10 +194,9 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
 
 Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
     $database = null;
-
     return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
         if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getSequence());
+            $database->setTenant((int)$project->getSequence());
             return $database;
         }
 
@@ -212,68 +211,15 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authoriza
             ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
             ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
 
+        // set tenant
         if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getSequence());
+            $database->setTenant((int)$project->getSequence());
         }
 
         return $database;
     };
 }, ['pools', 'cache', 'authorization']);
 
-Server::setResource('getDatabasesDB', function (Cache $cache, Registry $register, Document $project, Authorization $authorization) {
-    return function (Document $database, ?Document $projectDocument = null) use ($cache, $register, $project, $authorization): Database {
-        $projectDocument ??= $project;
-        $databaseDSN = $database->getAttribute('database', $project->getAttribute('database', ''));
-        $databaseType = $database->getAttribute('type', '');
-
-        // Backwards‑compatibility: older or seeded legacy databases may not have a DSN stored
-        // in the "database" attribute. In that case, fall back to the project's database DSN.
-        if ($databaseDSN === '') {
-            $databaseDSN = $projectDocument->getAttribute('database', '');
-        }
-
-        try {
-            $databaseDSN = new DSN($databaseDSN);
-        } catch (\InvalidArgumentException) {
-            $databaseDSN = new DSN('mysql://'.$databaseDSN);
-        }
-
-        try {
-            $dsn = new DSN($projectDocument->getAttribute('database'));
-        } catch (\InvalidArgumentException) {
-            // Temporary fallback until all projects use shared tables
-            $dsn = new DSN('mysql://' . $projectDocument->getAttribute('database'));
-        }
-
-        $pools = $register->get('pools');
-        $pool = $pools->get($databaseDSN->getHost());
-
-        $adapter = new DatabasePool($pool);
-        $database = new Database($adapter, $cache);
-        $database
-            ->setDatabase(APP_DATABASE)
-            ->setAuthorization($authorization);
-        $database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
-
-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-        if (\in_array($dsn->getHost(), $sharedTables, true)) {
-            $database
-                ->setSharedTables(true)
-                ->setTenant((int) $projectDocument->getSequence())
-                ->setNamespace($dsn->getParam('namespace'));
-        } else {
-            $database
-                ->setSharedTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $projectDocument->getSequence());
-        }
-
-        $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-        return $database;
-    };
-}, ['cache', 'register', 'project', 'authorization']);
-
 Server::setResource('abuseRetention', function () {
     return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
 });
@@ -282,7 +228,6 @@ Server::setResource('auditRetention', function (Document $project) {
     if ($project->getId() === 'console') {
         return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
     }
-
     return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
 }, ['project']);
 
@@ -308,7 +253,7 @@ Server::setResource('redis', function () {
     $pass = System::getEnv('_APP_REDIS_PASS', '');
 
     $redis = new \Redis();
-    @$redis->pconnect($host, (int) $port);
+    @$redis->pconnect($host, (int)$port);
     if ($pass) {
         $redis->auth($pass);
     }
@@ -325,6 +270,7 @@ Server::setResource('timelimit', function (\Redis $redis) {
 
 Server::setResource('log', fn () => new Log());
 
+
 Server::setResource('publisher', function (Group $pools) {
     return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);
@@ -341,6 +287,10 @@ Server::setResource('publisherMigrations', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
 
+Server::setResource('publisherStatsUsage', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
 Server::setResource('publisherMessaging', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
@@ -361,13 +311,9 @@ Server::setResource('consumerStatsUsage', function (BrokerPool $consumer) {
     return $consumer;
 }, ['consumer']);
 
-Server::setResource('usage', function () {
-    return new Context();
-}, []);
-Server::setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
-), ['publisher']);
+Server::setResource('queueForStatsUsage', function (Publisher $publisher) {
+    return new StatsUsage($publisher);
+}, ['publisher']);
 
 Server::setResource('queueForDatabase', function (Publisher $publisher) {
     return new EventDatabase($publisher);
@@ -409,6 +355,10 @@ Server::setResource('queueForFunctions', function (Publisher $publisher) {
     return new Func($publisher);
 }, ['publisher']);
 
+Server::setResource('queueForExecutions', function (Publisher $publisher) {
+    return new Execution($publisher);
+}, ['publisher']);
+
 Server::setResource('queueForRealtime', function () {
     return new Realtime();
 }, []);
@@ -538,13 +488,11 @@ Server::setResource('getAudit', function (Database $dbForPlatform, callable $get
     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']);
@@ -561,7 +509,7 @@ $pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');
 
-if (! isset($args[1])) {
+if (!isset($args[1])) {
     Console::error('Missing worker name');
     Console::exit(1);
 }
@@ -586,18 +534,14 @@ try {
         'workersNum' => System::getEnv('_APP_WORKERS_NUM', 1),
         'connection' => $pools->get('consumer')->pop()->getResource(),
         'workerName' => strtolower($workerName) ?? null,
-        'queueName' => $queueName,
+        'queueName' => $queueName
     ]);
 } catch (\Throwable $e) {
-    Console::error($e->getMessage() . ', File: ' . $e->getFile() . ', Line: ' . $e->getLine());
+    Console::error($e->getMessage() . ', File: ' . $e->getFile() .  ', Line: ' . $e->getLine());
 }
 
 $worker = $platform->getWorker();
 
-Server::setResource('bus', function ($register) use ($worker) {
-    return $register->get('bus')->setResolver(fn (string $name) => $worker->getResource($name));
-}, ['register']);
-
 $worker
     ->error()
     ->inject('error')
@@ -606,11 +550,11 @@ $worker
     ->inject('pools')
     ->inject('project')
     ->inject('authorization')
-    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project, Authorization $authorization) use ($queueName) {
+    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project, Authorization $authorization) use ($worker, $queueName) {
         $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
 
         if ($logger) {
-            $log->setNamespace('appwrite-worker');
+            $log->setNamespace("appwrite-worker");
             $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
             $log->setVersion($version);
             $log->setType(Log::TYPE_ERROR);

bin/task-time-travel

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

compose/mariadb.env

@@ -1,3 +0,0 @@
-_APP_DB_ADAPTER=mariadb
-_APP_DB_HOST=mariadb
-_APP_DB_PORT=3306

compose/mariadb.yml

@@ -1,36 +0,0 @@
-x-logging: &x-logging
-  logging:
-    driver: "json-file"
-    options:
-      max-file: "5"
-      max-size: "10m"
-
-services:
-  mongodb:
-    scale: 0
-
-  mariadb:
-    image: mariadb:10.11 # fix issues when upgrading using: mysql_upgrade -u root -p
-    container_name: appwrite-mariadb
-    <<: *x-logging
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-mariadb:/var/lib/mysql:rw
-    ports:
-      - "3306:3306"
-    environment:
-      - MYSQL_ROOT_PASSWORD=${_APP_DB_ROOT_PASS}
-      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
-      - MYSQL_USER=${_APP_DB_USER}
-      - MYSQL_PASSWORD=${_APP_DB_PASS}
-      - MARIADB_AUTO_UPGRADE=1
-    command: "mysqld --innodb-flush-method=fsync"
-    healthcheck:
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
-      interval: 5s
-      timeout: 5s
-      retries: 12
-
-volumes:
-  appwrite-mariadb:

compose/postgresql.env

@@ -1,3 +0,0 @@
-_APP_DB_ADAPTER=postgresql
-_APP_DB_HOST=postgresql
-_APP_DB_PORT=5432

compose/postgresql.yml

@@ -1,3 +0,0 @@
-services:
-  mongodb:
-    scale: 0

composer.json

@@ -13,17 +13,16 @@
         "test": "vendor/bin/phpunit",
         "lint": "vendor/bin/pint --test --config pint.json",
         "format": "vendor/bin/pint --config pint.json",
-        "analyze": "./vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=1G",
         "bench": "vendor/bin/phpbench run --report=benchmark",
-        "check": "./vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=1G",
+        "check": "./vendor/bin/phpstan analyse -c phpstan.neon",
         "installer:clean": "php src/Appwrite/Platform/Installer/Server.php --clean",
-        "installer:dev": "docker compose build && composer installer:clean && php src/Appwrite/Platform/Installer/Server.php --docker"
+        "installer:dev": "docker compose build && composer installer:clean && php src/Appwrite/Platform/Installer/Server.php --docker",
+        "installer:dev-upgrade": "docker compose build && php src/Appwrite/Platform/Installer/Server.php --docker --upgrade"
     },
     "autoload": {
         "psr-4": {
             "Appwrite\\": "src/Appwrite",
-            "Executor\\": "src/Executor",
-            "Utopia\\Bus\\": "src/Utopia/Bus"
+            "Executor\\": "src/Executor"
         }
     },
     "autoload-dev": {
@@ -52,6 +51,7 @@
         "appwrite/php-runtimes": "0.19.*",
         "appwrite/php-clamav": "2.0.*",
         "utopia-php/abuse": "1.2.*",
+        "utopia-php/agents": "1.2.*",
         "utopia-php/analytics": "0.15.*",
         "utopia-php/audit": "2.2.*",
         "utopia-php/auth": "0.5.*",
@@ -61,7 +61,6 @@
         "utopia-php/config": "1.*",
         "utopia-php/console": "0.1.*",
         "utopia-php/database": "5.*",
-        "utopia-php/agents": "1.*",
         "utopia-php/detector": "0.2.*",
         "utopia-php/domains": "1.*",
         "utopia-php/emails": "0.6.*",
@@ -73,18 +72,17 @@
         "utopia-php/locale": "0.8.*",
         "utopia-php/logger": "0.6.*",
         "utopia-php/messaging": "0.20.*",
-        "utopia-php/migration": "1.8.*",
+        "utopia-php/migration": "1.6.*",
         "utopia-php/platform": "0.7.*",
         "utopia-php/pools": "1.*",
         "utopia-php/span": "1.1.*",
         "utopia-php/preloader": "0.2.*",
         "utopia-php/queue": "0.15.*",
-        "utopia-php/servers": "0.2.5",
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "1.0.*",
         "utopia-php/system": "0.10.*",
         "utopia-php/telemetry": "0.2.*",
-        "utopia-php/vcs": "3.*",
+        "utopia-php/vcs": "2.*",
         "utopia-php/websocket": "1.0.*",
         "matomo/device-detector": "6.4.*",
         "dragonmantank/cron-expression": "3.4.*",
@@ -94,8 +92,7 @@
         "spomky-labs/otphp": "11.*",
         "webonyx/graphql-php": "14.11.*",
         "league/csv": "9.14.*",
-        "enshrined/svg-sanitize": "0.22.*",
-        "utopia-php/di": "0.1.0"
+        "enshrined/svg-sanitize": "0.22.*"
     },
     "require-dev": {
         "ext-fileinfo": "*",
@@ -103,16 +100,17 @@
         "brianium/paratest": "7.*",
         "phpunit/phpunit": "12.*",
         "swoole/ide-helper": "6.*",
-        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan": "1.12.*",
         "textalk/websocket": "1.5.*",
-        "czproject/git-php": "4.*",
-        "laravel/pint": "1.*"
+        "laravel/pint": "1.*",
+        "phpbench/phpbench": "1.*"
     },
     "provide": {
         "ext-phpiredis": "*"
     },
     "config": {
         "platform": {
+            "php": "8.3"
         },
         "allow-plugins": {
             "php-http/discovery": true,

docker-compose.override.yml

@@ -1,143 +0,0 @@
-# Dev tools for local development only.
-# This file is automatically loaded by `docker compose` alongside docker-compose.yml.
-# CI sets COMPOSE_FILE=docker-compose.yml explicitly, so these services are excluded from test runs.
-
-services:
-  appwrite-mongo-express:
-    image: mongo-express
-    container_name: appwrite-mongo-express
-    networks:
-      - appwrite
-    ports:
-      - "8082:8081"
-    environment:
-      ME_CONFIG_MONGODB_URL: "mongodb://root:${_APP_DB_ROOT_PASS}@appwrite-mongodb:27017/?replicaSet=rs0&directConnection=true"
-      ME_CONFIG_BASICAUTH_USERNAME: ${_APP_DB_USER}
-      ME_CONFIG_BASICAUTH_PASSWORD: ${_APP_DB_PASS}
-    depends_on:
-      - mongodb
-
-  adminer:
-    image: adminer
-    container_name: appwrite-adminer
-    restart: always
-    ports:
-      - 9506:8080
-    networks:
-      - appwrite
-      - gateway
-    environment:
-      - ADMINER_DESIGN=pepa-linha
-      - ADMINER_DEFAULT_SERVER=mariadb
-      - ADMINER_DEFAULT_USERNAME=root
-      - ADMINER_DEFAULT_PASSWORD=rootsecretpassword
-      - ADMINER_DEFAULT_DB=appwrite
-    configs:
-      - source: adminer-index.php
-        target: /var/www/html/index.php
-        mode: 0755
-    labels:
-      - "traefik.enable=true"
-      - "traefik.constraint-label-stack=appwrite"
-      - "traefik.docker.network=gateway"
-      - "traefik.http.services.appwrite_adminer.loadbalancer.server.port=8080"
-      - "traefik.http.routers.appwrite_adminer_http.entrypoints=appwrite_web"
-      - "traefik.http.routers.appwrite_adminer_http.rule=Host(`mysql.localhost`)"
-      - "traefik.http.routers.appwrite_adminer_http.service=appwrite_adminer"
-      - "traefik.http.routers.appwrite_adminer_https.entrypoints=appwrite_websecure"
-      - "traefik.http.routers.appwrite_adminer_https.rule=Host(`mysql.localhost`)"
-      - "traefik.http.routers.appwrite_adminer_https.service=appwrite_adminer"
-      - "traefik.http.routers.appwrite_adminer_https.tls=true"
-
-  redis-insight:
-    image: redis/redisinsight:latest
-    restart: unless-stopped
-    networks:
-      - appwrite
-      - gateway
-    environment:
-      - RI_PRE_SETUP_DATABASES_PATH=/mnt/connections.json
-    configs:
-      - source: redisinsight-connections.json
-        target: /mnt/connections.json
-        mode: 0755
-    labels:
-      - "traefik.enable=true"
-      - "traefik.constraint-label-stack=appwrite"
-      - "traefik.docker.network=gateway"
-      - "traefik.http.services.appwrite_redisinsight.loadbalancer.server.port=5540"
-      - "traefik.http.routers.appwrite_redisinsight_http.entrypoints=appwrite_web"
-      - "traefik.http.routers.appwrite_redisinsight_http.rule=Host(`redis.localhost`)"
-      - "traefik.http.routers.appwrite_redisinsight_http.service=appwrite_redisinsight"
-      - "traefik.http.routers.appwrite_redisinsight_https.entrypoints=appwrite_websecure"
-      - "traefik.http.routers.appwrite_redisinsight_https.rule=Host(`redis.localhost`)"
-      - "traefik.http.routers.appwrite_redisinsight_https.service=appwrite_redisinsight"
-      - "traefik.http.routers.appwrite_redisinsight_https.tls=true"
-    ports:
-      - "8081:5540"
-
-  graphql-explorer:
-    container_name: appwrite-graphql-explorer
-    image: appwrite/altair:0.3.0
-    restart: unless-stopped
-    networks:
-      - appwrite
-    ports:
-      - "9509:3000"
-    environment:
-      - SERVER_URL=http://localhost/v1/graphql
-
-configs:
-  redisinsight-connections.json:
-    content: |
-      [
-        {
-          "compressor": "NONE",
-          "id": "104dc90a-21ef-4d5e-8912-b30baabb152f",
-          "host": "redis",
-          "port": 6379,
-          "name": "redis:6379",
-          "db": 0,
-          "username": "default",
-          "password": null,
-          "connectionType": "STANDALONE",
-          "nameFromProvider": null,
-          "provider": "REDIS",
-          "lastConnection": "2025-10-16T09:22:02.591Z",
-          "modules": [
-            {
-              "name": "ReJSON",
-              "version": 20808,
-              "semanticVersion": "2.8.8"
-            },
-            {
-              "name": "search",
-              "version": 21015,
-              "semanticVersion": "2.10.15"
-            }
-          ],
-          "tls": false,
-          "tlsServername": null,
-          "verifyServerCert": null,
-          "caCert": null,
-          "clientCert": null,
-          "ssh": false,
-          "sshOptions": null,
-          "forceStandalone": false,
-          "tags": []
-        }
-      ]
-
-  adminer-index.php:
-    content: |
-      <?php
-        if(!count($$_GET)) {
-          $$_POST['auth'] = [
-            'server' => $$_ENV['ADMINER_DEFAULT_SERVER'],
-            'driver' => 'server', /* seems to autodetect the driver from server settings */
-            'username' => $$_ENV['ADMINER_DEFAULT_USERNAME'],
-            'password' => $$_ENV['ADMINER_DEFAULT_PASSWORD'],
-            'db' => $$_ENV['ADMINER_DEFAULT_DB'],
-          ];
-        }
-        include './adminer.php';

docker-compose.yml

@@ -10,15 +10,6 @@ x-logging: &x-logging
       max-file: "5"
       max-size: "10m"
 
-x-build: &x-build
-  build:
-    context: .
-    target: development
-    args:
-      DEBUG: false
-      TESTING: true
-      VERSION: dev
-
 services:
   traefik:
     image: traefik:3.6
@@ -59,13 +50,15 @@ services:
 
   appwrite:
     container_name: appwrite
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     image: appwrite-dev
-    healthcheck:
-      test: ["CMD", "doctor"]
-      interval: 5s
-      timeout: 5s
-      retries: 12
+    build:
+      context: .
+      target: development
+      args:
+        DEBUG: false
+        TESTING: true
+        VERSION: dev
     ports:
       - 9501:80
     networks:
@@ -108,12 +101,10 @@ services:
       - ./dev:/usr/src/code/dev
 
     depends_on:
-      redis:
-        condition: service_healthy
-      coredns:
-        condition: service_started
-      ollama:
-        condition: service_started
+      - ${_APP_DB_HOST:-mongodb}
+      - redis
+      - coredns
+      # - clamav
     entrypoint:
       - php
       - -e
@@ -161,12 +152,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER_VECTORSDB
-      - _APP_DB_HOST_VECTORSDB
-      - _APP_DB_PORT_VECTORSDB
-      - _APP_DB_SCHEMA_VECTORSDB
-      - _APP_DB_USER_VECTORSDB
-      - _APP_DB_PASS_VECTORSDB
+      - _APP_DB_ADAPTER
       - _APP_SMTP_HOST
       - _APP_SMTP_PORT
       - _APP_SMTP_SECURE
@@ -254,7 +240,7 @@ services:
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:7.8.26
+    image: appwrite/console:7.5.7
     restart: unless-stopped
     networks:
       - appwrite
@@ -275,7 +261,7 @@ services:
 
   appwrite-realtime:
     entrypoint: realtime
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-realtime
     image: appwrite-dev
     restart: unless-stopped
@@ -303,7 +289,6 @@ services:
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
       - redis
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -320,12 +305,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER_VECTORSDB
-      - _APP_DB_HOST_VECTORSDB
-      - _APP_DB_PORT_VECTORSDB
-      - _APP_DB_SCHEMA_VECTORSDB
-      - _APP_DB_USER_VECTORSDB
-      - _APP_DB_PASS_VECTORSDB
+      - _APP_DB_ADAPTER
       - _APP_USAGE_STATS
       - _APP_LOGGING_CONFIG
       - _APP_LOGGING_CONFIG_REALTIME
@@ -334,7 +314,7 @@ services:
 
   appwrite-worker-audits:
     entrypoint: worker-audits
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-audits
     image: appwrite-dev
     networks:
@@ -345,7 +325,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -361,12 +340,13 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_DATABASE_SHARED_TABLES
 
   appwrite-worker-webhooks:
     entrypoint: worker-webhooks
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-webhooks
     image: appwrite-dev
     networks:
@@ -379,7 +359,6 @@ services:
       - ${_APP_DB_HOST:-mongodb}
       - request-catcher-sms
       - request-catcher-webhook
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -392,6 +371,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -402,7 +382,7 @@ services:
 
   appwrite-worker-deletes:
     entrypoint: worker-deletes
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-deletes
     image: appwrite-dev
     networks:
@@ -410,7 +390,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     volumes:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -420,7 +399,6 @@ services:
       - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
-      
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -436,6 +414,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
       - _APP_STORAGE_S3_SECRET
@@ -469,7 +448,7 @@ services:
 
   appwrite-worker-databases:
     entrypoint: worker-databases
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-databases
     image: appwrite-dev
     networks:
@@ -477,11 +456,9 @@ services:
     volumes:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
-      
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -497,12 +474,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER_VECTORSDB
-      - _APP_DB_HOST_VECTORSDB
-      - _APP_DB_PORT_VECTORSDB
-      - _APP_DB_SCHEMA_VECTORSDB
-      - _APP_DB_USER_VECTORSDB
-      - _APP_DB_PASS_VECTORSDB
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_WORKERS_NUM
       - _APP_QUEUE_NAME
@@ -510,7 +482,7 @@ services:
 
   appwrite-worker-builds:
     entrypoint: worker-builds
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-builds
     image: appwrite-dev
     networks:
@@ -524,7 +496,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -542,6 +513,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_VCS_GITHUB_APP_NAME
       - _APP_VCS_GITHUB_PRIVATE_KEY
@@ -586,7 +558,7 @@ services:
 
   appwrite-worker-screenshots:
     entrypoint: worker-screenshots
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-screenshots
     image: appwrite-dev
     networks:
@@ -649,7 +621,7 @@ services:
 
   appwrite-worker-certificates:
     entrypoint: worker-certificates
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-certificates
     image: appwrite-dev
     networks:
@@ -657,7 +629,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     volumes:
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
@@ -687,12 +658,13 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_DATABASE_SHARED_TABLES
 
   appwrite-worker-executions:
     entrypoint: worker-executions
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-executions
     image: appwrite-dev
     networks:
@@ -722,7 +694,7 @@ services:
 
   appwrite-worker-functions:
     entrypoint: worker-functions
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-functions
     image: appwrite-dev
     networks:
@@ -750,6 +722,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_FUNCTIONS_TIMEOUT
       - _APP_SITES_TIMEOUT
       - _APP_COMPUTE_BUILD_TIMEOUT
@@ -766,7 +739,7 @@ services:
 
   appwrite-worker-mails:
     entrypoint: worker-mails
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-mails
     image: appwrite-dev
     networks:
@@ -808,7 +781,7 @@ services:
 
   appwrite-worker-messaging:
     entrypoint: worker-messaging
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-messaging
     restart: unless-stopped
     image: appwrite-dev
@@ -835,6 +808,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_SMS_FROM
       - _APP_SMS_PROVIDER
@@ -865,7 +839,7 @@ services:
 
   appwrite-worker-migrations:
     entrypoint: worker-migrations
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-migrations
     restart: unless-stopped
     image: appwrite-dev
@@ -877,7 +851,6 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
       - ./tests:/usr/src/code/tests
-      
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
     environment:
@@ -902,6 +875,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
@@ -911,7 +885,7 @@ services:
 
   appwrite-task-maintenance:
     entrypoint: maintenance
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-task-maintenance
     image: appwrite-dev
     networks:
@@ -944,6 +918,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_MAINTENANCE_INTERVAL
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_MAINTENANCE_RETENTION_CACHE
@@ -957,7 +932,7 @@ services:
 
   appwrite-task-interval:
     entrypoint: interval
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-task-interval
     image: appwrite-dev
     networks:
@@ -998,7 +973,7 @@ services:
   appwrite-task-stats-resources:
     container_name: appwrite-task-stats-resources
     entrypoint: stats-resources
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     image: appwrite-dev
     networks:
       - appwrite
@@ -1019,6 +994,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -1030,7 +1006,7 @@ services:
 
   appwrite-worker-stats-resources:
     entrypoint: worker-stats-resources
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-stats-resources
     image: appwrite-dev
     networks:
@@ -1052,6 +1028,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -1063,7 +1040,7 @@ services:
 
   appwrite-worker-stats-usage:
     entrypoint: worker-stats-usage
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-worker-stats-usage
     image: appwrite-dev
     networks:
@@ -1074,7 +1051,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1086,6 +1062,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -1097,7 +1074,7 @@ services:
 
   appwrite-task-scheduler-functions:
     entrypoint: schedule-functions
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-task-scheduler-functions
     image: appwrite-dev
     networks:
@@ -1108,7 +1085,6 @@ services:
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
       - redis
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1124,11 +1100,12 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_DATABASE_SHARED_TABLES
 
   appwrite-task-scheduler-executions:
     entrypoint: schedule-executions
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-task-scheduler-executions
     image: appwrite-dev
     networks:
@@ -1139,7 +1116,6 @@ services:
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
       - redis
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1155,11 +1131,11 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DATABASE_SHARED_TABLES
+      - _APP_DB_ADAPTER
 
   appwrite-task-scheduler-messages:
     entrypoint: schedule-messages
-    <<: [*x-logging, *x-build]
+    <<: *x-logging
     container_name: appwrite-task-scheduler-messages
     image: appwrite-dev
     networks:
@@ -1170,7 +1146,6 @@ services:
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
       - redis
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1186,6 +1161,7 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_DATABASE_SHARED_TABLES
 
   appwrite-assistant:
@@ -1261,29 +1237,27 @@ services:
       retries: 20
       start_period: 5s
 
-  postgresql:
-    image: appwrite/postgres:0.1.0
-    container_name: appwrite-postgresql
+  mariadb:
+    profiles: ["mariadb"]
+    image: mariadb:10.11 # fix issues when upgrading using: mysql_upgrade -u root -p
+    container_name: appwrite-mariadb
     <<: *x-logging
     networks:
       - appwrite
     volumes:
-      - appwrite-postgresql:/var/lib/postgresql/18/data:rw
+      - appwrite-mariadb:/var/lib/mysql:rw
     ports:
-      - "5432:5432"
+      - "3306:3306"
     environment:
-      - POSTGRES_DB=${_APP_DB_SCHEMA}
-      - POSTGRES_USER=${_APP_DB_USER}
-      - POSTGRES_PASSWORD=${_APP_DB_PASS}
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${_APP_DB_USER} -d ${_APP_DB_SCHEMA}"]
-      interval: 5s
-      timeout: 5s
-      retries: 10
-      start_period: 10s
-    command: "postgres"
+      - MYSQL_ROOT_PASSWORD=${_APP_DB_ROOT_PASS}
+      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
+      - MYSQL_USER=${_APP_DB_USER}
+      - MYSQL_PASSWORD=${_APP_DB_PASS}
+      - MARIADB_AUTO_UPGRADE=1
+    command: "mysqld --innodb-flush-method=fsync"
 
   mongodb:
+    profiles: ["mongodb"]
     image: mongo:8.2.5
     container_name: appwrite-mongodb
     <<: *x-logging
@@ -1319,19 +1293,40 @@ services:
       retries: 10
       start_period: 30s
 
-  ollama:
-    image: appwrite/ollama:0.1.1
-    container_name: ollama
-    ports:
-      - "11434:11434"
-    restart: unless-stopped
-    environment:
-      MODELS: ${_APP_EMBEDDING_MODELS:-embeddinggemma}
-      OLLAMA_KEEP_ALIVE: 24h
-    volumes:
-      - appwrite-models:/root/.ollama
+  appwrite-mongo-express:
+    profiles: ["mongodb"]
+    image: mongo-express
+    container_name: appwrite-mongo-express
     networks:
       - appwrite
+    ports:
+      - "8082:8081"
+    environment:
+      ME_CONFIG_MONGODB_URL: "mongodb://root:${_APP_DB_ROOT_PASS}@appwrite-mongodb:27017/?replicaSet=rs0&directConnection=true"
+      ME_CONFIG_BASICAUTH_USERNAME: ${_APP_DB_USER}
+      ME_CONFIG_BASICAUTH_PASSWORD: ${_APP_DB_PASS}
+    depends_on:
+      - mongodb
+
+  postgresql:
+    profiles: ["postgresql"]
+    build:
+      context: ./tests/resources/postgresql
+      args:
+        POSTGRES_VERSION: 17
+    container_name: appwrite-postgresql
+    <<: *x-logging
+    networks:
+      - appwrite
+    volumes:
+      - appwrite-postgresql:/var/lib/postgresql:rw
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_DB=${_APP_DB_SCHEMA}
+      - POSTGRES_USER=${_APP_DB_USER}
+      - POSTGRES_PASSWORD=${_APP_DB_PASS}
+    command: "postgres"
 
   redis:
     image: redis:7.4.7-alpine
@@ -1348,11 +1343,6 @@ services:
       - appwrite
     volumes:
       - appwrite-redis:/data:rw
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 5s
-      timeout: 5s
-      retries: 12
 
   coredns: # DNS server for testing purposes (Proxy APIs)
     image: coredns/coredns:1.12.4
@@ -1424,8 +1414,78 @@ services:
     networks:
       - appwrite
 
-  # Dev tools (adminer, redis-insight, mongo-express, graphql-explorer)
-  # are defined in docker-compose.override.yml
+  adminer:
+    image: adminer
+    container_name: appwrite-adminer
+    <<: *x-logging
+    restart: always
+    ports:
+      - 9506:8080
+    networks:
+      - appwrite
+      - gateway
+    environment:
+      - ADMINER_DESIGN=pepa-linha
+      - ADMINER_DEFAULT_SERVER=mariadb
+      - ADMINER_DEFAULT_USERNAME=root
+      - ADMINER_DEFAULT_PASSWORD=rootsecretpassword
+      - ADMINER_DEFAULT_DB=appwrite
+    configs:
+      - source: adminer-index.php
+        target: /var/www/html/index.php
+        mode: 0755
+    labels:
+      - "traefik.enable=true"
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=gateway"
+      - "traefik.http.services.appwrite_adminer.loadbalancer.server.port=8080"
+      - "traefik.http.routers.appwrite_adminer_http.entrypoints=appwrite_web"
+      - "traefik.http.routers.appwrite_adminer_http.rule=Host(`mysql.localhost`)"
+      - "traefik.http.routers.appwrite_adminer_http.service=appwrite_adminer"
+      - "traefik.http.routers.appwrite_adminer_https.entrypoints=appwrite_websecure"
+      - "traefik.http.routers.appwrite_adminer_https.rule=Host(`mysql.localhost`)"
+      - "traefik.http.routers.appwrite_adminer_https.service=appwrite_adminer"
+      - "traefik.http.routers.appwrite_adminer_https.tls=true"
+
+  redis-insight:
+    image: redis/redisinsight:latest
+    restart: unless-stopped
+    networks:
+      - appwrite
+      - gateway
+    environment:
+      - RI_PRE_SETUP_DATABASES_PATH=/mnt/connections.json
+    configs:
+      - source: redisinsight-connections.json
+        target: /mnt/connections.json
+        mode: 0755
+    labels:
+      - "traefik.enable=true"
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=gateway"
+      - "traefik.http.services.appwrite_redisinsight.loadbalancer.server.port=5540"
+      - "traefik.http.routers.appwrite_redisinsight_http.entrypoints=appwrite_web"
+      - "traefik.http.routers.appwrite_redisinsight_http.rule=Host(`redis.localhost`)"
+      - "traefik.http.routers.appwrite_redisinsight_http.service=appwrite_redisinsight"
+      - "traefik.http.routers.appwrite_redisinsight_https.entrypoints=appwrite_websecure"
+      - "traefik.http.routers.appwrite_redisinsight_https.rule=Host(`redis.localhost`)"
+      - "traefik.http.routers.appwrite_redisinsight_https.service=appwrite_redisinsight"
+      - "traefik.http.routers.appwrite_redisinsight_https.tls=true"
+    ports:
+      - "8081:5540"
+
+  graphql-explorer:
+    container_name: appwrite-graphql-explorer
+    image: appwrite/altair:0.3.0
+    restart: unless-stopped
+    networks:
+      - appwrite
+    ports:
+      - "9509:3000"
+    environment:
+      - SERVER_URL=http://localhost/v1/graphql
+
+  # Dev Tools End   ------------------------------------------------------------------------------------------
 
 networks:
   gateway:
@@ -1438,12 +1498,66 @@ networks:
   runtimes:
     name: runtimes
 
+configs:
+  redisinsight-connections.json:
+    content: |
+      [
+        {
+          "compressor": "NONE",
+          "id": "104dc90a-21ef-4d5e-8912-b30baabb152f",
+          "host": "redis",
+          "port": 6379,
+          "name": "redis:6379",
+          "db": 0,
+          "username": "default",
+          "password": null,
+          "connectionType": "STANDALONE",
+          "nameFromProvider": null,
+          "provider": "REDIS",
+          "lastConnection": "2025-10-16T09:22:02.591Z",
+          "modules": [
+            {
+              "name": "ReJSON",
+              "version": 20808,
+              "semanticVersion": "2.8.8"
+            },
+            {
+              "name": "search",
+              "version": 21015,
+              "semanticVersion": "2.10.15"
+            }
+          ],
+          "tls": false,
+          "tlsServername": null,
+          "verifyServerCert": null,
+          "caCert": null,
+          "clientCert": null,
+          "ssh": false,
+          "sshOptions": null,
+          "forceStandalone": false,
+          "tags": []
+        }
+      ]
 
+  adminer-index.php:
+    content: |
+      <?php
+        if(!count($$_GET)) {
+          $$_POST['auth'] = [
+            'server' => $$_ENV['ADMINER_DEFAULT_SERVER'],
+            'driver' => 'server', /* seems to autodetect the driver from server settings */
+            'username' => $$_ENV['ADMINER_DEFAULT_USERNAME'],
+            'password' => $$_ENV['ADMINER_DEFAULT_PASSWORD'],
+            'db' => $$_ENV['ADMINER_DEFAULT_DB'],
+          ];
+        }
+        include './adminer.php';
 
 volumes:
-  appwrite-postgresql:
+  appwrite-mariadb:
   appwrite-mongodb:
   appwrite-mongodb-keyfile:
+  appwrite-postgresql:
   appwrite-redis:
   appwrite-cache:
   appwrite-uploads:
@@ -1453,4 +1567,3 @@ volumes:
   appwrite-sites:
   appwrite-builds:
   appwrite-config:
-  appwrite-models:

docs/WEB_INSTALLER.md

@@ -0,0 +1,131 @@
+# Appwrite Web Installer
+
+The Appwrite Web Installer provides a modern, user-friendly web interface for installing Appwrite. It runs in a
+temporary Docker container with its own web server before the Appwrite stack is created.
+
+## Architecture
+
+The web installer runs as part of the installation task using a Swoole HTTP server with Utopia PHP routing:
+
+```
+docker run (temporary container)
+  └── Server.php
+       ├── Swoole HTTP server (0.0.0.0:20080)
+       ├── Module / Service / Action routes
+       ├── State (progress tracking)
+       └── Config (installation settings)
+```
+
+## Features
+
+- Retry failed steps with payload validation
+- Step-by-step guided installation with real-time validation
+- Progress tracking with Server-Sent Events and polling fallback
+
+## Usage
+
+### Docker
+
+```bash
+docker run -it --rm \
+    --name appwrite-installer \
+    -p 20080:20080 \
+    --volume /var/run/docker.sock:/var/run/docker.sock \
+    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
+    --entrypoint="install" \
+    appwrite/appwrite:<version>
+```
+
+Then open http://localhost:20080 in your browser.
+
+### Composer (Development)
+
+```bash
+composer installer:dev              # Start web installer in Docker
+composer installer:dev-upgrade      # Start web installer in upgrade mode
+composer installer:clean            # Clean up installer containers and temp files
+```
+
+### CLI Mode
+
+```bash
+docker run -it --rm \
+    --name appwrite-installer \
+    --volume /var/run/docker.sock:/var/run/docker.sock \
+    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
+    --entrypoint="install" \
+    appwrite/appwrite:<version> \
+    --interactive N
+```
+
+## Files
+
+### Frontend
+
+- `app/views/install/installer.phtml` - Main layout
+- `app/views/install/installer/` - UI components (templates, CSS, JS, icons)
+
+### Backend
+
+- `src/Appwrite/Platform/Installer/**/*.php` - Installer backend (Server, Module, Actions, State, Config)
+- `src/Appwrite/Platform/Tasks/Install.php` - Installation task execution
+- `app/views/install/*.phtml` - Docker Compose and env templates
+
+## Technical Details
+
+### Endpoints
+
+- `GET /` - Installer UI
+- `POST /install` - Start installation (SSE stream or JSON)
+- `GET /install/status?installId=...` - Progress polling
+- `POST /install/validate` - CSRF validation
+- `POST /install/complete` - Notify completion
+
+### URL Parameters
+
+- `?step=1..5` - Jump to specific installation step
+
+### Installation Flow
+
+1. User submits form → CSRF validation
+2. Acquire global lock (prevents concurrent installs)
+3. Stream progress via SSE (or poll if SSE fails)
+4. Generate `docker-compose.yml` and `.env`
+5. Run `docker compose up -d`
+6. Redirect to console, shutdown server
+
+## Security
+
+- **CSRF**: Cookie tokens with timing-safe comparison
+- **CSP**: Strict headers prevent XSS
+- **Validation**: Ports (1-65535), emails, domains, env var names
+- **Escaping**: All shell commands use `escapeshellarg()`
+- **Path protection**: `realpath()` + `str_starts_with()` checks
+- **File permissions**: Config files created with mode 0600
+- **Global lock**: File-based with exception-safe cleanup
+
+## Troubleshooting
+
+### ERR_EMPTY_RESPONSE
+
+Server binds to `0.0.0.0` (not `localhost`) for Docker port mapping. If `localhost` resolves to IPv6 `::1`, connection
+will fail from host.
+
+### Can't access localhost:20080
+
+Ensure `-p 20080:20080` is in docker run command. Try `http://127.0.0.1:20080` instead.
+
+### Installation fails
+
+- Check Docker is running
+- Verify write permissions for appwrite directory
+- Check browser console for errors
+- Review Docker logs: `docker logs appwrite-installer`
+
+## Support
+
+For issues or questions:
+
+- [GitHub Issues](https://github.com/appwrite/appwrite/issues)
+- [Discord Community](https://appwrite.io/discord)
+- [Documentation](https://appwrite.io/docs)

docs/references/documentsdb/create-collection.md

@@ -1 +0,0 @@
-Create a new Collection. Before using this route, you should create a new database resource using either a [server integration](https://appwrite.io/docs/server/databases#documentsDBCreateCollection) API or directly from your database console.

docs/references/documentsdb/create-document.md

@@ -1 +0,0 @@
-Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https://appwrite.io/docs/server/databases#documentsDBCreateCollection) API or directly from your database console.

docs/references/documentsdb/create-documents.md

@@ -1 +0,0 @@
-Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https://appwrite.io/docs/server/databases#documentsDBCreateCollection) API or directly from your database console.

docs/references/documentsdb/create-index.md

@@ -1,2 +0,0 @@
-Creates an index on the attributes listed. Your index should include all the attributes you will query in a single request.
-Attributes can be `key`, `fulltext`, and `unique`.

docs/references/documentsdb/create-operations.md

@@ -1 +0,0 @@
-Create multiple operations in a single transaction.

docs/references/documentsdb/create-transaction.md

@@ -1 +0,0 @@
-Create a new transaction.

docs/references/documentsdb/create.md

@@ -1 +0,0 @@
-Create a new Database.

docs/references/documentsdb/decrement-document-attribute.md

@@ -1 +0,0 @@
-Decrement a specific column of a row by a given value.

docs/references/documentsdb/delete-collection.md

@@ -1 +0,0 @@
-Delete a collection by its unique ID. Only users with write permissions have access to delete this resource.

docs/references/documentsdb/delete-document.md

@@ -1 +0,0 @@
-Delete a document by its unique ID.

docs/references/documentsdb/delete-documents.md

@@ -1 +0,0 @@
-Bulk delete documents using queries, if no queries are passed then all documents are deleted.

docs/references/documentsdb/delete-index.md

@@ -1 +0,0 @@
-Delete an index.

docs/references/documentsdb/delete-transaction.md

@@ -1 +0,0 @@
-Delete a transaction by its unique ID.

docs/references/documentsdb/delete.md

@@ -1 +0,0 @@
-Delete a database by its unique ID. Only API keys with with databases.write scope can delete a database.

docs/references/documentsdb/get-collection-logs.md

@@ -1 +0,0 @@
-Get the collection activity logs list by its unique ID.

docs/references/documentsdb/get-collection-usage.md

@@ -1 +0,0 @@
-Get usage metrics and statistics for a collection. Returning the total number of documents. The response includes both current totals and historical data over time. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, range defaults to 30 days.

docs/references/documentsdb/get-collection.md

@@ -1 +0,0 @@
-Get a collection by its unique ID. This endpoint response returns a JSON object with the collection metadata.

docs/references/documentsdb/get-database-usage.md

@@ -1 +0,0 @@
-Get usage metrics and statistics for a database. You can view the total number of collections, documents, and storage usage. The response includes both current totals and historical data over time. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, range defaults to 30 days.

docs/references/documentsdb/get-document-logs.md

@@ -1 +0,0 @@
-Get the document activity logs list by its unique ID.

docs/references/documentsdb/get-document.md

@@ -1 +0,0 @@
-Get a document by its unique ID. This endpoint response returns a JSON object with the document data.

docs/references/documentsdb/get-index.md

@@ -1 +0,0 @@
-Get index by ID.

docs/references/documentsdb/get-logs.md

@@ -1 +0,0 @@
-Get the database activity logs list by its unique ID.

docs/references/documentsdb/get-transaction.md

@@ -1 +0,0 @@
-Get a transaction by its unique ID.