revert: drop $log clone and sdks in-lock re-read

Both were defensive against rare edge cases the reviewer flagged but which don't justify the complexity: - $log clone: protects against tag pollution on the per-request Log if reportError fires AND the request later errors. http.php's request-end handler overwrites the core fields (namespace, message, action, etc.) anyway; only addTag/addExtra accumulate. Aligns with Embeddings/Text/Create.php precedent which mutates $log directly. - sdks in-lock re-read: closes a sequential-acquire stale-read race on the sdks append-list. The race exists but the impact is bounded — one SDK registration delayed until the next request from that SDK fires. Self-healing on retry. The codebase already accepts this exact race for auths, oAuthProviders, services, identities, sessions, factors, etc. Special-casing this one site is precision the analytics use case doesn't need.
refactor(lock): extract magic numbers and outcome strings, fix target parse
2026-05-26 13:51:13 +00:00 · 2026-04-30 08:24:56 +01:00 · 2026-04-30 07:48:04 +01:00 · 2026-04-30 07:42:59 +01:00 · 2026-04-30 07:31:15 +01:00 · 2026-04-30 07:26:45 +01:00
327 changed files with 5382 additions and 13691 deletions
@@ -47,8 +47,6 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_DATABASE_SHARED_TABLES=
-_APP_DATABASE_SHARED_NAMESPACE=
 _APP_DB_ADAPTER_DOCUMENTSDB=mongodb
 _APP_DB_HOST_DOCUMENTSDB=mongodb
 _APP_DB_PORT_DOCUMENTSDB=27017
@@ -25,6 +25,6 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: AI Moderator
-        uses: github/ai-moderator@81159c370785e295c97461ade67d7c33576e9319 # v1.1.4
+        uses: github/ai-moderator@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Issue Labeler
-        uses: github/issue-labeler@c1b0f9f52a63158c4adc09425e858e87b32e9685 # v3.4
+        uses: github/issue-labeler@v3.4
        with:
          configuration-path: .github/labeler.yml
          enable-versioned-regex: false
@@ -32,7 +32,7 @@ jobs:
      actions: read
      security-events: write
      contents: read
-    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@c51854704019a247608d928f370c98740469d4b5" # v2.3.5
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@v2.3.3"

  security:
    name: Checks / Image
@@ -43,13 +43,13 @@ jobs:
      security-events: write
    steps:
      - name: Check out code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0
          submodules: 'recursive'

      - name: Build the Docker image
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: false
@@ -58,7 +58,7 @@ jobs:
          target: production

      - name: Run Trivy vulnerability scanner on image
-        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
+        uses: aquasecurity/trivy-action@0.35.0
        with:
          image-ref: 'pr_image:${{ github.sha }}'
          format: 'sarif'
@@ -66,7 +66,7 @@ jobs:
          severity: 'CRITICAL,HIGH'

      - name: Run Trivy vulnerability scanner on source code
-        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
+        uses: aquasecurity/trivy-action@0.35.0
        with:
          scan-type: 'fs'
          scan-ref: '.'
@@ -76,14 +76,14 @@ jobs:
          skip-setup-trivy: true

      - name: Upload image scan results
-        uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        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@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        uses: github/codeql-action/upload-sarif@v4
        if: always() && hashFiles('trivy-fs-results.sarif') != ''
        with:
          sarif_file: 'trivy-fs-results.sarif'
@@ -94,10 +94,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Setup PHP
-        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
+        uses: shivammathur/setup-php@v2
        with:
          php-version: '8.3'
          tools: composer:v2
@@ -119,7 +119,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
        with:
          fetch-depth: 2

@@ -127,7 +127,7 @@ jobs:
        if: github.event_name == 'pull_request'

      - name: Setup PHP
-        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
+        uses: shivammathur/setup-php@v2
        with:
          php-version: '8.3'
          tools: composer:v2
@@ -144,10 +144,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out the repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Setup PHP
-        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
+        uses: shivammathur/setup-php@v2
        with:
          php-version: '8.3'
          tools: composer:v2
@@ -157,7 +157,7 @@ jobs:
        run: composer install --prefer-dist --no-progress --ignore-platform-reqs

      - name: Cache PHPStan result cache
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache@v4
        with:
          path: .phpstan-cache
          key: phpstan-${{ github.sha }}
@@ -172,10 +172,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out the repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Setup PHP
-        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
+        uses: shivammathur/setup-php@v2
        with:
          php-version: '8.3'
          extensions: swoole
@@ -193,10 +193,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out the repo
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Setup Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@v4
        with:
          node-version: '24'

@@ -212,7 +212,7 @@ jobs:
    steps:
      - name: Generate matrix
        id: generate
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        uses: actions/github-script@v8
        with:
          script: |
            const allDatabases = ['MariaDB', 'PostgreSQL', 'MongoDB'];
@@ -253,28 +253,28 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
        with:
          submodules: recursive

      - name: Login to Docker Hub
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+        uses: docker/setup-buildx-action@v4

      - name: Build and push Appwrite
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: true
@@ -297,16 +297,16 @@ jobs:
      packages: read
    steps:
      - name: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Login to Docker Hub
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -327,7 +327,7 @@ jobs:
        run: docker compose exec -T appwrite vars

      - name: Run Unit Tests
-        uses: itznotabug/php-retry@d6bef45a8bff490babfb613e33b00d133e4062f0 # v3
+        uses: itznotabug/php-retry@v3
        with:
          max_attempts: 2
          retry_wait_seconds: 60
@@ -350,16 +350,16 @@ jobs:
      packages: read
    steps:
      - name: checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Login to Docker Hub
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -385,7 +385,7 @@ jobs:
          done

      - name: Run General Tests
-        uses: itznotabug/php-retry@d6bef45a8bff490babfb613e33b00d133e4062f0 # v3
+        uses: itznotabug/php-retry@v3
        with:
          max_attempts: 2
          retry_wait_seconds: 60
@@ -406,7 +406,7 @@ jobs:

  e2e_service:
    name: Tests / E2E / ${{ matrix.database }} (${{ matrix.mode }}) / ${{ matrix.service }}
-    runs-on: ${{ matrix.runner || format('runs-on={0}/runner=4cpu-linux-x64/volume=120g/spot=false', github.run_id) }}
+    runs-on: ${{ matrix.runner || 'ubuntu-latest' }}
    needs: [build, matrix]
    permissions:
      contents: read
@@ -427,7 +427,6 @@ jobs:
          FunctionsSchedule,
          GraphQL,
          Health,
-          Advisor,
          Locale,
          Projects,
          Realtime,
@@ -446,18 +445,26 @@ jobs:
        ]
        include:
          - service: Databases
-            runner: runs-on=${{ github.run_id }}/runner=8cpu-linux-x64/volume=120g/spot=false
+            runner: blacksmith-4vcpu-ubuntu-2404
            paratest_processes: 3
            timeout_minutes: 30
+          - service: Sites
+            runner: blacksmith-4vcpu-ubuntu-2404
+          - service: Functions
+            runner: blacksmith-4vcpu-ubuntu-2404
+          - service: Avatars
+            runner: blacksmith-4vcpu-ubuntu-2404
+          - service: Realtime
+            runner: blacksmith-4vcpu-ubuntu-2404
          - service: TablesDB
-            runner: runs-on=${{ github.run_id }}/runner=8cpu-linux-x64/volume=120g/spot=false
+            runner: blacksmith-4vcpu-ubuntu-2404
            paratest_processes: 3
            timeout_minutes: 30
          - service: Migrations
            paratest_processes: 1
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Set environment
        run: |
@@ -481,13 +488,13 @@ jobs:
          fi

      - name: Login to Docker Hub
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -518,7 +525,7 @@ jobs:
          done

      - name: Run tests
-        uses: itznotabug/php-retry@d6bef45a8bff490babfb613e33b00d133e4062f0 # v3
+        uses: itznotabug/php-retry@v3
        with:
          max_attempts: 2
          retry_wait_seconds: 60
@@ -566,18 +573,18 @@ jobs:
        mode: ${{ fromJSON(needs.matrix.outputs.modes) }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
        with:
          fetch-depth: 1

      - name: Login to Docker Hub
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -600,7 +607,7 @@ jobs:
          docker compose up -d --quiet-pull --wait

      - name: Run tests
-        uses: itznotabug/php-retry@d6bef45a8bff490babfb613e33b00d133e4062f0 # v3
+        uses: itznotabug/php-retry@v3
        with:
          max_attempts: 2
          retry_wait_seconds: 60
@@ -633,16 +640,16 @@ jobs:
        mode: ${{ fromJSON(needs.matrix.outputs.modes) }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Login to Docker Hub
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -672,7 +679,7 @@ jobs:
          done

      - name: Run tests
-        uses: itznotabug/php-retry@d6bef45a8bff490babfb613e33b00d133e4062f0 # v3
+        uses: itznotabug/php-retry@v3
        with:
          max_attempts: 2
          retry_wait_seconds: 60
@@ -704,18 +711,18 @@ jobs:
      packages: read
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
        with:
          fetch-depth: 1

      - name: Login to Docker Hub
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GHCR
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@v4
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -728,7 +735,7 @@ jobs:
          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}:after

      - name: Setup k6
-        uses: grafana/setup-k6-action@db07bd9765aac508ef18982e52ab937fe633a065 # v1.2.1
+        uses: grafana/setup-k6-action@ffe7d7290dfa715e48c2ccc924d068444c94bde2
        with:
          k6-version: ${{ env.K6_VERSION }}

@@ -767,7 +774,7 @@ jobs:
      - name: Benchmark before
        if: steps.benchmark_before_start.outcome == 'success'
        continue-on-error: true
-        uses: grafana/run-k6-action@de51a7390bdf0ac85a3bef493691bd71d4c7c158 # v1.4.0
+        uses: grafana/run-k6-action@a15e2072ede004e8d46141e33d7f7dad8ad08d9d
        env:
          APPWRITE_ENDPOINT: 'http://localhost/v1'
          APPWRITE_BENCHMARK_ITERATIONS: '5'
@@ -819,7 +826,7 @@ jobs:
      - name: Benchmark after
        id: benchmark_after
        continue-on-error: true
-        uses: grafana/run-k6-action@de51a7390bdf0ac85a3bef493691bd71d4c7c158 # v1.4.0
+        uses: grafana/run-k6-action@a15e2072ede004e8d46141e33d7f7dad8ad08d9d
        env:
          APPWRITE_ENDPOINT: 'http://localhost/v1'
          APPWRITE_BENCHMARK_ITERATIONS: '5'
@@ -839,7 +846,7 @@ jobs:

      - name: Comment on PR
        if: always()
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        uses: actions/github-script@v8
        env:
          BENCHMARK_BASE_REF: ${{ github.event.pull_request.base.ref }}
          BENCHMARK_HEAD_REF: ${{ github.event.pull_request.head.ref }}
@@ -849,7 +856,7 @@ jobs:
            await comment({ github, context, core });

      - name: Save results
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@v7
        if: ${{ !cancelled() }}
        with:
          name: benchmark-results
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
        
      - name: Cleanup
        run: |
@@ -34,7 +34,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v6
      with:
        # We must fetch at least the immediate parents so that if this is
        # a pull request then we can checkout the head.
@@ -47,14 +47,14 @@ jobs:

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+      uses: github/codeql-action/init@v2
      with:
        languages: ${{ matrix.language }}

    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+      uses: github/codeql-action/autobuild@v2

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
    #   make release

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+      uses: github/codeql-action/analyze@v2
@@ -10,13 +10,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
        with:
          submodules: recursive
      - 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@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
+        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
        with:
          image-ref: 'appwrite_image:latest'
          format: 'sarif'
@@ -24,7 +24,7 @@ jobs:
          ignore-unfixed: 'false'
          severity: 'CRITICAL,HIGH'
      - name: Upload Docker Image Scan Results
-        uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        uses: github/codeql-action/upload-sarif@v4
        if: always() && hashFiles('trivy-image-results.sarif') != ''
        with:
          sarif_file: 'trivy-image-results.sarif'
@@ -35,16 +35,16 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
      - name: Run Trivy vulnerability scanner on filesystem
-        uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
+        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
        with:
          scan-type: 'fs'
          format: 'sarif'
          output: 'trivy-fs-results.sarif'
          severity: 'CRITICAL,HIGH'
      - name: Upload Code Scan Results
-        uses: github/codeql-action/upload-sarif@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
+        uses: github/codeql-action/upload-sarif@v4
        if: always() && hashFiles('trivy-fs-results.sarif') != ''
        with:
          sarif_file: 'trivy-fs-results.sarif'
@@ -12,33 +12,33 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v6
      with:
        fetch-depth: 2
        submodules: recursive

    - name: Set up QEMU
-      uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
+      uses: docker/setup-qemu-action@v3

    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+      uses: docker/setup-buildx-action@v3

    - name: Login to Docker Hub
-      uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+      uses: docker/login-action@v3
      with:
        username: ${{ vars.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}

    - name: Extract metadata (tags, labels) for Docker
      id: meta
-      uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
+      uses: docker/metadata-action@v4
      with:
        images: appwrite/cloud
        tags: |
          type=ref,event=tag

    - name: Build & Publish to DockerHub
-      uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+      uses: docker/build-push-action@v6
      with:
        context: .
        platforms: linux/amd64,linux/arm64
@@ -11,7 +11,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@v6
      with:
        # We must fetch at least the immediate parents so that if this is
        # a pull request then we can checkout the head.
@@ -20,20 +20,20 @@ jobs:
        submodules: recursive

    - name: Set up QEMU
-      uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
+      uses: docker/setup-qemu-action@v3

    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+      uses: docker/setup-buildx-action@v3

    - name: Login to Docker Hub
-      uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+      uses: docker/login-action@v3
      with:
        username: ${{ vars.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}

    - name: Extract metadata (tags, labels) for Docker
      id: meta
-      uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
+      uses: docker/metadata-action@v4
      with:
        images: appwrite/appwrite
        tags: |
@@ -42,7 +42,7 @@ jobs:
          type=semver,pattern={{major}}

    - name: Build and push
-      uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+      uses: docker/build-push-action@v6
      with:
        context: .
        platforms: linux/amd64,linux/arm64
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6

      - name: Set SDK type
        id: set-sdk
@@ -49,7 +49,7 @@ jobs:
          docker compose exec appwrite sdks --platform=${{ steps.set-sdk.outputs.platform }} --sdk=${{ steps.set-sdk.outputs.sdk_type }} --version=latest --git=no
          sudo chown -R $USER:$USER ./app/sdks/${{ steps.set-sdk.outputs.platform }}-${{ steps.set-sdk.outputs.sdk_type }}
          
-      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+      - uses: actions/setup-node@v4
        with:
          node-version: 20

@@ -31,7 +31,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@v6
        with:
          submodules: recursive

@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+      - uses: actions/stale@v10
        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."
@@ -115,14 +115,6 @@ Common injections: `$response`, `$request`, `$dbForProject`, `$dbForPlatform`, `
 - Never hardcode credentials -- use environment variables.
 - Code changes may require container restart. No central log location -- check relevant containers.

-## Tracing with Utopia Span
-
-In handlers, only call `Span::add($key, $value)`. **Never** call `Span::init`, `Span::error`, or `Span::finish` -- lifecycle is owned by the entry-point harness (`app/http.php`, `app/worker.php`, `app/realtime.php`, `Bus::dispatch`). For selective export, filter in the sampler in `app/init/span.php`.
-
-Keys are `snake_case` with dots only for child relationships: `project.id` (id of project), `storage.bucket.id`. No dot otherwise: `inbound_bytes`, not `inbound.bytes`. No camelCase, no bare top-level keys (`function.id`, not `functionId`).
-
-Cross-cutting identifiers (`project.id`, `function.id`, `user.id`) live at the top level, not under a subsystem (no `realtime.project.id`). The trace sampler and downstream filters look them up by the canonical key.
-
 ## Patch release process

 For bumping patch versions (e.g., `1.9.0` -> `1.9.1`), follow the checklist in `.claude/skills/patch-release-checklist/SKILL.md`. It covers the 4 files that must be updated, console image bumps, CHANGES.md updates, and common pitfalls to avoid.
@@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
    --no-plugins --no-scripts --prefer-dist \
    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`

-FROM appwrite/base:1.4.1 AS base
+FROM appwrite/base:1.2.1 AS base

 LABEL maintainer="team@appwrite.io"

@@ -2,10 +2,10 @@

 require_once __DIR__ . '/init.php';

+use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Func;
 use Appwrite\Event\Publisher\Certificate as CertificatePublisher;
-use Appwrite\Event\Publisher\Delete as DeletePublisher;
-use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Event\Publisher\StatsResources as StatsResourcesPublisher;
 use Appwrite\Event\Publisher\Usage as UsagePublisher;
 use Appwrite\Platform\Appwrite;
@@ -157,19 +157,12 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
        }

        if (isset($databases[$dsn->getHost()])) {
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
            $database = $databases[$dsn->getHost()];
            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

            if (\in_array($dsn->getHost(), $sharedTables)) {
                $database
                    ->setSharedTables(true)
-                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -189,16 +182,9 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
            $database
                ->setSharedTables(true)
                ->setTenant($project->getSequence())
-                ->setGlobalCollections($projectsGlobalCollections)
                ->setNamespace($dsn->getParam('namespace'));
        } else {
            $database
@@ -226,11 +212,6 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
            return $database;
        }

-        /** @var array $collections */
-        $collections = Config::getParam('collections', []);
-        $logsCollections = $collections['logs'] ?? [];
-        $logsCollections = array_keys($logsCollections);
-
        $adapter = new DatabasePool($pools->get('logs'));
        $database = new Database($adapter, $cache);

@@ -239,7 +220,6 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
            ->setAuthorization($authorization)
            ->setSharedTables(true)
            ->setNamespace('logsV1')
-            ->setGlobalCollections($logsCollections)
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);

@@ -281,14 +261,12 @@ $container->set('publisherForStatsResources', fn (Publisher $publisher) => new S
    $publisher,
    new Queue(System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME))
 ), ['publisher']);
-$container->set('publisherForFunctions', fn (Publisher $publisher) => new FunctionPublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL)
-), ['publisher']);
-$container->set('publisherForDeletes', fn (Publisher $publisher) => new DeletePublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME))
-), ['publisher']);
+$container->set('queueForFunctions', function (Publisher $publisher) {
+    return new Func($publisher);
+}, ['publisher']);
+$container->set('queueForDeletes', function (Publisher $publisher) {
+    return new Delete($publisher);
+}, ['publisher']);
 $container->set('logError', function (Registry $register) {
    return function (Throwable $error, string $namespace, string $action) use ($register) {
        Console::error('[Error] Timestamp: ' . date('c', time()));
@@ -1523,13 +1523,6 @@ return [
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
-            [
-                '$id' => ID::custom('_key_team_confirm'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['teamInternalId', 'confirm'],
-                'lengths' => [],
-                'orders' => [],
-            ],
        ],
    ],

@@ -404,13 +404,6 @@ $platformCollections = [
                'lengths' => [],
                'orders' => [],
            ],
-            [
-                '$id' => ID::custom('_key_teamInternalId'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['teamInternalId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
        ],
    ],

@@ -642,13 +635,6 @@ $platformCollections = [
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
-            [
-                '$id' => ID::custom('_key_project_id'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
        ],
    ],

@@ -1021,14 +1007,7 @@ $platformCollections = [
                'attributes' => ['projectInternalId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_project_id'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
+            ]
        ],
    ],

@@ -1956,440 +1935,6 @@ $platformCollections = [
        'attributes' => [],
        'indexes' => []
    ],
-
-    'reports' => [
-        '$collection' => ID::custom(Database::METADATA),
-        '$id' => ID::custom('reports'),
-        'name' => 'Reports',
-        'attributes' => [
-            [
-                '$id' => ID::custom('projectInternalId'),
-                'type' => Database::VAR_ID,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('projectId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('appInternalId'),
-                'type' => Database::VAR_ID,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('appId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('type'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 64,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('title'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 256,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('summary'),
-                'type' => Database::VAR_TEXT,
-                'format' => '',
-                'size' => 65535,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                // Resource type the report is about. Plural noun, e.g. databases, sites, urls.
-                '$id' => ID::custom('targetType'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 64,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                // Free-form target identifier (URL for lighthouse, resource ID for db).
-                // Indexed by `_key_project_target` with an explicit prefix length.
-                '$id' => ID::custom('target'),
-                'type' => Database::VAR_TEXT,
-                'format' => '',
-                'size' => 65535,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                // Category strings, e.g. 'performance', 'accessibility'. Native array
-                // column — we never query on individual entries (MySQL JSON-array
-                // indexes are weak), this is read+rewrite only.
-                '$id' => ID::custom('categories'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 64,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => true,
-                'filters' => [],
-            ],
-            [
-                // Virtual attribute — insights live in the `insights` collection
-                // back-referenced by `reportInternalId`. The subQuery filter joins
-                // them at read time.
-                '$id' => ID::custom('insights'),
-                'type' => Database::VAR_TEXT,
-                'format' => '',
-                'size' => 65535,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['subQueryReportInsights'],
-            ],
-            [
-                '$id' => ID::custom('analyzedAt'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-        ],
-        'indexes' => [
-            [
-                '$id' => ID::custom('_key_project_app_type'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'appInternalId', 'type'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_project_target'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'appInternalId', 'targetType', 'target'],
-                'lengths' => [null, null, null, 700],
-                'orders' => [],
-            ],
-        ],
-    ],
-
-    'insights' => [
-        '$collection' => ID::custom(Database::METADATA),
-        '$id' => ID::custom('insights'),
-        'name' => 'Insights',
-        'attributes' => [
-            [
-                '$id' => ID::custom('projectInternalId'),
-                'type' => Database::VAR_ID,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('projectId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('reportInternalId'),
-                'type' => Database::VAR_ID,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('reportId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('type'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 64,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('severity'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('status'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16,
-                'signed' => true,
-                'required' => true,
-                'default' => 'active',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('resourceType'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 64,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('resourceId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('resourceInternalId'),
-                'type' => Database::VAR_ID,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('parentResourceType'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 64,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('parentResourceId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('parentResourceInternalId'),
-                'type' => Database::VAR_ID,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('title'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 256,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('summary'),
-                'type' => Database::VAR_TEXT,
-                'format' => '',
-                'size' => 65535,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('ctas'),
-                'type' => Database::VAR_TEXT,
-                'format' => '',
-                'size' => 65535,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['json'],
-            ],
-            [
-                '$id' => ID::custom('analyzedAt'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('dismissedAt'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('dismissedBy'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-        ],
-        'indexes' => [
-            [
-                '$id' => ID::custom('_key_project_report'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'reportInternalId'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_project_resource'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'resourceType', 'resourceId'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_project_parent_resource'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'parentResourceType', 'parentResourceId'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_project_type'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'type'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_project_severity'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'severity'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_project_status'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'status'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_project_dismissedAt'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'dismissedAt'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC, Database::ORDER_DESC],
-            ],
-        ],
-    ],
-
 ];

 // Organization API keys subquery
@@ -54,6 +54,11 @@ return [
        'description' => 'Rate limit for the current endpoint has been exceeded. Please try again after some time.',
        'code' => 429,
    ],
+    Exception::GENERAL_RESOURCE_LOCKED => [
+        'name' => Exception::GENERAL_RESOURCE_LOCKED,
+        'description' => 'The requested resource is currently being modified by another request. Please retry after a brief delay.',
+        'code' => 409,
+    ],
    Exception::GENERAL_SMTP_DISABLED => [
        'name' => Exception::GENERAL_SMTP_DISABLED,
        'description' => 'SMTP is disabled on your Appwrite instance. You can <a href="/docs/email-delivery">learn more about setting up SMTP</a> in our docs.',
@@ -623,11 +628,6 @@ return [
        'description' => 'Synchronous function execution timed out. Use asynchronous execution instead, or ensure the execution duration doesn\'t exceed 30 seconds.',
        'code' => 408,
    ],
-    Exception::FUNCTION_ASYNCHRONOUS_TIMEOUT => [
-        'name' => Exception::FUNCTION_ASYNCHRONOUS_TIMEOUT,
-        'description' => 'Asynchronous function execution timed out. Ensure the execution duration doesn\'t exceed the configured function timeout.',
-        'code' => 408,
-    ],
    Exception::FUNCTION_TEMPLATE_NOT_FOUND => [
        'name' => Exception::FUNCTION_TEMPLATE_NOT_FOUND,
        'description' => 'Function Template with the requested ID could not be found.',
@@ -692,11 +692,6 @@ return [
        'description' => 'Build with the requested ID failed. Please check the logs for more information.',
        'code' => 400,
    ],
-    Exception::BUILD_TIMEOUT => [
-        'name' => Exception::BUILD_TIMEOUT,
-        'description' => 'Build timed out. Increase the build timeout via the `_APP_COMPUTE_BUILD_TIMEOUT` environment variable, or simplify the build to complete within the limit.',
-        'code' => 408,
-    ],

    /** Deployments */
    Exception::DEPLOYMENT_NOT_FOUND => [
@@ -1246,26 +1241,6 @@ return [
        'description' => 'The specified database type is not supported for CSV import or export operations.',
        'code' => 400,
    ],
-    Exception::MIGRATION_SOURCE_PROJECT_ID_REQUIRED => [
-        'name' => Exception::MIGRATION_SOURCE_PROJECT_ID_REQUIRED,
-        'description' => 'A source projectId is required for Appwrite migrations. Provide it in the migration credentials.',
-        'code' => 400,
-    ],
-    Exception::MIGRATION_SOURCE_PROJECT_NOT_FOUND => [
-        'name' => Exception::MIGRATION_SOURCE_PROJECT_NOT_FOUND,
-        'description' => 'The source project for the provided projectId was not found. Verify the projectId and the API key has access to it.',
-        'code' => 404,
-    ],
-    Exception::MIGRATION_SOURCE_TYPE_INVALID => [
-        'name' => Exception::MIGRATION_SOURCE_TYPE_INVALID,
-        'description' => 'The migration source type is invalid. Use one of the supported source types.',
-        'code' => 400,
-    ],
-    Exception::MIGRATION_DESTINATION_TYPE_INVALID => [
-        'name' => Exception::MIGRATION_DESTINATION_TYPE_INVALID,
-        'description' => 'The migration destination type is invalid. Use one of the supported destination types.',
-        'code' => 400,
-    ],

    /** Realtime */
    Exception::REALTIME_MESSAGE_FORMAT_INVALID => [
@@ -1453,28 +1428,4 @@ return [
        'description' => 'The maximum number of mock phones for this project has been reached.',
        'code' => 400,
    ],
-
-    /** Advisor */
-    Exception::INSIGHT_NOT_FOUND => [
-        'name' => Exception::INSIGHT_NOT_FOUND,
-        'description' => 'Insight with the requested ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::INSIGHT_ALREADY_EXISTS => [
-        'name' => Exception::INSIGHT_ALREADY_EXISTS,
-        'description' => 'Insight with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
-        'code' => 409,
-    ],
-
-    /** Reports */
-    Exception::REPORT_NOT_FOUND => [
-        'name' => Exception::REPORT_NOT_FOUND,
-        'description' => 'Report with the requested ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::REPORT_ALREADY_EXISTS => [
-        'name' => Exception::REPORT_ALREADY_EXISTS,
-        'description' => 'Report with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
-        'code' => 409,
-    ],
 ];
@@ -426,33 +426,5 @@ return [
        'update' => [
            '$description' => 'This event triggers when a proxy rule is updated.',
        ]
-    ],
-    'reports' => [
-        '$model' => Response::MODEL_REPORT,
-        '$resource' => true,
-        '$description' => 'This event triggers on any report event.',
-        'create' => [
-            '$description' => 'This event triggers when a report is created.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a report is updated.',
-        ],
-        'delete' => [
-            '$description' => 'This event triggers when a report is deleted.',
-        ],
-        'insights' => [
-            '$model' => Response::MODEL_INSIGHT,
-            '$resource' => true,
-            '$description' => 'This event triggers on any insight event.',
-            'create' => [
-                '$description' => 'This event triggers when an insight is created.',
-            ],
-            'update' => [
-                '$description' => 'This event triggers when an insight is updated.',
-            ],
-            'delete' => [
-                '$description' => 'This event triggers when an insight is deleted.',
-            ],
-        ],
-    ],
+    ]
 ];
@@ -28,16 +28,6 @@
    "emails.invitation.thanks": "Gracias.,",
    "emails.invitation.buttonText": "Aceptar invitación a {{team}}",
    "emails.invitation.signature": "El equipo de {{project}}",
-    "emails.sessionAlert.subject": "Alerta de seguridad: nueva sesión en tu cuenta de {{project}}",
-    "emails.sessionAlert.preview": "Nuevo inicio de sesión detectado en {{project}} a las {{time}} UTC.",
-    "emails.sessionAlert.hello": "Hola {{user}},",
-    "emails.sessionAlert.body": "Se ha creado una nueva sesión en tu cuenta de {{b}}{{project}}{{/b}}, {{b}}el {{date}} de {{year}} a las {{time}} UTC{{/b}}.\nEstos son los detalles de la nueva sesión:",
-    "emails.sessionAlert.listDevice": "Dispositivo: {{b}}{{device}}{{/b}}",
-    "emails.sessionAlert.listIpAddress": "Dirección IP: {{b}}{{ipAddress}}{{/b}}",
-    "emails.sessionAlert.listCountry": "País: {{b}}{{country}}{{/b}}",
-    "emails.sessionAlert.footer": "Si has sido tú, no tienes que hacer nada más.\nSi no has iniciado esta sesión o sospechas actividad no autorizada, protege tu cuenta.",
-    "emails.sessionAlert.thanks": "Gracias,",
-    "emails.sessionAlert.signature": "El equipo de {{project}}",
    "locale.country.unknown": "Desconocido",
    "countries.af": "Afganistán",
    "countries.ao": "Angola",
@@ -59,8 +59,8 @@ $admins = [
    'oauth2.write',
    'mocks.read',
    'mocks.write',
-    'project.policies.read',
-    'project.policies.write',
+    'policies.read',
+    'policies.write',
    'templates.read',
    'templates.write',
    'projects.write',
@@ -103,10 +103,6 @@ $admins = [
    'tokens.write',
    'schedules.read',
    'schedules.write',
-    'insights.read',
-    'insights.write',
-    'reports.read',
-    'reports.write',
 ];

 return [
@@ -44,23 +44,11 @@ return [
        "category" => "Project",
    ],
    "policies.read" => [
-        "description" =>
-            "Access to read project\'s policies. Replaced by \'project.policies.read\' for more granular control",
-        "category" => "Project",
-        'deprecated' => true,
-    ],
-    "policies.write" => [
-        "description" =>
-            "Access to update project\'s policies. Replaces by \'project.policies.write\' for more granular control",
-        "category" => "Project",
-        'deprecated' => true,
-    ],
-    "project.policies.read" => [
        "description" =>
            "Access to read project\'s policies",
        "category" => "Project",
    ],
-    "project.policies.write" => [
+    "policies.write" => [
        "description" =>
            "Access to update project\'s policies",
        "category" => "Project",
@@ -227,16 +215,6 @@ return [
        'description' => 'Access to create function executions',
        'category' => 'Functions',
    ],
-    'execution.read' => [
-        'description' => 'Access to read function executions. This scope is deprecated for consistency purposes, and replaced by `executions.read`.',
-        'category' => 'Functions',
-        'deprecated' => true,
-    ],
-    'execution.write' => [
-        'description' => 'Access to create function executions. This scope is deprecated for consistency purposes, and replaced by `executions.write`.',
-        'category' => 'Functions',
-        'deprecated' => true,
-    ],

    // Sites
    'sites.read' => [
@@ -298,16 +276,6 @@ return [
        'category' => 'Messaging',
    ],

-    // Proxy
-    'rules.read' => [
-        'description' => 'Access to read proxy rules.',
-        'category' => 'Proxy',
-    ],
-    'rules.write' => [
-        'description' => 'Access to create, update, and delete proxy rules.',
-        'category' => 'Proxy',
-    ],
-
    // Other
    "webhooks.read" => [
        "description" =>
@@ -361,22 +329,12 @@ return [
        'description' => 'Access to create, update, and delete resources under VCS service.',
        'category' => 'Other',
    ],
-
-    // Advisor
-    'insights.read' => [
-        'description' => 'Access to read insights under Advisor service.',
-        'category' => 'Advisor',
+    'rules.read' => [
+        'description' => 'Access to read proxy rules.',
+        'category' => 'Other',
    ],
-    'insights.write' => [
-        'description' => 'Reserved for Advisor insight ingestion outside CE.',
-        'category' => 'Advisor',
-    ],
-    'reports.read' => [
-        'description' => 'Access to read reports under Advisor service.',
-        'category' => 'Advisor',
-    ],
-    'reports.write' => [
-        'description' => 'Access to delete reports under Advisor service.',
-        'category' => 'Advisor',
+    'rules.write' => [
+        'description' => 'Access to create, update, and delete proxy rules.',
+        'category' => 'Other',
    ],
 ];
@@ -320,26 +320,6 @@ return [
                'repoBranch' => 'main',
                'changelog' => \realpath(__DIR__ . '/../../docs/sdks/claude-plugin/CHANGELOG.md'),
            ],
-            [
-                'key' => 'codex-plugin',
-                'name' => 'CodexPlugin',
-                'version' => '0.1.1',
-                'url' => 'https://github.com/appwrite/codex-plugin.git',
-                'enabled' => true,
-                'beta' => false,
-                'dev' => false,
-                'hidden' => false,
-                'spec' => 'static',
-                'family' => APP_SDK_PLATFORM_STATIC,
-                'prism' => 'codex-plugin',
-                'source' => \realpath(__DIR__ . '/../sdks/static-codex-plugin'),
-                'gitUrl' => 'git@github.com:appwrite/codex-plugin.git',
-                'gitRepoName' => 'codex-plugin',
-                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
-                'repoBranch' => 'main',
-                'changelog' => \realpath(__DIR__ . '/../../docs/sdks/codex-plugin/CHANGELOG.md'),
-            ],
        ],
    ],

@@ -308,19 +308,5 @@ return [
        'optional' => true,
        'icon' => '/images/services/messaging.png',
        'platforms' => ['client', 'server', 'console'],
-    ],
-    'advisor' => [
-        'key' => 'advisor',
-        'name' => 'Advisor',
-        'subtitle' => 'The Advisor service surfaces actionable reports about your project resources, with CTA descriptors for one-click remediation in the console.',
-        'description' => '/docs/services/advisor.md',
-        'controller' => '', // Uses modules
-        'sdk' => true,
-        'docs' => true,
-        'docsUrl' => 'https://appwrite.io/docs/server/advisor',
-        'tests' => true,
-        'optional' => true,
-        'icon' => '/images/services/insights.png',
-        'platforms' => ['server', 'console'],
-    ],
+    ]
 ];
@@ -79,13 +79,12 @@ return [
            ...getRuntimes($templateRuntimes['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter', $allowList),
            ...getRuntimes($templateRuntimes['BUN'], 'bun install', 'src/main.ts', 'bun/starter', $allowList),
            ...getRuntimes($templateRuntimes['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter', $allowList),
-            ...getRuntimes($templateRuntimes['RUST'], '', 'main.rs', 'rust/starter', $allowList),
        ],
-        'instructions' => 'For documentation and instructions check out the <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates">templates repository</a>.',
+        'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/starter">file</a>.',
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.2.*',
        'variables' => [],
        'scopes' => ['users.read']
    ],
@@ -34,6 +34,15 @@ return [
                'question' => '',
                'filter' => ''
            ],
+            [
+                'name' => '_APP_LOCKING_ENABLED',
+                'description' => 'Enable distributed locking for platform writes. Locks coordinate concurrent updates across API pods so that read-modify-write operations on shared documents do not lose updates. By default, set to \'enabled\'. Set to \'disabled\' as an emergency kill switch — locks become no-ops (fail-open) and concurrent writes will race.',
+                'introduction' => '1.9.3',
+                'default' => 'enabled',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_OPTIONS_FORCE_HTTPS',
                'description' => 'Allows you to force HTTPS connection to your API. This feature redirects any HTTP call to HTTPS and adds the \'Strict-Transport-Security\' header to all HTTP responses. By default, set to \'enabled\'. To disable, set to \'disabled\'. This feature will work only when your ports are set to default 80 and 443, and you have set up wildcard certificates with DNS challenge.',
@@ -1336,15 +1345,6 @@ return [
        'category' => 'Migrations',
        'description' => '',
        'variables' => [
-            [
-                'name' => '_APP_MIGRATION_HOST',
-                'description' => 'Internal hostname the migrations worker uses to reach this instance\'s API (for migrations and CSV/JSON imports & exports). Defaults to \'appwrite\', the API service name in the standard Docker Compose setup. Only change this for non-standard deployments.',
-                'introduction' => '1.9.0',
-                'default' => 'appwrite',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
            [
                'name' => '_APP_MIGRATIONS_FIREBASE_CLIENT_ID',
                'description' => 'Google OAuth client ID. You can find it in your GCP application settings.',
@@ -11,13 +11,10 @@ use Appwrite\Auth\Validator\PersonalData;
 use Appwrite\Auth\Validator\Phone;
 use Appwrite\Bus\Events\SessionCreated;
 use Appwrite\Detector\Detector;
+use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
-use Appwrite\Event\Message\Delete as DeleteMessage;
-use Appwrite\Event\Message\Mail as MailMessage;
-use Appwrite\Event\Message\Messaging as MessagingMessage;
-use Appwrite\Event\Publisher\Delete as DeletePublisher;
-use Appwrite\Event\Publisher\Mail as MailPublisher;
-use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
+use Appwrite\Event\Mail;
+use Appwrite\Event\Messaging;
 use Appwrite\Extend\Exception;
 use Appwrite\Hooks\Hooks;
 use Appwrite\Network\Validator\Redirect;
@@ -335,15 +332,15 @@ Http::post('/v1/account')
            throw new Exception(Exception::GENERAL_INVALID_EMAIL);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
            throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsCanonicalEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
            throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsFreeEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
            throw new Exception(Exception::USER_EMAIL_FREE);
        }

@@ -473,9 +470,9 @@ Http::delete('/v1/account')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('publisherForDeletes')
+    ->inject('queueForDeletes')
    ->inject('authorization')
-    ->action(function (Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, DeletePublisher $publisherForDeletes, Authorization $authorization) {
+    ->action(function (Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes, Authorization $authorization) {
        if ($user->isEmpty()) {
            throw new Exception(Exception::USER_NOT_FOUND);
        }
@@ -499,11 +496,9 @@ Http::delete('/v1/account')

        $dbForProject->deleteDocument('users', $user->getId());

-        $publisherForDeletes->enqueue(new DeleteMessage(
-            project: $project,
-            type: DELETE_TYPE_DOCUMENT,
-            document: $user,
-        ));
+        $queueForDeletes
+            ->setType(DELETE_TYPE_DOCUMENT)
+            ->setDocument($user);

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -585,12 +580,12 @@ Http::delete('/v1/account/sessions')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('queueForEvents')
-    ->inject('publisherForDeletes')
+    ->inject('queueForDeletes')
    ->inject('store')
    ->inject('proofForToken')
    ->inject('domainVerification')
    ->inject('cookieDomain')
-    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, DeletePublisher $publisherForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {

        $protocol = $request->getProtocol();
        $sessions = $user->getAttribute('sessions', []);
@@ -620,11 +615,10 @@ Http::delete('/v1/account/sessions')
                $queueForEvents
                    ->setPayload($response->output($session, Response::MODEL_SESSION));

-                $publisherForDeletes->enqueue(new DeleteMessage(
-                    project: $queueForEvents->getProject(),
-                    type: DELETE_TYPE_SESSION_TARGETS,
-                    document: $session,
-                ));
+                $queueForDeletes
+                    ->setType(DELETE_TYPE_SESSION_TARGETS)
+                    ->setDocument($session)
+                    ->trigger();
            }
        }

@@ -718,12 +712,12 @@ Http::delete('/v1/account/sessions/:sessionId')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('queueForEvents')
-    ->inject('publisherForDeletes')
+    ->inject('queueForDeletes')
    ->inject('store')
    ->inject('proofForToken')
    ->inject('domainVerification')
    ->inject('cookieDomain')
-    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, DeletePublisher $publisherForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {

        $protocol = $request->getProtocol();
        $sessionId = ($sessionId === 'current')
@@ -765,11 +759,10 @@ Http::delete('/v1/account/sessions/:sessionId')
                ->setParam('sessionId', $session->getId())
                ->setPayload($response->output($session, Response::MODEL_SESSION));

-            $publisherForDeletes->enqueue(new DeleteMessage(
-                project: $queueForEvents->getProject(),
-                type: DELETE_TYPE_SESSION_TARGETS,
-                document: $session,
-            ));
+            $queueForDeletes
+                ->setType(DELETE_TYPE_SESSION_TARGETS)
+                ->setDocument($session)
+                ->trigger();

            $response->noContent();
            return;
@@ -837,11 +830,11 @@ Http::patch('/v1/account/sessions/:sessionId')
        $refreshToken = $session->getAttribute('providerRefreshToken', '');
        $oAuthProviders = Config::getParam('oAuthProviders') ?? [];
        $className = $oAuthProviders[$provider]['class'] ?? null;
-        if (!empty($refreshToken) && ($className === null || !\class_exists($className))) {
+        if (!empty($provider) && ($className === null || !\class_exists($className))) {
            throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
        }

-        if ($className !== null && \class_exists($className)) {
+        if (!empty($provider) && \class_exists($className)) {
            $appId = $project->getAttribute('oAuthProviders', [])[$provider . 'Appid'] ?? '';
            $appSecret = $project->getAttribute('oAuthProviders', [])[$provider . 'Secret'] ?? '{}';

@@ -1683,15 +1676,15 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                    $failureRedirect(Exception::GENERAL_INVALID_EMAIL);
                }

-                if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+                if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
                    $failureRedirect(Exception::USER_EMAIL_DISPOSABLE);
                }

-                if ((($project->getId() === 'console') || ($plan['supportsCanonicalEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+                if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
                    $failureRedirect(Exception::USER_EMAIL_NOT_CANONICAL);
                }

-                if ((($project->getId() === 'console') || ($plan['supportsFreeEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+                if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
                    $failureRedirect(Exception::USER_EMAIL_FREE);
                }

@@ -1824,15 +1817,15 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                $failureRedirect(Exception::GENERAL_INVALID_EMAIL);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
                $failureRedirect(Exception::USER_EMAIL_DISPOSABLE);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsCanonicalEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
                $failureRedirect(Exception::USER_EMAIL_NOT_CANONICAL);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsFreeEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
                $failureRedirect(Exception::USER_EMAIL_FREE);
            }

@@ -2120,12 +2113,12 @@ Http::post('/v1/account/tokens/magic-url')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('queueForEvents')
-    ->inject('publisherForMails')
+    ->inject('queueForMails')
    ->inject('plan')
    ->inject('proofForPassword')
    ->inject('platform')
    ->inject('authorization')
-    ->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, MailPublisher $publisherForMails, array $plan, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) {
+    ->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, array $plan, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) {
        if (empty(System::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
        }
@@ -2182,15 +2175,15 @@ Http::post('/v1/account/tokens/magic-url')
                throw new Exception(Exception::GENERAL_INVALID_EMAIL);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
                throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsCanonicalEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
                throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsFreeEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
                throw new Exception(Exception::USER_EMAIL_FREE);
            }

@@ -2311,7 +2304,6 @@ Http::post('/v1/account/tokens/magic-url')
        $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
        $replyToEmail = '';
        $replyToName = '';
-        $smtpConfig = [];

        if ($smtpEnabled) {
            if (!empty($smtp['senderEmail'])) {
@@ -2329,6 +2321,13 @@ Http::post('/v1/account/tokens/magic-url')
                $replyToName = $smtp['replyToName'];
            }

+            $queueForMails
+                ->setSmtpHost($smtp['host'] ?? '')
+                ->setSmtpPort($smtp['port'] ?? '')
+                ->setSmtpUsername($smtp['username'] ?? '')
+                ->setSmtpPassword($smtp['password'] ?? '')
+                ->setSmtpSecure($smtp['secure'] ?? '');
+
            if (!empty($customTemplate)) {
                if (!empty($customTemplate['senderEmail'])) {
                    $senderEmail = $customTemplate['senderEmail'];
@@ -2349,17 +2348,11 @@ Http::post('/v1/account/tokens/magic-url')
                $subject = $customTemplate['subject'] ?? $subject;
            }

-            $smtpConfig = [
-                'host' => $smtp['host'] ?? '',
-                'port' => $smtp['port'] ?? '',
-                'username' => $smtp['username'] ?? '',
-                'password' => $smtp['password'] ?? '',
-                'secure' => $smtp['secure'] ?? '',
-                'replyToEmail' => $replyToEmail,
-                'replyToName' => $replyToName,
-                'senderEmail' => $senderEmail,
-                'senderName' => $senderName,
-            ];
+            $queueForMails
+                ->setSmtpReplyToEmail($replyToEmail)
+                ->setSmtpReplyToName($replyToName)
+                ->setSmtpSenderEmail($senderEmail)
+                ->setSmtpSenderName($senderName);
        }

        $projectName = $project->getAttribute('name');
@@ -2381,17 +2374,18 @@ Http::post('/v1/account/tokens/magic-url')
            'team' => '',
        ];

-        $publisherForMails->enqueue(new MailMessage(
-            project: $project,
-            recipient: $email,
-            subject: $subject,
-            body: $body,
-            preview: $preview,
-            smtp: $smtpConfig,
-            variables: $emailVariables,
-            customMailOptions: $project->getId() === 'console' ? ['senderName' => $platform['emailSenderName']] : [],
-            platform: $platform,
-        ));
+        $queueForMails
+            ->setSubject($subject)
+            ->setPreview($preview)
+            ->setBody($body)
+            ->appendVariables($emailVariables)
+            ->setRecipient($email);
+
+        if ($project->getId() === 'console') {
+            $queueForMails->setSenderName($platform['emailSenderName']);
+        }
+
+        $queueForMails->trigger();

        $token->setAttribute('secret', $tokenSecret);

@@ -2442,12 +2436,12 @@ Http::post('/v1/account/tokens/email')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('queueForEvents')
-    ->inject('publisherForMails')
+    ->inject('queueForMails')
    ->inject('plan')
    ->inject('proofForPassword')
    ->inject('proofForCode')
    ->inject('authorization')
-    ->action(function (string $userId, string $email, bool $phrase, Request $request, Response $response, User $user, Document $project, array $platform, Database $dbForProject, Locale $locale, Event $queueForEvents, MailPublisher $publisherForMails, array $plan, ProofsPassword $proofForPassword, ProofsCode $proofForCode, Authorization $authorization) {
+    ->action(function (string $userId, string $email, bool $phrase, Request $request, Response $response, User $user, Document $project, array $platform, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, array $plan, ProofsPassword $proofForPassword, ProofsCode $proofForCode, Authorization $authorization) {
        if (empty(System::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
        }
@@ -2502,15 +2496,15 @@ Http::post('/v1/account/tokens/email')
                throw new Exception(Exception::GENERAL_INVALID_EMAIL);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
                throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsCanonicalEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
                throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
            }

-            if ((($project->getId() === 'console') || ($plan['supportsFreeEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
                throw new Exception(Exception::USER_EMAIL_FREE);
            }

@@ -2639,7 +2633,6 @@ Http::post('/v1/account/tokens/email')
        $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
        $replyToEmail = '';
        $replyToName = '';
-        $smtpConfig = [];

        if ($smtpEnabled) {
            if (!empty($smtp['senderEmail'])) {
@@ -2657,6 +2650,13 @@ Http::post('/v1/account/tokens/email')
                $replyToName = $smtp['replyToName'];
            }

+            $queueForMails
+                ->setSmtpHost($smtp['host'] ?? '')
+                ->setSmtpPort($smtp['port'] ?? '')
+                ->setSmtpUsername($smtp['username'] ?? '')
+                ->setSmtpPassword($smtp['password'] ?? '')
+                ->setSmtpSecure($smtp['secure'] ?? '');
+
            if (!empty($customTemplate)) {
                if (!empty($customTemplate['senderEmail'])) {
                    $senderEmail = $customTemplate['senderEmail'];
@@ -2677,17 +2677,11 @@ Http::post('/v1/account/tokens/email')
                $subject = $customTemplate['subject'] ?? $subject;
            }

-            $smtpConfig = [
-                'host' => $smtp['host'] ?? '',
-                'port' => $smtp['port'] ?? '',
-                'username' => $smtp['username'] ?? '',
-                'password' => $smtp['password'] ?? '',
-                'secure' => $smtp['secure'] ?? '',
-                'replyToEmail' => $replyToEmail,
-                'replyToName' => $replyToName,
-                'senderEmail' => $senderEmail,
-                'senderName' => $senderName,
-            ];
+            $queueForMails
+                ->setSmtpReplyToEmail($replyToEmail)
+                ->setSmtpReplyToName($replyToName)
+                ->setSmtpSenderEmail($senderEmail)
+                ->setSmtpSenderName($senderName);
        }

        $projectName = $project->getAttribute('name');
@@ -2723,18 +2717,20 @@ Http::post('/v1/account/tokens/email')
            ]);
        }

-        $publisherForMails->enqueue(new MailMessage(
-            project: $project,
-            recipient: $email,
-            subject: $subject,
-            bodyTemplate: $bodyTemplate,
-            body: $body,
-            preview: $preview,
-            smtp: $smtpConfig,
-            variables: $emailVariables,
-            customMailOptions: $smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE ? ['senderName' => $platform['emailSenderName']] : [],
-            platform: $platform,
-        ));
+        $queueForMails
+            ->setSubject($subject)
+            ->setPreview($preview)
+            ->setBody($body)
+            ->setBodyTemplate($bodyTemplate)
+            ->appendVariables($emailVariables)
+            ->setRecipient($email);
+
+        // since this is console project, set email sender name!
+        if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) {
+            $queueForMails->setSenderName($platform['emailSenderName']);
+        }
+
+        $queueForMails->trigger();

        $token->setAttribute('secret', $tokenSecret);

@@ -2884,7 +2880,7 @@ Http::post('/v1/account/tokens/phone')
    ->inject('platform')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('publisherForMessaging')
+    ->inject('queueForMessaging')
    ->inject('locale')
    ->inject('timelimit')
    ->inject('usage')
@@ -2892,7 +2888,7 @@ Http::post('/v1/account/tokens/phone')
    ->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, MessagingPublisher $publisherForMessaging, 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, Context $usage, 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');
        }
@@ -3025,13 +3021,11 @@ Http::post('/v1/account/tokens/phone')
                ],
            ]);

-            $publisherForMessaging->enqueue(new MessagingMessage(
-                type: MESSAGE_SEND_TYPE_INTERNAL,
-                project: $project,
-                message: $messageDoc,
-                recipients: [$phone],
-                providerType: MESSAGE_TYPE_SMS,
-            ));
+            $queueForMessaging
+                ->setType(MESSAGE_SEND_TYPE_INTERNAL)
+                ->setMessage($messageDoc)
+                ->setRecipients([$phone])
+                ->setProviderType(MESSAGE_TYPE_SMS);

            $helper = PhoneNumberUtil::getInstance();
            try {
@@ -3423,15 +3417,15 @@ Http::patch('/v1/account/email')
            throw new Exception(Exception::GENERAL_INVALID_EMAIL);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
            throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsCanonicalEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
            throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsFreeEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
            throw new Exception(Exception::USER_EMAIL_FREE);
        }

@@ -3687,11 +3681,11 @@ Http::post('/v1/account/recovery')
    ->inject('project')
    ->inject('platform')
    ->inject('locale')
-    ->inject('publisherForMails')
+    ->inject('queueForMails')
    ->inject('queueForEvents')
    ->inject('proofForToken')
    ->inject('authorization')
-    ->action(function (string $email, string $url, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, MailPublisher $publisherForMails, Event $queueForEvents, ProofsToken $proofForToken, Authorization $authorization) {
+    ->action(function (string $email, string $url, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Mail $queueForMails, Event $queueForEvents, ProofsToken $proofForToken, Authorization $authorization) {

        if (empty(System::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
@@ -3774,7 +3768,6 @@ Http::post('/v1/account/recovery')
        $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
        $replyToEmail = '';
        $replyToName = '';
-        $smtpConfig = [];

        if ($smtpEnabled) {
            if (!empty($smtp['senderEmail'])) {
@@ -3792,6 +3785,13 @@ Http::post('/v1/account/recovery')
                $replyToName = $smtp['replyToName'];
            }

+            $queueForMails
+                ->setSmtpHost($smtp['host'] ?? '')
+                ->setSmtpPort($smtp['port'] ?? '')
+                ->setSmtpUsername($smtp['username'] ?? '')
+                ->setSmtpPassword($smtp['password'] ?? '')
+                ->setSmtpSecure($smtp['secure'] ?? '');
+
            if (!empty($customTemplate)) {
                if (!empty($customTemplate['senderEmail'])) {
                    $senderEmail = $customTemplate['senderEmail'];
@@ -3812,17 +3812,11 @@ Http::post('/v1/account/recovery')
                $subject = $customTemplate['subject'] ?? $subject;
            }

-            $smtpConfig = [
-                'host' => $smtp['host'] ?? '',
-                'port' => $smtp['port'] ?? '',
-                'username' => $smtp['username'] ?? '',
-                'password' => $smtp['password'] ?? '',
-                'secure' => $smtp['secure'] ?? '',
-                'replyToEmail' => $replyToEmail,
-                'replyToName' => $replyToName,
-                'senderEmail' => $senderEmail,
-                'senderName' => $senderName,
-            ];
+            $queueForMails
+                ->setSmtpReplyToEmail($replyToEmail)
+                ->setSmtpReplyToName($replyToName)
+                ->setSmtpSenderEmail($senderEmail)
+                ->setSmtpSenderName($senderName);
        }

        $emailVariables = [
@@ -3835,18 +3829,19 @@ Http::post('/v1/account/recovery')
            'team' => ''
        ];

-        $publisherForMails->enqueue(new MailMessage(
-            project: $project,
-            recipient: $profile->getAttribute('email', ''),
-            name: $profile->getAttribute('name', ''),
-            subject: $subject,
-            body: $body,
-            preview: $preview,
-            smtp: $smtpConfig,
-            variables: $emailVariables,
-            customMailOptions: $project->getId() === 'console' ? ['senderName' => $platform['emailSenderName']] : [],
-            platform: $platform,
-        ));
+        $queueForMails
+            ->setRecipient($profile->getAttribute('email', ''))
+            ->setName($profile->getAttribute('name', ''))
+            ->setBody($body)
+            ->appendVariables($emailVariables)
+            ->setSubject($subject)
+            ->setPreview($preview);
+
+        if ($project->getId() === 'console') {
+            $queueForMails->setSenderName($platform['emailSenderName']);
+        }
+
+        $queueForMails->trigger();

        $recovery->setAttribute('secret', $secret);

@@ -4014,10 +4009,10 @@ Http::post('/v1/account/verifications/email')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('queueForEvents')
-    ->inject('publisherForMails')
+    ->inject('queueForMails')
    ->inject('proofForToken')
    ->inject('authorization')
-    ->action(function (string $url, Request $request, Response $response, Document $project, array $platform, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, MailPublisher $publisherForMails, ProofsToken $proofForToken, Authorization $authorization) {
+    ->action(function (string $url, Request $request, Response $response, Document $project, array $platform, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, ProofsToken $proofForToken, Authorization $authorization) {

        if (empty(System::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
@@ -4104,7 +4099,6 @@ Http::post('/v1/account/verifications/email')
        $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
        $replyToEmail = '';
        $replyToName = '';
-        $smtpConfig = [];

        if ($smtpEnabled) {
            if (!empty($smtp['senderEmail'])) {
@@ -4122,6 +4116,13 @@ Http::post('/v1/account/verifications/email')
                $replyToName = $smtp['replyToName'];
            }

+            $queueForMails
+                ->setSmtpHost($smtp['host'] ?? '')
+                ->setSmtpPort($smtp['port'] ?? '')
+                ->setSmtpUsername($smtp['username'] ?? '')
+                ->setSmtpPassword($smtp['password'] ?? '')
+                ->setSmtpSecure($smtp['secure'] ?? '');
+
            if (!empty($customTemplate)) {
                if (!empty($customTemplate['senderEmail'])) {
                    $senderEmail = $customTemplate['senderEmail'];
@@ -4142,17 +4143,11 @@ Http::post('/v1/account/verifications/email')
                $subject = $customTemplate['subject'] ?? $subject;
            }

-            $smtpConfig = [
-                'host' => $smtp['host'] ?? '',
-                'port' => $smtp['port'] ?? '',
-                'username' => $smtp['username'] ?? '',
-                'password' => $smtp['password'] ?? '',
-                'secure' => $smtp['secure'] ?? '',
-                'replyToEmail' => $replyToEmail,
-                'replyToName' => $replyToName,
-                'senderEmail' => $senderEmail,
-                'senderName' => $senderName,
-            ];
+            $queueForMails
+                ->setSmtpReplyToEmail($replyToEmail)
+                ->setSmtpReplyToName($replyToName)
+                ->setSmtpSenderEmail($senderEmail)
+                ->setSmtpSenderName($senderName);
        }

        $emailVariables = [
@@ -4179,19 +4174,20 @@ Http::post('/v1/account/verifications/email')
            ]);
        }

-        $publisherForMails->enqueue(new MailMessage(
-            project: $project,
-            recipient: $user->getAttribute('email'),
-            name: $user->getAttribute('name') ?? '',
-            subject: $subject,
-            bodyTemplate: $bodyTemplate,
-            body: $body,
-            preview: $preview,
-            smtp: $smtpConfig,
-            variables: $emailVariables,
-            customMailOptions: $project->getId() === 'console' ? ['senderName' => $platform['emailSenderName']] : [],
-            platform: $platform,
-        ));
+        $queueForMails
+            ->setSubject($subject)
+            ->setPreview($preview)
+            ->setBody($body)
+            ->setBodyTemplate($bodyTemplate)
+            ->appendVariables($emailVariables)
+            ->setRecipient($user->getAttribute('email'))
+            ->setName($user->getAttribute('name') ?? '');
+
+        if ($project->getId() === 'console') {
+            $queueForMails->setSenderName($platform['emailSenderName']);
+        }
+
+        $queueForMails->trigger();

        $verification->setAttribute('secret', $verificationSecret);

@@ -4325,7 +4321,7 @@ Http::post('/v1/account/verifications/phone')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('publisherForMessaging')
+    ->inject('queueForMessaging')
    ->inject('project')
    ->inject('locale')
    ->inject('timelimit')
@@ -4333,7 +4329,7 @@ Http::post('/v1/account/verifications/phone')
    ->inject('plan')
    ->inject('proofForCode')
                ->inject('authorization')
-    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Event $queueForEvents, MessagingPublisher $publisherForMessaging, 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, Context $usage, array $plan, ProofsCode $proofForCode, Authorization $authorization) {
        if (empty(System::getEnv('_APP_SMS_PROVIDER'))) {
            throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
        }
@@ -4402,13 +4398,11 @@ Http::post('/v1/account/verifications/phone')
                ],
            ]);

-            $publisherForMessaging->enqueue(new MessagingMessage(
-                type: MESSAGE_SEND_TYPE_INTERNAL,
-                project: $project,
-                message: $messageDoc,
-                recipients: [$user->getAttribute('phone')],
-                providerType: MESSAGE_TYPE_SMS,
-            ));
+            $queueForMessaging
+                ->setType(MESSAGE_SEND_TYPE_INTERNAL)
+                ->setMessage($messageDoc)
+                ->setRecipients([$user->getAttribute('phone')])
+                ->setProviderType(MESSAGE_TYPE_SMS);

            $helper = PhoneNumberUtil::getInstance();
            try {
@@ -4680,13 +4674,13 @@ Http::delete('/v1/account/targets/:targetId/push')
    ))
    ->param('targetId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Target ID.', false, ['dbForProject'])
    ->inject('queueForEvents')
-    ->inject('publisherForDeletes')
+    ->inject('queueForDeletes')
    ->inject('user')
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('authorization')
-    ->action(function (string $targetId, Event $queueForEvents, DeletePublisher $publisherForDeletes, Document $user, Request $request, Response $response, Database $dbForProject, Authorization $authorization) {
+    ->action(function (string $targetId, Event $queueForEvents, Delete $queueForDeletes, Document $user, Request $request, Response $response, Database $dbForProject, Authorization $authorization) {
        $target = $authorization->skip(fn () => $dbForProject->getDocument('targets', $targetId));

        if ($target->isEmpty()) {
@@ -4701,11 +4695,9 @@ Http::delete('/v1/account/targets/:targetId/push')

        $dbForProject->purgeCachedDocument('users', $user->getId());

-        $publisherForDeletes->enqueue(new DeleteMessage(
-            project: $queueForEvents->getProject(),
-            type: DELETE_TYPE_TARGET,
-            document: $target,
-        ));
+        $queueForDeletes
+            ->setType(DELETE_TYPE_TARGET)
+            ->setDocument($target);

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -3,11 +3,9 @@
 use Ahc\Jwt\JWT;
 use Appwrite\Auth\Validator\Phone;
 use Appwrite\Detector\Detector;
+use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
-use Appwrite\Event\Message\Delete as DeleteMessage;
-use Appwrite\Event\Message\Messaging as MessagingMessage;
-use Appwrite\Event\Publisher\Delete as DeletePublisher;
-use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
+use Appwrite\Event\Messaging;
 use Appwrite\Extend\Exception;
 use Appwrite\Messaging\Status as MessageStatus;
 use Appwrite\Permission;
@@ -2729,9 +2727,9 @@ Http::delete('/v1/messaging/topics/:topicId')
    ->param('topicId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Topic ID.', false, ['dbForProject'])
    ->inject('queueForEvents')
    ->inject('dbForProject')
-    ->inject('publisherForDeletes')
+    ->inject('queueForDeletes')
    ->inject('response')
-    ->action(function (string $topicId, Event $queueForEvents, Database $dbForProject, DeletePublisher $publisherForDeletes, Response $response) {
+    ->action(function (string $topicId, Event $queueForEvents, Database $dbForProject, Delete $queueForDeletes, Response $response) {
        $topic = $dbForProject->getDocument('topics', $topicId);

        if ($topic->isEmpty()) {
@@ -2740,11 +2738,9 @@ Http::delete('/v1/messaging/topics/:topicId')

        $dbForProject->deleteDocument('topics', $topicId);

-        $publisherForDeletes->enqueue(new DeleteMessage(
-            project: $queueForEvents->getProject(),
-            type: DELETE_TYPE_TOPIC,
-            document: $topic,
-        ));
+        $queueForDeletes
+            ->setType(DELETE_TYPE_TOPIC)
+            ->setDocument($topic);

        $queueForEvents
            ->setParam('topicId', $topic->getId());
@@ -3191,9 +3187,9 @@ Http::post('/v1/messaging/messages/email')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
    ->inject('project')
-    ->inject('publisherForMessaging')
+    ->inject('queueForMessaging')
    ->inject('response')
-    ->action(function (string $messageId, string $subject, string $content, ?array $topics, ?array $users, ?array $targets, ?array $cc, ?array $bcc, ?array $attachments, bool $draft, bool $html, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, MessagingPublisher $publisherForMessaging, Response $response) {
+    ->action(function (string $messageId, string $subject, string $content, ?array $topics, ?array $users, ?array $targets, ?array $cc, ?array $bcc, ?array $attachments, bool $draft, bool $html, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response) {
        $messageId = $messageId == 'unique()'
            ? ID::unique()
            : $messageId;
@@ -3278,11 +3274,9 @@ Http::post('/v1/messaging/messages/email')

        switch ($status) {
            case MessageStatus::PROCESSING:
-                $publisherForMessaging->enqueue(new MessagingMessage(
-                    type: MESSAGE_SEND_TYPE_EXTERNAL,
-                    project: $project,
-                    messageId: $message->getId(),
-                ));
+                $queueForMessaging
+                    ->setType(MESSAGE_SEND_TYPE_EXTERNAL)
+                    ->setMessageId($message->getId());
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
@@ -3368,9 +3362,9 @@ Http::post('/v1/messaging/messages/sms')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
    ->inject('project')
-    ->inject('publisherForMessaging')
+    ->inject('queueForMessaging')
    ->inject('response')
-    ->action(function (string $messageId, string $content, ?array $topics, ?array $users, ?array $targets, bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, MessagingPublisher $publisherForMessaging, Response $response) {
+    ->action(function (string $messageId, string $content, ?array $topics, ?array $users, ?array $targets, bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response) {
        $messageId = $messageId == 'unique()'
            ? ID::unique()
            : $messageId;
@@ -3424,11 +3418,9 @@ Http::post('/v1/messaging/messages/sms')

        switch ($status) {
            case MessageStatus::PROCESSING:
-                $publisherForMessaging->enqueue(new MessagingMessage(
-                    type: MESSAGE_SEND_TYPE_EXTERNAL,
-                    project: $project,
-                    messageId: $message->getId(),
-                ));
+                $queueForMessaging
+                    ->setType(MESSAGE_SEND_TYPE_EXTERNAL)
+                    ->setMessageId($message->getId());
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
@@ -3506,10 +3498,10 @@ Http::post('/v1/messaging/messages/push')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
    ->inject('project')
-    ->inject('publisherForMessaging')
+    ->inject('queueForMessaging')
    ->inject('response')
    ->inject('platform')
-    ->action(function (string $messageId, string $title, string $body, ?array $topics, ?array $users, ?array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, int $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, MessagingPublisher $publisherForMessaging, Response $response, array $platform) {
+    ->action(function (string $messageId, string $title, string $body, ?array $topics, ?array $users, ?array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, int $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response, array $platform) {
        $messageId = $messageId == 'unique()'
            ? ID::unique()
            : $messageId;
@@ -3646,11 +3638,9 @@ Http::post('/v1/messaging/messages/push')

        switch ($status) {
            case MessageStatus::PROCESSING:
-                $publisherForMessaging->enqueue(new MessagingMessage(
-                    type: MESSAGE_SEND_TYPE_EXTERNAL,
-                    project: $project,
-                    messageId: $message->getId(),
-                ));
+                $queueForMessaging
+                    ->setType(MESSAGE_SEND_TYPE_EXTERNAL)
+                    ->setMessageId($message->getId());
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
@@ -3993,9 +3983,9 @@ Http::patch('/v1/messaging/messages/email/:messageId')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
    ->inject('project')
-    ->inject('publisherForMessaging')
+    ->inject('queueForMessaging')
    ->inject('response')
-    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $subject, ?string $content, ?bool $draft, ?bool $html, ?array $cc, ?array $bcc, ?string $scheduledAt, ?array $attachments, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, MessagingPublisher $publisherForMessaging, Response $response) {
+    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $subject, ?string $content, ?bool $draft, ?bool $html, ?array $cc, ?array $bcc, ?string $scheduledAt, ?array $attachments, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response) {
        $message = $dbForProject->getDocument('messages', $messageId);

        if ($message->isEmpty()) {
@@ -4151,11 +4141,9 @@ Http::patch('/v1/messaging/messages/email/:messageId')
        $message = $dbForProject->updateDocument('messages', $message->getId(), $message);

        if ($status === MessageStatus::PROCESSING) {
-            $publisherForMessaging->enqueue(new MessagingMessage(
-                type: MESSAGE_SEND_TYPE_EXTERNAL,
-                project: $project,
-                messageId: $message->getId(),
-            ));
+            $queueForMessaging
+                ->setType(MESSAGE_SEND_TYPE_EXTERNAL)
+                ->setMessageId($message->getId());
        }

        $queueForEvents
@@ -4217,9 +4205,9 @@ Http::patch('/v1/messaging/messages/sms/:messageId')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
    ->inject('project')
-    ->inject('publisherForMessaging')
+    ->inject('queueForMessaging')
    ->inject('response')
-    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $content, ?bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, MessagingPublisher $publisherForMessaging, Response $response) {
+    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $content, ?bool $draft, ?string $scheduledAt, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response) {
        $message = $dbForProject->getDocument('messages', $messageId);

        if ($message->isEmpty()) {
@@ -4335,11 +4323,9 @@ Http::patch('/v1/messaging/messages/sms/:messageId')
        $message = $dbForProject->updateDocument('messages', $message->getId(), $message);

        if ($status === MessageStatus::PROCESSING) {
-            $publisherForMessaging->enqueue(new MessagingMessage(
-                type: MESSAGE_SEND_TYPE_EXTERNAL,
-                project: $project,
-                messageId: $message->getId(),
-            ));
+            $queueForMessaging
+                ->setType(MESSAGE_SEND_TYPE_EXTERNAL)
+                ->setMessageId($message->getId());
        }

        $queueForEvents
@@ -4393,10 +4379,10 @@ Http::patch('/v1/messaging/messages/push/:messageId')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
    ->inject('project')
-    ->inject('publisherForMessaging')
+    ->inject('queueForMessaging')
    ->inject('response')
    ->inject('platform')
-    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $title, ?string $body, ?array $data, ?string $action, ?string $image, ?string $icon, ?string $sound, ?string $color, ?string $tag, ?int $badge, ?bool $draft, ?string $scheduledAt, ?bool $contentAvailable, ?bool $critical, ?string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, MessagingPublisher $publisherForMessaging, Response $response, array $platform) {
+    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $title, ?string $body, ?array $data, ?string $action, ?string $image, ?string $icon, ?string $sound, ?string $color, ?string $tag, ?int $badge, ?bool $draft, ?string $scheduledAt, ?bool $contentAvailable, ?bool $critical, ?string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response, array $platform) {
        $message = $dbForProject->getDocument('messages', $messageId);

        if ($message->isEmpty()) {
@@ -4598,11 +4584,9 @@ Http::patch('/v1/messaging/messages/push/:messageId')
        $message = $dbForProject->updateDocument('messages', $message->getId(), $message);

        if ($status === MessageStatus::PROCESSING) {
-            $publisherForMessaging->enqueue(new MessagingMessage(
-                type: MESSAGE_SEND_TYPE_EXTERNAL,
-                project: $project,
-                messageId: $message->getId(),
-            ));
+            $queueForMessaging
+                ->setType(MESSAGE_SEND_TYPE_EXTERNAL)
+                ->setMessageId($message->getId());
        }

        $queueForEvents
@@ -2,6 +2,9 @@

 use Appwrite\Auth\Validator\MockNumber;
 use Appwrite\Extend\Exception;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
@@ -24,6 +27,37 @@ Http::init()
        }
    });

+Http::get('/v1/projects/:projectId')
+    ->desc('Get project')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.read')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'projects',
+        name: 'get',
+        description: '/docs/references/projects/get.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_PROJECT,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
+    });
+
 // Backwards compatibility
 Http::patch('/v1/projects/:projectId/oauth2')
    ->desc('Update project OAuth2')
@@ -11,9 +11,8 @@ use Appwrite\Auth\Validator\Phone;
 use Appwrite\Deletes\Identities as DeleteIdentities;
 use Appwrite\Deletes\Targets as DeleteTargets;
 use Appwrite\Detector\Detector;
+use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
-use Appwrite\Event\Message\Delete as DeleteMessage;
-use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Hooks\Hooks;
 use Appwrite\SDK\AuthType;
@@ -132,15 +131,15 @@ function createUser(Hash $hash, string $userId, ?string $email, ?string $passwor
        } catch (\Throwable) {
        }

-        if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
            throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsCanonicalEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
            throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsFreeEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
            throw new Exception(Exception::USER_EMAIL_FREE);
        }

@@ -1564,15 +1563,15 @@ Http::patch('/v1/users/:userId/email')
        } catch (\Throwable) {
        }

-        if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
+        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
            throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsCanonicalEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
+        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
            throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
        }

-        if ((($project->getId() === 'console') || ($plan['supportsFreeEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
+        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
            throw new Exception(Exception::USER_EMAIL_FREE);
        }

@@ -2593,8 +2592,8 @@ Http::delete('/v1/users/:userId')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('publisherForDeletes')
-    ->action(function (string $userId, Response $response, Database $dbForProject, Event $queueForEvents, DeletePublisher $publisherForDeletes) {
+    ->inject('queueForDeletes')
+    ->action(function (string $userId, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {

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

@@ -2609,11 +2608,9 @@ Http::delete('/v1/users/:userId')
        DeleteIdentities::delete($dbForProject, Query::equal('userInternalId', [$user->getSequence()]));
        DeleteTargets::delete($dbForProject, Query::equal('userInternalId', [$user->getSequence()]));

-        $publisherForDeletes->enqueue(new DeleteMessage(
-            project: $queueForEvents->getProject(),
-            type: DELETE_TYPE_DOCUMENT,
-            document: $clone,
-        ));
+        $queueForDeletes
+            ->setType(DELETE_TYPE_DOCUMENT)
+            ->setDocument($clone);

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -2646,10 +2643,10 @@ Http::delete('/v1/users/:userId/targets/:targetId')
    ->param('userId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'User ID.', false, ['dbForProject'])
    ->param('targetId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Target ID.', false, ['dbForProject'])
    ->inject('queueForEvents')
-    ->inject('publisherForDeletes')
+    ->inject('queueForDeletes')
    ->inject('response')
    ->inject('dbForProject')
-    ->action(function (string $userId, string $targetId, Event $queueForEvents, DeletePublisher $publisherForDeletes, Response $response, Database $dbForProject) {
+    ->action(function (string $userId, string $targetId, Event $queueForEvents, Delete $queueForDeletes, Response $response, Database $dbForProject) {
        $user = $dbForProject->getDocument('users', $userId);

        if ($user->isEmpty()) {
@@ -2669,11 +2666,9 @@ Http::delete('/v1/users/:userId/targets/:targetId')
        $dbForProject->deleteDocument('targets', $target->getId());
        $dbForProject->purgeCachedDocument('users', $user->getId());

-        $publisherForDeletes->enqueue(new DeleteMessage(
-            project: $queueForEvents->getProject(),
-            type: DELETE_TYPE_TARGET,
-            document: $target,
-        ));
+        $queueForDeletes
+            ->setType(DELETE_TYPE_TARGET)
+            ->setDocument($target);

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -7,11 +7,11 @@ use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Key;
 use Appwrite\Bus\Events\ExecutionCompleted;
 use Appwrite\Bus\Events\RequestCompleted;
+use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
-use Appwrite\Event\Message\Delete as DeleteMessage;
 use Appwrite\Event\Publisher\Certificate;
-use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Extend\Exception as AppwriteException;
+use Appwrite\Locking\Lock;
 use Appwrite\Network\Cors;
 use Appwrite\Platform\Appwrite;
 use Appwrite\SDK\Method;
@@ -29,8 +29,6 @@ use Appwrite\Utopia\Request\Filters\V21 as RequestV21;
 use Appwrite\Utopia\Request\Filters\V22 as RequestV22;
 use Appwrite\Utopia\Request\Filters\V23 as RequestV23;
 use Appwrite\Utopia\Request\Filters\V24 as RequestV24;
-use Appwrite\Utopia\Request\Filters\V25 as RequestV25;
-use Appwrite\Utopia\Request\Filters\V26 as RequestV26;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Filters\V16 as ResponseV16;
 use Appwrite\Utopia\Response\Filters\V17 as ResponseV17;
@@ -41,10 +39,7 @@ use Appwrite\Utopia\Response\Filters\V21 as ResponseV21;
 use Appwrite\Utopia\Response\Filters\V22 as ResponseV22;
 use Appwrite\Utopia\Response\Filters\V23 as ResponseV23;
 use Appwrite\Utopia\Response\Filters\V24 as ResponseV24;
-use Appwrite\Utopia\Response\Filters\V25 as ResponseV25;
-use Appwrite\Utopia\Response\Filters\V26 as ResponseV26;
 use Appwrite\Utopia\View;
-use Executor\Exception\Timeout as ExecutorTimeout;
 use Executor\Executor;
 use MaxMind\Db\Reader;
 use Swoole\Http\Request as SwooleRequest;
@@ -75,7 +70,7 @@ use Utopia\Validator\Text;

 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, DeletePublisher $publisherForDeletes, int $executionsRetentionCount)
+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, Lock $lock)
 {
    $host = $request->getHostname();
    if (!empty($previewHostname)) {
@@ -144,9 +139,7 @@ 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()
-            ])));
+            $lock->set('projects', $project->getId(), 'accessedAt', DateTime::now());
        }

        /**
@@ -585,30 +578,26 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
                'site' => '',
            };

-            try {
-                $executionResponse = $executor->createExecution(
-                    projectId: $project->getId(),
-                    deploymentId: $deployment->getId(),
-                    body: \strlen($body) > 0 ? $body : null,
-                    variables: $vars,
-                    timeout: $resource->getAttribute('timeout', 30),
-                    image: $runtime['image'],
-                    source: $source,
-                    entrypoint: $entrypoint,
-                    version: $version,
-                    path: $path,
-                    method: $method,
-                    headers: $headers,
-                    runtimeEntrypoint: $runtimeEntrypoint,
-                    cpus: $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
-                    memory: $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
-                    logging: $resource->getAttribute('logging', true),
-                    requestTimeout: 30,
-                    responseFormat: Executor::RESPONSE_FORMAT_ARRAY_HEADERS
-                );
-            } catch (ExecutorTimeout $th) {
-                throw new AppwriteException(AppwriteException::FUNCTION_SYNCHRONOUS_TIMEOUT, previous: $th);
-            }
+            $executionResponse = $executor->createExecution(
+                projectId: $project->getId(),
+                deploymentId: $deployment->getId(),
+                body: \strlen($body) > 0 ? $body : null,
+                variables: $vars,
+                timeout: $resource->getAttribute('timeout', 30),
+                image: $runtime['image'],
+                source: $source,
+                entrypoint: $entrypoint,
+                version: $version,
+                path: $path,
+                method: $method,
+                headers: $headers,
+                runtimeEntrypoint: $runtimeEntrypoint,
+                cpus: $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
+                memory: $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
+                logging: $resource->getAttribute('logging', true),
+                requestTimeout: 30,
+                responseFormat: Executor::RESPONSE_FORMAT_ARRAY_HEADERS
+            );

            $headerOverrides = [];

@@ -791,12 +780,12 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
                ? RESOURCE_TYPE_FUNCTIONS
                : RESOURCE_TYPE_SITES;

-            $publisherForDeletes->enqueue(new DeleteMessage(
-                project: $project,
-                type: DELETE_TYPE_EXECUTIONS_LIMIT,
-                resource: (string) $resource->getSequence(),
-                resourceType: $resourceType,
-            ));
+            $queueForDeletes
+                ->setProject($project)
+                ->setResourceType($resourceType)
+                ->setResource($resource->getSequence())
+                ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
+                ->trigger();
        }

        return true;
@@ -857,9 +846,10 @@ Http::init()
    ->inject('apiKey')
    ->inject('cors')
    ->inject('authorization')
-    ->inject('publisherForDeletes')
+    ->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, DeletePublisher $publisherForDeletes, int $executionsRetentionCount) {
+    ->inject('lock')
+    ->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, Lock $lock) {
        /*
        * Appwrite Router
        */
@@ -867,7 +857,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, $publisherForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount, $lock)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -914,12 +904,6 @@ Http::init()
            if (version_compare($requestFormat, '1.9.3', '<')) {
                $request->addFilter(new RequestV24());
            }
-            if (version_compare($requestFormat, '1.9.4', '<')) {
-                $request->addFilter(new RequestV25());
-            }
-            if (version_compare($requestFormat, '1.9.5', '<')) {
-                $request->addFilter(new RequestV26());
-            }
        }

        $localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
@@ -944,12 +928,6 @@ Http::init()
         */
        $responseFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
        if ($responseFormat) {
-            if (version_compare($responseFormat, '1.9.5', '<')) {
-                $response->addFilter(new ResponseV26());
-            }
-            if (version_compare($responseFormat, '1.9.4', '<')) {
-                $response->addFilter(new ResponseV25());
-            }
            if (version_compare($responseFormat, '1.9.3', '<')) {
                $response->addFilter(new ResponseV24());
            }
@@ -1168,16 +1146,17 @@ Http::options()
    ->inject('apiKey')
    ->inject('cors')
    ->inject('authorization')
-    ->inject('publisherForDeletes')
+    ->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, DeletePublisher $publisherForDeletes, int $executionsRetentionCount) {
+    ->inject('lock')
+    ->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, Lock $lock) {
        /*
        * 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, $publisherForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount, $lock)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1283,7 +1262,7 @@ Http::error()
        if (!$publish && $project->getId() !== 'console') {
            $errorUser = new DBUser();
            try {
-                $resolvedUser = $utopia->context()->get('user');
+                $resolvedUser = $utopia->getResource('user');
                if ($resolvedUser instanceof DBUser) {
                    $errorUser = $resolvedUser;
                }
@@ -1302,7 +1281,7 @@ Http::error()
        if ($logger && $publish) {
            try {
                /** @var Utopia\Database\Document $user */
-                $user = $utopia->context()->get('user');
+                $user = $utopia->getResource('user');
            } catch (\Throwable) {
                // All good, user is optional information for logger
            }
@@ -1503,7 +1482,7 @@ Http::error()
        // the cors resource (which depends on rule -> DB) would cascade.
        // Uses override:true to avoid duplicate headers if init() already set them.
        try {
-            $cors = $utopia->context()->get('cors');
+            $cors = $utopia->getResource('cors');
            foreach ($cors->headers($request->getOrigin()) as $name => $value) {
                $response
                    ->removeHeader($name)
@@ -1570,15 +1549,16 @@ Http::get('/robots.txt')
    ->inject('previewHostname')
    ->inject('apiKey')
    ->inject('authorization')
-    ->inject('publisherForDeletes')
+    ->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, DeletePublisher $publisherForDeletes, int $executionsRetentionCount) {
+    ->inject('lock')
+    ->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, Lock $lock) {
        $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, $publisherForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount, $lock)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1604,15 +1584,16 @@ Http::get('/humans.txt')
    ->inject('previewHostname')
    ->inject('apiKey')
    ->inject('authorization')
-    ->inject('publisherForDeletes')
+    ->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, DeletePublisher $publisherForDeletes, int $executionsRetentionCount) {
+    ->inject('lock')
+    ->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, Lock $lock) {
        $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, $publisherForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount, $lock)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -3,22 +3,24 @@
 use Appwrite\Auth\Key;
 use Appwrite\Auth\MFA\Type\TOTP;
 use Appwrite\Bus\Events\RequestCompleted;
+use Appwrite\Event\Build;
 use Appwrite\Event\Context\Audit as AuditContext;
 use Appwrite\Event\Database as EventDatabase;
+use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Func;
+use Appwrite\Event\Mail;
 use Appwrite\Event\Message\Audit as AuditMessage;
-use Appwrite\Event\Message\Func as FunctionMessage;
 use Appwrite\Event\Message\Usage as UsageMessage;
+use Appwrite\Event\Messaging;
 use Appwrite\Event\Publisher\Audit;
-use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Event\Publisher\Usage as UsagePublisher;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\Webhook;
 use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Functions\EventProcessor;
-use Appwrite\Platform\Modules\Storage\Config\CacheControl;
-use Appwrite\Platform\Modules\Storage\Config\StorageCacheControl;
+use Appwrite\Locking\Lock;
 use Appwrite\SDK\Method;
 use Appwrite\Usage\Context;
 use Appwrite\Utopia\Database\Documents\User;
@@ -99,7 +101,8 @@ Http::init()
    ->inject('team')
    ->inject('apiKey')
    ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, AuditContext $auditContext, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
+    ->inject('lock')
+    ->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, AuditContext $auditContext, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization, Lock $lock) {
        $route = $utopia->getRoute();
        if ($route === null) {
            throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
@@ -244,20 +247,22 @@ Http::init()
                        $sdks[] = $sdk;

                        $updates->setAttribute('sdks', $sdks);
-                        $updates->setAttribute('accessedAt', Datetime::now());
+                        $updates->setAttribute('accessedAt', DateTime::now());
                    }
                }

                if (! $updates->isEmpty()) {
-                    $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->updateDocument('keys', $dbKey->getId(), $updates));
+                    $lock->run('keys', $dbKey->getId(), function () use ($dbForPlatform, $dbKey, $updates, $apiKey, $project, $user, $team) {
+                        $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->updateDocument('keys', $dbKey->getId(), $updates));

-                    if (! empty($apiKey->getProjectId())) {
-                        $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('projects', $project->getId()));
-                    } elseif (! empty($apiKey->getUserId())) {
-                        $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('users', $user->getId()));
-                    } elseif (! empty($apiKey->getTeamId())) {
-                        $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('teams', $team->getId()));
-                    }
+                        if (! empty($apiKey->getProjectId())) {
+                            $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('projects', $project->getId()));
+                        } elseif (! empty($apiKey->getUserId())) {
+                            $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('users', $user->getId()));
+                        } elseif (! empty($apiKey->getTeamId())) {
+                            $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->purgeCachedDocument('teams', $team->getId()));
+                        }
+                    });
                }

                $userClone = clone $user;
@@ -388,9 +393,7 @@ Http::init()
        if ($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()
-                ])));
+                $lock->set('projects', $project->getId(), 'accessedAt', DateTime::now());
            }
        }

@@ -407,9 +410,7 @@ Http::init()
                        'accessedAt' => $user->getAttribute('accessedAt')
                    ]));
                } else {
-                    $authorization->skip(fn () => $dbForPlatform->updateDocument('users', $user->getId(), new Document([
-                        'accessedAt' => $user->getAttribute('accessedAt')
-                    ])));
+                    $lock->set('users', $user->getId(), 'accessedAt', $user->getAttribute('accessedAt'));
                }
            }
        }
@@ -476,85 +477,6 @@ Http::init()
        }
    });

-Http::init()
-    ->groups(['api'])
-    ->inject('utopia')
-    ->inject('request')
-    ->inject('response')
-    ->inject('project')
-    ->inject('user')
-    ->inject('timelimit')
-    ->inject('devKey')
-    ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, callable $timelimit, Document $devKey, Authorization $authorization) {
-        $response->setUser($user);
-        $request->setUser($user);
-
-        $roles = $authorization->getRoles();
-        $shouldCheckAbuse = System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled'
-            && ! $user->isApp($roles)
-            && ! $user->isPrivileged($roles)
-            && $devKey->isEmpty();
-
-        $route = $utopia->getRoute();
-        if ($route === null) {
-            throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
-        }
-
-        $abuseKeyLabel = $route->getLabel('abuse-key', 'url:{url},ip:{ip}');
-        $abuseKeyLabel = (! is_array($abuseKeyLabel)) ? [$abuseKeyLabel] : $abuseKeyLabel;
-        $closestLimit = null;
-
-        foreach ($abuseKeyLabel as $abuseKey) {
-            $isRateLimited = false;
-
-            try {
-                $start = $request->getContentRangeStart();
-                $end = $request->getContentRangeEnd();
-                $timeLimit = $timelimit($abuseKey, $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600));
-                $timeLimit
-                    ->setParam('{projectId}', $project->getId())
-                    ->setParam('{userId}', $user->getId())
-                    ->setParam('{userAgent}', $request->getUserAgent(''))
-                    ->setParam('{ip}', $request->getIP())
-                    ->setParam('{url}', $request->getHostname() . $route->getPath())
-                    ->setParam('{method}', $request->getMethod())
-                    ->setParam('{chunkId}', (int) ($start / ($end + 1 - $start)));
-
-                foreach ($request->getParams() as $key => $value) {
-                    if (! empty($value)) {
-                        $timeLimit->setParam('{param-' . $key . '}', (\is_array($value)) ? \json_encode($value) : $value);
-                    }
-                }
-
-                $abuse = new Abuse($timeLimit);
-                $remaining = $timeLimit->remaining();
-                $limit = $timeLimit->limit();
-                $time = $timeLimit->time() + $route->getLabel('abuse-time', 3600);
-
-                if ($limit && ($remaining < $closestLimit || is_null($closestLimit))) {
-                    $closestLimit = $remaining;
-                    $response
-                        ->addHeader('X-RateLimit-Limit', $limit)
-                        ->addHeader('X-RateLimit-Remaining', $remaining)
-                        ->addHeader('X-RateLimit-Reset', $time);
-                }
-
-                if ($shouldCheckAbuse) {
-                    $isRateLimited = $abuse->check();
-                }
-            } catch (\Throwable $th) {
-                \error_log((string) $th);
-
-                continue;
-            }
-
-            if ($isRateLimited) {
-                throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED);
-            }
-        }
-    });
-
 Http::init()
    ->groups(['api'])
    ->inject('utopia')
@@ -563,20 +485,25 @@ Http::init()
    ->inject('project')
    ->inject('user')
    ->inject('queueForEvents')
+    ->inject('queueForMessaging')
    ->inject('auditContext')
+    ->inject('queueForDeletes')
    ->inject('queueForDatabase')
+    ->inject('queueForBuilds')
    ->inject('usage')
-    ->inject('publisherForFunctions')
+    ->inject('queueForFunctions')
+    ->inject('queueForMails')
    ->inject('dbForProject')
+    ->inject('timelimit')
    ->inject('resourceToken')
    ->inject('mode')
    ->inject('apiKey')
    ->inject('plan')
+    ->inject('devKey')
    ->inject('telemetry')
    ->inject('platform')
    ->inject('authorization')
-    ->inject('cacheControlForStorage')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, EventDatabase $queueForDatabase, Context $usage, FunctionPublisher $publisherForFunctions, Database $dbForProject, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage) {
+    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Messaging $queueForMessaging, AuditContext $auditContext, 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);
@@ -593,6 +520,70 @@ Http::init()
            default => '',
        };

+        /*
+        * Abuse Check
+        */
+
+        $abuseKeyLabel = $route->getLabel('abuse-key', 'url:{url},ip:{ip}');
+        $timeLimitArray = [];
+
+        $abuseKeyLabel = (! is_array($abuseKeyLabel)) ? [$abuseKeyLabel] : $abuseKeyLabel;
+
+        foreach ($abuseKeyLabel as $abuseKey) {
+            $start = $request->getContentRangeStart();
+            $end = $request->getContentRangeEnd();
+            $timeLimit = $timelimit($abuseKey, $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600));
+            $timeLimit
+                ->setParam('{projectId}', $project->getId())
+                ->setParam('{userId}', $user->getId())
+                ->setParam('{userAgent}', $request->getUserAgent(''))
+                ->setParam('{ip}', $request->getIP())
+                ->setParam('{url}', $request->getHostname() . $route->getPath())
+                ->setParam('{method}', $request->getMethod())
+                ->setParam('{chunkId}', (int) ($start / ($end + 1 - $start)));
+            $timeLimitArray[] = $timeLimit;
+        }
+
+        $closestLimit = null;
+
+        $roles = $authorization->getRoles();
+        $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)) {
+                    $timeLimit->setParam('{param-' . $key . '}', (\is_array($value)) ? \json_encode($value) : $value);
+                }
+            }
+
+            $abuse = new Abuse($timeLimit);
+            $remaining = $timeLimit->remaining();
+
+            $limit = $timeLimit->limit();
+            $time = $timeLimit->time() + $route->getLabel('abuse-time', 3600);
+
+            if ($limit && ($remaining < $closestLimit || is_null($closestLimit))) {
+                $closestLimit = $remaining;
+                $response
+                    ->addHeader('X-RateLimit-Limit', $limit)
+                    ->addHeader('X-RateLimit-Remaining', $remaining)
+                    ->addHeader('X-RateLimit-Reset', $time);
+            }
+
+            $enabled = System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled';
+
+            if (
+                $enabled                // Abuse is enabled
+                && ! $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
+            ) {
+                throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED);
+            }
+        }
+
        /**
         *  TODO: (@loks0n)
         *  Avoid mutating the message across file boundaries - it's difficult to reason about at scale.
@@ -623,16 +614,24 @@ Http::init()
        }

        /* Auto-set projects */
+        $queueForDeletes->setProject($project);
        $queueForDatabase->setProject($project);
+        $queueForMessaging->setProject($project);
+        $queueForFunctions->setProject($project);
+        $queueForBuilds->setProject($project);
+        $queueForMails->setProject($project);
+
+        /* Auto-set platforms */
+        $queueForFunctions->setPlatform($platform);
+        $queueForBuilds->setPlatform($platform);
+        $queueForMails->setPlatform($platform);

        $useCache = $route->getLabel('cache', false);
        $storageCacheOperationsCounter = $telemetry->createCounter('storage.cache.operations.load');
        if ($useCache) {
            $route = $utopia->match($request);
-            $roles = $authorization->getRoles();
-            $isAppUser = $user->isApp($roles);
            $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
-            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && ! $user->isPrivileged($roles);
+            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && ! $user->isPrivileged($authorization->getRoles());

            $key = $request->cacheIdentifier();
            Span::add('storage.cache.key', $key);
@@ -644,7 +643,6 @@ Http::init()
            $data = $cache->load($key, $timestamp);

            if (! empty($data) && ! $cacheLog->isEmpty()) {
-                $cacheControl = \sprintf('private, max-age=%d', $timestamp);
                $parts = explode('/', $cacheLog->getAttribute('resourceType', ''));
                $type = $parts[0];

@@ -653,7 +651,7 @@ Http::init()
                    $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

                    $isToken = ! $resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
-                    $isPrivilegedUser = $user->isPrivileged($roles);
+                    $isPrivilegedUser = $user->isPrivileged($authorization->getRoles());

                    if ($bucket->isEmpty() || (! $bucket->getAttribute('enabled') && ! $isAppUser && ! $isPrivilegedUser)) {
                        throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -697,21 +695,6 @@ Http::init()
                            ])));
                        }
                    }
-
-                    if ($isImageTransformation) {
-                        $cacheControl = $cacheControlForStorage(new StorageCacheControl(
-                            source: CacheControl::SOURCE_CACHE,
-                            user: $user,
-                            maxAge: $timestamp,
-                            project: $project,
-                            bucket: $bucket,
-                            file: $file,
-                            resourceToken: $resourceToken,
-                            fileSecurity: $fileSecurity,
-                            cacheLog: $cacheLog,
-                            route: $route,
-                        ));
-                    }
                }

                $accessedAt = $cacheLog->getAttribute('accessedAt', '');
@@ -724,7 +707,7 @@ Http::init()
                }

                $response
-                    ->addHeader('Cache-Control', $cacheControl)
+                    ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp))
                    ->addHeader('X-Appwrite-Cache', 'hit')
                    ->setContentType($cacheLog->getAttribute('mimeType'));
                $storageCacheOperationsCounter->add(1, ['result' => 'hit']);
@@ -815,8 +798,11 @@ Http::shutdown()
    ->inject('publisherForAudits')
    ->inject('usage')
    ->inject('publisherForUsage')
+    ->inject('queueForDeletes')
    ->inject('queueForDatabase')
-    ->inject('publisherForFunctions')
+    ->inject('queueForBuilds')
+    ->inject('queueForMessaging')
+    ->inject('queueForFunctions')
    ->inject('queueForWebhooks')
    ->inject('queueForRealtime')
    ->inject('dbForProject')
@@ -826,7 +812,7 @@ Http::shutdown()
    ->inject('bus')
    ->inject('apiKey')
    ->inject('mode')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Audit $publisherForAudits, Context $usage, UsagePublisher $publisherForUsage, EventDatabase $queueForDatabase, FunctionPublisher $publisherForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor, Bus $bus, ?Key $apiKey, string $mode) use ($parseLabel) {
+    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Audit $publisherForAudits, 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, string $mode) use ($parseLabel) {

        $responsePayload = $response->getPayload();

@@ -855,15 +841,9 @@ Http::shutdown()
            if (! empty($functionsEvents)) {
                foreach ($generatedEvents as $event) {
                    if (isset($functionsEvents[$event])) {
-                        $publisherForFunctions->enqueue(FunctionMessage::fromEvent(
-                            event: $queueForEvents->getEvent(),
-                            params: $queueForEvents->getParams(),
-                            project: $queueForEvents->getProject(),
-                            user: $queueForEvents->getUser(),
-                            userId: $queueForEvents->getUserId(),
-                            payload: $queueForEvents->getPayload(),
-                            platform: $queueForEvents->getPlatform(),
-                        ));
+                        $queueForFunctions
+                            ->from($queueForEvents)
+                            ->trigger();
                        break;
                    }
                }
@@ -973,10 +953,22 @@ Http::shutdown()
            $publisherForAudits->enqueue(AuditMessage::fromContext($auditContext));
        }

+        if (! empty($queueForDeletes->getType())) {
+            $queueForDeletes->trigger();
+        }
+
        if (! empty($queueForDatabase->getType())) {
            $queueForDatabase->trigger();
        }

+        if (! empty($queueForBuilds->getType())) {
+            $queueForBuilds->trigger();
+        }
+
+        if (! empty($queueForMessaging->getType())) {
+            $queueForMessaging->trigger();
+        }
+
        // Cache label
        $useCache = $route->getLabel('cache', false);
        if ($useCache) {
@@ -3,7 +3,7 @@
 require_once __DIR__ . '/init.php';
 require_once __DIR__ . '/init/span.php';

-$setRequestContext = require __DIR__ . '/init/resources/request.php';
+$registerRequestResources = require __DIR__ . '/init/resources/request.php';

 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
@@ -26,7 +26,6 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
-use Utopia\DI\Container;
 use Utopia\Http\Adapter\Swoole\Server;
 use Utopia\Http\Files;
 use Utopia\Http\Http;
@@ -58,7 +57,7 @@ $container->set('pools', function ($register) {
 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
 $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));

-$swoole = new Server(
+$swooleAdapter = new Server(
    host: "0.0.0.0",
    port: System::getEnv('PORT', 80),
    settings: [
@@ -70,10 +69,10 @@ $swoole = new Server(
        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
    ],
-    resources: $container,
+    container: $container,
 );

-$http = $swoole->getServer();
+$http = $swooleAdapter->getServer();

 /**
 * Assigns HTTP requests to worker threads by analyzing its payload/content.
@@ -191,11 +190,13 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server) {
    Console::success('Reload completed...');
 });

-$container->set('bus', fn ($register) => $register->get('bus')->setResolver(fn (string $name) => $swoole->context()->get($name)), ['register']);
+$container->set('bus', function ($register) use ($swooleAdapter) {
+    return $register->get('bus')->setResolver(fn (string $name) => $swooleAdapter->getContainer()->get($name));
+}, ['register']);

 include __DIR__ . '/controllers/general.php';

-function createDatabase(Container $resources, string $resourceKey, string $dbName, array $collections, mixed $pools, ?callable $extraSetup = null): void
+function createDatabase(Http $app, string $resourceKey, string $dbName, array $collections, mixed $pools, ?callable $extraSetup = null): void
 {
    $max = 15;
    $sleep = 2;
@@ -204,7 +205,7 @@ function createDatabase(Container $resources, string $resourceKey, string $dbNam
    while (true) {
        try {
            $attempts++;
-            $resource = $resources->get($resourceKey);
+            $resource = $app->getResource($resourceKey);
            /* @var $database Database */
            $database = is_callable($resource) ? $resource() : $resource;
            break; // exit loop on success
@@ -287,21 +288,23 @@ function createDatabase(Container $resources, string $resourceKey, string $dbNam
    Span::current()?->finish();
 }

-$http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorkers, $container) {
-    /** @var \Utopia\Pools\Group $pools */
-    $pools = $container->get('pools');
+$http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorkers, $swooleAdapter) {
+    $app = new Http($swooleAdapter, 'UTC');

-    go(function () use ($container, $pools) {
+    /** @var \Utopia\Pools\Group $pools */
+    $pools = $app->getResource('pools');
+
+    go(function () use ($app, $pools) {

        /** @var array $collections */
        $collections = Config::getParam('collections', []);

        // create logs database first, `getLogsDB` is a callable.
-        createDatabase($container, 'getLogsDB', 'logs', $collections['logs'], $pools);
+        createDatabase($app, 'getLogsDB', 'logs', $collections['logs'], $pools);

        // create appwrite database, `dbForPlatform` is a direct access call.
-        createDatabase($container, 'dbForPlatform', 'appwrite', $collections['console'], $pools, function (Database $dbForPlatform) use ($collections, $container) {
-            $authorization = $container->get('authorization');
+        createDatabase($app, 'dbForPlatform', 'appwrite', $collections['console'], $pools, function (Database $dbForPlatform) use ($collections, $app) {
+            $authorization = $app->getResource('authorization');

            if ($dbForPlatform->getCollection(AuditAdapterSQL::COLLECTION)->isEmpty()) {
                $adapter = new AdapterDatabase($dbForPlatform);
@@ -413,7 +416,7 @@ $http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorke
        $documentsSharedTables = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''));
        $vectorSharedTables = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''));

-        $cache = $container->get('cache');
+        $cache = $app->getResource('cache');

        // All shared tables pools that need project metadata collections
        $allSharedTables = \array_values(\array_unique(\array_filter([
@@ -499,7 +502,7 @@ $http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorke
    });
 });

-$swoole->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swoole, $setRequestContext) {
+$swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swooleAdapter, $registerRequestResources) {
    Span::init('http.request');

    $request = new Request($utopiaRequest->getSwooleRequest());
@@ -519,18 +522,21 @@ $swoole->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swoo
        return;
    }

-    $app = new Http($swoole, 'UTC');
-    $app->context()->set('request', fn () => $request);
-    $app->context()->set('response', fn () => $response);
-    $app->context()->set('utopia', fn () => $app);
+    $requestContainer = $swooleAdapter->getContainer();
+    $requestContainer->set('container', fn () => $requestContainer);
+    $requestContainer->set('request', fn () => $request);
+    $requestContainer->set('response', fn () => $response);

-    $setRequestContext($app->context());
+    $app = new Http($swooleAdapter, 'UTC');
+    $requestContainer->set('utopia', fn () => $app);
+
+    $registerRequestResources($requestContainer);

    $app->setCompression(System::getEnv('_APP_COMPRESSION_ENABLED', 'enabled') === 'enabled');
    $app->setCompressionMinSize(intval(System::getEnv('_APP_COMPRESSION_MIN_SIZE_BYTES', '1024'))); // 1KB

    try {
-        $authorization = $app->context()->get('authorization');
+        $authorization = $app->getResource('authorization');

        $request->setAuthorization($authorization);
        $response->setAuthorization($authorization);
@@ -546,18 +552,18 @@ $swoole->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swoo

        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');

-        $logger = $app->context()->get("logger");
+        $logger = $app->getResource("logger");
        if ($logger) {
            try {
                /** @var Utopia\Database\Document $user */
-                $user = $app->context()->get('user');
+                $user = $app->getResource('user');
            } catch (\Throwable $_th) {
                // All good, user is optional information for logger
            }

            $route = $app->getRoute();

-            $log = $app->context()->get("log");
+            $log = $app->getResource("log");

            if (isset($user) && !$user->isEmpty()) {
                $log->setUser(new User($user->getId()));
@@ -636,16 +642,18 @@ $swoole->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swoo
 });

 // Fetch domains every `DOMAIN_SYNC_TIMER` seconds and update in the memory
-$http->on(Constant::EVENT_TASK, function () use ($container) {
+$http->on(Constant::EVENT_TASK, function () use ($swooleAdapter) {
    $lastSyncUpdate = null;

+    $app = new Http($swooleAdapter, 'UTC');
+
    /** @var Utopia\Database\Database $dbForPlatform */
-    $dbForPlatform = $container->get('dbForPlatform');
+    $dbForPlatform = $app->getResource('dbForPlatform');

    /** @var \Swoole\Table $riskyDomains */
-    $riskyDomains = $container->get('riskyDomains');
+    $riskyDomains = $app->getResource('riskyDomains');

-    Timer::tick(DOMAIN_SYNC_TIMER * 1000, function () use ($dbForPlatform, $riskyDomains, &$lastSyncUpdate, $container) {
+    Timer::tick(DOMAIN_SYNC_TIMER * 1000, function () use ($dbForPlatform, $riskyDomains, &$lastSyncUpdate, $app) {
        try {
            $time = DateTime::now();
            $limit = 1000;
@@ -662,7 +670,7 @@ $http->on(Constant::EVENT_TASK, function () use ($container) {
                }
                $results = [];
                try {
-                    $authorization = $container->get('authorization');
+                    $authorization = $app->getResource('authorization');
                    $results = $authorization->skip(fn () =>  $dbForPlatform->find('rules', $queries));
                } catch (Throwable $th) {
                    Console::error('rules ' . $th->getMessage());
@@ -712,4 +720,4 @@ $http->on(Constant::EVENT_TASK, function () use ($container) {
    });
 });

-$swoole->start();
+$swooleAdapter->start();
@@ -1,11 +1,5 @@
 <?php

-use Appwrite\Platform\Modules\Advisor\Enums\InsightCTAMethod;
-use Appwrite\Platform\Modules\Advisor\Enums\InsightCTAService;
-use Appwrite\Platform\Modules\Advisor\Enums\InsightSeverity;
-use Appwrite\Platform\Modules\Advisor\Enums\InsightStatus;
-use Appwrite\Platform\Modules\Advisor\Enums\InsightType;
-use Appwrite\Platform\Modules\Advisor\Enums\ReportType;
 use Appwrite\Platform\Modules\Compute\Specification;
 use Utopia\System\System;

@@ -50,15 +44,14 @@ const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
 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 = 4326;
-const APP_VERSION_STABLE = '1.9.5';
+const APP_CACHE_BUSTER = 4324;
+const APP_VERSION_STABLE = '1.9.3';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
 const APP_DATABASE_ATTRIBUTE_DATETIME = 'datetime';
 const APP_DATABASE_ATTRIBUTE_URL = 'url';
 const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
-const APP_DATABASE_ATTRIBUTE_BIGINT_RANGE = 'bigintRange';
 const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
 const APP_DATABASE_ATTRIBUTE_POINT = 'point';
 const APP_DATABASE_ATTRIBUTE_LINE = 'line';
@@ -200,7 +193,7 @@ const BUILD_TYPE_RETRY = 'retry';
 const DELETE_TYPE_DATABASES = 'databases';
 const DELETE_TYPE_DOCUMENT = 'document';
 const DELETE_TYPE_COLLECTIONS = 'collections';
-const DELETE_TYPE_TRANSACTIONS = 'transactions';
+const DELETE_TYPE_TRANSACTION = 'transaction';
 const DELETE_TYPE_EXPIRED_TRANSACTIONS = 'expired_transactions';
 const DELETE_TYPE_PROJECTS = 'projects';
 const DELETE_TYPE_SITES = 'sites';
@@ -228,7 +221,6 @@ const DELETE_TYPE_EXPIRED_TARGETS = 'invalid_targets';
 const DELETE_TYPE_SESSION_TARGETS = 'session_targets';
 const DELETE_TYPE_CSV_EXPORTS = 'csv_exports';
 const DELETE_TYPE_MAINTENANCE = 'maintenance';
-const DELETE_TYPE_REPORT = 'report';

 // Rule statuses
 const RULE_STATUS_CREATED = 'created'; // This is also the status when domain DNS verification fails.
@@ -431,55 +423,6 @@ const RESOURCE_TYPE_MESSAGES = 'messages';
 const RESOURCE_TYPE_EXECUTIONS = 'executions';
 const RESOURCE_TYPE_VCS = 'vcs';
 const RESOURCE_TYPE_EMBEDDINGS_TEXT = 'embeddingsText';
-const RESOURCE_TYPE_INSIGHTS = 'insights';
-const RESOURCE_TYPE_REPORTS = 'reports';
-
-// Insight types — engine-specific so the CTA action can reference the right public API.
-const ADVISOR_INSIGHT_TYPES = [
-    InsightType::DATABASE_INDEX->value, // legacy databases.createIndex
-    InsightType::TABLES_DB_INDEX->value, // tablesDB.createIndex
-    InsightType::DOCUMENTS_DB_INDEX->value, // documentsDB.createIndex
-    InsightType::VECTORS_DB_INDEX->value, // vectorsDB.createIndex
-    InsightType::DATABASE_PERFORMANCE->value,
-    InsightType::SITE_PERFORMANCE->value,
-    InsightType::SITE_ACCESSIBILITY->value,
-    InsightType::SITE_SEO->value,
-    InsightType::FUNCTION_PERFORMANCE->value,
-];
-
-// Public API services (SDK namespaces) that an insight CTA's `service` can reference.
-// Analyzers must pick the one matching the engine the resource lives in.
-const ADVISOR_CTA_SERVICES = [
-    InsightCTAService::DATABASES->value, // legacy
-    InsightCTAService::TABLES_DB->value,
-    InsightCTAService::DOCUMENTS_DB->value,
-    InsightCTAService::VECTORS_DB->value,
-];
-
-// Public API method names that an insight CTA's `method` can reference for index suggestions.
-const ADVISOR_CTA_METHODS = [
-    InsightCTAMethod::CREATE_INDEX->value,
-];
-
-// Insight severities
-const ADVISOR_SEVERITIES = [
-    InsightSeverity::INFO->value,
-    InsightSeverity::WARNING->value,
-    InsightSeverity::CRITICAL->value,
-];
-
-// Insight statuses
-const ADVISOR_STATUSES = [
-    InsightStatus::ACTIVE->value,
-    InsightStatus::DISMISSED->value,
-];
-
-// Report types
-const ADVISOR_REPORT_TYPES = [
-    ReportType::LIGHTHOUSE->value,
-    ReportType::AUDIT->value,
-    ReportType::DATABASE_ANALYZER->value,
-];

 // Resource types for Tokens
 const TOKENS_RESOURCE_TYPE_FILES = 'files';
@@ -514,7 +457,3 @@ const CSV_ALLOWED_DATABASE_TYPES = [
    DATABASE_TYPE_TABLESDB,
    DATABASE_TYPE_VECTORSDB
 ];
-
-const VCS_DEPLOYMENT_SKIP_PATTERNS = [
-    '[skip ci]',
-];
@@ -475,17 +475,3 @@ Database::addFilter(
            ]));
    }
 );
-
-Database::addFilter(
-    'subQueryReportInsights',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database->getAuthorization()->skip(fn () => $database->find('insights', [
-            Query::equal('projectInternalId', [$document->getAttribute('projectInternalId')]),
-            Query::equal('reportInternalId', [$document->getSequence()]),
-            Query::limit(APP_LIMIT_SUBQUERY),
-        ]));
-    }
-);
@@ -36,13 +36,6 @@ Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function ($attribute) {
    return new Range($min, $max, Range::TYPE_INTEGER);
 }, Database::VAR_INTEGER);

-// BigInt uses a dedicated bigintRange format name to avoid clobbering `intRange`.
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_BIGINT_RANGE, function ($attribute) {
-    $min = $attribute['formatOptions']['min'] ?? -INF;
-    $max = $attribute['formatOptions']['max'] ?? INF;
-    return new Range($min, $max, Range::TYPE_INTEGER);
-}, Database::VAR_BIGINT);
-
 Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
    $min = $attribute['formatOptions']['min'] ?? -INF;
    $max = $attribute['formatOptions']['max'] ?? INF;
@@ -11,7 +11,6 @@ use Appwrite\Utopia\Response\Model\AlgoScryptModified;
 use Appwrite\Utopia\Response\Model\AlgoSha;
 use Appwrite\Utopia\Response\Model\Any;
 use Appwrite\Utopia\Response\Model\Attribute;
-use Appwrite\Utopia\Response\Model\AttributeBigInt;
 use Appwrite\Utopia\Response\Model\AttributeBoolean;
 use Appwrite\Utopia\Response\Model\AttributeDatetime;
 use Appwrite\Utopia\Response\Model\AttributeEmail;
@@ -38,7 +37,6 @@ use Appwrite\Utopia\Response\Model\Branch;
 use Appwrite\Utopia\Response\Model\Bucket;
 use Appwrite\Utopia\Response\Model\Collection;
 use Appwrite\Utopia\Response\Model\Column;
-use Appwrite\Utopia\Response\Model\ColumnBigInt;
 use Appwrite\Utopia\Response\Model\ColumnBoolean;
 use Appwrite\Utopia\Response\Model\ColumnDatetime;
 use Appwrite\Utopia\Response\Model\ColumnEmail;
@@ -92,8 +90,6 @@ use Appwrite\Utopia\Response\Model\HealthTime;
 use Appwrite\Utopia\Response\Model\HealthVersion;
 use Appwrite\Utopia\Response\Model\Identity;
 use Appwrite\Utopia\Response\Model\Index;
-use Appwrite\Utopia\Response\Model\Insight;
-use Appwrite\Utopia\Response\Model\InsightCTA;
 use Appwrite\Utopia\Response\Model\Installation;
 use Appwrite\Utopia\Response\Model\JWT;
 use Appwrite\Utopia\Response\Model\Key;
@@ -175,16 +171,12 @@ use Appwrite\Utopia\Response\Model\PolicySessionLimit;
 use Appwrite\Utopia\Response\Model\PolicyUserLimit;
 use Appwrite\Utopia\Response\Model\Preferences;
 use Appwrite\Utopia\Response\Model\Project;
-use Appwrite\Utopia\Response\Model\ProjectAuthMethod;
-use Appwrite\Utopia\Response\Model\ProjectProtocol;
-use Appwrite\Utopia\Response\Model\ProjectService;
 use Appwrite\Utopia\Response\Model\Provider;
 use Appwrite\Utopia\Response\Model\ProviderRepository;
 use Appwrite\Utopia\Response\Model\ProviderRepositoryFramework;
 use Appwrite\Utopia\Response\Model\ProviderRepositoryFrameworkList;
 use Appwrite\Utopia\Response\Model\ProviderRepositoryRuntime;
 use Appwrite\Utopia\Response\Model\ProviderRepositoryRuntimeList;
-use Appwrite\Utopia\Response\Model\Report;
 use Appwrite\Utopia\Response\Model\ResourceToken;
 use Appwrite\Utopia\Response\Model\Row;
 use Appwrite\Utopia\Response\Model\Rule;
@@ -294,8 +286,6 @@ Response::setModel(new BaseList('Specifications List', Response::MODEL_SPECIFICA
 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));
-Response::setModel(new BaseList('Insights List', Response::MODEL_INSIGHT_LIST, 'insights', Response::MODEL_INSIGHT));
-Response::setModel(new BaseList('Reports List', Response::MODEL_REPORT_LIST, 'reports', Response::MODEL_REPORT));

 // Entities
 Response::setModel(new Database());
@@ -307,7 +297,6 @@ Response::setModel(new Attribute());
 Response::setModel(new AttributeList());
 Response::setModel(new AttributeString());
 Response::setModel(new AttributeInteger());
-Response::setModel(new AttributeBigInt());
 Response::setModel(new AttributeFloat());
 Response::setModel(new AttributeBoolean());
 Response::setModel(new AttributeEmail());
@@ -341,7 +330,6 @@ Response::setModel(new Column());
 Response::setModel(new ColumnList());
 Response::setModel(new ColumnString());
 Response::setModel(new ColumnInteger());
-Response::setModel(new ColumnBigInt());
 Response::setModel(new ColumnFloat());
 Response::setModel(new ColumnBoolean());
 Response::setModel(new ColumnEmail());
@@ -405,9 +393,6 @@ Response::setModel(new FrameworkAdapter());
 Response::setModel(new Deployment());
 Response::setModel(new Execution());
 Response::setModel(new Project());
-Response::setModel(new ProjectAuthMethod());
-Response::setModel(new ProjectService());
-Response::setModel(new ProjectProtocol());
 Response::setModel(new Webhook());
 Response::setModel(new Key());
 Response::setModel(new EphemeralKey());
@@ -520,9 +505,6 @@ Response::setModel(new Target());
 Response::setModel(new Migration());
 Response::setModel(new MigrationReport());
 Response::setModel(new MigrationFirebaseProject());
-Response::setModel(new Insight());
-Response::setModel(new InsightCTA());
-Response::setModel(new Report());

 // Tests (keep last)
 Response::setModel(new Mock());
@@ -2,18 +2,12 @@

 use Appwrite\Event\Event;
 use Appwrite\Event\Publisher\Audit as AuditPublisher;
-use Appwrite\Event\Publisher\Build as BuildPublisher;
 use Appwrite\Event\Publisher\Certificate as CertificatePublisher;
-use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Event\Publisher\Execution as ExecutionPublisher;
-use Appwrite\Event\Publisher\Func as FunctionPublisher;
-use Appwrite\Event\Publisher\Mail as MailPublisher;
-use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
 use Appwrite\Event\Publisher\Migration as MigrationPublisher;
 use Appwrite\Event\Publisher\Screenshot as ScreenshotPublisher;
 use Appwrite\Event\Publisher\StatsResources as StatsResourcesPublisher;
 use Appwrite\Event\Publisher\Usage as UsagePublisher;
-use Appwrite\Platform\Modules\Storage\Config\StorageCacheControl;
 use Appwrite\Utopia\Database\Documents\User;
 use Executor\Executor;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
@@ -110,10 +104,6 @@ $container->set('publisherForExecutions', fn (Publisher $publisher) => new Execu
    $publisher,
    new Queue(System::getEnv('_APP_EXECUTIONS_QUEUE_NAME', Event::EXECUTIONS_QUEUE_NAME))
 ), ['publisher']);
-$container->set('publisherForFunctions', fn (Publisher $publisher) => new FunctionPublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL)
-), ['publisher']);
 $container->set('publisherForMigrations', fn (Publisher $publisher) => new MigrationPublisher(
    $publisher,
    new Queue(System::getEnv('_APP_MIGRATIONS_QUEUE_NAME', Event::MIGRATIONS_QUEUE_NAME))
@@ -122,22 +112,6 @@ $container->set('publisherForStatsResources', fn (Publisher $publisher) => new S
    $publisher,
    new Queue(System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME))
 ), ['publisher']);
-$container->set('publisherForBuilds', fn (Publisher $publisher) => new BuildPublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME))
-), ['publisher']);
-$container->set('publisherForDeletes', fn (Publisher $publisher) => new DeletePublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME))
-), ['publisher']);
-$container->set('publisherForMails', fn (Publisher $publisher) => new MailPublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME))
-), ['publisher']);
-$container->set('publisherForMessaging', fn (Publisher $publisher) => new MessagingPublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME))
-), ['publisher']);

 /**
 * Platform configuration
@@ -185,16 +159,10 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
        $adapter = new DatabasePool($pools->get('logs'));
        $database = new Database($adapter, $cache);

-        /** @var array $collections */
-        $collections = Config::getParam('collections', []);
-        $logsCollections = $collections['logs'] ?? [];
-        $logsCollections = array_keys($logsCollections);
-
        $database
            ->setDatabase(APP_DATABASE)
            ->setAuthorization($authorization)
            ->setSharedTables(true)
-            ->setGlobalCollections($logsCollections)
            ->setNamespace('logsV1')
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
@@ -224,10 +192,6 @@ $container->set('cache', function (Group $pools, Telemetry $telemetry) {
    return $cache;
 }, ['pools', 'telemetry']);

-$container->set('cacheControlForStorage', fn () => function (StorageCacheControl $config): string {
-    return \sprintf('private, max-age=%d', $config->maxAge);
-});
-
 $container->set('redis', function () {
    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
    $port = System::getEnv('_APP_REDIS_PORT', 6379);
@@ -4,16 +4,20 @@ use Ahc\Jwt\JWT;
 use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Key;
 use Appwrite\Databases\TransactionState;
+use Appwrite\Event\Build;
 use Appwrite\Event\Context\Audit as AuditContext;
 use Appwrite\Event\Database as EventDatabase;
+use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
-use Appwrite\Event\Message\Func as FunctionMessage;
-use Appwrite\Event\Publisher\Func as FunctionPublisher;
+use Appwrite\Event\Func;
+use Appwrite\Event\Mail;
+use Appwrite\Event\Messaging;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\Webhook;
 use Appwrite\Extend\Exception;
 use Appwrite\Functions\EventProcessor;
 use Appwrite\GraphQL\Schema;
+use Appwrite\Locking\Lock;
 use Appwrite\Network\Cors;
 use Appwrite\Network\Platform;
 use Appwrite\Network\Validator\Origin;
@@ -46,9 +50,9 @@ use Utopia\DSN\DSN;
 use Utopia\Http\Http;
 use Utopia\Locale\Locale;
 use Utopia\Logger\Log;
+use Utopia\Logger\Logger;
 use Utopia\Pools\Group;
 use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
 use Utopia\Storage\Device;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter as Telemetry;
@@ -60,18 +64,30 @@ use Utopia\Validator\WhiteList;
 * These resources depend (directly or transitively) on request/response
 * and must be fresh for each HTTP request.
 */
-return function (Container $context): void {
-    $context->set('utopia:graphql', fn ($utopia) => $utopia, ['utopia']);
+return function (Container $container): void {
+    $container->set('utopia:graphql', function ($utopia) {
+        return $utopia;
+    }, ['utopia']);

-    $context->set('log', fn () => new Log(), []);
+    $container->set('log', fn () => new Log(), []);

-    $context->set('logger', fn ($register) => $register->get('logger'), ['register']);
+    $container->set('logger', function ($register) {
+        return $register->get('logger');
+    }, ['register']);

-    $context->set('authorization', fn () => new Authorization(), []);
+    $container->set('lock', function (\Redis $redis, Telemetry $telemetry, Database $dbForPlatform, Authorization $authorization, Log $log, ?Logger $logger, Document $project): Lock {
+        return new Lock($redis, $telemetry, $dbForPlatform, $authorization, $log, $logger, $project);
+    }, ['redis', 'telemetry', 'dbForPlatform', 'authorization', 'log', 'logger', 'project']);

-    $context->set('store', fn (): Store => new Store(), []);
+    $container->set('authorization', function () {
+        return new Authorization();
+    }, []);

-    $context->set('proofForPassword', function (): Password {
+    $container->set('store', function (): Store {
+        return new Store();
+    }, []);
+
+    $container->set('proofForPassword', function (): Password {
        $hash = new Argon2();
        $hash
            ->setMemoryCost(7168)
@@ -85,21 +101,21 @@ return function (Container $context): void {
        return $password;
    });

-    $context->set('proofForToken', function (): Token {
+    $container->set('proofForToken', function (): Token {
        $token = new Token();
        $token->setHash(new Sha());

        return $token;
    });

-    $context->set('proofForCode', function (): Code {
+    $container->set('proofForCode', function (): Code {
        $code = new Code();
        $code->setHash(new Sha());

        return $code;
    });

-    $context->set('locale', function () {
+    $container->set('locale', function () {
        $locale = new Locale(System::getEnv('_APP_LOCALE', 'en'));
        $locale->setFallback(System::getEnv('_APP_LOCALE', 'en'));

@@ -107,18 +123,41 @@ return function (Container $context): void {
    });

    // Per-request queue resources (stateful, accumulate event data during request)
-    $context->set('queueForDatabase', fn (Publisher $publisher) => new EventDatabase($publisher), ['publisher']);
-    $context->set('queueForEvents', fn (Publisher $publisher) => new Event($publisher), ['publisher']);
-    $context->set('queueForWebhooks', fn (Publisher $publisher) => new Webhook($publisher), ['publisher']);
-    $context->set('queueForRealtime', fn () => new Realtime(), []);
-    $context->set('usage', fn () => new UsageContext(), []);
-    $context->set('auditContext', fn () => new AuditContext(), []);
-    $context->set('publisherForFunctions', fn (Publisher $publisher) => new FunctionPublisher(
-        $publisher,
-        new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL)
-    ), ['publisher']);
-    $context->set('eventProcessor', fn () => new EventProcessor(), []);
-    $context->set('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
+    $container->set('queueForMessaging', function (Publisher $publisher) {
+        return new Messaging($publisher);
+    }, ['publisher']);
+    $container->set('queueForMails', function (Publisher $publisher) {
+        return new Mail($publisher);
+    }, ['publisher']);
+    $container->set('queueForBuilds', function (Publisher $publisher) {
+        return new Build($publisher);
+    }, ['publisher']);
+    $container->set('queueForDatabase', function (Publisher $publisher) {
+        return new EventDatabase($publisher);
+    }, ['publisher']);
+    $container->set('queueForDeletes', function (Publisher $publisher) {
+        return new Delete($publisher);
+    }, ['publisher']);
+    $container->set('queueForEvents', function (Publisher $publisher) {
+        return new Event($publisher);
+    }, ['publisher']);
+    $container->set('queueForWebhooks', function (Publisher $publisher) {
+        return new Webhook($publisher);
+    }, ['publisher']);
+    $container->set('queueForRealtime', function () {
+        return new Realtime();
+    }, []);
+    $container->set('usage', function () {
+        return new UsageContext();
+    }, []);
+    $container->set('auditContext', fn () => new AuditContext(), []);
+    $container->set('queueForFunctions', function (Publisher $publisher) {
+        return new Func($publisher);
+    }, ['publisher']);
+    $container->set('eventProcessor', function () {
+        return new EventProcessor();
+    }, []);
+    $container->set('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
        $adapter = new DatabasePool($pools->get('console'));
        $database = new Database($adapter, $cache);

@@ -136,7 +175,7 @@ return function (Container $context): void {
        return $database;
    }, ['pools', 'cache', 'authorization']);

-    $context->set('getProjectDB', function (Group $pools, Database $dbForPlatform, Cache $cache, Authorization $authorization) {
+    $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform, Cache $cache, Authorization $authorization) {
        $adapters = [];

        return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$adapters) {
@@ -171,16 +210,9 @@ return function (Container $context): void {
            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

            if (\in_array($dsn->getHost(), $sharedTables)) {
-                /** @var array $collections */
-                $collections = Config::getParam('collections', []);
-                $projectCollections = $collections['projects'] ?? [];
-                $projectsGlobalCollections = array_keys($projectCollections);
-                $projectsGlobalCollections[] = 'audit';
-
                $database
                    ->setSharedTables(true)
                    ->setTenant($project->getSequence())
-                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
                $database
@@ -193,15 +225,10 @@ return function (Container $context): void {
        };
    }, ['pools', 'dbForPlatform', 'cache', 'authorization']);

-    $context->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+    $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
        $adapter = null;

        return function (?Document $project = null) use ($pools, $cache, $authorization, &$adapter) {
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $logsCollections = $collections['logs'] ?? [];
-            $logsCollections = array_keys($logsCollections);
-
            $adapter ??= new DatabasePool($pools->get('logs'));
            $database = new Database($adapter, $cache);

@@ -209,7 +236,6 @@ return function (Container $context): void {
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
                ->setSharedTables(true)
-                ->setGlobalCollections($logsCollections)
                ->setNamespace('logsV1')
                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
@@ -225,7 +251,7 @@ return function (Container $context): void {
    /**
     * List of allowed request hostnames for the request.
     */
-    $context->set('allowedHostnames', function (array $platform, Document $project, Document $rule, Document $devKey, Request $request) {
+    $container->set('allowedHostnames', function (array $platform, Document $project, Document $rule, Document $devKey, Request $request) {
        $allowed = [...($platform['hostnames'] ?? [])];

        /* Add platform configured hostnames */
@@ -269,7 +295,7 @@ return function (Container $context): void {
    /**
     * List of allowed request schemes for the request.
     */
-    $context->set('allowedSchemes', function (array $platform, Document $project) {
+    $container->set('allowedSchemes', function (array $platform, Document $project) {
        $allowed = [...($platform['schemas'] ?? [])];

        if (! $project->isEmpty() && $project->getId() !== 'console') {
@@ -289,7 +315,7 @@ return function (Container $context): void {
    /**
     * Whether the request origin is verified against the request hostname.
     */
-    $context->set('domainVerification', function (Request $request) {
+    $container->set('domainVerification', function (Request $request) {
        $origin = \parse_url($request->getOrigin($request->getReferer('')), PHP_URL_HOST);
        $selfDomain = new Domain($request->getHostname());
        $endDomain = new Domain((string) $origin);
@@ -301,7 +327,7 @@ return function (Container $context): void {
    /**
     * Cookie domain for the current request.
     */
-    $context->set('cookieDomain', function (Request $request, Document $project) {
+    $container->set('cookieDomain', function (Request $request, Document $project) {
        $localHosts = ['localhost', 'localhost:' . $request->getPort()];

        $migrationHost = System::getEnv('_APP_MIGRATION_HOST');
@@ -335,7 +361,7 @@ return function (Container $context): void {
    /**
     * Rule associated with a request origin.
     */
-    $context->set('rule', function (Request $request, Database $dbForPlatform, Document $project, Authorization $authorization) {
+    $container->set('rule', function (Request $request, Database $dbForPlatform, Document $project, Authorization $authorization) {
        $domain = \parse_url($request->getOrigin(), PHP_URL_HOST);

        if (empty($domain)) {
@@ -385,7 +411,7 @@ return function (Container $context): void {
    /**
     * CORS service
     */
-    $context->set('cors', function (array $allowedHostnames) {
+    $container->set('cors', function (array $allowedHostnames) {
        $corsConfig = Config::getParam('cors');

        return new Cors(
@@ -397,23 +423,23 @@ return function (Container $context): void {
        );
    }, ['allowedHostnames']);

-    $context->set(
-        'originValidator',
-        fn (Document $devKey, array $allowedHostnames, array $allowedSchemes) => $devKey->isEmpty()
-            ? new Origin($allowedHostnames, $allowedSchemes)
-            : new URL(),
-        ['devKey', 'allowedHostnames', 'allowedSchemes']
-    );
+    $container->set('originValidator', function (Document $devKey, array $allowedHostnames, array $allowedSchemes) {
+        if (! $devKey->isEmpty()) {
+            return new URL();
+        }

-    $context->set(
-        'redirectValidator',
-        fn (Document $devKey, array $allowedHostnames, array $allowedSchemes) => $devKey->isEmpty()
-            ? new Redirect($allowedHostnames, $allowedSchemes)
-            : new URL(),
-        ['devKey', 'allowedHostnames', 'allowedSchemes']
-    );
+        return new Origin($allowedHostnames, $allowedSchemes);
+    }, ['devKey', 'allowedHostnames', 'allowedSchemes']);

-    $context->set('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken, $authorization) {
+    $container->set('redirectValidator', function (Document $devKey, array $allowedHostnames, array $allowedSchemes) {
+        if (! $devKey->isEmpty()) {
+            return new URL();
+        }
+
+        return new Redirect($allowedHostnames, $allowedSchemes);
+    }, ['devKey', 'allowedHostnames', 'allowedSchemes']);
+
+    $container->set('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken, $authorization) {
        /**
         * Handles user authentication and session validation.
         *
@@ -584,7 +610,7 @@ return function (Container $context): void {
        return $user;
    }, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken', 'authorization']);

-    $context->set('project', function ($dbForPlatform, $request, $console, $authorization, Http $utopia) {
+    $container->set('project', function ($dbForPlatform, $request, $console, $authorization, Http $utopia) {
        /** @var Appwrite\Utopia\Request $request */
        /** @var Utopia\Database\Database $dbForPlatform */
        /** @var Utopia\Database\Document $console */
@@ -617,7 +643,7 @@ return function (Container $context): void {
        return $project;
    }, ['dbForPlatform', 'request', 'console', 'authorization', 'utopia']);

-    $context->set('session', function (User $user, Store $store, Token $proofForToken) {
+    $container->set('session', function (User $user, Store $store, Token $proofForToken) {
        if ($user->isEmpty()) {
            return;
        }
@@ -638,7 +664,7 @@ return function (Container $context): void {
        return;
    }, ['user', 'store', 'proofForToken']);

-    $context->set('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, FunctionPublisher $publisherForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, UsageContext $usage, Authorization $authorization, Request $request) {
+    $container->set('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, UsageContext $usage, Authorization $authorization, Request $request) {
        if ($project->isEmpty() || $project->getId() === 'console') {
            return $dbForPlatform;
        }
@@ -670,15 +696,8 @@ return function (Container $context): void {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
            $database
                ->setSharedTables(true)
-                ->setGlobalCollections($projectsGlobalCollections)
                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
@@ -694,7 +713,7 @@ return function (Container $context): void {
         * Accounts can be created in many ways beyond `createAccount`
         * (anonymous, OAuth, phone, etc.), and those flows are probably not covered in event tests; so we handle this here.
         */
-        $eventDatabaseListener = function (Document $project, Document $document, Response $response, Event $queueForEvents, FunctionPublisher $publisherForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
+        $eventDatabaseListener = function (Document $project, Document $document, Response $response, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
            // Only trigger events for user creation with the database listener.
            if ($document->getCollection() !== 'users') {
                return;
@@ -706,15 +725,9 @@ return function (Container $context): void {
                ->setPayload($response->output($document, Response::MODEL_USER));

            // Trigger functions, webhooks, and realtime events
-            $publisherForFunctions->enqueue(FunctionMessage::fromEvent(
-                event: $queueForEvents->getEvent(),
-                params: $queueForEvents->getParams(),
-                project: $queueForEvents->getProject(),
-                user: $queueForEvents->getUser(),
-                userId: $queueForEvents->getUserId(),
-                payload: $queueForEvents->getPayload(),
-                platform: $queueForEvents->getPlatform(),
-            ));
+            $queueForFunctions
+                ->from($queueForEvents)
+                ->trigger();

            /** Trigger webhooks events only if a project has them enabled */
            if (! empty($project->getAttribute('webhooks'))) {
@@ -894,6 +907,7 @@ return function (Container $context): void {
        // Clone the queues, to prevent events triggered by the database listener
        // from overwriting the events that are supposed to be triggered in the shutdown hook.
        $queueForEventsClone = new Event($publisher);
+        $queueForFunctions = new Func($publisherFunctions);
        $queueForWebhooks = new Webhook($publisherWebhooks);
        $queueForRealtime = new Realtime();

@@ -908,7 +922,7 @@ return function (Container $context): void {
                $document,
                $response,
                $queueForEventsClone->from($queueForEvents),
-                $publisherForFunctions,
+                $queueForFunctions->from($queueForEvents),
                $queueForWebhooks->from($queueForEvents),
                $queueForRealtime->from($queueForEvents)
            ))
@@ -917,9 +931,9 @@ return function (Container $context): void {
            ->on(Database::EVENT_DOCUMENT_DELETE, 'purge-function-events-cache', fn ($event, $document) => $functionsEventsCacheListener($event, $document, $project, $database));

        return $database;
-    }, ['pools', 'dbForPlatform', 'cache', 'project', 'response', 'publisher', 'publisherFunctions', 'publisherWebhooks', 'queueForEvents', 'publisherForFunctions', 'queueForWebhooks', 'queueForRealtime', 'usage', 'authorization', 'request']);
+    }, ['pools', 'dbForPlatform', 'cache', 'project', 'response', 'publisher', 'publisherFunctions', 'publisherWebhooks', 'queueForEvents', 'queueForFunctions', 'queueForWebhooks', 'queueForRealtime', 'usage', 'authorization', 'request']);

-    $context->set('schema', function ($utopia, $dbForProject, $authorization) {
+    $container->set('schema', function ($utopia, $dbForProject, $authorization) {

        $complexity = function (int $complexity, array $args) {
            $queries = Query::parseQueries($args['queries'] ?? []);
@@ -1006,9 +1020,13 @@ return function (Container $context): void {
        );
    }, ['utopia', 'dbForProject', 'authorization']);

-    $context->set('audit', fn ($dbForProject) => new Audit(new AdapterDatabase($dbForProject)), ['dbForProject']);
+    $container->set('audit', function ($dbForProject) {
+        $adapter = new AdapterDatabase($dbForProject);

-    $context->set('mode', function ($request, Document $project) {
+        return new Audit($adapter);
+    }, ['dbForProject']);
+
+    $container->set('mode', function ($request, Document $project) {
        /** @var Appwrite\Utopia\Request $request */

        /**
@@ -1026,7 +1044,7 @@ return function (Container $context): void {
        return $mode;
    }, ['request', 'project']);

-    $context->set('requestTimestamp', function ($request) {
+    $container->set('requestTimestamp', function ($request) {
        // TODO: Move this to the Request class itself
        $timestampHeader = $request->getHeader('x-appwrite-timestamp');
        $requestTimestamp = null;
@@ -1041,7 +1059,7 @@ return function (Container $context): void {
        return $requestTimestamp;
    }, ['request']);

-    $context->set('devKey', function (Request $request, Document $project, array $servers, Database $dbForPlatform, Authorization $authorization) {
+    $container->set('devKey', function (Request $request, Document $project, array $servers, Database $dbForPlatform, Authorization $authorization) {
        $devKey = $request->getHeader('x-appwrite-dev-key', $request->getParam('devKey', ''));

        // Check if given key match project's development keys
@@ -1090,7 +1108,7 @@ return function (Container $context): void {
        return $key;
    }, ['request', 'project', 'servers', 'dbForPlatform', 'authorization']);

-    $context->set('team', function (Document $project, Database $dbForPlatform, Http $utopia, Request $request, Authorization $authorization) {
+    $container->set('team', function (Document $project, Database $dbForPlatform, Http $utopia, Request $request, Authorization $authorization) {
        $teamInternalId = '';
        if ($project->getId() !== 'console') {
            $teamInternalId = $project->getAttribute('teamInternalId', '');
@@ -1133,7 +1151,7 @@ return function (Container $context): void {
        return $team;
    }, ['project', 'dbForPlatform', 'utopia', 'request', 'authorization']);

-    $context->set('previewHostname', function (Request $request, ?Key $apiKey) {
+    $container->set('previewHostname', function (Request $request, ?Key $apiKey) {
        $allowed = false;

        if (Http::isDevelopment()) {
@@ -1152,7 +1170,7 @@ return function (Container $context): void {
        return '';
    }, ['request', 'apiKey']);

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

        if (empty($key)) {
@@ -1186,7 +1204,7 @@ return function (Container $context): void {
        return $key;
    }, ['request', 'project', 'team', 'user']);

-    $context->set('resourceToken', function ($project, $dbForProject, $request, Authorization $authorization) {
+    $container->set('resourceToken', function ($project, $dbForProject, $request, Authorization $authorization) {
        $tokenJWT = $request->getParam('token');

        if (! empty($tokenJWT) && ! $project->isEmpty()) { // JWT authentication
@@ -1253,10 +1271,10 @@ return function (Container $context): void {
        return new Document([]);
    }, ['project', 'dbForProject', 'request', 'authorization']);

-    $context->set('getDatabasesDB', function (Group $pools, Cache $cache, Document $project, Request $request, UsageContext $usage, Authorization $authorization) {
+    $container->set('getDatabasesDB', function (Group $pools, Cache $cache, Document $project, Request $request, UsageContext $usage, Authorization $authorization) {

        return function (Document $database) use ($pools, $cache, $project, $request, $usage, $authorization): Database {
-            $databaseDSN = $database->getAttribute('database') ?: $project->getAttribute('database', '');
+            $databaseDSN = $database->getAttribute('database', $project->getAttribute('database', ''));
            $databaseType = $database->getAttribute('type', '');

            try {
@@ -1280,12 +1298,6 @@ return function (Container $context): void {
            $database = new Database($adapter, $cache);
            $sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));

-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
            $database
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
@@ -1308,7 +1320,6 @@ return function (Container $context): void {
                if (\in_array($databaseHost, $dbTypeSharedTables)) {
                    $database
                        ->setSharedTables(true)
-                        ->setGlobalCollections($projectsGlobalCollections)
                        ->setTenant($project->getSequence())
                        ->setNamespace($databaseDSN->getParam('namespace'));
                } else {
@@ -1320,7 +1331,6 @@ return function (Container $context): void {
            } elseif (\in_array($dsn->getHost(), $sharedTables)) {
                $database
                    ->setSharedTables(true)
-                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -1415,27 +1425,35 @@ return function (Container $context): void {

    }, ['pools', 'cache', 'project', 'request', 'usage', 'authorization']);

-    $context->set(
-        'transactionState',
-        fn (Database $dbForProject, Authorization $authorization, callable $getDatabasesDB) => new TransactionState($dbForProject, $authorization, $getDatabasesDB),
-        ['dbForProject', 'authorization', 'getDatabasesDB']
-    );
+    $container->set('transactionState', function (Database $dbForProject, Authorization $authorization, callable $getDatabasesDB) {
+        return new TransactionState($dbForProject, $authorization, $getDatabasesDB);
+    }, ['dbForProject', 'authorization', 'getDatabasesDB']);

-    $context->set(
-        'executionsRetentionCount',
-        fn (Document $project, array $plan) => ($project->getId() === 'console' || empty($plan))
-            ? 0
-            : (int) ($plan['executionsRetentionCount'] ?? 100),
-        ['project', 'plan']
-    );
+    $container->set('executionsRetentionCount', function (Document $project, array $plan) {
+        if ($project->getId() === 'console' || empty($plan)) {
+            return 0;
+        }

-    $context->set('deviceForFiles', fn ($project, Telemetry $telemetry) => new Device\Telemetry($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId())), ['project', 'telemetry']);
-    $context->set('deviceForSites', fn ($project, Telemetry $telemetry) => new Device\Telemetry($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId())), ['project', 'telemetry']);
-    $context->set('deviceForMigrations', fn ($project, Telemetry $telemetry) => new Device\Telemetry($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId())), ['project', 'telemetry']);
-    $context->set('deviceForFunctions', fn ($project, Telemetry $telemetry) => new Device\Telemetry($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId())), ['project', 'telemetry']);
-    $context->set('deviceForBuilds', fn ($project, Telemetry $telemetry) => new Device\Telemetry($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId())), ['project', 'telemetry']);
+        return (int) ($plan['executionsRetentionCount'] ?? 100);
+    }, ['project', 'plan']);

-    $context->set('embeddingAgent', function ($register) {
+    $container->set('deviceForFiles', function ($project, Telemetry $telemetry) {
+        return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
+    }, ['project', 'telemetry']);
+    $container->set('deviceForSites', function ($project, Telemetry $telemetry) {
+        return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
+    }, ['project', 'telemetry']);
+    $container->set('deviceForMigrations', function ($project, Telemetry $telemetry) {
+        return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
+    }, ['project', 'telemetry']);
+    $container->set('deviceForFunctions', function ($project, Telemetry $telemetry) {
+        return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
+    }, ['project', 'telemetry']);
+    $container->set('deviceForBuilds', function ($project, Telemetry $telemetry) {
+        return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
+    }, ['project', 'telemetry']);
+
+    $container->set('embeddingAgent', function ($register) {
        $adapter = new Ollama();
        $adapter->setEndpoint(System::getEnv('_APP_EMBEDDING_ENDPOINT', 'http://ollama:11434/api/embed'));
        $adapter->setTimeout((int) System::getEnv('_APP_EMBEDDING_TIMEOUT', '30000'));
@@ -3,30 +3,11 @@
 use Utopia\Span\Exporter;
 use Utopia\Span\Span;
 use Utopia\Span\Storage;
-use Utopia\System\System;

 Span::setStorage(new Storage\Coroutine());
-
-// Resolve trace filters once at boot to avoid repeated env lookups per span.
-$traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
-$traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
-$traceEnabled = $traceProjectId !== '' || $traceFunctionId !== '';
-
-Span::addExporter(new Exporter\Pretty(), function (Span $span) use ($traceEnabled, $traceProjectId, $traceFunctionId): bool {
+Span::addExporter(new Exporter\Pretty(), function (Span $span): bool {
    if (\str_starts_with($span->getAction(), 'listener.')) {
        return $span->getError() !== null;
    }
-
-    // Selective tracing: when _APP_TRACE_PROJECT_ID / _APP_TRACE_FUNCTION_ID are set,
-    // only export spans tagged with matching project.id / function.id.
-    if ($traceEnabled) {
-        if ($traceProjectId !== '' && $span->get('project.id') !== $traceProjectId) {
-            return false;
-        }
-        if ($traceFunctionId !== '' && $span->get('function.id') !== $traceFunctionId) {
-            return false;
-        }
-    }
-
    return true;
 });
@@ -1,8 +1,12 @@
 <?php

+use Appwrite\Event\Build;
 use Appwrite\Event\Database as EventDatabase;
+use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
-use Appwrite\Event\Publisher\Func as FunctionPublisher;
+use Appwrite\Event\Func;
+use Appwrite\Event\Mail;
+use Appwrite\Event\Messaging;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\Webhook;
 use Appwrite\Usage\Context;
@@ -10,7 +14,6 @@ use Appwrite\Utopia\Database\Documents\User;
 use Utopia\Audit\Adapter\Database as AdapterDatabase;
 use Utopia\Audit\Audit as UtopiaAudit;
 use Utopia\Cache\Cache;
-use Utopia\Config\Config;
 use Utopia\Console;
 use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
@@ -22,7 +25,6 @@ use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Pools\Group;
 use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
 use Utopia\Registry\Registry;
 use Utopia\Storage\Device\Telemetry as TelemetryDevice;
 use Utopia\System\System;
@@ -88,15 +90,8 @@ return function (Container $container): void {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
            $database
                ->setSharedTables(true)
-                ->setGlobalCollections($projectsGlobalCollections)
                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
@@ -135,15 +130,8 @@ return function (Container $container): void {
                $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

                if (\in_array($dsn->getHost(), $sharedTables)) {
-                    /** @var array $collections */
-                    $collections = Config::getParam('collections', []);
-                    $projectCollections = $collections['projects'] ?? [];
-                    $projectsGlobalCollections = array_keys($projectCollections);
-                    $projectsGlobalCollections[] = 'audit';
-
                    $database
                        ->setSharedTables(true)
-                        ->setGlobalCollections($projectsGlobalCollections)
                        ->setTenant($project->getSequence())
                        ->setNamespace($dsn->getParam('namespace'));
                } else {
@@ -164,15 +152,8 @@ return function (Container $container): void {
            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

            if (\in_array($dsn->getHost(), $sharedTables)) {
-                /** @var array $collections */
-                $collections = Config::getParam('collections', []);
-                $projectCollections = $collections['projects'] ?? [];
-                $projectsGlobalCollections = array_keys($projectCollections);
-                $projectsGlobalCollections[] = 'audit';
-
                $database
                    ->setSharedTables(true)
-                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -229,14 +210,6 @@ return function (Container $container): void {

            $sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));

-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
-            $database->setGlobalCollections($projectsGlobalCollections);
-
            // For separate pools (documentsdb/vectorsdb), check their own shared tables config.
            // If not configured, use dedicated mode to avoid cross-engine tenant type mismatches.
            if ($databaseHost !== $dsn->getHost()) {
@@ -249,7 +222,6 @@ return function (Container $container): void {
                if (\in_array($databaseHost, $dbTypeSharedTables)) {
                    $database
                        ->setSharedTables(true)
-                        ->setGlobalCollections($projectsGlobalCollections)
                        ->setTenant($projectDocument->getSequence())
                        ->setNamespace($databaseDSN->getParam('namespace'));
                } else {
@@ -261,7 +233,6 @@ return function (Container $container): void {
            } elseif (\in_array($dsn->getHost(), $sharedTables, true)) {
                $database
                    ->setSharedTables(true)
-                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($projectDocument->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -286,11 +257,6 @@ return function (Container $container): void {
                return $database;
            }

-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $logsCollections = $collections['logs'] ?? [];
-            $logsCollections = array_keys($logsCollections);
-
            $adapter = new DatabasePool($pools->get('logs'));
            $database = new Database($adapter, $cache);

@@ -298,7 +264,6 @@ return function (Container $container): void {
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
                ->setSharedTables(true)
-                ->setGlobalCollections($logsCollections)
                ->setNamespace('logsV1')
                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
@@ -331,6 +296,22 @@ return function (Container $container): void {
        return new EventDatabase($publisher);
    }, ['publisher']);

+    $container->set('queueForMessaging', function (Publisher $publisher) {
+        return new Messaging($publisher);
+    }, ['publisher']);
+
+    $container->set('queueForMails', function (Publisher $publisher) {
+        return new Mail($publisher);
+    }, ['publisher']);
+
+    $container->set('queueForBuilds', function (Publisher $publisher) {
+        return new Build($publisher);
+    }, ['publisher']);
+
+    $container->set('queueForDeletes', function (Publisher $publisher) {
+        return new Delete($publisher);
+    }, ['publisher']);
+
    $container->set('queueForEvents', function (Publisher $publisher) {
        return new Event($publisher);
    }, ['publisher']);
@@ -339,10 +320,10 @@ return function (Container $container): void {
        return new Webhook($publisher);
    }, ['publisher']);

-    $container->set('publisherForFunctions', fn (Publisher $publisher) => new FunctionPublisher(
-        $publisher,
-        new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL)
-    ), ['publisher']);
+    $container->set('queueForFunctions', function (Publisher $publisher) {
+        return new Func($publisher);
+    }, ['publisher']);
+
    $container->set('queueForRealtime', function () {
        return new Realtime();
    }, []);
@@ -130,14 +130,8 @@ if (!function_exists('getProjectDB')) {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
            $database
                ->setSharedTables(true)
-                ->setGlobalCollections($projectsGlobalCollections)
                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
@@ -728,8 +722,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
    $success = false;

    Span::init('realtime.open');
-    Span::add('realtime.connection.id', $connection);
-    Span::add('realtime.inbound_bytes', $rawSize);
+    Span::add('realtime.connectionId', $connection);
+    Span::add('realtime.inboundBytes', $rawSize);
    if (!empty($request->getOrigin())) {
        Span::add('realtime.origin', $request->getOrigin());
    }
@@ -936,16 +930,16 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
        Span::error($th);
    } finally {
        Span::add('realtime.success', $success);
-        Span::add('realtime.response_code', $responseCode);
-        Span::add('realtime.subscription_mode', $subscriptionMode);
-        Span::add('realtime.channel_count', $channelCount);
-        Span::add('realtime.subscription_count', $subscriptionCount);
-        Span::add('realtime.outbound_bytes', $outboundBytes);
+        Span::add('realtime.responseCode', $responseCode);
+        Span::add('realtime.subscriptionMode', $subscriptionMode);
+        Span::add('realtime.channelCount', $channelCount);
+        Span::add('realtime.subscriptionCount', $subscriptionCount);
+        Span::add('realtime.outboundBytes', $outboundBytes);
        if (!empty($project?->getId())) {
-            Span::add('project.id', $project->getId());
+            Span::add('realtime.projectId', $project->getId());
        }
        if (!empty($logUser?->getId())) {
-            Span::add('user.id', $logUser->getId());
+            Span::add('realtime.userId', $logUser->getId());
        }
        Span::current()?->finish();
    }
@@ -965,9 +959,9 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
    $success = false;

    Span::init('realtime.message');
-    Span::add('realtime.connection.id', $connection);
-    Span::add('realtime.inbound_bytes', $rawSize);
-    Span::add('realtime.container.id', $containerId);
+    Span::add('realtime.connectionId', $connection);
+    Span::add('realtime.inboundBytes', $rawSize);
+    Span::add('realtime.containerId', $containerId);

    try {
        $response = new Response(new SwooleResponse());
@@ -1352,15 +1346,15 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
        Span::error($th);
    } finally {
        Span::add('realtime.success', $success);
-        Span::add('realtime.response_code', $responseCode);
-        Span::add('realtime.subscription_delta', $subscriptionDelta);
-        Span::add('realtime.subscriptions_requested', $subscriptionsRequested);
-        Span::add('realtime.subscriptions_removed', $subscriptionsRemoved);
-        Span::add('realtime.subscribe.subscriptions_count', $subscriptionsRequested);
-        Span::add('realtime.outbound_bytes', $outboundBytes);
-        Span::add('project.id', $project?->getId() ?? $projectId);
-        Span::add('user.id', $realtime->connections[$connection]['userId'] ?? null);
-        Span::add('realtime.message_type', $messageType);
+        Span::add('realtime.responseCode', $responseCode);
+        Span::add('realtime.subscriptionDelta', $subscriptionDelta);
+        Span::add('realtime.subscriptionsRequested', $subscriptionsRequested);
+        Span::add('realtime.subscriptionsRemoved', $subscriptionsRemoved);
+        Span::add('realtime.subscribe.subscriptionsCount', $subscriptionsRequested);
+        Span::add('realtime.outboundBytes', $outboundBytes);
+        Span::add('realtime.projectId', $project?->getId() ?? $projectId);
+        Span::add('realtime.userId', $realtime->connections[$connection]['userId'] ?? null);
+        Span::add('realtime.messageType', $messageType);
        Span::current()?->finish();
    }
 });
@@ -1372,7 +1366,7 @@ $server->onClose(function (int $connection) use ($realtime, $stats, $register) {
    $success = false;

    Span::init('realtime.close');
-    Span::add('realtime.connection.id', $connection);
+    Span::add('realtime.connectionId', $connection);

    if (array_key_exists($connection, $realtime->connections)) {
        $projectId = $realtime->connections[$connection]['projectId'] ?? null;
@@ -1411,12 +1405,12 @@ $server->onClose(function (int $connection) use ($realtime, $stats, $register) {

        Span::add('realtime.success', $success);
        if (!empty($projectId)) {
-            Span::add('project.id', $projectId);
+            Span::add('realtime.projectId', $projectId);
        }
        if (!empty($userId)) {
-            Span::add('user.id', $userId);
+            Span::add('realtime.userId', $userId);
        }
-        Span::add('realtime.subscriptions_before_close', $subscriptionsBeforeClose);
+        Span::add('realtime.subscriptionsBeforeClose', $subscriptionsBeforeClose);
        Span::current()?->finish();
    }

@@ -881,13 +881,6 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
      - _APP_ENV
      - _APP_WORKER_PER_CORE
      - _APP_OPENSSL_KEY_V1
-      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_DOMAIN
-      - _APP_CONSOLE_DOMAIN
-      - _APP_DOMAIN_FUNCTIONS
-      - _APP_DOMAIN_SITES
-      - _APP_MIGRATION_HOST
-      - _APP_CONSOLE_SCHEMA
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
      - _APP_REDIS_USER
@@ -916,13 +909,6 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
      - _APP_ENV
      - _APP_WORKER_PER_CORE
      - _APP_OPENSSL_KEY_V1
-      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_DOMAIN
-      - _APP_CONSOLE_DOMAIN
-      - _APP_DOMAIN_FUNCTIONS
-      - _APP_DOMAIN_SITES
-      - _APP_MIGRATION_HOST
-      - _APP_CONSOLE_SCHEMA
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
      - _APP_REDIS_USER
@@ -16,7 +16,6 @@ use Utopia\Pools\Group;
 use Utopia\Queue\Adapter\Swoole;
 use Utopia\Queue\Broker\Pool as BrokerPool;
 use Utopia\Queue\Server;
-use Utopia\Span\Span;
 use Utopia\System\System;

 Runtime::enableCoroutine();
@@ -92,13 +91,8 @@ $adapter = new Swoole(
 $worker = new Server($adapter, $container);

 try {
-    $worker->init()->action(function () use ($worker, $registerWorkerMessageResources, $queueName) {
+    $worker->init()->action(function () use ($worker, $registerWorkerMessageResources) {
        $registerWorkerMessageResources($worker->getContainer());
-        Span::init("worker.{$queueName}");
-    });
-
-    $worker->shutdown()->action(function () {
-        Span::current()?->finish();
    });

    $container->set('bus', function ($register) use ($worker) {
@@ -126,8 +120,6 @@ $worker
    ->action(function (Throwable $error, ?Logger $logger, Log $log, Document $project, Authorization $authorization) use ($queueName) {
        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');

-        Span::error($error);
-
        if ($logger) {
            $log->setNamespace('appwrite-worker');
            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
@@ -49,43 +49,43 @@
        "ext-openssl": "*",
        "ext-zlib": "*",
        "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.20.*",
+        "appwrite/php-runtimes": "0.19.*",
        "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "1.3.*",
+        "utopia-php/abuse": "1.2.*",
        "utopia-php/agents": "1.2.*",
        "utopia-php/analytics": "0.15.*",
-        "utopia-php/audit": "2.3.*",
+        "utopia-php/audit": "2.2.*",
        "utopia-php/auth": "0.5.*",
-        "utopia-php/cache": "^2.1",
+        "utopia-php/cache": "1.0.*",
        "utopia-php/cli": "0.23.*",
        "utopia-php/compression": "0.1.*",
        "utopia-php/config": "1.*",
        "utopia-php/console": "0.1.*",
        "utopia-php/database": "5.*",
        "utopia-php/detector": "0.2.*",
-        "utopia-php/domains": "2.*",
-        "utopia-php/emails": "0.7.*",
-        "utopia-php/dns": "1.7.*",
+        "utopia-php/domains": "1.*",
+        "utopia-php/emails": "0.6.*",
+        "utopia-php/dns": "1.6.*",
        "utopia-php/dsn": "0.2.1",
-        "utopia-php/http": "^2.0@RC",
-        "utopia-php/fetch": "^1.1",
+        "utopia-php/http": "0.34.*",
+        "utopia-php/fetch": "0.5.*",
        "utopia-php/validators": "0.2.*",
        "utopia-php/image": "0.8.*",
        "utopia-php/locale": "0.8.*",
-        "utopia-php/logger": "0.8.*",
+        "utopia-php/logger": "0.6.*",
        "utopia-php/messaging": "0.22.*",
-        "utopia-php/migration": "1.*",
-        "utopia-php/platform": "^1.0@RC",
+        "utopia-php/migration": "1.9.*",
+        "utopia-php/platform": "0.13.*",
        "utopia-php/pools": "1.*",
        "utopia-php/span": "1.1.*",
        "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.18.*",
-        "utopia-php/servers": "0.4.*",
+        "utopia-php/queue": "0.17.*",
+        "utopia-php/servers": "0.3.*",
        "utopia-php/registry": "0.5.*",
        "utopia-php/storage": "2.*",
        "utopia-php/system": "0.10.*",
        "utopia-php/telemetry": "0.2.*",
-        "utopia-php/vcs": "4.*",
+        "utopia-php/vcs": "3.*",
        "utopia-php/websocket": "1.0.*",
        "matomo/device-detector": "6.4.*",
        "dragonmantank/cron-expression": "3.4.*",
@@ -93,10 +93,17 @@
        "chillerlan/php-qrcode": "4.3.*",
        "adhocore/jwt": "1.1.*",
        "spomky-labs/otphp": "11.*",
-        "webonyx/graphql-php": "15.32.*",
+        "webonyx/graphql-php": "15.31.*",
        "league/csv": "9.14.*",
-        "enshrined/svg-sanitize": "0.22.*"
+        "enshrined/svg-sanitize": "0.22.*",
+        "utopia-php/lock": "0.2.*"
    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/utopia-php/lock"
+        }
+    ],
    "require-dev": {
        "ext-fileinfo": "*",
        "appwrite/sdk-generator": "*",
@@ -212,6 +212,7 @@ services:
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_CONFIG
+      - _APP_LOCKING_ENABLED
      - _APP_MAINTENANCE_INTERVAL
      - _APP_MAINTENANCE_RETENTION_EXECUTION
      - _APP_MAINTENANCE_RETENTION_CACHE
@@ -255,7 +256,7 @@ services:
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: appwrite/console:8
+    image: appwrite/console:7.8.45
    restart: unless-stopped
    networks:
      - appwrite
@@ -1114,13 +1115,6 @@ services:
      - _APP_WORKER_PER_CORE
      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
-      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_DOMAIN
-      - _APP_CONSOLE_DOMAIN
-      - _APP_DOMAIN_FUNCTIONS
-      - _APP_DOMAIN_SITES
-      - _APP_MIGRATION_HOST
-      - _APP_CONSOLE_SCHEMA
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
      - _APP_REDIS_USER
@@ -1152,13 +1146,6 @@ services:
      - _APP_WORKER_PER_CORE
      - _APP_POOL_ADAPTER
      - _APP_OPENSSL_KEY_V1
-      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_DOMAIN
-      - _APP_CONSOLE_DOMAIN
-      - _APP_DOMAIN_FUNCTIONS
-      - _APP_DOMAIN_SITES
-      - _APP_MIGRATION_HOST
-      - _APP_CONSOLE_SCHEMA
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
      - _APP_REDIS_USER
@@ -1492,4 +1479,4 @@ volumes:
  appwrite-sites:
  appwrite-builds:
  appwrite-config:
-  appwrite-models:
+  appwrite-models:
@@ -1 +0,0 @@
-Delete an analyzer report by its unique ID. Nested insights and CTA metadata are removed asynchronously by the deletes worker.
@@ -1 +0,0 @@
-Get an insight by its unique ID, scoped to its parent report.
@@ -1 +0,0 @@
-Get an analyzer report by its unique ID. The response includes the report's metadata and the nested insights it produced.
@@ -1 +0,0 @@
-List the insights produced under a single analyzer report. You can use the query params to filter your results further.
@@ -1 +0,0 @@
-Get a list of all the project's analyzer reports. You can use the query params to filter your results.
@@ -1 +0,0 @@
-Create a bigint attribute. Optionally, minimum and maximum values can be provided.
@@ -1 +0,0 @@
-Update a bigint attribute. Changing the `default` value will not update already existing documents.
@@ -1 +0,0 @@
-Create a bigint column. Optionally, minimum and maximum values can be provided.
@@ -1 +0,0 @@
-Update a bigint column. Changing the `default` value will not update already existing rows.
@@ -1 +1 @@
-Get a list of branches from a GitHub repository in your installation. This endpoint supports filtering by a search term and pagination using query strings such as `Query.limit()`, `Query.offset()`, `Query.cursorAfter()`, and `Query.cursorBefore()`. It returns branch names along with the total number of matches. The GitHub installation must be properly configured and have access to the requested repository for this endpoint to work.
+Get a list of all branches from a GitHub repository in your installation. This endpoint returns the names of all branches in the repository and their total count. The GitHub installation must be properly configured and have access to the requested repository for this endpoint to work.
@@ -1,3 +0,0 @@
-The Advisor service provides read access to analyzer reports and their nested insights for a project.
-
-Use the reports endpoints to list and fetch analyzer runs, then use the insights endpoints to inspect individual findings attached to a report.
@@ -38,7 +38,6 @@
            <directory>./tests/e2e/Services/Messaging</directory>
            <directory>./tests/e2e/Services/Migrations</directory>
            <directory>./tests/e2e/Services/Project</directory>
-            <directory>./tests/e2e/Services/Advisor</directory>
            <file>./tests/e2e/Services/Functions/FunctionsBase.php</file>
            <file>./tests/e2e/Services/Functions/FunctionsCustomServerTest.php</file>
            <file>./tests/e2e/Services/Functions/FunctionsCustomClientTest.php</file>
@@ -1,83 +0,0 @@
-<?php
-
-namespace Appwrite\Advisor\Validator;
-
-use Utopia\Validator;
-
-class CTAs extends Validator
-{
-    public const MAX_COUNT_DEFAULT = 16;
-
-    protected string $message = 'Value must be an array of CTA descriptors. Each entry must define `label`, `service`, `method`, and an optional `params` object.';
-    protected array $allowedServices;
-    protected array $allowedMethods;
-
-    public function __construct(
-        protected int $maxCount = self::MAX_COUNT_DEFAULT,
-        ?array $allowedServices = null,
-        ?array $allowedMethods = null,
-    ) {
-        $this->allowedServices = $allowedServices ?? ADVISOR_CTA_SERVICES;
-        $this->allowedMethods = $allowedMethods ?? ADVISOR_CTA_METHODS;
-    }
-
-    public function getDescription(): string
-    {
-        return $this->message;
-    }
-
-    public function isArray(): bool
-    {
-        return true;
-    }
-
-    public function getType(): string
-    {
-        return self::TYPE_ARRAY;
-    }
-
-    public function isValid($value): bool
-    {
-        if (!\is_array($value)) {
-            return false;
-        }
-
-        if (\count($value) > $this->maxCount) {
-            $this->message = "A maximum of {$this->maxCount} CTAs are allowed per insight.";
-            return false;
-        }
-
-        foreach ($value as $entry) {
-            if (!\is_array($entry)) {
-                return false;
-            }
-
-            $maxLengths = ['label' => 256, 'service' => 64, 'method' => 64];
-            foreach ($maxLengths as $required => $maxLength) {
-                if (!isset($entry[$required]) || !\is_string($entry[$required]) || $entry[$required] === '') {
-                    return false;
-                }
-                if (\strlen($entry[$required]) > $maxLength) {
-                    $this->message = "CTA `{$required}` must not exceed {$maxLength} characters.";
-                    return false;
-                }
-            }
-
-            if (!empty($this->allowedServices) && !\in_array($entry['service'], $this->allowedServices, true)) {
-                $this->message = "CTA `service` must be one of: " . \implode(', ', $this->allowedServices) . '.';
-                return false;
-            }
-
-            if (!empty($this->allowedMethods) && !\in_array($entry['method'], $this->allowedMethods, true)) {
-                $this->message = "CTA `method` must be one of: " . \implode(', ', $this->allowedMethods) . '.';
-                return false;
-            }
-
-            if (isset($entry['params']) && !\is_array($entry['params']) && !\is_object($entry['params'])) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
@@ -37,13 +37,6 @@ class Authentik extends OAuth2
        return 'authentik';
    }

-    public function verifyCredentials(): void
-    {
-        if (empty($this->getAuthentikDomain())) {
-            throw new \Exception('Authentik endpoint is required.');
-        }
-    }
-
    /**
     * @return string
     */
@@ -37,13 +37,6 @@ class FusionAuth extends OAuth2
        return 'fusionauth';
    }

-    public function verifyCredentials(): void
-    {
-        if (empty($this->getFusionAuthDomain())) {
-            throw new \Exception('FusionAuth endpoint is required.');
-        }
-    }
-
    /**
     * @return string
     */
@@ -55,7 +55,7 @@ class Google extends OAuth2
            'state' => \json_encode($this->state),
            'response_type' => 'code',
            'access_type' => 'offline',
-            'prompt' => $this->getPrompt()
+            'prompt' => 'consent'
        ]);
    }

@@ -72,7 +72,7 @@ class Google extends OAuth2
                'https://oauth2.googleapis.com/token?' . \http_build_query([
                    'code' => $code,
                    'client_id' => $this->appID,
-                    'client_secret' => $this->getClientSecret(),
+                    'client_secret' => $this->appSecret,
                    'redirect_uri' => $this->callback,
                    'scope' => null,
                    'grant_type' => 'authorization_code'
@@ -95,7 +95,7 @@ class Google extends OAuth2
            'https://oauth2.googleapis.com/token?' . \http_build_query([
                'refresh_token' => $refreshToken,
                'client_id' => $this->appID,
-                'client_secret' => $this->getClientSecret(),
+                'client_secret' => $this->appSecret,
                'grant_type' => 'refresh_token'
            ])
        ), true);
@@ -177,54 +177,4 @@ class Google extends OAuth2

        return $this->user;
    }
-
-    /**
-     * Extracts the Client Secret from the JSON stored in appSecret
-     *
-     * @return string
-     */
-    protected function getClientSecret(): string
-    {
-        $secret = $this->getAppSecret();
-
-        return $secret['clientSecret'] ?? $this->appSecret;
-    }
-
-    /**
-     * Extracts the prompt values from the JSON stored in appSecret
-     *
-     * @return string
-     */
-    protected function getPrompt(): string
-    {
-        $secret = $this->getAppSecret();
-        $prompt = $secret['prompt'] ?? [];
-
-        if (empty($prompt)) {
-            $prompt = ['consent'];
-        }
-
-        return \implode(' ', $prompt);
-    }
-
-    /**
-     * Decode the JSON stored in appSecret.
-     * Falls back to treating the raw string as the client secret for backwards compatibility.
-     *
-     * @return array
-     */
-    protected function getAppSecret(): array
-    {
-        try {
-            $secret = \json_decode($this->appSecret, true, 512, JSON_THROW_ON_ERROR);
-        } catch (\Throwable $th) {
-            return ['clientSecret' => $this->appSecret];
-        }
-
-        if (!\is_array($secret)) {
-            return ['clientSecret' => $this->appSecret];
-        }
-
-        return $secret;
-    }
 }
@@ -37,17 +37,6 @@ class Keycloak extends OAuth2
        return 'keycloak';
    }

-    public function verifyCredentials(): void
-    {
-        if (empty($this->getKeycloakDomain())) {
-            throw new \Exception('Keycloak endpoint is required.');
-        }
-
-        if (empty($this->getKeycloakRealm())) {
-            throw new \Exception('Keycloak realm name is required.');
-        }
-    }
-
    /**
     * @return string
     */
@@ -36,13 +36,6 @@ class Microsoft extends OAuth2
        return 'microsoft';
    }

-    public function verifyCredentials(): void
-    {
-        if (empty($this->getTenantID())) {
-            throw new \Exception('Microsoft tenant is required.');
-        }
-    }
-
    /**
     * @return string
     */
@@ -208,7 +201,7 @@ class Microsoft extends OAuth2
    }

    /**
-     * Extracts the Tenant Id from the JSON stored in appSecret.
+     * Extracts the Tenant Id from the JSON stored in appSecret. Defaults to 'common' as a fallback
     *
     * @return string
     */
@@ -216,6 +209,6 @@ class Microsoft extends OAuth2
    {
        $secret = $this->getAppSecret();

-        return $secret['tenantID'] ?? '';
+        return $secret['tenantID'] ?? 'common';
    }
 }
@@ -8,6 +8,7 @@ use Appwrite\Event\Publisher\Execution as ExecutionPublisher;
 use Utopia\Bus\Listener;
 use Utopia\Database\Document;
 use Utopia\Span\Span;
+use Utopia\System\System;

 class Log extends Listener
 {
@@ -33,13 +34,20 @@ class Log extends Listener
    {
        $project = new Document($event->project);
        $execution = new Document($event->execution);
-
        if ($execution->getAttribute('resourceType', '') === 'functions') {
-            Span::add('project.id', $project->getId());
-            Span::add('function.id', $execution->getAttribute('resourceId', ''));
-            Span::add('execution.id', $execution->getId());
-            Span::add('deployment.id', $execution->getAttribute('deploymentId', ''));
-            Span::add('execution.status', $execution->getAttribute('status', ''));
+            $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
+            $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
+            $resourceId = $execution->getAttribute('resourceId', '');
+            if ($traceProjectId !== '' && $traceFunctionId !== '' && $project->getId() === $traceProjectId && $resourceId === $traceFunctionId) {
+                Span::init('execution.trace.v1_executions_enqueue');
+                Span::add('datetime', gmdate('c'));
+                Span::add('projectId', $project->getId());
+                Span::add('functionId', $resourceId);
+                Span::add('executionId', $execution->getId());
+                Span::add('deploymentId', $execution->getAttribute('deploymentId', ''));
+                Span::add('status', $execution->getAttribute('status', ''));
+                Span::current()?->finish();
+            }
        }

        $publisherForExecutions->enqueue(new ExecutionMessage(
@@ -4,14 +4,14 @@ namespace Appwrite\Bus\Listeners;

 use Appwrite\Auth\MFA\Type;
 use Appwrite\Bus\Events\SessionCreated;
-use Appwrite\Event\Message\Mail as MailMessage;
-use Appwrite\Event\Publisher\Mail as MailPublisher;
+use Appwrite\Event\Mail;
 use Appwrite\Template\Template;
 use Utopia\Bus\Listener;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Locale\Locale;
+use Utopia\Queue\Publisher;
 use Utopia\Storage\Validator\FileName;
 use Utopia\System\System;

@@ -31,14 +31,14 @@ class Mails extends Listener
    {
        $this
            ->desc('Sends session alert emails')
-            ->inject('publisherForMails')
+            ->inject('publisher')
            ->inject('locale')
            ->inject('platform')
            ->inject('dbForProject')
            ->callback($this->handle(...));
    }

-    public function handle(SessionCreated $event, MailPublisher $publisherForMails, Locale $locale, array $platform, Database $dbForProject): void
+    public function handle(SessionCreated $event, Publisher $publisher, Locale $locale, array $platform, Database $dbForProject): void
    {
        $project = new Document($event->project);

@@ -124,32 +124,34 @@ class Mails extends Listener
            ];
        }

-        $smtpConfig = [];
+        $queueForMails = new Mail($publisher);
+
        if ($smtp['enabled'] ?? false) {
-            $smtpConfig = [
-                'host' => $smtp['host'] ?? '',
-                'port' => $smtp['port'] ?? '',
-                'username' => $smtp['username'] ?? '',
-                'password' => $smtp['password'] ?? '',
-                'secure' => $smtp['secure'] ?? '',
-                'replyToEmail' => $customTemplate['replyToEmail'] ?? $customTemplate['replyTo'] ?? $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '', // Includes backwards compatibility
-                'replyToName' => $customTemplate['replyToName'] ?? $smtp['replyToName'] ?? '',
-                'senderEmail' => $customTemplate['senderEmail'] ?? $smtp['senderEmail'] ?? System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
-                'senderName' => $customTemplate['senderName'] ?? $smtp['senderName'] ?? System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'),
-            ];
+            $queueForMails
+                ->setSmtpHost($smtp['host'] ?? '')
+                ->setSmtpPort($smtp['port'] ?? '')
+                ->setSmtpUsername($smtp['username'] ?? '')
+                ->setSmtpPassword($smtp['password'] ?? '')
+                ->setSmtpSecure($smtp['secure'] ?? '')
+                ->setSmtpReplyToEmail($customTemplate['replyToEmail'] ?? $customTemplate['replyTo'] ?? $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '') // Includes backwards compatibility
+                ->setSmtpReplyToName($customTemplate['replyToName'] ?? $smtp['replyToName'] ?? '')
+                ->setSmtpSenderEmail($customTemplate['senderEmail'] ?? $smtp['senderEmail'] ?? System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM))
+                ->setSmtpSenderName($customTemplate['senderName'] ?? $smtp['senderName'] ?? System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
        }

-        $publisherForMails->enqueue(new MailMessage(
-            project: $project,
-            recipient: $event->user['email'],
-            subject: $subject,
-            bodyTemplate: __DIR__ . '/../../../../app/config/locale/templates/' . $smtpBaseTemplate . '.tpl',
-            body: $body,
-            preview: $preview,
-            smtp: $smtpConfig,
-            variables: $emailVariables,
-            customMailOptions: $isBranded ? ['senderName' => $platform['emailSenderName']] : [],
-            platform: $platform,
-        ));
+        $queueForMails
+            ->setProject($project)
+            ->setSubject($subject)
+            ->setPreview($preview)
+            ->setBody($body)
+            ->setBodyTemplate(__DIR__ . '/../../../../app/config/locale/templates/' . $smtpBaseTemplate . '.tpl')
+            ->appendVariables($emailVariables)
+            ->setRecipient($event->user['email']);
+
+        if ($isBranded) {
+            $queueForMails->setSenderName($platform['emailSenderName']);
+        }
+
+        $queueForMails->trigger();
    }
 }
@@ -0,0 +1,146 @@
+<?php
+
+namespace Appwrite\Event;
+
+use Utopia\Config\Config;
+use Utopia\Database\Document;
+use Utopia\Queue\Publisher;
+use Utopia\System\System;
+
+class Build extends Event
+{
+    protected string $type = '';
+    protected ?Document $resource = null;
+    protected ?Document $deployment = null;
+    protected ?Document $template = null;
+
+    public function __construct(protected Publisher $publisher)
+    {
+        parent::__construct($publisher);
+
+        $this
+            ->setQueue(System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME))
+            ->setClass(System::getEnv('_APP_BUILDS_CLASS_NAME', Event::BUILDS_CLASS_NAME));
+    }
+
+    /**
+     * Sets template for the build event.
+     *
+     * @param Document $template
+     * @return self
+     */
+    public function setTemplate(Document $template): self
+    {
+        $this->template = $template;
+
+        return $this;
+    }
+
+    /**
+     * Sets resource document for the build event.
+     *
+     * @param Document $resource
+     * @return self
+     */
+    public function setResource(Document $resource): self
+    {
+        $this->resource = $resource;
+
+        return $this;
+    }
+
+    /**
+     * Returns set resource document for the build event.
+     *
+     * @return null|Document
+     */
+    public function getResource(): ?Document
+    {
+        return $this->resource;
+    }
+
+    /**
+     * Sets deployment for the build event.
+     *
+     * @param Document $deployment
+     * @return self
+     */
+    public function setDeployment(Document $deployment): self
+    {
+        $this->deployment = $deployment;
+
+        return $this;
+    }
+
+    /**
+     * Returns set deployment for the build event.
+     *
+     * @return null|Document
+     */
+    public function getDeployment(): ?Document
+    {
+        return $this->deployment;
+    }
+
+    /**
+     * Sets type for the build event.
+     *
+     * @param string $type Can be `BUILD_TYPE_DEPLOYMENT` or `BUILD_TYPE_RETRY`.
+     * @return self
+     */
+    public function setType(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Returns set type for the function event.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Prepare payload for queue.
+     *
+     * @return array
+     */
+    protected function preparePayload(): array
+    {
+        $platform = $this->platform;
+        if (empty($platform)) {
+            $platform = Config::getParam('platform', []);
+        }
+
+        return [
+            'project' => $this->project,
+            'resource' => $this->resource,
+            'deployment' => $this->deployment,
+            'type' => $this->type,
+            'template' => $this->template,
+            'platform' => $platform,
+        ];
+    }
+
+    /**
+     * Resets event.
+     *
+     * @return self
+     */
+    public function reset(): self
+    {
+        $this->type = '';
+        $this->resource = null;
+        $this->deployment = null;
+        $this->template = null;
+        $this->platform = [];
+        parent::reset();
+
+        return $this;
+    }
+}
@@ -0,0 +1,576 @@
+<?php
+
+namespace Appwrite\Event;
+
+use Utopia\Config\Config;
+use Utopia\Queue\Publisher;
+use Utopia\System\System;
+
+class Mail extends Event
+{
+    protected string $recipient = '';
+    protected string $name = '';
+    protected string $subject = '';
+    protected string $body = '';
+    protected string $preview = '';
+    protected array $smtp = [];
+    protected array $variables = [];
+    protected string $bodyTemplate = '';
+    protected array $attachment = [];
+
+    protected array $customMailOptions = [];
+
+    public function __construct(protected Publisher $publisher)
+    {
+        parent::__construct($publisher);
+
+        $this
+            ->setQueue(System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME))
+            ->setClass(System::getEnv('_APP_MAILS_CLASS_NAME', Event::MAILS_CLASS_NAME));
+    }
+
+    /**
+     * Sets subject for the mail event.
+     *
+     * @param string $subject
+     * @return self
+     */
+    public function setSubject(string $subject): self
+    {
+        $this->subject = $subject;
+
+        return $this;
+    }
+
+    /**
+     * Returns subject for the mail event.
+     *
+     * @return string
+     */
+    public function getSubject(): string
+    {
+        return $this->subject;
+    }
+
+    /**
+     * Sets recipient for the mail event.
+     *
+     * @param string $recipient
+     * @return self
+     */
+    public function setRecipient(string $recipient): self
+    {
+        $this->recipient = $recipient;
+
+        return $this;
+    }
+
+    /**
+     * Returns set recipient for mail event.
+     *
+     * @return string
+     */
+    public function getRecipient(): string
+    {
+        return $this->recipient;
+    }
+
+    /**
+     * Sets body for the mail event.
+     *
+     * @param string $body
+     * @return self
+     */
+    public function setBody(string $body): self
+    {
+        $this->body = $body;
+
+        return $this;
+    }
+
+    /**
+     * Returns body for the mail event.
+     *
+     * @return string
+     */
+    public function getBody(): string
+    {
+        return $this->body;
+    }
+
+    /**
+     * Sets preview for the mail event.
+     *
+     * @return self
+     */
+    public function setPreview(string $preview): self
+    {
+        $this->preview = $preview;
+
+        return $this;
+    }
+
+    /**
+     * Returns preview for the mail event.
+     *
+     * @return string
+     */
+    public function getPreview(): string
+    {
+        return $this->preview;
+    }
+
+    /**
+     * Sets name for the mail event.
+     *
+     * @param string $name
+     * @return self
+     */
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Returns set name for the mail event.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Sets bodyTemplate for the mail event.
+     *
+     * @param string $bodyTemplate
+     * @return self
+     */
+    public function setBodyTemplate(string $bodyTemplate): self
+    {
+        $this->bodyTemplate = $bodyTemplate;
+
+        return $this;
+    }
+
+    /**
+     * Returns subject for the mail event.
+     *
+     * @return string
+     */
+    public function getBodyTemplate(): string
+    {
+        return $this->bodyTemplate;
+    }
+
+    /**
+     * Set SMTP Host
+     *
+     * @param string $host
+     * @return self
+     */
+    public function setSmtpHost(string $host): self
+    {
+        $this->smtp['host'] = $host;
+        return $this;
+    }
+
+    /**
+     * Set SMTP port
+     *
+     * @param int $port
+     * @return self
+     */
+    public function setSmtpPort(int $port): self
+    {
+        $this->smtp['port'] = $port;
+        return $this;
+    }
+
+    /**
+     * Set SMTP username
+     *
+     * @param string $username
+     * @return self
+     */
+    public function setSmtpUsername(string $username): self
+    {
+        $this->smtp['username'] = $username;
+        return $this;
+    }
+
+    /**
+     * Set SMTP password
+     *
+     * @param string $password
+     * @return self
+     */
+    public function setSmtpPassword(string $password): self
+    {
+        $this->smtp['password'] = $password;
+        return $this;
+    }
+
+    /**
+     * Set SMTP secure
+     *
+     * @param string $secure
+     * @return self
+     */
+    public function setSmtpSecure(string $secure): self
+    {
+        $this->smtp['secure'] = $secure;
+        return $this;
+    }
+
+    /**
+     * Set SMTP sender email
+     *
+     * @param string $senderEmail
+     * @return self
+     */
+    public function setSmtpSenderEmail(string $senderEmail): self
+    {
+        $this->smtp['senderEmail'] = $senderEmail;
+        return $this;
+    }
+
+    /**
+     * Set SMTP sender name
+     *
+     * @param string $senderName
+     * @return self
+     */
+    public function setSmtpSenderName(string $senderName): self
+    {
+        $this->smtp['senderName'] = $senderName;
+        return $this;
+    }
+
+    /**
+     * Set SMTP reply-to email
+     *
+     * @param string $email
+     * @return self
+     */
+    public function setSmtpReplyToEmail(string $email): self
+    {
+        $this->smtp['replyToEmail'] = $email;
+        return $this;
+    }
+
+    /**
+     * Set SMTP reply-to name
+     *
+     * @param string $name
+     * @return self
+     */
+    public function setSmtpReplyToName(string $name): self
+    {
+        $this->smtp['replyToName'] = $name;
+        return $this;
+    }
+
+    /**
+     * Get SMTP
+     *
+     * @return string
+     */
+    public function getSmtpHost(): string
+    {
+        return $this->smtp['host'] ?? '';
+    }
+
+    /**
+     * Get SMTP port
+     *
+     * @return integer
+     */
+    public function getSmtpPort(): int
+    {
+        return $this->smtp['port'] ?? 0;
+    }
+
+    /**
+     * Get SMTP username
+     *
+     * @return string
+     */
+    public function getSmtpUsername(): string
+    {
+        return $this->smtp['username'] ?? '';
+    }
+
+    /**
+     * Get SMTP password
+     *
+     * @return string
+     */
+    public function getSmtpPassword(): string
+    {
+        return $this->smtp['password'] ?? '';
+    }
+
+    /**
+     * Get SMTP secure
+     *
+     * @return string
+     */
+    public function getSmtpSecure(): string
+    {
+        return $this->smtp['secure'] ?? '';
+    }
+
+    /**
+     * Get SMTP sender email
+     *
+     * @return string
+     */
+    public function getSmtpSenderEmail(): string
+    {
+        return $this->smtp['senderEmail'] ?? '';
+    }
+
+    /**
+     * Get SMTP sender name
+     *
+     * @return string
+     */
+    public function getSmtpSenderName(): string
+    {
+        return $this->smtp['senderName'] ?? '';
+    }
+
+    /**
+     * Get SMTP reply-to email
+     *
+     * @return string
+     */
+    public function getSmtpReplyToEmail(): string
+    {
+        return $this->smtp['replyToEmail'] ?? '';
+    }
+
+    /**
+     * Get SMTP reply-to name
+     *
+     * @return string
+     */
+    public function getSmtpReplyToName(): string
+    {
+        return $this->smtp['replyToName'] ?? '';
+    }
+
+    /**
+     * Get Email Variables
+     *
+     * @return array
+     */
+    public function getVariables(): array
+    {
+        return $this->variables;
+    }
+
+    /**
+     * Set Email Variables
+     *
+     * @param array $variables
+     * @return self
+     */
+    public function setVariables(array $variables): self
+    {
+        $this->variables = $variables;
+        return $this;
+    }
+
+    /**
+     * Append variables to the email event.
+     *
+     * @param array $variables
+     * @return self
+     */
+    public function appendVariables(array $variables): self
+    {
+        $this->variables = \array_merge($this->variables, $variables);
+        return $this;
+    }
+
+    /**
+     * Set attachment
+     * @param string $content
+     * @param string $filename
+     * @param string $encoding
+     * @param string $type
+     * @return self
+     */
+    public function setAttachment(string $content, string $filename, string $encoding = 'base64', string $type = 'plain/text')
+    {
+        $this->attachment = [
+            'content' => base64_encode($content),
+            'filename' => $filename,
+            'encoding' => $encoding,
+            'type' => $type,
+        ];
+        return $this;
+    }
+
+    /**
+     * Get attachment
+     *
+     * @return array
+     */
+    public function getAttachment(): array
+    {
+        return $this->attachment;
+    }
+
+    /**
+     * Reset attachment
+     *
+     * @return self
+     */
+    public function resetAttachment(): self
+    {
+        $this->attachment = [];
+        return $this;
+    }
+
+    /**
+     * Set sender email
+     *
+     * @param string $email
+     * @return self
+     */
+    public function setSenderEmail(string $email): self
+    {
+        $this->customMailOptions['senderEmail'] = $email;
+        return $this;
+    }
+
+    /**
+     * Get sender email
+     *
+     * @return string
+     */
+    public function getSenderEmail(): string
+    {
+        return $this->customMailOptions['senderEmail'] ?? '';
+    }
+
+    /**
+     * Set sender name
+     *
+     * @param string $name
+     * @return self
+     */
+    public function setSenderName(string $name): self
+    {
+        $this->customMailOptions['senderName'] = $name;
+        return $this;
+    }
+
+    /**
+     * Get sender name
+     *
+     * @return string
+     */
+    public function getSenderName(): string
+    {
+        return $this->customMailOptions['senderName'] ?? '';
+    }
+
+    /**
+     * Set reply-to email
+     *
+     * @param string $email
+     * @return self
+     */
+    public function setReplyToEmail(string $email): self
+    {
+        $this->customMailOptions['replyToEmail'] = $email;
+        return $this;
+    }
+
+    /**
+     * Get reply-to email
+     *
+     * @return string
+     */
+    public function getReplyToEmail(): string
+    {
+        return $this->customMailOptions['replyToEmail'] ?? '';
+    }
+
+    /**
+     * Set reply-to name
+     *
+     * @param string $name
+     * @return self
+     */
+    public function setReplyToName(string $name): self
+    {
+        $this->customMailOptions['replyToName'] = $name;
+        return $this;
+    }
+
+    /**
+     * Get reply-to name
+     *
+     * @return string
+     */
+    public function getReplyToName(): string
+    {
+        return $this->customMailOptions['replyToName'] ?? '';
+    }
+
+    /**
+     * Reset
+     *
+     * @return self
+     */
+    public function reset(): self
+    {
+        $this->project = null;
+        $this->recipient = '';
+        $this->name = '';
+        $this->subject = '';
+        $this->body = '';
+        $this->variables = [];
+        $this->bodyTemplate = '';
+        $this->attachment = [];
+        $this->customMailOptions = [];
+        return $this;
+    }
+
+    /**
+     * Prepare the payload for the event
+     *
+     * @return array
+     */
+    protected function preparePayload(): array
+    {
+        $platform = $this->platform;
+        if (empty($platform)) {
+            $platform = Config::getParam('platform', []);
+        }
+
+        return [
+            'project' => $this->project,
+            'recipient' => $this->recipient,
+            'name' => $this->name,
+            'subject' => $this->subject,
+            'bodyTemplate' => $this->bodyTemplate,
+            'body' => $this->body,
+            'preview' => $this->preview,
+            'smtp' => $this->smtp,
+            'variables' => $this->variables,
+            'attachment' => $this->attachment,
+            'customMailOptions' => $this->customMailOptions,
+            'events' => Event::generateEvents($this->getEvent(), $this->getParams()),
+            'platform' => $platform,
+        ];
+    }
+}
@@ -1,45 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Message;
-
-use Utopia\Config\Config;
-use Utopia\Database\Document;
-
-final class Build extends Base
-{
-    public function __construct(
-        public readonly Document $project,
-        public readonly Document $resource,
-        public readonly Document $deployment,
-        public readonly string $type,
-        public readonly ?Document $template = null,
-        public readonly array $platform = [],
-    ) {
-    }
-
-    public function toArray(): array
-    {
-        $platform = !empty($this->platform) ? $this->platform : Config::getParam('platform', []);
-
-        return [
-            'project' => $this->project->getArrayCopy(),
-            'resource' => $this->resource->getArrayCopy(),
-            'deployment' => $this->deployment->getArrayCopy(),
-            'type' => $this->type,
-            'template' => $this->template?->getArrayCopy(),
-            'platform' => $platform,
-        ];
-    }
-
-    public static function fromArray(array $data): static
-    {
-        return new self(
-            project: new Document($data['project'] ?? []),
-            resource: new Document($data['resource'] ?? []),
-            deployment: new Document($data['deployment'] ?? []),
-            type: $data['type'] ?? '',
-            template: !empty($data['template']) ? new Document($data['template']) : null,
-            platform: $data['platform'] ?? [],
-        );
-    }
-}
@@ -1,45 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Message;
-
-use Utopia\Database\Document;
-
-final class Delete extends Base
-{
-    public function __construct(
-        public readonly ?Document $project = null,
-        public readonly string $type = '',
-        public readonly ?Document $document = null,
-        public readonly ?string $resource = null,
-        public readonly ?string $resourceType = null,
-        public readonly ?string $datetime = null,
-        public readonly ?string $hourlyUsageRetentionDatetime = null,
-    ) {
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'project' => $this->project?->getArrayCopy(),
-            'type' => $this->type,
-            'document' => $this->document?->getArrayCopy(),
-            'resource' => $this->resource,
-            'resourceType' => $this->resourceType,
-            'datetime' => $this->datetime,
-            'hourlyUsageRetentionDatetime' => $this->hourlyUsageRetentionDatetime,
-        ];
-    }
-
-    public static function fromArray(array $data): static
-    {
-        return new self(
-            project: !empty($data['project']) ? new Document($data['project']) : null,
-            type: $data['type'] ?? '',
-            document: !empty($data['document']) ? new Document($data['document']) : null,
-            resource: $data['resource'] ?? null,
-            resourceType: $data['resourceType'] ?? null,
-            datetime: $data['datetime'] ?? null,
-            hourlyUsageRetentionDatetime: $data['hourlyUsageRetentionDatetime'] ?? null,
-        );
-    }
-}
@@ -1,92 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Message;
-
-use Appwrite\Event\Event;
-use Utopia\Config\Config;
-use Utopia\Database\Document;
-
-final class Func extends Base
-{
-    public function __construct(
-        public readonly ?Document $project = null,
-        public readonly ?Document $user = null,
-        public readonly ?string $userId = null,
-        public readonly ?Document $function = null,
-        public readonly ?string $functionId = null,
-        public readonly ?Document $execution = null,
-        public readonly string $type = '',
-        public readonly string $jwt = '',
-        public readonly array $payload = [],
-        public readonly array $events = [],
-        public readonly string $body = '',
-        public readonly string $path = '',
-        public readonly array $headers = [],
-        public readonly string $method = '',
-        public readonly array $platform = [],
-    ) {
-    }
-
-    public static function fromEvent(
-        string $event,
-        array $params,
-        ?Document $project = null,
-        ?Document $user = null,
-        ?string $userId = null,
-        array $payload = [],
-        array $platform = [],
-    ): static {
-        return new self(
-            project: $project,
-            user: $user,
-            userId: $userId,
-            payload: $payload,
-            events: $event !== '' ? Event::generateEvents($event, $params) : [],
-            platform: $platform,
-        );
-    }
-
-    public function toArray(): array
-    {
-        $platform = !empty($this->platform) ? $this->platform : Config::getParam('platform', []);
-
-        return [
-            'project' => $this->project?->getArrayCopy(),
-            'user' => $this->user?->getArrayCopy(),
-            'userId' => $this->userId,
-            'function' => $this->function?->getArrayCopy(),
-            'functionId' => $this->functionId,
-            'execution' => $this->execution?->getArrayCopy(),
-            'type' => $this->type,
-            'jwt' => $this->jwt,
-            'payload' => $this->payload,
-            'events' => $this->events,
-            'body' => $this->body,
-            'path' => $this->path,
-            'headers' => $this->headers,
-            'method' => $this->method,
-            'platform' => $platform,
-        ];
-    }
-
-    public static function fromArray(array $data): static
-    {
-        return new self(
-            project: !empty($data['project']) ? new Document($data['project']) : null,
-            user: !empty($data['user']) ? new Document($data['user']) : null,
-            userId: $data['userId'] ?? null,
-            function: !empty($data['function']) ? new Document($data['function']) : null,
-            functionId: $data['functionId'] ?? null,
-            execution: !empty($data['execution']) ? new Document($data['execution']) : null,
-            type: $data['type'] ?? '',
-            jwt: $data['jwt'] ?? '',
-            payload: $data['payload'] ?? [],
-            events: $data['events'] ?? [],
-            body: $data['body'] ?? '',
-            path: $data['path'] ?? '',
-            headers: $data['headers'] ?? [],
-            method: $data['method'] ?? '',
-            platform: $data['platform'] ?? [],
-        );
-    }
-}
@@ -1,66 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Message;
-
-use Utopia\Config\Config;
-use Utopia\Database\Document;
-
-final class Mail extends Base
-{
-    public function __construct(
-        public readonly ?Document $project = null,
-        public readonly string $recipient = '',
-        public readonly string $name = '',
-        public readonly string $subject = '',
-        public readonly string $bodyTemplate = '',
-        public readonly string $body = '',
-        public readonly string $preview = '',
-        public readonly array $smtp = [],
-        public readonly array $variables = [],
-        public readonly array $attachment = [],
-        public readonly array $customMailOptions = [],
-        public readonly array $events = [],
-        public readonly array $platform = [],
-    ) {
-    }
-
-    public function toArray(): array
-    {
-        $platform = !empty($this->platform) ? $this->platform : Config::getParam('platform', []);
-
-        return [
-            'project' => $this->project?->getArrayCopy(),
-            'recipient' => $this->recipient,
-            'name' => $this->name,
-            'subject' => $this->subject,
-            'bodyTemplate' => $this->bodyTemplate,
-            'body' => $this->body,
-            'preview' => $this->preview,
-            'smtp' => $this->smtp,
-            'variables' => $this->variables,
-            'attachment' => $this->attachment,
-            'customMailOptions' => $this->customMailOptions,
-            'events' => $this->events,
-            'platform' => $platform,
-        ];
-    }
-
-    public static function fromArray(array $data): static
-    {
-        return new self(
-            project: !empty($data['project']) ? new Document($data['project']) : null,
-            recipient: $data['recipient'] ?? '',
-            name: $data['name'] ?? '',
-            subject: $data['subject'] ?? '',
-            bodyTemplate: $data['bodyTemplate'] ?? '',
-            body: $data['body'] ?? '',
-            preview: $data['preview'] ?? '',
-            smtp: $data['smtp'] ?? [],
-            variables: $data['variables'] ?? [],
-            attachment: $data['attachment'] ?? [],
-            customMailOptions: $data['customMailOptions'] ?? [],
-            events: $data['events'] ?? [],
-            platform: $data['platform'] ?? [],
-        );
-    }
-}
@@ -1,45 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Message;
-
-use Utopia\Database\Document;
-
-final class Messaging extends Base
-{
-    public function __construct(
-        public readonly string $type,
-        public readonly Document $project,
-        public readonly ?Document $user = null,
-        public readonly ?string $messageId = null,
-        public readonly ?Document $message = null,
-        public readonly ?array $recipients = null,
-        public readonly ?string $providerType = null,
-    ) {
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'type' => $this->type,
-            'project' => $this->project->getArrayCopy(),
-            'user' => $this->user?->getArrayCopy(),
-            'messageId' => $this->messageId,
-            'message' => $this->message?->getArrayCopy(),
-            'recipients' => $this->recipients,
-            'providerType' => $this->providerType,
-        ];
-    }
-
-    public static function fromArray(array $data): static
-    {
-        return new self(
-            type: $data['type'] ?? '',
-            project: new Document($data['project'] ?? []),
-            user: !empty($data['user']) ? new Document($data['user']) : null,
-            messageId: $data['messageId'] ?? null,
-            message: !empty($data['message']) ? new Document($data['message']) : null,
-            recipients: $data['recipients'] ?? null,
-            providerType: $data['providerType'] ?? null,
-        );
-    }
-}
@@ -0,0 +1,182 @@
+<?php
+
+namespace Appwrite\Event;
+
+use Utopia\Database\Document;
+use Utopia\Queue\Publisher;
+use Utopia\System\System;
+
+class Messaging extends Event
+{
+    protected string $type = '';
+    protected ?string $messageId = null;
+    protected ?Document $message = null;
+    protected ?array $recipients = null;
+    protected ?string $scheduledAt = null;
+    protected ?string $providerType = null;
+
+    public function __construct(protected Publisher $publisher)
+    {
+        parent::__construct($publisher);
+
+        $this
+            ->setQueue(System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME))
+            ->setClass(System::getEnv('_APP_MESSAGING_CLASS_NAME', Event::MESSAGING_CLASS_NAME));
+    }
+
+    /**
+     * Sets type for the build event.
+     *
+     * @param string $type Can be `MESSAGE_SEND_TYPE_INTERNAL` or `MESSAGE_SEND_TYPE_EXTERNAL`.
+     * @return self
+     */
+    public function setType(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Returns set type for the function event.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Sets recipient for the messaging event.
+     *
+     * @param string[] $recipients
+     * @return self
+     */
+    public function setRecipients(array $recipients): self
+    {
+        $this->recipients = $recipients;
+
+        return $this;
+    }
+
+    /**
+     * Returns set recipient for messaging event.
+     *
+     * @return string[]
+     */
+    public function getRecipient(): array
+    {
+        return $this->recipients;
+    }
+
+    /**
+     * Sets message document for the messaging event.
+     *
+     * @param Document $message
+     * @return self
+     */
+    public function setMessage(Document $message): self
+    {
+        $this->message = $message;
+
+        return $this;
+    }
+
+    /**
+     * Returns message document for the messaging event.
+     *
+     * @return Document
+     */
+    public function getMessage(): Document
+    {
+        return $this->message;
+    }
+
+    /**
+     * Sets message ID for the messaging event.
+     *
+     * @param string $messageId
+     * @return self
+     */
+    public function setMessageId(string $messageId): self
+    {
+        $this->messageId = $messageId;
+
+        return $this;
+    }
+
+    /**
+     * Returns set message ID for the messaging event.
+     *
+     * @return string
+     */
+    public function getMessageId(): string
+    {
+        return $this->messageId;
+    }
+
+    /**
+     * Sets provider type for the messaging event.
+     *
+     * @param string $providerType
+     * @return self
+     */
+    public function setProviderType(string $providerType): self
+    {
+        $this->providerType = $providerType;
+
+        return $this;
+    }
+
+    /**
+     * Returns set provider type for the messaging event.
+     *
+     * @return string
+     */
+    public function getProviderType(): string
+    {
+        return $this->providerType;
+    }
+
+    /**
+     * Sets Scheduled delivery time for the messaging event.
+     *
+     * @param string $scheduledAt
+     * @return self
+     */
+    public function setScheduledAt(string $scheduledAt): self
+    {
+        $this->scheduledAt = $scheduledAt;
+
+        return $this;
+    }
+
+    /**
+     * Returns set Delivery Time for the messaging event.
+     *
+     * @return string
+     */
+    public function getScheduledAt(): string
+    {
+        return $this->scheduledAt;
+    }
+
+    /**
+     * Prepare the payload for the event
+     *
+     * @return array
+     */
+    protected function preparePayload(): array
+    {
+        return [
+            'type' => $this->type,
+            'project' => $this->project,
+            'user' => $this->user,
+            'messageId' => $this->messageId,
+            'message' => $this->message,
+            'recipients' => $this->recipients,
+            'providerType' => $this->providerType,
+        ];
+    }
+}
@@ -1,27 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Publisher;
-
-use Appwrite\Event\Message\Build as BuildMessage;
-use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
-
-readonly class Build extends Base
-{
-    public function __construct(
-        Publisher $publisher,
-        protected Queue $queue
-    ) {
-        parent::__construct($publisher);
-    }
-
-    public function enqueue(BuildMessage $message, ?Queue $queue = null): string|bool
-    {
-        return $this->publish($queue ?? $this->queue, $message);
-    }
-
-    public function getSize(bool $failed = false, ?Queue $queue = null): int
-    {
-        return $this->getQueueSize($queue ?? $this->queue, $failed);
-    }
-}
@@ -1,27 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Publisher;
-
-use Appwrite\Event\Message\Delete as DeleteMessage;
-use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
-
-readonly class Delete extends Base
-{
-    public function __construct(
-        Publisher $publisher,
-        protected Queue $queue,
-    ) {
-        parent::__construct($publisher);
-    }
-
-    public function enqueue(DeleteMessage $message, ?Queue $queue = null): string|bool
-    {
-        return $this->publish($queue ?? $this->queue, $message);
-    }
-
-    public function getSize(bool $failed = false, ?Queue $queue = null): int
-    {
-        return $this->getQueueSize($queue ?? $this->queue, $failed);
-    }
-}
@@ -1,27 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Publisher;
-
-use Appwrite\Event\Message\Func as FunctionMessage;
-use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
-
-readonly class Func extends Base
-{
-    public function __construct(
-        Publisher $publisher,
-        protected Queue $queue,
-    ) {
-        parent::__construct($publisher);
-    }
-
-    public function enqueue(FunctionMessage $message, ?Queue $queue = null): string|bool
-    {
-        return $this->publish($queue ?? $this->queue, $message);
-    }
-
-    public function getSize(bool $failed = false, ?Queue $queue = null): int
-    {
-        return $this->getQueueSize($queue ?? $this->queue, $failed);
-    }
-}
@@ -1,27 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Publisher;
-
-use Appwrite\Event\Message\Mail as MailMessage;
-use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
-
-readonly class Mail extends Base
-{
-    public function __construct(
-        Publisher $publisher,
-        protected Queue $queue
-    ) {
-        parent::__construct($publisher);
-    }
-
-    public function enqueue(MailMessage $message, ?Queue $queue = null): string|bool
-    {
-        return $this->publish($queue ?? $this->queue, $message);
-    }
-
-    public function getSize(bool $failed = false, ?Queue $queue = null): int
-    {
-        return $this->getQueueSize($queue ?? $this->queue, $failed);
-    }
-}
@@ -1,27 +0,0 @@
-<?php
-
-namespace Appwrite\Event\Publisher;
-
-use Appwrite\Event\Message\Messaging as MessagingMessage;
-use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
-
-readonly class Messaging extends Base
-{
-    public function __construct(
-        Publisher $publisher,
-        protected Queue $queue
-    ) {
-        parent::__construct($publisher);
-    }
-
-    public function enqueue(MessagingMessage $message, ?Queue $queue = null): string|bool
-    {
-        return $this->publish($queue ?? $this->queue, $message);
-    }
-
-    public function getSize(bool $failed = false, ?Queue $queue = null): int
-    {
-        return $this->getQueueSize($queue ?? $this->queue, $failed);
-    }
-}
@@ -45,6 +45,7 @@ class Exception extends \Exception
    public const string GENERAL_SERVICE_DISABLED = 'general_service_disabled';
    public const string GENERAL_UNAUTHORIZED_SCOPE = 'general_unauthorized_scope';
    public const string GENERAL_RATE_LIMIT_EXCEEDED = 'general_rate_limit_exceeded';
+    public const string GENERAL_RESOURCE_LOCKED = 'general_resource_locked';
    public const string GENERAL_SMTP_DISABLED = 'general_smtp_disabled';
    public const string GENERAL_PHONE_DISABLED = 'general_phone_disabled';
    public const string GENERAL_ARGUMENT_INVALID = 'general_argument_invalid';
@@ -178,7 +179,6 @@ class Exception extends \Exception
    public const string FUNCTION_RUNTIME_UNSUPPORTED = 'function_runtime_unsupported';
    public const string FUNCTION_ENTRYPOINT_MISSING = 'function_entrypoint_missing';
    public const string FUNCTION_SYNCHRONOUS_TIMEOUT = 'function_synchronous_timeout';
-    public const string FUNCTION_ASYNCHRONOUS_TIMEOUT = 'function_asynchronous_timeout';
    public const string FUNCTION_TEMPLATE_NOT_FOUND = 'function_template_not_found';
    public const string FUNCTION_RUNTIME_NOT_DETECTED = 'function_runtime_not_detected';
    public const string FUNCTION_EXECUTE_PERMISSION_MISSING = 'function_execute_permission_missing';
@@ -193,7 +193,6 @@ class Exception extends \Exception
    public const string BUILD_ALREADY_COMPLETED = 'build_already_completed';
    public const string BUILD_CANCELED = 'build_canceled';
    public const string BUILD_FAILED = 'build_failed';
-    public const string BUILD_TIMEOUT = 'build_timeout';

    /** Execution */
    public const string EXECUTION_NOT_FOUND = 'execution_not_found';
@@ -348,10 +347,6 @@ class Exception extends \Exception
    public const string MIGRATION_IN_PROGRESS = 'migration_in_progress';
    public const string MIGRATION_PROVIDER_ERROR = 'migration_provider_error';
    public const string MIGRATION_DATABASE_TYPE_UNSUPPORTED = 'migration_database_type_unsupported';
-    public const string MIGRATION_SOURCE_PROJECT_ID_REQUIRED = 'migration_source_project_id_required';
-    public const string MIGRATION_SOURCE_PROJECT_NOT_FOUND = 'migration_source_project_not_found';
-    public const string MIGRATION_SOURCE_TYPE_INVALID = 'migration_source_type_invalid';
-    public const string MIGRATION_DESTINATION_TYPE_INVALID = 'migration_destination_type_invalid';

    /** Realtime */
    public const string REALTIME_MESSAGE_FORMAT_INVALID = 'realtime_message_format_invalid';
@@ -406,14 +401,6 @@ class Exception extends \Exception
    public const string TOKEN_EXPIRED = 'token_expired';
    public const string TOKEN_RESOURCE_TYPE_INVALID = 'token_resource_type_invalid';

-    /** Advisor */
-    public const string INSIGHT_NOT_FOUND = 'insight_not_found';
-    public const string INSIGHT_ALREADY_EXISTS = 'insight_already_exists';
-
-    /** Reports */
-    public const string REPORT_NOT_FOUND = 'report_not_found';
-    public const string REPORT_ALREADY_EXISTS = 'report_already_exists';
-
    protected string $type = '';
    protected array $errors = [];
    protected bool $publish;
@@ -6,6 +6,7 @@ use Appwrite\GraphQL\Exception as GQLException;
 use Appwrite\Promises\Swoole;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
+use Utopia\DI\Container;
 use Utopia\Http\Exception;
 use Utopia\Http\Http;
 use Utopia\Http\Route;
@@ -52,6 +53,22 @@ class Resolvers
        }
    }

+    /**
+     * Get the current request container.
+     */
+    private static function getResolverContainer(Http $utopia): Container
+    {
+        $container = $utopia->getResource('container');
+
+        if ($container instanceof Container || (\is_object($container) && \method_exists($container, 'get') && \method_exists($container, 'set'))) {
+            /** @var Container $container */
+            return $container;
+        }
+
+        /** @var callable(): Container $container */
+        return $container();
+    }
+
    /**
     * Get the request-scoped lock shared by GraphQL resolver coroutines
     * for the current HTTP request.
@@ -78,9 +95,9 @@ class Resolvers
        ?Route $route,
    ): callable {
        return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $route, $args) {
-            $utopia = $utopia->context()->get('utopia:graphql');
-            $request = $utopia->context()->get('request');
-            $response = $utopia->context()->get('response');
+            $utopia = $utopia->getResource('utopia:graphql');
+            $request = $utopia->getResource('request');
+            $response = $utopia->getResource('response');

            self::resolve(
                $utopia,
@@ -150,9 +167,9 @@ class Resolvers
        callable $url,
    ): callable {
        return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
-            $utopia = $utopia->context()->get('utopia:graphql');
-            $request = $utopia->context()->get('request');
-            $response = $utopia->context()->get('response');
+            $utopia = $utopia->getResource('utopia:graphql');
+            $request = $utopia->getResource('request');
+            $response = $utopia->getResource('response');

            self::resolve(
                $utopia,
@@ -186,9 +203,9 @@ class Resolvers
        callable $params,
    ): callable {
        return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
-            $utopia = $utopia->context()->get('utopia:graphql');
-            $request = $utopia->context()->get('request');
-            $response = $utopia->context()->get('response');
+            $utopia = $utopia->getResource('utopia:graphql');
+            $request = $utopia->getResource('request');
+            $response = $utopia->getResource('response');

            $beforeResolve = function ($payload) {
                return $payload['documents'];
@@ -228,9 +245,9 @@ class Resolvers
        callable $params,
    ): callable {
        return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
-            $utopia = $utopia->context()->get('utopia:graphql');
-            $request = $utopia->context()->get('request');
-            $response = $utopia->context()->get('response');
+            $utopia = $utopia->getResource('utopia:graphql');
+            $request = $utopia->getResource('request');
+            $response = $utopia->getResource('response');

            self::resolve(
                $utopia,
@@ -265,9 +282,9 @@ class Resolvers
        callable $params,
    ): callable {
        return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
-            $utopia = $utopia->context()->get('utopia:graphql');
-            $request = $utopia->context()->get('request');
-            $response = $utopia->context()->get('response');
+            $utopia = $utopia->getResource('utopia:graphql');
+            $request = $utopia->getResource('request');
+            $response = $utopia->getResource('response');

            self::resolve(
                $utopia,
@@ -300,9 +317,9 @@ class Resolvers
        callable $url,
    ): callable {
        return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
-            $utopia = $utopia->context()->get('utopia:graphql');
-            $request = $utopia->context()->get('request');
-            $response = $utopia->context()->get('response');
+            $utopia = $utopia->getResource('utopia:graphql');
+            $request = $utopia->getResource('request');
+            $response = $utopia->getResource('response');

            self::resolve(
                $utopia,
@@ -356,9 +373,10 @@ class Resolvers
            }

            /** @var Response $resolverResponse */
-            $resolverResponse = clone $utopia->context()->get('response');
-            $utopia->context()->set('request', static fn () => $request);
-            $utopia->context()->set('response', static fn () => $resolverResponse);
+            $resolverResponse = clone $utopia->getResource('response');
+            $container = self::getResolverContainer($utopia);
+            $container->set('request', static fn () => $request);
+            $container->set('response', static fn () => $resolverResponse);
            $resolverResponse->setContentType(Response::CONTENT_TYPE_NULL);
            $resolverResponse->setSent(false);

@@ -84,7 +84,7 @@ class Schema
    protected static function api(Http $utopia, callable $complexity): array
    {
        Mapper::init($utopia
-            ->context()->get('response')
+            ->getResource('response')
            ->getModels());

        $queries = [];
@@ -254,7 +254,7 @@ class Mapper
        array $injections
    ): Type {
        $validator = \is_callable($validator)
-            ? \call_user_func_array($validator, \array_map($utopia->context()->get(...), $injections))
+            ? \call_user_func_array($validator, $utopia->getResources($injections))
            : $validator;

        $isNullable = $validator instanceof Nullable;
@@ -0,0 +1,235 @@
+<?php
+
+namespace Appwrite\Locking;
+
+use Appwrite\Extend\Exception;
+use Closure;
+use Throwable;
+use Utopia\Console;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Lock\Distributed as DistributedLock;
+use Utopia\Logger\Log;
+use Utopia\Logger\Logger;
+use Utopia\System\System;
+use Utopia\Telemetry\Adapter as Telemetry;
+
+final class Lock
+{
+    private const SKIP_TTL_SECONDS = 5;
+
+    private const FAIL_TTL_SECONDS = 10;
+
+    private const FAIL_WAIT_SECONDS = 3.0;
+
+    private const REPORT_RATE_LIMIT_SECONDS = 60;
+
+    private const OUTCOME_ACQUIRED = 'acquired';
+
+    private const OUTCOME_SKIPPED = 'skipped';
+
+    private const OUTCOME_CONTENDED = 'contended';
+
+    private const OUTCOME_BACKEND_ERROR = 'backend_error';
+
+    private const OUTCOME_RELEASE_ERROR = 'release_error';
+
+    private readonly bool $enabled;
+
+    private readonly mixed $attempts;
+
+    private readonly string $projectInternalId;
+
+    /** @var array<string,int> */
+    private static array $lastReportAt = [];
+
+    public function __construct(
+        private readonly \Redis $redis,
+        Telemetry $telemetry,
+        private readonly Database $dbForPlatform,
+        private readonly Authorization $authorization,
+        private readonly Log $log,
+        private readonly ?Logger $logger,
+        Document $project,
+    ) {
+        $this->enabled = System::getEnv('_APP_LOCKING_ENABLED', 'enabled') !== 'disabled';
+        $this->attempts = $telemetry->createCounter('lock.attempts', null, 'Distributed lock acquire outcomes');
+        $sequence = $project->getSequence();
+        $this->projectInternalId = ($sequence !== null && $sequence !== '') ? (string) $sequence : 'unknown';
+    }
+
+    /**
+     * Throttled single-attribute write under a per-attribute skip-on-contention
+     * lock with authorization bypass. For idempotent timestamp-style updates
+     * (accessedAt, mcpAccessedAt) where regional pods writing the same value
+     * would thrash the platform DB.
+     */
+    public function set(
+        string $collection,
+        string $id,
+        string $attribute,
+        string $value,
+    ): void {
+        $key = "lock:platform:{$this->projectInternalId}:{$collection}:{$id}:{$attribute}";
+        $this->execute($key, $collection, function () use ($collection, $id, $attribute, $value) {
+            $this->authorization->skip(fn () => $this->dbForPlatform->updateDocument(
+                $collection,
+                $id,
+                new Document([$attribute => $value])
+            ));
+        });
+    }
+
+    /**
+     * Skip-on-contention lock around an arbitrary callback for a platform
+     * document. For idempotent multi-statement writes that don't fit `set`.
+     */
+    public function run(string $collection, string $id, Closure $fn): void
+    {
+        $key = "lock:platform:{$this->projectInternalId}:{$collection}:{$id}";
+        $this->execute($key, $collection, $fn);
+    }
+
+    /**
+     * Block-then-409 lock around an arbitrary callback for a platform document.
+     * For read-modify-write endpoints where silently dropping a concurrent
+     * request would lose user data.
+     */
+    public function runOrFail(string $collection, string $id, Closure $fn): mixed
+    {
+        $key = "lock:platform:{$this->projectInternalId}:{$collection}:{$id}";
+
+        return $this->execute($key, $collection, $fn, ttl: self::FAIL_TTL_SECONDS, orFail: true);
+    }
+
+    /**
+     * Generic lock primitive with full control over key, TTL, contention
+     * behavior, and wait timeout. Escape hatch for non-platform keys
+     * (cache, queue, edge) and for unusual TTL/timeout requirements.
+     *
+     * Caller may pass `target` for telemetry; otherwise it's extracted by
+     * position from the key (best-effort for keys following the standard
+     * `lock:platform:{project}:{target}:...` shape).
+     */
+    public function withKey(
+        string $key,
+        Closure $fn,
+        int $ttl = self::SKIP_TTL_SECONDS,
+        bool $orFail = false,
+        float $waitTimeout = self::FAIL_WAIT_SECONDS,
+        ?string $target = null,
+    ): mixed {
+        return $this->execute(
+            $key,
+            $target ?? self::inferTargetFromKey($key),
+            $fn,
+            ttl: $ttl,
+            orFail: $orFail,
+            waitTimeout: $waitTimeout,
+        );
+    }
+
+    private function execute(
+        string $key,
+        string $target,
+        Closure $fn,
+        int $ttl = self::SKIP_TTL_SECONDS,
+        bool $orFail = false,
+        float $waitTimeout = self::FAIL_WAIT_SECONDS,
+    ): mixed {
+        if (! $this->enabled) {
+            return $fn();
+        }
+
+        $lock = new DistributedLock($this->redis, $key, $ttl);
+        $labels = ['target' => $target, 'project' => $this->projectInternalId];
+
+        try {
+            $acquired = $orFail ? $lock->acquire($waitTimeout) : $lock->tryAcquire();
+        } catch (\RedisException $e) {
+            $this->attempts->add(1, ['outcome' => self::OUTCOME_BACKEND_ERROR, ...$labels]);
+            $this->reportError(self::OUTCOME_BACKEND_ERROR, $key, $target, $e);
+
+            return $fn();
+        }
+
+        if (! $acquired) {
+            if ($orFail) {
+                $this->attempts->add(1, ['outcome' => self::OUTCOME_CONTENDED, ...$labels]);
+                // No custom message — the lock key embeds collection + document id.
+                throw new Exception(Exception::GENERAL_RESOURCE_LOCKED);
+            }
+            $this->attempts->add(1, ['outcome' => self::OUTCOME_SKIPPED, ...$labels]);
+
+            return null;
+        }
+
+        $this->attempts->add(1, ['outcome' => self::OUTCOME_ACQUIRED, ...$labels]);
+        try {
+            return $fn();
+        } finally {
+            try {
+                $lock->release();
+            } catch (Throwable $e) {
+                $this->attempts->add(1, ['outcome' => self::OUTCOME_RELEASE_ERROR, ...$labels]);
+                $this->reportError(self::OUTCOME_RELEASE_ERROR, $key, $target, $e);
+            }
+        }
+    }
+
+    /**
+     * Best-effort target extraction for telemetry. Assumes the standard
+     * `lock:platform:{project}:{target}:...` shape. For non-platform keys
+     * passed via withKey(), callers should pass `target` explicitly.
+     */
+    private static function inferTargetFromKey(string $key): string
+    {
+        $parts = explode(':', $key, 5);
+
+        return $parts[3] ?? 'unknown';
+    }
+
+    /**
+     * Rate-limited to one push per REPORT_RATE_LIMIT_SECONDS per (action, target)
+     * so a sustained backend outage doesn't flood Sentry across the pod fleet.
+     */
+    private function reportError(string $action, string $key, string $target, Throwable $e): void
+    {
+        Console::warning("Lock {$action} for {$key}: {$e->getMessage()}");
+
+        if ($this->logger === null) {
+            return;
+        }
+
+        $bucket = $action.':'.$target;
+        $now = time();
+        if ((self::$lastReportAt[$bucket] ?? 0) + self::REPORT_RATE_LIMIT_SECONDS > $now) {
+            return;
+        }
+        self::$lastReportAt[$bucket] = $now;
+
+        $this->log->setNamespace('http');
+        $this->log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+        $this->log->setVersion(APP_VERSION_STABLE);
+        $this->log->setType(Log::TYPE_WARNING);
+        $this->log->setMessage('Distributed lock '.$action.': '.$e->getMessage());
+        $this->log->setAction("lock.{$action}");
+        $this->log->setEnvironment(System::getEnv('_APP_ENV', 'development') === 'production'
+            ? Log::ENVIRONMENT_PRODUCTION
+            : Log::ENVIRONMENT_STAGING);
+        $this->log->addTag('lock.target', $target);
+        $this->log->addTag('lock.project', $this->projectInternalId);
+        // Strip trailing document ID to keep aggregator cardinality bounded.
+        $this->log->addTag('lock.key_pattern', preg_replace('/:[^:]+$/', ':*', $key));
+        $this->log->addTag('code', $e->getCode());
+        $this->log->addExtra('file', $e->getFile());
+        $this->log->addExtra('line', $e->getLine());
+        $this->log->addExtra('trace', $e->getTraceAsString());
+
+        try {
+            $this->logger->addLog($this->log);
+        } catch (Throwable) {
+        }
+    }
+}
@@ -774,21 +774,6 @@ class Realtime extends MessagingAdapter
                    $roles = [Role::team($project->getAttribute('teamId'))->toString()];
                }
                break;
-            case 'reports':
-                // Plain report event: `reports.{reportId}.{action}`
-                $channels[] = 'reports';
-                if (isset($parts[1])) {
-                    $channels[] = 'reports.' . $parts[1];
-                }
-                // Nested insight event: `reports.{reportId}.insights.{insightId}.{action}`
-                if (isset($parts[2]) && $parts[2] === 'insights') {
-                    $channels[] = 'reports.' . $parts[1] . '.insights';
-                    if (isset($parts[3])) {
-                        $channels[] = 'reports.' . $parts[1] . '.insights.' . $parts[3];
-                    }
-                }
-                $roles = [Role::team($project->getAttribute('teamId'))->toString()];
-                break;
        }

        // Action is the last segment for plain CRUD events (e.g. `documents.X.create`),
@@ -96,8 +96,6 @@ abstract class Migration
        '1.9.1' => 'V24',
        '1.9.2' => 'V24',
        '1.9.3' => 'V24',
-        '1.9.4' => 'V24',
-        '1.9.5' => 'V24',
    ];

    /**
@@ -3,7 +3,6 @@
 namespace Appwrite\Platform;

 use Appwrite\Platform\Modules\Account;
-use Appwrite\Platform\Modules\Advisor;
 use Appwrite\Platform\Modules\Avatars;
 use Appwrite\Platform\Modules\Console;
 use Appwrite\Platform\Modules\Core;
@@ -43,6 +42,5 @@ class Appwrite extends Platform
        $this->addModule(new Webhooks\Module());
        $this->addModule(new Migrations\Module());
        $this->addModule(new Project\Module());
-        $this->addModule(new Advisor\Module());
    }
 }
@@ -154,7 +154,7 @@ class Server

        $nativeServer = $adapter->getNativeServer();

-        $container = $adapter->resources();
+        $container = $adapter->getContainer();
        $container->set('installerState', fn () => $state);
        $container->set('installerConfig', fn () => $config);
        $container->set('installerPaths', fn () => $paths);
@@ -5,10 +5,8 @@ namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\Challenges;
 use Appwrite\Auth\MFA\Type;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Event;
-use Appwrite\Event\Message\Mail as MailMessage;
-use Appwrite\Event\Message\Messaging as MessagingMessage;
-use Appwrite\Event\Publisher\Mail as MailPublisher;
-use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
+use Appwrite\Event\Mail;
+use Appwrite\Event\Messaging;
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -103,8 +101,8 @@ class Create extends Action
            ->inject('platform')
            ->inject('request')
            ->inject('queueForEvents')
-            ->inject('publisherForMessaging')
-            ->inject('publisherForMails')
+            ->inject('queueForMessaging')
+            ->inject('queueForMails')
            ->inject('timelimit')
            ->inject('usage')
            ->inject('plan')
@@ -123,8 +121,8 @@ class Create extends Action
        array $platform,
        Request $request,
        Event $queueForEvents,
-        MessagingPublisher $publisherForMessaging,
-        MailPublisher $publisherForMails,
+        Messaging $queueForMessaging,
+        Mail $queueForMails,
        callable $timelimit,
        Context $usage,
        array $plan,
@@ -182,18 +180,16 @@ class Create extends Action
                $message = $message->render();

                $phone = $user->getAttribute('phone');
-                $publisherForMessaging->enqueue(new MessagingMessage(
-                    type: MESSAGE_SEND_TYPE_INTERNAL,
-                    project: $project,
-                    message: new Document([
+                $queueForMessaging
+                    ->setType(MESSAGE_SEND_TYPE_INTERNAL)
+                    ->setMessage(new Document([
                        '$id' => $challenge->getId(),
                        'data' => [
                            'content' => $code,
                        ],
-                    ]),
-                    recipients: [$phone],
-                    providerType: MESSAGE_TYPE_SMS,
-                ));
+                    ]))
+                    ->setRecipients([$phone])
+                    ->setProviderType(MESSAGE_TYPE_SMS);

                $helper = PhoneNumberUtil::getInstance();
                try {
@@ -256,7 +252,6 @@ class Create extends Action
                $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
                $replyToEmail = '';
                $replyToName = '';
-                $smtpConfig = [];

                if ($smtpEnabled) {
                    if (!empty($smtp['senderEmail'])) {
@@ -274,6 +269,13 @@ class Create extends Action
                        $replyToName = $smtp['replyToName'];
                    }

+                    $queueForMails
+                        ->setSmtpHost($smtp['host'] ?? '')
+                        ->setSmtpPort($smtp['port'] ?? '')
+                        ->setSmtpUsername($smtp['username'] ?? '')
+                        ->setSmtpPassword($smtp['password'] ?? '')
+                        ->setSmtpSecure($smtp['secure'] ?? '');
+
                    if (!empty($customTemplate)) {
                        if (!empty($customTemplate['senderEmail'])) {
                            $senderEmail = $customTemplate['senderEmail'];
@@ -294,17 +296,11 @@ class Create extends Action
                        $subject = $customTemplate['subject'] ?? $subject;
                    }

-                    $smtpConfig = [
-                        'host' => $smtp['host'] ?? '',
-                        'port' => $smtp['port'] ?? '',
-                        'username' => $smtp['username'] ?? '',
-                        'password' => $smtp['password'] ?? '',
-                        'secure' => $smtp['secure'] ?? '',
-                        'replyToEmail' => $replyToEmail,
-                        'replyToName' => $replyToName,
-                        'senderEmail' => $senderEmail,
-                        'senderName' => $senderName,
-                    ];
+                    $queueForMails
+                        ->setSmtpReplyToEmail($replyToEmail)
+                        ->setSmtpReplyToName($replyToName)
+                        ->setSmtpSenderEmail($senderEmail)
+                        ->setSmtpSenderName($senderName);
                }

                $emailVariables = [
@@ -331,18 +327,20 @@ class Create extends Action
                    ]);
                }

-                $publisherForMails->enqueue(new MailMessage(
-                    project: $project,
-                    recipient: $user->getAttribute('email'),
-                    subject: $subject,
-                    bodyTemplate: $bodyTemplate,
-                    body: $body,
-                    preview: $preview,
-                    smtp: $smtpConfig,
-                    variables: $emailVariables,
-                    customMailOptions: $smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE ? ['senderName' => $platform['emailSenderName']] : [],
-                    platform: $platform,
-                ));
+                $queueForMails
+                    ->setSubject($subject)
+                    ->setPreview($preview)
+                    ->setBody($body)
+                    ->setBodyTemplate($bodyTemplate)
+                    ->appendVariables($emailVariables)
+                    ->setRecipient($user->getAttribute('email'));
+
+                // since this is console project, set email sender name!
+                if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) {
+                    $queueForMails->setSenderName($platform['emailSenderName']);
+                }
+
+                $queueForMails->trigger();
                break;
        }

@@ -1,8 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Enums;
-
-enum InsightCTAMethod: string
-{
-    case CREATE_INDEX = 'createIndex';
-}
@@ -1,11 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Enums;
-
-enum InsightCTAService: string
-{
-    case DATABASES = 'databases';
-    case TABLES_DB = 'tablesDB';
-    case DOCUMENTS_DB = 'documentsDB';
-    case VECTORS_DB = 'vectorsDB';
-}
@@ -1,10 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Enums;
-
-enum InsightSeverity: string
-{
-    case INFO = 'info';
-    case WARNING = 'warning';
-    case CRITICAL = 'critical';
-}
@@ -1,9 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Enums;
-
-enum InsightStatus: string
-{
-    case ACTIVE = 'active';
-    case DISMISSED = 'dismissed';
-}
@@ -1,16 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Enums;
-
-enum InsightType: string
-{
-    case DATABASE_INDEX = 'databaseIndex';
-    case TABLES_DB_INDEX = 'tablesDBIndex';
-    case DOCUMENTS_DB_INDEX = 'documentsDBIndex';
-    case VECTORS_DB_INDEX = 'vectorsDBIndex';
-    case DATABASE_PERFORMANCE = 'databasePerformance';
-    case SITE_PERFORMANCE = 'sitePerformance';
-    case SITE_ACCESSIBILITY = 'siteAccessibility';
-    case SITE_SEO = 'siteSeo';
-    case FUNCTION_PERFORMANCE = 'functionPerformance';
-}
@@ -1,10 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Enums;
-
-enum ReportType: string
-{
-    case LIGHTHOUSE = 'lighthouse';
-    case AUDIT = 'audit';
-    case DATABASE_ANALYZER = 'databaseAnalyzer';
-}
@@ -1,84 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Http\Insights;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
-use Appwrite\SDK\AuthType;
-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\Validator\UID;
-use Utopia\Platform\Scope\HTTP;
-
-class Get extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getInsight';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/reports/:reportId/insights/:insightId')
-            ->desc('Get insight')
-            ->groups(['api', 'advisor'])
-            ->label('scope', 'insights.read')
-            ->label('resourceType', RESOURCE_TYPE_INSIGHTS)
-            ->label('sdk', new Method(
-                namespace: 'advisor',
-                group: 'insights',
-                name: 'getInsight',
-                description: '/docs/references/advisor/get-insight.md',
-                auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_INSIGHT,
-                    ),
-                ]
-            ))
-            ->param('reportId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Parent report ID.', false, ['dbForPlatform'])
-            ->param('insightId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Insight ID.', false, ['dbForPlatform'])
-            ->inject('response')
-            ->inject('project')
-            ->inject('dbForPlatform')
-            ->callback($this->action(...));
-    }
-
-    public function action(
-        string $reportId,
-        string $insightId,
-        Response $response,
-        Document $project,
-        Database $dbForPlatform
-    ) {
-        // Skip the insights subquery — we only need ownership metadata.
-        $report = $dbForPlatform->skipFilters(
-            fn () => $dbForPlatform->getDocument('reports', $reportId),
-            ['subQueryReportInsights'],
-        );
-
-        if ($report->isEmpty() || $report->getAttribute('projectInternalId') !== $project->getSequence()) {
-            throw new Exception(Exception::REPORT_NOT_FOUND);
-        }
-
-        $insight = $dbForPlatform->getDocument('insights', $insightId);
-
-        if (
-            $insight->isEmpty()
-            || $insight->getAttribute('projectInternalId') !== $project->getSequence()
-            || $insight->getAttribute('reportInternalId') !== $report->getSequence()
-        ) {
-            throw new Exception(Exception::INSIGHT_NOT_FOUND);
-        }
-
-        $response->dynamic($insight, Response::MODEL_INSIGHT);
-    }
-}
@@ -1,126 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Http\Insights;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Database\Validator\Queries\Insights;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Order as OrderException;
-use Utopia\Database\Exception\Query as QueryException;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Query\Cursor;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\Boolean;
-
-class XList extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'listInsights';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/reports/:reportId/insights')
-            ->desc('List insights')
-            ->groups(['api', 'advisor'])
-            ->label('scope', 'insights.read')
-            ->label('resourceType', RESOURCE_TYPE_INSIGHTS)
-            ->label('sdk', new Method(
-                namespace: 'advisor',
-                group: 'insights',
-                name: 'listInsights',
-                description: '/docs/references/advisor/list-insights.md',
-                auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_INSIGHT_LIST,
-                    ),
-                ]
-            ))
-            ->param('reportId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Parent report ID.', false, ['dbForPlatform'])
-            ->param('queries', [], new Insights(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Insights::ALLOWED_ATTRIBUTES), true)
-            ->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('project')
-            ->inject('dbForPlatform')
-            ->callback($this->action(...));
-    }
-
-    public function action(
-        string $reportId,
-        array $queries,
-        bool $includeTotal,
-        Response $response,
-        Document $project,
-        Database $dbForPlatform
-    ) {
-        // Skip the insights subquery — we're about to fetch a filtered, paginated slice ourselves.
-        $report = $dbForPlatform->skipFilters(
-            fn () => $dbForPlatform->getDocument('reports', $reportId),
-            ['subQueryReportInsights'],
-        );
-
-        if ($report->isEmpty() || $report->getAttribute('projectInternalId') !== $project->getSequence()) {
-            throw new Exception(Exception::REPORT_NOT_FOUND);
-        }
-
-        try {
-            $queries = Query::parseQueries($queries);
-        } catch (QueryException $e) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
-        }
-
-        $queries[] = Query::equal('projectInternalId', [$project->getSequence()]);
-        $queries[] = Query::equal('reportInternalId', [$report->getSequence()]);
-
-        $cursor = Query::getCursorQueries($queries, false);
-        $cursor = \reset($cursor);
-
-        if ($cursor !== false) {
-            $validator = new Cursor();
-            if (!$validator->isValid($cursor)) {
-                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
-            }
-
-            $insightId = $cursor->getValue();
-            $cursorDocument = $dbForPlatform->getDocument('insights', $insightId);
-
-            if (
-                $cursorDocument->isEmpty()
-                || $cursorDocument->getAttribute('projectInternalId') !== $project->getSequence()
-                || $cursorDocument->getAttribute('reportInternalId') !== $report->getSequence()
-            ) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Insight '{$insightId}' for the 'cursor' value not found.");
-            }
-
-            $cursor->setValue($cursorDocument);
-        }
-
-        $filterQueries = Query::groupByType($queries)['filters'];
-
-        try {
-            $insights = $dbForPlatform->find('insights', $queries);
-            $total = $includeTotal ? $dbForPlatform->count('insights', $filterQueries, APP_LIMIT_COUNT) : 0;
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
-
-        $response->dynamic(new Document([
-            'insights' => $insights,
-            'total' => $total,
-        ]), Response::MODEL_INSIGHT_LIST);
-    }
-}
@@ -1,100 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Http\Reports;
-
-use Appwrite\Event\Event;
-use Appwrite\Event\Message\Delete as DeleteMessage;
-use Appwrite\Event\Publisher\Delete as DeletePublisher;
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
-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\Validator\UID;
-use Utopia\Platform\Scope\HTTP;
-
-class Delete extends Action
-{
-    use HTTP;
-
-    public static function getName(): string
-    {
-        return 'deleteReport';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/reports/:reportId')
-            ->desc('Delete report')
-            ->groups(['api', 'advisor'])
-            ->label('scope', 'reports.write')
-            ->label('event', 'reports.[reportId].delete')
-            ->label('resourceType', RESOURCE_TYPE_REPORTS)
-            ->label('audits.event', 'report.delete')
-            ->label('audits.resource', 'report/{request.reportId}')
-            ->label('abuse-key', 'projectId:{projectId},userId:{userId}')
-            ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
-            ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
-            ->label('sdk', new Method(
-                namespace: 'advisor',
-                group: 'reports',
-                name: 'deleteReport',
-                description: '/docs/references/advisor/delete-report.md',
-                auth: [AuthType::ADMIN, AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_NOCONTENT,
-                        model: Response::MODEL_NONE,
-                    ),
-                ],
-                contentType: ContentType::NONE
-            ))
-            ->param('reportId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Report ID.', false, ['dbForPlatform'])
-            ->inject('response')
-            ->inject('project')
-            ->inject('dbForPlatform')
-            ->inject('publisherForDeletes')
-            ->inject('queueForEvents')
-            ->callback($this->action(...));
-    }
-
-    public function action(
-        string $reportId,
-        Response $response,
-        Document $project,
-        Database $dbForPlatform,
-        DeletePublisher $publisherForDeletes,
-        Event $queueForEvents
-    ): void {
-        $report = $dbForPlatform->skipFilters(
-            fn () => $dbForPlatform->getDocument('reports', $reportId),
-            ['subQueryReportInsights'],
-        );
-
-        if ($report->isEmpty() || $report->getAttribute('projectInternalId') !== $project->getSequence()) {
-            throw new Exception(Exception::REPORT_NOT_FOUND);
-        }
-
-        if (!$dbForPlatform->deleteDocument('reports', $report->getId())) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove report from DB');
-        }
-
-        $publisherForDeletes->enqueue(new DeleteMessage(
-            project: $project,
-            type: DELETE_TYPE_REPORT,
-            document: $report,
-        ));
-
-        $queueForEvents
-            ->setParam('reportId', $report->getId())
-            ->setPayload($response->output($report, Response::MODEL_REPORT));
-
-        $response->noContent();
-    }
-}
@@ -1,80 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Advisor\Http\Reports;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
-use Appwrite\SDK\AuthType;
-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\Query;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Scope\HTTP;
-
-class Get extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getReport';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/reports/:reportId')
-            ->desc('Get report')
-            ->groups(['api', 'advisor'])
-            ->label('scope', 'reports.read')
-            ->label('resourceType', RESOURCE_TYPE_REPORTS)
-            ->label('sdk', new Method(
-                namespace: 'advisor',
-                group: 'reports',
-                name: 'getReport',
-                description: '/docs/references/advisor/get-report.md',
-                auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_REPORT,
-                    ),
-                ]
-            ))
-            ->param('reportId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Report ID.', false, ['dbForPlatform'])
-            ->inject('response')
-            ->inject('project')
-            ->inject('dbForPlatform')
-            ->callback($this->action(...));
-    }
-
-    public function action(
-        string $reportId,
-        Response $response,
-        Document $project,
-        Database $dbForPlatform
-    ) {
-        $report = $dbForPlatform->skipFilters(
-            fn () => $dbForPlatform->getDocument('reports', $reportId),
-            ['subQueryReportInsights'],
-        );
-
-        if ($report->isEmpty() || $report->getAttribute('projectInternalId') !== $project->getSequence()) {
-            throw new Exception(Exception::REPORT_NOT_FOUND);
-        }
-
-        $insights = $dbForPlatform->find('insights', [
-            Query::equal('projectInternalId', [$project->getSequence()]),
-            Query::equal('reportInternalId', [$report->getSequence()]),
-            Query::limit(APP_LIMIT_SUBQUERY),
-        ]);
-
-        $report->setAttribute('insights', $insights);
-
-        $response->dynamic($report, Response::MODEL_REPORT);
-    }
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Delete an analyzer report by its unique ID. Nested insights and CTA metadata are removed asynchronously by the deletes worker.`
				`@@ -1 +0,0 @@`
				`Get an insight by its unique ID, scoped to its parent report.`
				`@@ -1 +0,0 @@`
				`Get an analyzer report by its unique ID. The response includes the report's metadata and the nested insights it produced.`
				`@@ -1 +0,0 @@`
				`List the insights produced under a single analyzer report. You can use the query params to filter your results further.`
				`@@ -1 +0,0 @@`
				`Get a list of all the project's analyzer reports. You can use the query params to filter your results.`
				`@@ -1 +0,0 @@`
				`Create a bigint attribute. Optionally, minimum and maximum values can be provided.`
				`@@ -1 +0,0 @@`
				Update a bigint attribute. Changing the `default` value will not update already existing documents.
				`@@ -1 +0,0 @@`
				`Create a bigint column. Optionally, minimum and maximum values can be provided.`
				`@@ -1 +0,0 @@`
				Update a bigint column. Changing the `default` value will not update already existing rows.