Merge pull request #11389 from appwrite/multitypedb-with-dedicated-db

vectordb api endpoints

.env

@@ -10,7 +10,6 @@ _APP_CONSOLE_SESSION_ALERTS=enabled
 _APP_CONSOLE_WHITELIST_IPS=
 _APP_CONSOLE_COUNTRIES_DENYLIST=AQ
 _APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io
-_APP_CONSOLE_SCHEMA=appwriteio
 _APP_MIGRATION_HOST=appwrite
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 _APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io
@@ -39,14 +38,22 @@ _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
 _APP_REDIS_USER=
-COMPOSE_PROFILES=mongodb
-_APP_DB_ADAPTER=mongodb
-_APP_DB_HOST=mongodb
-_APP_DB_PORT=27017
+_APP_DB_ADAPTER=mariadb
+_APP_DB_HOST=mariadb
+_APP_DB_PORT=3306
+_APP_DB_ADAPTER=mariadb
 _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
+_APP_DB_ADAPTER_DOCUMENTSDB=mongodb
+_APP_DB_HOST_DOCUMENTSDB=mongodb
+_APP_DB_PORT_DOCUMENTSDB=27017
+_APP_DB_ADAPTER_VECTORDB=postgresql
+_APP_DB_HOST_VECTORDB=postgresql
+_APP_DB_PORT_VECTORDB=5432
+_APP_EMBEDDING_MODELS=embeddinggemma
+_APP_EMBEDDING_ENDPOINT='http://ollama:11434/api/embed'
 _APP_STORAGE_DEVICE=Local
 _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=

.github/workflows/tests.yml

@@ -98,14 +98,16 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Load and Start Appwrite
-        timeout-minutes: 3
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose up -d
-          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
-            echo "Waiting for Appwrite to be ready..."
-            sleep 2
-          done
+          sleep 10
+
+      - name: Logs
+        run: docker compose logs appwrite
+
+      - name: Doctor
+        run: docker compose exec -T appwrite doctor
 
       - name: Environment Variables
         run: docker compose exec -T appwrite vars
@@ -113,9 +115,8 @@ jobs:
       - name: Run Unit Tests
         uses: itznotabug/php-retry@v3
         with:
-          max_attempts: 2
-          retry_wait_seconds: 300
-          timeout_minutes: 15
+          max_attempts: 3
+          timeout_minutes: 30
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/unit
@@ -143,15 +144,11 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Load and Start Appwrite
-        timeout-minutes: 3
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose up -d
-          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
-            echo "Waiting for Appwrite to be ready..."
-            sleep 2
-          done
-
+          sleep 10
+          
       - name: Wait for Open Runtimes
         timeout-minutes: 3
         run: |
@@ -163,9 +160,8 @@ jobs:
       - name: Run General Tests
         uses: itznotabug/php-retry@v3
         with:
-          max_attempts: 2
-          retry_wait_seconds: 300
-          timeout_minutes: 15
+          max_attempts: 3
+          timeout_minutes: 30
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/e2e/General
@@ -193,13 +189,16 @@ jobs:
         db_adapter: [
           MARIADB,
           POSTGRESQL,
-          MONGODB
+          # MONGODB
         ]
         service: [
           Account,
           Avatars,
           Console,
-          Databases,
+          Databases/Legacy,
+          Databases/TablesDB,
+          Databases/DocumentsDB,
+          Databases/VectorDB,
           Functions,
           FunctionsSchedule,
           GraphQL,
@@ -229,37 +228,24 @@ jobs:
           path: /tmp/${{ env.IMAGE }}.tar
           fail-on-cache-miss: true
 
-      - name: Set DB Adapter environment
-        id: set-db-env
-        run: |
-          DB_ADAPTER_LOWER=$(echo "${{ matrix.db_adapter }}" | tr 'A-Z' 'a-z')
-          echo "COMPOSE_PROFILES=${DB_ADAPTER_LOWER}" >> $GITHUB_ENV
-          
-          if [ "${{ matrix.db_adapter }}" = "MARIADB" ]; then
-            echo "_APP_DB_ADAPTER=mariadb" >> $GITHUB_ENV
-            echo "_APP_DB_HOST=mariadb" >> $GITHUB_ENV
-            echo "_APP_DB_PORT=3306" >> $GITHUB_ENV
-          elif [ "${{ matrix.db_adapter }}" = "MONGODB" ]; then
-            echo "_APP_DB_ADAPTER=mongodb" >> $GITHUB_ENV
-            echo "_APP_DB_HOST=mongodb" >> $GITHUB_ENV
-            echo "_APP_DB_PORT=27017" >> $GITHUB_ENV
-          elif [ "${{ matrix.db_adapter }}" = "POSTGRESQL" ]; then
-            echo "_APP_DB_ADAPTER=postgresql" >> $GITHUB_ENV
-            echo "_APP_DB_HOST=postgresql" >> $GITHUB_ENV
-            echo "_APP_DB_PORT=5432" >> $GITHUB_ENV
-          fi
-
       - name: Load and Start Appwrite
-        timeout-minutes: 3
-        env:
-          _APP_BROWSER_HOST: http://invalid-browser/v1
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
+          sed -i 's|^_APP_BROWSER_HOST=.*|_APP_BROWSER_HOST=http://invalid-browser/v1|' .env
+
+          # Set DB Adapter in .env before starting services
+          if [ "${{ matrix.db_adapter }}" = "MARIADB" ]; then
+            sed -i 's|^_APP_DB_ADAPTER=.*|_APP_DB_ADAPTER=mariadb|' .env
+            sed -i 's|^_APP_DB_HOST=.*|_APP_DB_HOST=mariadb|' .env
+            sed -i 's|^_APP_DB_PORT=.*|_APP_DB_PORT=3306|' .env
+          elif [ "${{ matrix.db_adapter }}" = "MONGODB" ]; then
+            sed -i 's|^_APP_DB_ADAPTER=.*|_APP_DB_ADAPTER=mongodb|' .env
+            sed -i 's|^_APP_DB_HOST=.*|_APP_DB_HOST=mongodb|' .env
+            sed -i 's|^_APP_DB_PORT=.*|_APP_DB_PORT=27017|' .env
+          fi
+
           docker compose up -d
-          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
-            echo "Waiting for Appwrite to be ready..."
-            sleep 2
-          done
+          sleep 30
 
       - name: Wait for Open Runtimes
         timeout-minutes: 3
@@ -272,38 +258,50 @@ jobs:
       - name: Run ${{ matrix.service }} tests with Project table mode
         uses: itznotabug/php-retry@v3
         with:
-          max_attempts: 2
-          retry_wait_seconds: 300
-          timeout_minutes: 20
+          max_attempts: 3
+          timeout_minutes: 30
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/e2e/Services/${{ matrix.service }}
           command: |
             echo "Using project tables"
-            SERVICE_PATH="/usr/src/code/tests/e2e/Services/${{ matrix.service }}"
 
-            # Services that rely on sequential test method execution (shared static state)
-            FUNCTIONAL_FLAG="--functional"
-            case "${{ matrix.service }}" in
-              Databases|Functions|Realtime) FUNCTIONAL_FLAG="" ;;
-            esac
+            export _APP_DATABASE_SHARED_TABLES=
+            export _APP_DATABASE_SHARED_TABLES_V1=
+
+            # Set DB Adapter Specific ENV Vars using if-elif
+            if [ "${{ matrix.db_adapter }}" = "MARIADB" ]; then
+              export _APP_DB_ADAPTER=mariadb
+              export _APP_DB_HOST=mariadb
+              export _APP_DB_PORT=3306
+              export _APP_DB_SCHEMA=appwrite
+            elif [ "${{ matrix.db_adapter }}" = "POSTGRESQL" ]; then
+              export _APP_DB_ADAPTER=postgresql
+              export _APP_DB_HOST=postgresql
+              export _APP_DB_PORT=5432
+              export _APP_DB_SCHEMA=appwrite
+            else
+              echo "Unknown DB adapter: ${{ matrix.db_adapter }}"
+              exit 1
+            fi
 
-            echo "Running with paratest (parallel) for: ${{ matrix.service }} ${FUNCTIONAL_FLAG:+(functional)}"
             docker compose exec -T \
-              -e _APP_DATABASE_SHARED_TABLES="" \
-              -e _APP_DATABASE_SHARED_TABLES_V1="" \
-              -e _APP_DB_ADAPTER="${{ env._APP_DB_ADAPTER }}" \
-              -e _APP_DB_HOST="${{ env._APP_DB_HOST }}" \
-              -e _APP_DB_PORT="${{ env._APP_DB_PORT }}" \
-              -e _APP_DB_SCHEMA=appwrite \
+              -e _APP_DATABASE_SHARED_TABLES \
+              -e _APP_DATABASE_SHARED_TABLES_V1 \
+              -e _APP_DB_ADAPTER \
+              -e _APP_DB_HOST \
+              -e _APP_DB_PORT \
+              -e _APP_DB_SCHEMA \
               -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-              appwrite vendor/bin/paratest --processes $(nproc) $FUNCTIONAL_FLAG "$SERVICE_PATH" --exclude-group abuseEnabled --exclude-group screenshots --exclude-group ciIgnore --log-junit tests/e2e/Services/${{ matrix.service }}/junit.xml
+              appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group abuseEnabled,screenshots
 
       - name: Failure Logs
         if: failure()
         run: |
-          echo "=== Appwrite Logs ==="
-          docker compose logs
+          echo "=== Appwrite Worker Builds Logs ==="
+          docker compose logs appwrite-worker-builds
+          echo "=== OpenRuntimes Executor Logs ==="
+          docker compose logs openruntimes-executor
 
   e2e_shared_mode_test:
     name: E2E Shared Mode Service Test
@@ -321,7 +319,8 @@ jobs:
             Account,
             Avatars,
             Console,
-            Databases,
+            Databases/Legacy,
+            Databases/TablesDB,
             Functions,
             FunctionsSchedule,
             GraphQL,
@@ -357,14 +356,10 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Load and Start Appwrite
-        timeout-minutes: 3
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose up -d
-          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
-            echo "Waiting for Appwrite to be ready..."
-            sleep 2
-          done
+          sleep 30
 
       - name: Wait for Open Runtimes
         timeout-minutes: 3
@@ -377,9 +372,8 @@ jobs:
       - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
         uses: itznotabug/php-retry@v3
         with:
-          max_attempts: 2
-          retry_wait_seconds: 300
-          timeout_minutes: 20
+          max_attempts: 3
+          timeout_minutes: 30
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/e2e/Services/${{ matrix.service }}
@@ -393,20 +387,12 @@ jobs:
               export _APP_DATABASE_SHARED_TABLES=database_db_main
               export _APP_DATABASE_SHARED_TABLES_V1=
             fi
-
-            SERVICE_PATH="/usr/src/code/tests/e2e/Services/${{ matrix.service }}"
-
-            # Services that rely on sequential test method execution (shared static state)
-            FUNCTIONAL_FLAG="--functional"
-            case "${{ matrix.service }}" in
-              Databases|Functions|Realtime) FUNCTIONAL_FLAG="" ;;
-            esac
-
+        
             docker compose exec -T \
               -e _APP_DATABASE_SHARED_TABLES \
               -e _APP_DATABASE_SHARED_TABLES_V1 \
               -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-              appwrite vendor/bin/paratest --processes $(nproc) $FUNCTIONAL_FLAG "$SERVICE_PATH" --exclude-group abuseEnabled --exclude-group screenshots --exclude-group ciIgnore --log-junit tests/e2e/Services/${{ matrix.service }}/junit.xml
+              appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude-group abuseEnabled,screenshots
 
       - name: Failure Logs
         if: failure()
@@ -435,22 +421,17 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Load and Start Appwrite
-        timeout-minutes: 3
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
           docker compose up -d
-          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
-            echo "Waiting for Appwrite to be ready..."
-            sleep 2
-          done
+          sleep 30
 
       - name: Run Projects tests in dedicated table mode
         uses: itznotabug/php-retry@v3
         with:
-          max_attempts: 2
-          retry_wait_seconds: 300
-          timeout_minutes: 15
+          max_attempts: 3
+          timeout_minutes: 30
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/e2e/Services/Projects
@@ -463,7 +444,7 @@ jobs:
               -e _APP_DATABASE_SHARED_TABLES \
               -e _APP_DATABASE_SHARED_TABLES_V1 \
               -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-              appwrite vendor/bin/paratest --processes $(nproc) /usr/src/code/tests/e2e/Services/Projects --group abuseEnabled
+              appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=abuseEnabled
 
       - name: Failure Logs
         if: failure()
@@ -500,22 +481,17 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Load and Start Appwrite
-        timeout-minutes: 3
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
           docker compose up -d
-          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
-            echo "Waiting for Appwrite to be ready..."
-            sleep 2
-          done
+          sleep 30
 
       - name: Run Projects tests in ${{ matrix.tables-mode }} table mode
         uses: itznotabug/php-retry@v3
         with:
-          max_attempts: 2
-          retry_wait_seconds: 300
-          timeout_minutes: 15
+          max_attempts: 3
+          timeout_minutes: 30
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/e2e/Services/Projects
@@ -534,7 +510,7 @@ jobs:
               -e _APP_DATABASE_SHARED_TABLES \
               -e _APP_DATABASE_SHARED_TABLES_V1 \
               -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-              appwrite vendor/bin/paratest --processes $(nproc) /usr/src/code/tests/e2e/Services/Projects --group abuseEnabled
+              appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=abuseEnabled
 
       - name: Failure Logs
         if: failure()
@@ -563,30 +539,17 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Load and Start Appwrite
-        timeout-minutes: 3
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
           docker compose up -d
-          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
-            echo "Waiting for Appwrite to be ready..."
-            sleep 2
-          done
-
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
+          sleep 30
 
       - name: Run Site tests with browser connected in dedicated table mode
         uses: itznotabug/php-retry@v3
         with:
-          max_attempts: 2
-          retry_wait_seconds: 300
-          timeout_minutes: 15
+          max_attempts: 3
+          timeout_minutes: 30
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/e2e/Services/Sites
@@ -600,7 +563,7 @@ jobs:
               -e _APP_DATABASE_SHARED_TABLES \
               -e _APP_DATABASE_SHARED_TABLES_V1 \
               -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-              appwrite vendor/bin/paratest --processes $(nproc) /usr/src/code/tests/e2e/Services/Sites --group screenshots
+              appwrite test /usr/src/code/tests/e2e/Services/Sites --debug --group=screenshots
 
       - name: Failure Logs
         if: failure()
@@ -637,30 +600,17 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Load and Start Appwrite
-        timeout-minutes: 3
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
           docker compose up -d
-          until docker compose exec -T appwrite doctor > /dev/null 2>&1; do
-            echo "Waiting for Appwrite to be ready..."
-            sleep 2
-          done
-
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
+          sleep 30
 
       - name: Run Site tests with browser connected in ${{ matrix.tables-mode }} table mode
         uses: itznotabug/php-retry@v3
         with:
-          max_attempts: 2
-          retry_wait_seconds: 300
-          timeout_minutes: 15
+          max_attempts: 3
+          timeout_minutes: 30
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/e2e/Services/Sites
@@ -680,7 +630,7 @@ jobs:
               -e _APP_DATABASE_SHARED_TABLES \
               -e _APP_DATABASE_SHARED_TABLES_V1 \
               -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-              appwrite vendor/bin/paratest --processes $(nproc) /usr/src/code/tests/e2e/Services/Sites --group screenshots
+              appwrite test /usr/src/code/tests/e2e/Services/Sites --debug --group=screenshots
 
       - name: Failure Logs
         if: failure()

.gitignore

@@ -18,17 +18,4 @@ dev/yasd_init.php
 Makefile
 appwrite.config.json
 /.zed/
-/app/config/specs/
-/docs/examples/
-.phpunit.cache
-playwright-report
-test-results
-docker-compose.web-installer.yml
-.env.web-installer
-docker-compose.web-installer.yml.**.backup
-
-# local installer output dir
-appwrite/
-
-# screenshots
-tests/playwright/screenshots
+/app/config/specs/

Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2 AS composer
+FROM composer:2.0 AS composer
 
 ARG TESTING=false
 ENV TESTING=$TESTING
@@ -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.0.1 AS base
+FROM appwrite/base:1.0.0 AS base
 
 LABEL maintainer="team@appwrite.io"
 
@@ -120,6 +120,5 @@ RUN if [ "$DEBUG" = "true" ]; then \
     fi
 
 EXPOSE 80
-EXPOSE 8080
 
 CMD [ "php", "app/http.php" ]

app/config/collections.php

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

app/config/collections/projects.php

@@ -61,6 +61,15 @@ return [
                 'array' => false,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('database'),
+                'type' => Database::VAR_STRING,
+                'size' => 128,
+                'required' => true,
+                'signed' => true,
+                'array' => false,
+                'filters' => [],
+            ]
         ],
         'indexes' => [
             [

app/config/collections/vectordb.php

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

app/config/console.php

@@ -26,7 +26,7 @@ $console = [
             'hostname' => 'localhost',
         ], // Current host is added on app init
     ],
-    'region' => System::getEnv('_APP_REGION', 'default'),
+    'region' => 'fra',
     'legalName' => '',
     'legalCountry' => '',
     'legalState' => '',

app/config/errors.php

@@ -139,11 +139,6 @@ return [
         'description' => 'There was an error processing your request. Please check the inputs and try again.',
         'code' => 400,
     ],
-    Exception::GENERAL_FEATURE_UNSUPPORTED => [
-        'name' => Exception::GENERAL_FEATURE_UNSUPPORTED,
-        'description' => 'This feature is not supported with your current configuration.',
-        'code' => 400,
-    ],
 
     /** User Errors */
     Exception::USER_COUNT_EXCEEDED => [
@@ -630,11 +625,6 @@ return [
         'description' => 'Site with the requested ID could not be found.',
         'code' => 404,
     ],
-    Exception::SITE_ALREADY_EXISTS => [
-        'name' => Exception::SITE_ALREADY_EXISTS,
-        'description' => 'Site with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
-        'code' => 409,
-    ],
     Exception::SITE_TEMPLATE_NOT_FOUND => [
         'name' => Exception::SITE_TEMPLATE_NOT_FOUND,
         'description' => 'Site Template with the requested ID could not be found.',
@@ -1296,11 +1286,6 @@ return [
         'description' => 'Message with the requested ID could not be found.',
         'code' => 404,
     ],
-    Exception::MESSAGE_ALREADY_EXISTS => [
-        'name' => Exception::MESSAGE_ALREADY_EXISTS,
-        'description' => 'Message with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
-        'code' => 409,
-    ],
     Exception::MESSAGE_MISSING_TARGET => [
         'name' => Exception::MESSAGE_MISSING_TARGET,
         'description' => 'Message with the requested ID has no recipients (topics or users or targets).',

app/config/platform.php

@@ -24,7 +24,6 @@ return [
         System::getEnv('_APP_CONSOLE_DOMAIN', 'localhost'),
         System::getEnv('_APP_MIGRATION_HOST'),
     ])),
-    'schemas' => \array_filter(\explode(',', System::getEnv('_APP_CONSOLE_SCHEMA', ''))),
     'platformName' => APP_EMAIL_PLATFORM_NAME,
     'logoUrl' => APP_EMAIL_LOGO_URL,
     'accentColor' => APP_EMAIL_ACCENT_COLOR,

app/config/sdks.php

@@ -289,25 +289,6 @@ return [
                 'repoBranch' => 'main',
                 'changelog' => \realpath(__DIR__ . '/../../docs/sdks/agent-skills/CHANGELOG.md'),
             ],
-            [
-                'key' => 'cursor-plugin',
-                'name' => 'CursorPlugin',
-                'version' => '0.1.0',
-                'url' => 'https://github.com/appwrite/cursor-plugin.git',
-                'enabled' => true,
-                'beta' => false,
-                'dev' => false,
-                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_CONSOLE,
-                'prism' => 'cursor-plugin',
-                'source' => \realpath(__DIR__ . '/../sdks/console-cursor-plugin'),
-                'gitUrl' => 'git@github.com:appwrite/cursor-plugin.git',
-                'gitRepoName' => 'cursor-plugin',
-                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
-                'repoBranch' => 'main',
-                'changelog' => \realpath(__DIR__ . '/../../docs/sdks/cursor-plugin/CHANGELOG.md'),
-            ],
         ],
     ],
 

app/config/services.php

@@ -160,7 +160,7 @@ return [
         'name' => 'Teams',
         'subtitle' => 'The Teams service allows you to group users of your project and to enable them to share read and write access to your project resources',
         'description' => '/docs/services/teams.md',
-        'controller' => '', // Uses modules
+        'controller' => 'api/teams.php',
         'sdk' => true,
         'docs' => true,
         'docsUrl' => 'https://appwrite.io/docs/client/teams',
@@ -188,7 +188,7 @@ return [
         'name' => 'VCS',
         'subtitle' => 'The VCS service allows you to interact with providers like GitHub, GitLab etc.',
         'description' => '',
-        'controller' => '', // Uses modules
+        'controller' => 'api/vcs.php',
         'sdk' => false,
         'docs' => false,
         'docsUrl' => '',

app/config/variables.php

@@ -358,6 +358,15 @@ return [
                 'question' => '',
                 'filter' => ''
             ],
+            [
+                'name' => '_APP_DB_ADAPTER',
+                'description' => 'Which database adapter to use. Must be one of: mariadb, postgresql.',
+                'introduction' => '1.6.0',
+                'default' => 'mariadb',
+                'required' => true,
+                'question' => 'Choose your database (mariadb|postgresql)',
+                'filter' => ''
+            ],
             [
                 'name' => '_APP_TRUSTED_HEADERS',
                 'description' => 'This option allows you to set the list of trusted headers, the value is a comma‑separated list of HTTP header names, evaluated left-to-right for the first valid IP. Header names are treated case-insensitively.',
@@ -370,73 +379,13 @@ return [
         ],
     ],
     [
-        'category' => 'Database',
-        'description' => 'Appwrite uses a database for storing user and meta data. You can choose between MariaDB, MongoDB or PostgreSQL.',
-        'variables' => [
-            [
-                'name' => '_APP_DB_ADAPTER',
-                'description' => 'Which database to use. Must be one of: MariaDB, MongoDB, or PostgreSQL',
-                'introduction' => '1.9.0',
-                'default' => 'mongodb',
-                'required' => true,
-                'question' => 'Choose your database (mariadb|mongodb|postgresql)',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_DB_HOST',
-                'description' => 'Database server host name address. Default value is: \'mongodb\'.',
-                'introduction' => '',
-                'default' => 'mongodb',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_DB_PORT',
-                'description' => 'Database server TCP port. Default value is: \'27017\'.',
-                'introduction' => '',
-                'default' => '27017',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_DB_SCHEMA',
-                'description' => 'Database server database schema. Default value is: \'appwrite\'.',
-                'introduction' => '',
-                'default' => 'appwrite',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_DB_USER',
-                'description' => 'Database server user name. Default value is: \'user\'.',
-                'introduction' => '',
-                'default' => 'user',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_DB_PASS',
-                'description' => 'Database server user password. Default value is: \'password\'.',
-                'introduction' => '',
-                'default' => 'password',
-                'required' => false,
-                'question' => '',
-                'filter' => 'password'
-            ],
-            [
-                'name' => '_APP_DB_ROOT_PASS',
-                'description' => 'Database server root password. Default value is: \'rootsecretpassword\'.',
-                'introduction' => '',
-                'default' => 'rootsecretpassword',
-                'required' => false,
-                'question' => '',
-                'filter' => 'password'
-            ],
-        ],
+        'name' => '_APP_DB_ADAPTER',
+        'description' => 'Which database engine to use. Possible options are "mariadb" or "mongodb"',
+        'introduction' => '1.8.0',
+        'default' => 'mongoDB',
+        'required' => true,
+        'question' => 'Choose your database (mariadb|mongoDB)',
+        'filter' => ''
     ],
     [
         'category' => 'Redis',
@@ -480,6 +429,66 @@ return [
             ],
         ],
     ],
+    [
+        'category' => 'MariaDB',
+        'description' => 'Appwrite is using a MariaDB server for managing persistent database data. The MariaDB env vars are used to allow Appwrite server to connect to the MariaDB container.',
+        'variables' => [
+            [
+                'name' => '_APP_DB_HOST',
+                'description' => 'MariaDB server host name address. Default value is: \'mariadb\'.',
+                'introduction' => '',
+                'default' => 'mariadb',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_DB_PORT',
+                'description' => 'MariaDB server TCP port. Default value is: \'3306\'.',
+                'introduction' => '',
+                'default' => '3306',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_DB_SCHEMA',
+                'description' => 'MariaDB server database schema. Default value is: \'appwrite\'.',
+                'introduction' => '',
+                'default' => 'appwrite',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_DB_USER',
+                'description' => 'MariaDB server user name. Default value is: \'user\'.',
+                'introduction' => '',
+                'default' => 'user',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_DB_PASS',
+                'description' => 'MariaDB server user password. Default value is: \'password\'.',
+                'introduction' => '',
+                'default' => 'password',
+                'required' => false,
+                'question' => '',
+                'filter' => 'password'
+            ],
+            [
+                'name' => '_APP_DB_ROOT_PASS',
+                'description' => 'MariaDB server root password. Default value is: \'rootsecretpassword\'.',
+                'introduction' => '',
+                'default' => 'rootsecretpassword',
+                'required' => false,
+                'question' => '',
+                'filter' => 'password'
+            ],
+        ],
+    ],
     [
         'category' => 'InfluxDB',
         'description' => 'Deprecated since 1.4.8.',

app/controllers/api/account.php

@@ -902,13 +902,13 @@ Http::patch('/v1/account/sessions/:sessionId')
         // Refresh OAuth access token
         $provider = $session->getAttribute('provider', '');
         $refreshToken = $session->getAttribute('providerRefreshToken', '');
-        $oAuthProviders = Config::getParam('oAuthProviders') ?? [];
-        $className = $oAuthProviders[$provider]['class'] ?? null;
-        if (!empty($provider) && ($className === null || !\class_exists($className))) {
+        $oAuthProviders = Config::getParam('oAuthProviders');
+        $className = $oAuthProviders[$provider]['class'];
+        if (!\class_exists($className)) {
             throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
         }
 
-        if (!empty($provider) && $className !== null && \class_exists($className)) {
+        if (!empty($provider) && \class_exists($className)) {
             $appId = $project->getAttribute('oAuthProviders', [])[$provider . 'Appid'] ?? '';
             $appSecret = $project->getAttribute('oAuthProviders', [])[$provider . 'Secret'] ?? '{}';
 
@@ -1262,7 +1262,7 @@ Http::post('/v1/account/sessions/token')
     ->label('abuse-limit', 10)
     ->label('abuse-key', 'ip:{ip},userId:{param-userId}')
     ->label('abuse-reset', [201])
-    ->param('userId', '', fn (Database $dbForProject) => new CustomId(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.', false, ['dbForProject'])
+    ->param('userId', '', new CustomId(), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
     ->param('secret', '', new Text(256), 'Secret of a token generated by login methods. For example, the `createMagicURLToken` or `createPhoneToken` methods.')
     ->inject('request')
     ->inject('response')
@@ -1340,9 +1340,9 @@ Http::get('/v1/account/sessions/oauth2/:provider')
             throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please configure the provider app ID and app secret key from your ' . APP_NAME . ' console to continue.');
         }
 
-        $oAuthProviders = Config::getParam('oAuthProviders') ?? [];
-        $className = $oAuthProviders[$provider]['class'] ?? null;
-        if ($className === null || !\class_exists($className)) {
+        $oAuthProviders = Config::getParam('oAuthProviders');
+        $className = $oAuthProviders[$provider]['class'];
+        if (!\class_exists($className)) {
             throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
         }
 
@@ -1492,13 +1492,13 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
         $appSecret = $project->getAttribute('oAuthProviders', [])[$provider . 'Secret'] ?? '{}';
         $providerEnabled = $project->getAttribute('oAuthProviders', [])[$provider . 'Enabled'] ?? false;
 
-        $oAuthProviders = Config::getParam('oAuthProviders') ?? [];
-        $className = $oAuthProviders[$provider]['class'] ?? null;
-        if ($className === null || !\class_exists($className)) {
+        $oAuthProviders = Config::getParam('oAuthProviders');
+        $className = $oAuthProviders[$provider]['class'];
+        if (!\class_exists($className)) {
             throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
         }
 
-        $providers = Config::getParam('oAuthProviders') ?? [];
+        $providers = Config::getParam('oAuthProviders');
         $providerName = $providers[$provider]['name'] ?? '';
 
         /** @var Appwrite\Auth\OAuth2 $oauth2 */
@@ -2035,9 +2035,9 @@ Http::get('/v1/account/tokens/oauth2/:provider')
             throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please configure the provider app ID and app secret key from your ' . APP_NAME . ' console to continue.');
         }
 
-        $oAuthProviders = Config::getParam('oAuthProviders') ?? [];
-        $className = $oAuthProviders[$provider]['class'] ?? null;
-        if ($className === null || !\class_exists($className)) {
+        $oAuthProviders = Config::getParam('oAuthProviders');
+        $className = $oAuthProviders[$provider]['class'];
+        if (!\class_exists($className)) {
             throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
         }
 
@@ -2115,7 +2115,7 @@ Http::post('/v1/account/tokens/magic-url')
         if (empty(System::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
         }
-
+        $url = htmlentities($url);
 
         if ($phrase === true) {
             $phrase = Phrase::generate();
@@ -2683,7 +2683,7 @@ Http::put('/v1/account/sessions/magic-url')
     ->label('abuse-limit', 10)
     ->label('abuse-key', 'ip:{ip},userId:{param-userId}')
     ->label('abuse-reset', [201])
-    ->param('userId', '', fn (Database $dbForProject) => new CustomId(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.', false, ['dbForProject'])
+    ->param('userId', '', new CustomId(), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
     ->param('secret', '', new Text(256), 'Valid verification token.')
     ->inject('request')
     ->inject('response')
@@ -3577,6 +3577,7 @@ Http::post('/v1/account/recovery')
             throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
         }
 
+        $url = htmlentities($url);
         $email = \strtolower($email);
 
         $profile = $dbForProject->findOne('users', [
@@ -3892,6 +3893,7 @@ Http::post('/v1/account/verifications/email')
             throw new Exception(Exception::USER_EMAIL_NOT_FOUND);
         }
 
+        $url = htmlentities($url);
         if ($user->getAttribute('emailVerification')) {
             throw new Exception(Exception::USER_EMAIL_ALREADY_VERIFIED);
         }

app/controllers/api/messaging.php

@@ -254,7 +254,7 @@ Http::post('/v1/messaging/providers/resend')
             )
         ]
     ))
-    ->param('providerId', '', fn (Database $dbForProject) => new CustomId(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Provider ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.', false, ['dbForProject'])
+    ->param('providerId', '', new CustomId(), 'Provider ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
     ->param('name', '', new Text(128), 'Provider name.')
     ->param('apiKey', '', new Text(0), 'Resend API key.', true)
     ->param('fromName', '', new Text(128, 0), 'Sender Name.', true)
@@ -1476,7 +1476,7 @@ Http::patch('/v1/messaging/providers/resend/:providerId')
             )
         ]
     ))
-    ->param('providerId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Provider ID.', false, ['dbForProject'])
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Nullable(new Boolean()), 'Set as enabled.', true)
     ->param('apiKey', '', new Text(0), 'Resend API key.', true)
@@ -2869,7 +2869,7 @@ Http::get('/v1/messaging/topics/:topicId/subscribers')
         ]
     ))
     ->param('topicId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Topic ID. The topic ID subscribed to.', false, ['dbForProject'])
-    ->param('queries', [], new Subscribers(), '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(', ', Subscribers::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Subscribers(), '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(', ', Providers::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', 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('dbForProject')
@@ -3251,7 +3251,7 @@ Http::post('/v1/messaging/messages/email')
             }
         }
 
-        $message = new Document([
+        $message = $dbForProject->createDocument('messages', new Document([
             '$id' => $messageId,
             'providerType' => MESSAGE_TYPE_EMAIL,
             'topics' => $topics,
@@ -3267,12 +3267,7 @@ Http::post('/v1/messaging/messages/email')
                 'attachments' => $attachments,
             ],
             'status' => $status,
-        ]);
-        try {
-            $message = $dbForProject->createDocument('messages', $message);
-        } catch (DuplicateException) {
-            throw new Exception(Exception::MESSAGE_ALREADY_EXISTS);
-        }
+        ]));
 
         switch ($status) {
             case MessageStatus::PROCESSING:
@@ -3405,7 +3400,7 @@ Http::post('/v1/messaging/messages/sms')
             }
         }
 
-        $message = new Document([
+        $message = $dbForProject->createDocument('messages', new Document([
             '$id' => $messageId,
             'providerType' => MESSAGE_TYPE_SMS,
             'topics' => $topics,
@@ -3415,12 +3410,7 @@ Http::post('/v1/messaging/messages/sms')
                 'content' => $content,
             ],
             'status' => $status,
-        ]);
-        try {
-            $message = $dbForProject->createDocument('messages', $message);
-        } catch (DuplicateException) {
-            throw new Exception(Exception::MESSAGE_ALREADY_EXISTS);
-        }
+        ]));
 
         switch ($status) {
             case MessageStatus::PROCESSING:
@@ -3630,7 +3620,7 @@ Http::post('/v1/messaging/messages/push')
             $pushData['priority'] = $priority;
         }
 
-        $message = new Document([
+        $message = $dbForProject->createDocument('messages', new Document([
             '$id' => $messageId,
             'providerType' => MESSAGE_TYPE_PUSH,
             'topics' => $topics,
@@ -3639,12 +3629,7 @@ Http::post('/v1/messaging/messages/push')
             'scheduledAt' => $scheduledAt,
             'data' => $pushData,
             'status' => $status,
-        ]);
-        try {
-            $message = $dbForProject->createDocument('messages', $message);
-        } catch (DuplicateException) {
-            throw new Exception(Exception::MESSAGE_ALREADY_EXISTS);
-        }
+        ]));
 
         switch ($status) {
             case MessageStatus::PROCESSING:

app/controllers/api/migrations.php

@@ -43,6 +43,15 @@ use Utopia\Validator\WhiteList;
 
 include_once __DIR__ . '/../shared/api.php';
 
+function getDatabaseTransferResourceServices(string $databaseType)
+{
+    return match($databaseType) {
+        DATABASE_TYPE_LEGACY,
+        DATABASE_TYPE_TABLESDB => Transfer::GROUP_DATABASES_TABLES_DB,
+        DATABASE_TYPE_VECTORDB => Transfer::GROUP_DATABASES_VECTOR_DB
+    };
+}
+
 Http::post('/v1/migrations/appwrite')
     ->groups(['api', 'migrations'])
     ->desc('Create Appwrite migration')
@@ -427,8 +436,16 @@ Http::post('/v1/migrations/csv/imports')
             throw new \Exception('Unable to copy file');
         }
 
+        // getting databasetype
+        $resources = explode(':', $resourceId);
+        $databaseId = $resources[0];
+        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
+        $databaseType = $database->getAttribute('type');
+        if (!in_array($databaseType, CSV_ALLOWED_DATABASE_TYPES)) {
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Database type not supported for csv');
+        }
         $fileSize = $deviceForMigrations->getFileSize($newPath);
-        $resources = Transfer::extractServices([Transfer::GROUP_DATABASES]);
+        $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
 
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => $migrationId,
@@ -557,13 +574,23 @@ Http::post('/v1/migrations/csv/exports')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
         }
 
+        // getting databasetype
+        $resources = explode(':', $resourceId);
+        $databaseId = $resources[0];
+        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
+        $databaseType = $database->getAttribute('type');
+        if (!in_array($databaseType, CSV_ALLOWED_DATABASE_TYPES)) {
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Database type not supported for csv');
+        }
+        $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
+
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
             'stage' => 'init',
             'source' => Appwrite::getName(),
             'destination' => CSV::getName(),
-            'resources' => Transfer::extractServices([Transfer::GROUP_DATABASES]),
+            'resources' => $resources,
             'resourceId' => $resourceId,
             'resourceType' => Resource::TYPE_DATABASE,
             'statusCounters' => '{}',
@@ -713,12 +740,10 @@ Http::get('/v1/migrations/appwrite/report')
     ->param('projectID', '', new Text(512), "Source's Project ID")
     ->param('key', '', new Text(512), "Source's API Key")
     ->inject('response')
-    ->inject('dbForProject')
-    ->inject('project')
-    ->inject('user')
-    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
+    ->inject('getDatabasesDB')
+    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response, callable $getDatabasesDB) {
 
-        $appwrite = new Appwrite($projectID, $endpoint, $key);
+        $appwrite = new Appwrite($projectID, $endpoint, $key, $getDatabasesDB);
 
         try {
             $report = $appwrite->report($resources);

app/controllers/api/project.php

@@ -62,16 +62,33 @@ Http::get('/v1/project/usage')
                 METRIC_EXECUTIONS_MB_SECONDS,
                 METRIC_BUILDS_MB_SECONDS,
                 METRIC_DOCUMENTS,
+                METRIC_DOCUMENTS_DOCUMENTSDB,
                 METRIC_DATABASES,
+                METRIC_DATABASES_DOCUMENTSDB,
                 METRIC_USERS,
                 METRIC_BUCKETS,
                 METRIC_FILES_STORAGE,
                 METRIC_DATABASES_STORAGE,
+                METRIC_DATABASES_STORAGE_DOCUMENTSDB,
                 METRIC_DEPLOYMENTS_STORAGE,
                 METRIC_BUILDS_STORAGE,
                 METRIC_DATABASES_OPERATIONS_READS,
+                METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB,
                 METRIC_DATABASES_OPERATIONS_WRITES,
+                METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB,
                 METRIC_FILES_IMAGES_TRANSFORMED,
+                // VectorDB totals
+                METRIC_DATABASES_VECTORDB,
+                METRIC_COLLECTIONS_VECTORDB,
+                METRIC_DOCUMENTS_VECTORDB,
+                METRIC_DATABASES_STORAGE_VECTORDB,
+                METRIC_DATABASES_OPERATIONS_READS_VECTORDB,
+                METRIC_DATABASES_OPERATIONS_WRITES_VECTORDB,
+                // Embeddings totals
+                METRIC_EMBEDDINGS_TEXT,
+                METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS,
+                METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION,
+                METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR
             ],
             'period' => [
                 METRIC_NETWORK_REQUESTS,
@@ -80,11 +97,26 @@ Http::get('/v1/project/usage')
                 METRIC_USERS,
                 METRIC_EXECUTIONS,
                 METRIC_DATABASES_STORAGE,
+                METRIC_DATABASES_STORAGE_DOCUMENTSDB,
                 METRIC_EXECUTIONS_MB_SECONDS,
                 METRIC_BUILDS_MB_SECONDS,
                 METRIC_DATABASES_OPERATIONS_READS,
+                METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB,
                 METRIC_DATABASES_OPERATIONS_WRITES,
+                METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB,
                 METRIC_FILES_IMAGES_TRANSFORMED,
+                // VectorDB time series
+                METRIC_DATABASES_VECTORDB,
+                METRIC_COLLECTIONS_VECTORDB,
+                METRIC_DOCUMENTS_VECTORDB,
+                METRIC_DATABASES_STORAGE_VECTORDB,
+                METRIC_DATABASES_OPERATIONS_READS_VECTORDB,
+                METRIC_DATABASES_OPERATIONS_WRITES_VECTORDB,
+                // Embeddings time series
+                METRIC_EMBEDDINGS_TEXT,
+                METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS,
+                METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION,
+                METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR
             ]
         ];
 
@@ -357,8 +389,11 @@ Http::get('/v1/project/usage')
             'buildsMbSecondsTotal' => $total[METRIC_BUILDS_MB_SECONDS],
             'documentsTotal' => $total[METRIC_DOCUMENTS],
             'rowsTotal' => $total[METRIC_DOCUMENTS],
+            'documentsdbDocumentsTotal' => $total[METRIC_DOCUMENTS_DOCUMENTSDB],
             'databasesTotal' => $total[METRIC_DATABASES],
+            'documentsdbTotal' => $total[METRIC_DATABASES_DOCUMENTSDB],
             'databasesStorageTotal' => $total[METRIC_DATABASES_STORAGE],
+            'documentsdbDatabasesStorageTotal' => $total[METRIC_DATABASES_STORAGE_DOCUMENTSDB],
             'usersTotal' => $total[METRIC_USERS],
             'bucketsTotal' => $total[METRIC_BUCKETS],
             'filesStorageTotal' => $total[METRIC_FILES_STORAGE],
@@ -367,10 +402,27 @@ Http::get('/v1/project/usage')
             'deploymentsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE],
             'databasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS],
             'databasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES],
+            'documentsdbDatabasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB],
+            'documentsdbDatabasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB],
+            'vectordbDatabasesTotal' => $total[METRIC_DATABASES_VECTORDB] ?? 0,
+            'vectordbCollectionsTotal' => $total[METRIC_COLLECTIONS_VECTORDB] ?? 0,
+            'vectordbDocumentsTotal' => $total[METRIC_DOCUMENTS_VECTORDB] ?? 0,
+            'vectordbDatabasesStorageTotal' => $total[METRIC_DATABASES_STORAGE_VECTORDB] ?? 0,
+            'vectordbDatabasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS_VECTORDB] ?? 0,
+            'vectordbDatabasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES_VECTORDB] ?? 0,
             'executionsBreakdown' => $executionsBreakdown,
             'bucketsBreakdown' => $bucketsBreakdown,
             'databasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS],
             'databasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES],
+            'documentsdbDatabasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB],
+            'documentsdbDatabasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB],
+            'documentsdbDatabasesStorage' => $usage[METRIC_DATABASES_STORAGE_DOCUMENTSDB],
+            'vectordbDatabases' => $usage[METRIC_DATABASES_VECTORDB] ?? [],
+            'vectordbCollections' => $usage[METRIC_COLLECTIONS_VECTORDB] ?? [],
+            'vectordbDocuments' => $usage[METRIC_DOCUMENTS_VECTORDB] ?? [],
+            'vectordbDatabasesStorage' => $usage[METRIC_DATABASES_STORAGE_VECTORDB] ?? [],
+            'vectordbDatabasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS_VECTORDB] ?? [],
+            'vectordbDatabasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES_VECTORDB] ?? [],
             'databasesStorageBreakdown' => $databasesStorageBreakdown,
             'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
             'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
@@ -380,6 +432,14 @@ Http::get('/v1/project/usage')
             'authPhoneCountryBreakdown' => $authPhoneCountryBreakdown,
             'imageTransformations' => $usage[METRIC_FILES_IMAGES_TRANSFORMED],
             'imageTransformationsTotal' => $total[METRIC_FILES_IMAGES_TRANSFORMED],
+            'embeddingsText' => $usage[METRIC_EMBEDDINGS_TEXT] ?? [],
+            'embeddingsTextTokens' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS] ?? [],
+            'embeddingsTextDuration' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION] ?? [],
+            'embeddingsTextErrors' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR] ?? [],
+            'embeddingsTextTotal' => $total[METRIC_EMBEDDINGS_TEXT] ?? 0,
+            'embeddingsTextTokensTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS] ?? 0,
+            'embeddingsTextDurationTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION] ?? 0,
+            'embeddingsTextErrorsTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR] ?? 0,
         ]), Response::MODEL_USAGE_PROJECT);
     });
 

app/controllers/api/projects.php

@@ -71,7 +71,7 @@ Http::get('/v1/projects/:projectId')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('dbForPlatform')
     ->action(function (string $projectId, Response $response, Database $dbForPlatform) {
@@ -102,7 +102,7 @@ Http::patch('/v1/projects/:projectId/service')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('service', '', new WhiteList(array_keys(array_filter(Config::getParam('services'), fn ($element) => $element['optional'])), true), 'Service name.')
     ->param('status', null, new Boolean(), 'Service status.')
     ->inject('response')
@@ -140,7 +140,7 @@ Http::patch('/v1/projects/:projectId/service/all')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('status', null, new Boolean(), 'Service status.')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -201,7 +201,7 @@ Http::patch('/v1/projects/:projectId/api')
             ]
         )
     ])
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('api', '', new WhiteList(array_keys(Config::getParam('apis')), true), 'API name.')
     ->param('status', null, new Boolean(), 'API status.')
     ->inject('response')
@@ -259,7 +259,7 @@ Http::patch('/v1/projects/:projectId/api/all')
             ]
         )
     ])
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('status', null, new Boolean(), 'API status.')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -300,7 +300,7 @@ Http::patch('/v1/projects/:projectId/oauth2')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('provider', '', new WhiteList(\array_keys(Config::getParam('oAuthProviders')), true), 'Provider Name')
     ->param('appId', null, new Nullable(new Text(256)), 'Provider app ID. Max length: 256 chars.', true)
     ->param('secret', null, new Nullable(new text(512)), 'Provider secret key. Max length: 512 chars.', true)
@@ -351,7 +351,7 @@ Http::patch('/v1/projects/:projectId/auth/session-alerts')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('alerts', false, new Boolean(true), 'Set to true to enable session emails.')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -389,7 +389,7 @@ Http::patch('/v1/projects/:projectId/auth/memberships-privacy')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('userName', true, new Boolean(true), 'Set to true to show userName to members of a team.')
     ->param('userEmail', true, new Boolean(true), 'Set to true to show email to members of a team.')
     ->param('mfa', true, new Boolean(true), 'Set to true to show mfa to members of a team.')
@@ -431,7 +431,7 @@ Http::patch('/v1/projects/:projectId/auth/limit')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('limit', false, new Range(0, APP_LIMIT_USERS), 'Set the max number of users allowed in this project. Use 0 for unlimited.')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -469,7 +469,7 @@ Http::patch('/v1/projects/:projectId/auth/duration')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('duration', 31536000, new Range(0, 31536000), 'Project session length in seconds. Max length: 31536000 seconds.')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -507,7 +507,7 @@ Http::patch('/v1/projects/:projectId/auth/:method')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('method', '', new WhiteList(\array_keys(Config::getParam('auth')), true), 'Auth Method. Possible values: ' . implode(',', \array_keys(Config::getParam('auth'))), false)
     ->param('status', false, new Boolean(true), 'Set the status of this auth method.')
     ->inject('response')
@@ -548,7 +548,7 @@ Http::patch('/v1/projects/:projectId/auth/password-history')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('limit', 0, new Range(0, APP_LIMIT_USER_PASSWORD_HISTORY), 'Set the max number of passwords to store in user history. User can\'t choose a new password that is already stored in the password history list.  Max number of passwords allowed in history is' . APP_LIMIT_USER_PASSWORD_HISTORY . '. Default value is 0')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -586,7 +586,7 @@ Http::patch('/v1/projects/:projectId/auth/password-dictionary')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('enabled', false, new Boolean(false), 'Set whether or not to enable checking user\'s password against most commonly used passwords. Default is false.')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -624,7 +624,7 @@ Http::patch('/v1/projects/:projectId/auth/personal-data')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('enabled', false, new Boolean(false), 'Set whether or not to check a password for similarity with personal data. Default is false.')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -662,7 +662,7 @@ Http::patch('/v1/projects/:projectId/auth/max-sessions')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('limit', false, new Range(1, APP_LIMIT_USER_SESSIONS_MAX), 'Set the max number of users allowed in this project. Value allowed is between 1-' . APP_LIMIT_USER_SESSIONS_MAX . '. Default is ' . APP_LIMIT_USER_SESSIONS_DEFAULT)
     ->inject('response')
     ->inject('dbForPlatform')
@@ -700,7 +700,7 @@ Http::patch('/v1/projects/:projectId/auth/mock-numbers')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('numbers', '', new ArrayList(new MockNumber(), 10), 'An array of mock numbers and their corresponding verification codes (OTPs). Each number should be a valid E.164 formatted phone number. Maximum of 10 numbers are allowed.')
     ->inject('response')
     ->inject('dbForPlatform')
@@ -749,7 +749,7 @@ Http::delete('/v1/projects/:projectId')
         ],
         contentType: ContentType::NONE
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('user')
     ->inject('dbForPlatform')
@@ -792,7 +792,7 @@ Http::post('/v1/projects/:projectId/webhooks')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('name', null, new Text(128), 'Webhook name. Max length: 128 chars.')
     ->param('enabled', true, new Boolean(true), 'Enable or disable a webhook.', true)
     ->param('events', null, new ArrayList(new Event(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
@@ -857,7 +857,7 @@ Http::get('/v1/projects/:projectId/webhooks')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
     ->inject('response')
     ->inject('dbForPlatform')
@@ -897,8 +897,8 @@ Http::get('/v1/projects/:projectId/webhooks/:webhookId')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('webhookId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('dbForPlatform')
     ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForPlatform) {
@@ -938,8 +938,8 @@ Http::put('/v1/projects/:projectId/webhooks/:webhookId')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('webhookId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForProject'])
     ->param('name', null, new Text(128), 'Webhook name. Max length: 128 chars.')
     ->param('enabled', true, new Boolean(true), 'Enable or disable a webhook.', true)
     ->param('events', null, new ArrayList(new Event(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
@@ -1004,8 +1004,8 @@ Http::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('webhookId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('dbForPlatform')
     ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForPlatform) {
@@ -1051,8 +1051,8 @@ Http::delete('/v1/projects/:projectId/webhooks/:webhookId')
         ],
         contentType: ContentType::NONE
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('webhookId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('webhookId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Webhook unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('dbForPlatform')
     ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForPlatform) {
@@ -1098,9 +1098,10 @@ Http::post('/v1/projects/:projectId/keys')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     // TODO: When migrating to Platform API, mark keyId required for consistency
-    ->param('keyId', 'unique()', fn (Database $dbForPlatform) => new CustomId($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Key ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.', true, ['dbForPlatform'])->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
+    ->param('keyId', 'unique()', new CustomId(), 'Key ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.', true)
+    ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
     ->param('scopes', null, new Nullable(new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
     ->param('expire', null, new Nullable(new DatetimeValidator()), 'Expiration time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Use null for unlimited expiration.', true)
     ->inject('response')
@@ -1162,7 +1163,7 @@ Http::get('/v1/projects/:projectId/keys')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('queries', [], new Keys(), '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(', ', Keys::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')
@@ -1235,8 +1236,8 @@ Http::get('/v1/projects/:projectId/keys/:keyId')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('keyId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('keyId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('dbForPlatform')
     ->action(function (string $projectId, string $keyId, Response $response, Database $dbForPlatform) {
@@ -1277,8 +1278,8 @@ Http::put('/v1/projects/:projectId/keys/:keyId')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('keyId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('keyId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForProject'])
     ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
     ->param('scopes', null, new Nullable(new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
     ->param('expire', null, new Nullable(new DatetimeValidator()), 'Expiration time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Use null for unlimited expiration.', true)
@@ -1332,8 +1333,8 @@ Http::delete('/v1/projects/:projectId/keys/:keyId')
         ],
         contentType: ContentType::NONE
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('keyId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('keyId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('dbForPlatform')
     ->action(function (string $projectId, string $keyId, Response $response, Database $dbForPlatform) {
@@ -1380,7 +1381,7 @@ Http::post('/v1/projects/:projectId/jwts')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('scopes', [], new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of scopes allowed for JWT key. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
     ->param('duration', 900, new Range(0, 3600), 'Time in seconds before JWT expires. Default duration is 900 seconds, and maximum is 3600 seconds.', true)
     ->inject('response')
@@ -1424,7 +1425,7 @@ Http::post('/v1/projects/:projectId/platforms')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param(
         'type',
         null,
@@ -1502,7 +1503,7 @@ Http::get('/v1/projects/:projectId/platforms')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
     ->inject('response')
     ->inject('dbForPlatform')
@@ -1542,8 +1543,8 @@ Http::get('/v1/projects/:projectId/platforms/:platformId')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('platformId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('platformId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('dbForPlatform')
     ->action(function (string $projectId, string $platformId, Response $response, Database $dbForPlatform) {
@@ -1583,8 +1584,8 @@ Http::put('/v1/projects/:projectId/platforms/:platformId')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('platformId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('platformId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForProject'])
     ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
     ->param('key', '', new Text(256), 'Package name for android or bundle ID for iOS. Max length: 256 chars.', true)
     ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
@@ -1640,8 +1641,8 @@ Http::delete('/v1/projects/:projectId/platforms/:platformId')
         ],
         contentType: ContentType::NONE
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
-    ->param('platformId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
+    ->param('platformId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForProject'])
     ->inject('response')
     ->inject('dbForPlatform')
     ->action(function (string $projectId, string $platformId, Response $response, Database $dbForPlatform) {
@@ -1707,7 +1708,7 @@ Http::patch('/v1/projects/:projectId/smtp')
             ]
         )
     ])
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('enabled', false, new Boolean(), 'Enable custom SMTP service')
     ->param('senderName', '', new Text(255, 0), 'Name of the email sender', true)
     ->param('senderEmail', '', new Email(), 'Email of the sender', true)
@@ -1825,7 +1826,7 @@ Http::post('/v1/projects/:projectId/smtp/tests')
             ]
         )
     ])
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('emails', [], new ArrayList(new Email(), 10), 'Array of emails to send test email to. Maximum of 10 emails are allowed.')
     ->param('senderName', System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'), new Text(255, 0), 'Name of the email sender')
     ->param('senderEmail', System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM), new Email(), 'Email of the sender')
@@ -1920,7 +1921,7 @@ Http::get('/v1/projects/:projectId/templates/sms/:type/:locale')
             ]
         )
     ])
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('type', '', new WhiteList(Config::getParam('locale-templates')['sms'] ?? [], true), 'Template type')
     ->param('locale', '', fn ($localeCodes) => new WhiteList($localeCodes), 'Template locale', false, ['localeCodes'])
     ->inject('response')
@@ -1968,7 +1969,7 @@ Http::get('/v1/projects/:projectId/templates/email/:type/:locale')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('type', '', new WhiteList(Config::getParam('locale-templates')['email'] ?? [], true), 'Template type')
     ->param('locale', '', fn ($localeCodes) => new WhiteList($localeCodes), 'Template locale', false, ['localeCodes'])
     ->inject('response')
@@ -2087,7 +2088,7 @@ Http::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
             ]
         )
     ])
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('type', '', new WhiteList(Config::getParam('locale-templates')['sms'] ?? [], true), 'Template type')
     ->param('locale', '', fn ($localeCodes) => new WhiteList($localeCodes), 'Template locale', false, ['localeCodes'])
     ->param('message', '', new Text(0), 'Template message')
@@ -2134,7 +2135,7 @@ Http::patch('/v1/projects/:projectId/templates/email/:type/:locale')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('type', '', new WhiteList(Config::getParam('locale-templates')['email'] ?? [], true), 'Template type')
     ->param('locale', '', fn ($localeCodes) => new WhiteList($localeCodes), 'Template locale', false, ['localeCodes'])
     ->param('subject', '', new Text(255), 'Email Subject')
@@ -2213,7 +2214,7 @@ Http::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
             contentType: ContentType::JSON
         )
     ])
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('type', '', new WhiteList(Config::getParam('locale-templates')['sms'] ?? [], true), 'Template type')
     ->param('locale', '', fn ($localeCodes) => new WhiteList($localeCodes), 'Template locale', false, ['localeCodes'])
     ->inject('response')
@@ -2264,7 +2265,7 @@ Http::delete('/v1/projects/:projectId/templates/email/:type/:locale')
         ],
         contentType: ContentType::JSON
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('type', '', new WhiteList(Config::getParam('locale-templates')['email'] ?? [], true), 'Template type')
     ->param('locale', '', fn ($localeCodes) => new WhiteList($localeCodes), 'Template locale', false, ['localeCodes'])
     ->inject('response')
@@ -2316,7 +2317,7 @@ Http::patch('/v1/projects/:projectId/auth/session-invalidation')
             )
         ]
     ))
-    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('projectId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForProject'])
     ->param('enabled', false, new Boolean(), 'Update authentication session invalidation status. Use this endpoint to enable or disable session invalidation on password change')
     ->inject('response')
     ->inject('dbForPlatform')

app/controllers/api/users.php

@@ -73,9 +73,8 @@ use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
 /** TODO: Remove function when we move to using utopia/platform */
-function createUser(Hash $hash, string $userId, ?string $email, ?string $password, ?string $phone, ?string $name, Document $project, Database $dbForProject, Hooks $hooks): Document
+function createUser(Hash $hash, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Document $project, Database $dbForProject, Hooks $hooks): Document
 {
-    $name = $name ?? '';
     $plaintextPassword = $password;
     $passwordHistory = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
 
@@ -256,7 +255,7 @@ Http::post('/v1/users')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $plaintext = new Plaintext();
 
         $user = createUser($plaintext, $userId, $email, $password, $phone, $name, $project, $dbForProject, $hooks);
@@ -292,7 +291,7 @@ Http::post('/v1/users/bcrypt')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $bcrypt = new Bcrypt();
         $bcrypt->setCost(8); // Default cost
 
@@ -330,7 +329,7 @@ Http::post('/v1/users/md5')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $md5 = new MD5();
 
         $user = createUser($md5, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
@@ -367,7 +366,7 @@ Http::post('/v1/users/argon2')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $argon2 = new Argon2();
 
         $user = createUser($argon2, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
@@ -405,7 +404,7 @@ Http::post('/v1/users/sha')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, string $passwordVersion, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $sha = new Sha();
         if (!empty($passwordVersion)) {
             $sha->setVersion($passwordVersion);
@@ -445,7 +444,7 @@ Http::post('/v1/users/phpass')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $phpass = new PHPass();
 
         $user = createUser($phpass, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
@@ -487,7 +486,7 @@ Http::post('/v1/users/scrypt')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $scrypt = new Scrypt();
         $scrypt
             ->setSalt($passwordSalt)
@@ -533,7 +532,7 @@ Http::post('/v1/users/scrypt-modified')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $scryptModified = new ScryptModified();
         $scryptModified
             ->setSalt($passwordSalt)

app/controllers/api/vcs.php

@@ -0,0 +1,705 @@
+<?php
+
+use Appwrite\Event\Build;
+use Appwrite\Extend\Exception;
+use Appwrite\Filter\BranchDomain as BranchDomainFilter;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Request;
+use Appwrite\Utopia\Response;
+use Appwrite\Vcs\Comment;
+use Utopia\Console;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
+use Utopia\Database\Helpers\Role;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Http\Http;
+use Utopia\System\System;
+use Utopia\Validator\Text;
+use Utopia\VCS\Adapter\Git\GitHub;
+use Utopia\VCS\Exception\RepositoryNotFound;
+
+$createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForPlatform, Authorization $authorization, Build $queueForBuilds, callable $getProjectDB, Request $request, array $platform) {
+    $errors = [];
+    foreach ($repositories as $repository) {
+        try {
+            $resourceType = $repository->getAttribute('resourceType');
+
+            if ($resourceType !== "function" && $resourceType !== "site") {
+                continue;
+            }
+
+            $projectId = $repository->getAttribute('projectId');
+            $project = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+            if ($project->isEmpty()) {
+                throw new Exception(Exception::PROJECT_NOT_FOUND, 'Repository references non-existent project');
+            }
+            $dbForProject = $getProjectDB($project);
+
+            $resourceCollection = $resourceType === "function" ? 'functions' : 'sites';
+            $resourceId = $repository->getAttribute('resourceId');
+            $resource = $authorization->skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
+            $resourceInternalId = $resource->getSequence();
+
+            $deploymentId = ID::unique();
+            $repositoryId = $repository->getId();
+            $repositoryInternalId = $repository->getSequence();
+            $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+            $installationId = $repository->getAttribute('installationId');
+            $installationInternalId = $repository->getAttribute('installationInternalId');
+            $productionBranch = $resource->getAttribute('providerBranch');
+            $activate = false;
+
+            if ($providerBranch == $productionBranch && $external === false) {
+                $activate = true;
+            }
+
+            $owner = $github->getOwnerName($providerInstallationId) ?? '';
+            try {
+                $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
+                if (empty($repositoryName)) {
+                    throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+                }
+            } catch (RepositoryNotFound $e) {
+                throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+            }
+
+            if (empty($repositoryName)) {
+                throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+            }
+
+            $isAuthorized = !$external;
+
+            if (!$isAuthorized && !empty($providerPullRequestId)) {
+                if (\in_array($providerPullRequestId, $repository->getAttribute('providerPullRequestIds', []))) {
+                    $isAuthorized = true;
+                }
+            }
+
+            $commentStatus = $isAuthorized ? 'waiting' : 'failed';
+            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+            $hostname = $platform['consoleHostname'] ?? '';
+
+            $authorizeUrl = $protocol . '://' . $hostname . "/console/git/authorize-contributor?projectId={$projectId}&installationId={$installationId}&repositoryId={$repositoryId}&providerPullRequestId={$providerPullRequestId}";
+
+            $action = $isAuthorized ? ['type' => 'logs'] : ['type' => 'authorize', 'url' => $authorizeUrl];
+
+            $latestCommentId = '';
+
+            if (!empty($providerPullRequestId) && $resource->getAttribute('providerSilentMode', false) === false) {
+                $latestComment = $authorization->skip(fn () => $dbForPlatform->findOne('vcsComments', [
+                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
+                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
+                    Query::orderDesc('$createdAt'),
+                ]));
+
+                if (!$latestComment->isEmpty()) {
+                    $latestCommentId = $latestComment->getAttribute('providerCommentId', '');
+
+                    $retries = 0;
+                    $lockAcquired = false;
+
+                    while ($retries < 9) {
+                        $retries++;
+
+                        try {
+                            $dbForPlatform->createDocument('vcsCommentLocks', new Document([
+                                '$id' => $latestCommentId
+                            ]));
+                            $lockAcquired = true;
+                            break;
+                        } catch (\Throwable $err) {
+                            if ($retries >= 9) {
+                                Console::warning("Error creating vcs comment lock for " . $latestCommentId . ": " . $err->getMessage());
+                            }
+
+                            \sleep(1);
+                        }
+                    }
+
+                    if ($lockAcquired) {
+                        // Wrap in try/finally to ensure lock file gets deleted
+                        try {
+                            $comment = new Comment($platform);
+                            $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
+                            $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');
+
+                            $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
+                        } finally {
+                            $authorization->skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
+                        }
+                    }
+                } else {
+                    $comment = new Comment($platform);
+                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');
+                    $latestCommentId = \strval($github->createComment($owner, $repositoryName, $providerPullRequestId, $comment->generateComment()));
+
+                    if (!empty($latestCommentId)) {
+                        $teamId = $project->getAttribute('teamId', '');
+
+                        $latestComment = $authorization->skip(fn () => $dbForPlatform->createDocument('vcsComments', new Document([
+                            '$id' => ID::unique(),
+                            '$permissions' => [
+                                Permission::read(Role::team(ID::custom($teamId))),
+                                Permission::update(Role::team(ID::custom($teamId), 'owner')),
+                                Permission::update(Role::team(ID::custom($teamId), 'developer')),
+                                Permission::delete(Role::team(ID::custom($teamId), 'owner')),
+                                Permission::delete(Role::team(ID::custom($teamId), 'developer')),
+                            ],
+                            'installationInternalId' => $installationInternalId,
+                            'installationId' => $installationId,
+                            'projectInternalId' => $project->getSequence(),
+                            'projectId' => $project->getId(),
+                            'providerRepositoryId' => $providerRepositoryId,
+                            'providerBranch' => $providerBranch,
+                            'providerPullRequestId' => $providerPullRequestId,
+                            'providerCommentId' => $latestCommentId
+                        ])));
+                    }
+                }
+            } elseif (!empty($providerBranch)) {
+                $latestComments = $authorization->skip(fn () => $dbForPlatform->find('vcsComments', [
+                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
+                    Query::equal('providerBranch', [$providerBranch]),
+                    Query::orderDesc('$createdAt'),
+                ]));
+
+                foreach ($latestComments as $comment) {
+                    $latestCommentId = $comment->getAttribute('providerCommentId', '');
+
+                    $retries = 0;
+                    $lockAcquired = false;
+
+                    while ($retries < 9) {
+                        $retries++;
+
+                        try {
+                            $dbForPlatform->createDocument('vcsCommentLocks', new Document([
+                                '$id' => $latestCommentId
+                            ]));
+                            $lockAcquired = true;
+                            break;
+                        } catch (\Throwable $err) {
+                            if ($retries >= 9) {
+                                Console::warning("Error creating vcs comment lock for " . $latestCommentId . ": " . $err->getMessage());
+                            }
+
+                            \sleep(1);
+                        }
+                    }
+
+                    if ($lockAcquired) {
+                        // Wrap in try/finally to ensure lock file gets deleted
+                        try {
+                            $comment = new Comment($platform);
+                            $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
+                            $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');
+
+                            $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
+                        } finally {
+                            $authorization->skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
+                        }
+                    }
+                }
+            }
+
+            if (!$isAuthorized) {
+                $resourceName = $resource->getAttribute('name');
+                $projectName = $project->getAttribute('name');
+                $name = "{$resourceName} ({$projectName})";
+                $message = 'Authorization required for external contributor.';
+
+                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+                try {
+                    $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
+                    if (empty($repositoryName)) {
+                        throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+                    }
+                } catch (RepositoryNotFound $e) {
+                    throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+                }
+                $owner = $github->getOwnerName($providerInstallationId);
+                $github->updateCommitStatus($repositoryName, $providerCommitHash, $owner, 'failure', $message, $authorizeUrl, $name);
+                continue;
+            }
+
+            if ($external) {
+                $pullRequestResponse = $github->getPullRequest($owner, $repositoryName, $providerPullRequestId);
+                $providerRepositoryName = $pullRequestResponse['head']['repo']['owner']['login'];
+                $providerRepositoryOwner = $pullRequestResponse['head']['repo']['name'];
+            }
+
+            $commands = [];
+            if (!empty($resource->getAttribute('installCommand', ''))) {
+                $commands[] = $resource->getAttribute('installCommand', '');
+            }
+            if (!empty($resource->getAttribute('buildCommand', ''))) {
+                $commands[] = $resource->getAttribute('buildCommand', '');
+            }
+            if (!empty($resource->getAttribute('commands', ''))) {
+                $commands[] = $resource->getAttribute('commands', '');
+            }
+
+            $deployment = $authorization->skip(fn () => $dbForProject->createDocument('deployments', new Document([
+                '$id' => $deploymentId,
+                '$permissions' => [
+                    Permission::read(Role::any()),
+                    Permission::update(Role::any()),
+                    Permission::delete(Role::any()),
+                ],
+                'resourceId' => $resourceId,
+                'resourceInternalId' => $resourceInternalId,
+                'resourceType' => $resourceCollection,
+                'entrypoint' => $resource->getAttribute('entrypoint', ''),
+                'buildCommands' => \implode(' && ', $commands),
+                'startCommand' => $resource->getAttribute('startCommand', ''),
+                'buildOutput' => $resource->getAttribute('outputDirectory', ''),
+                'adapter' => $resource->getAttribute('adapter', ''),
+                'fallbackFile' => $resource->getAttribute('fallbackFile', ''),
+                'type' => 'vcs',
+                'installationId' => $installationId,
+                'installationInternalId' => $installationInternalId,
+                'providerRepositoryId' => $providerRepositoryId,
+                'repositoryId' => $repositoryId,
+                'repositoryInternalId' => $repositoryInternalId,
+                'providerBranchUrl' => $providerBranchUrl,
+                'providerRepositoryName' => $providerRepositoryName,
+                'providerRepositoryOwner' => $providerRepositoryOwner,
+                'providerRepositoryUrl' => $providerRepositoryUrl,
+                'providerCommitHash' => $providerCommitHash,
+                'providerCommitAuthorUrl' => $providerCommitAuthorUrl,
+                'providerCommitAuthor' => $providerCommitAuthor,
+                'providerCommitMessage' => mb_strimwidth($providerCommitMessage, 0, 255, '...'),
+                'providerCommitUrl' => $providerCommitUrl,
+                'providerCommentId' => \strval($latestCommentId),
+                'providerBranch' => $providerBranch,
+                'activate' => $activate,
+            ])));
+
+            $resource = $resource
+                ->setAttribute('latestDeploymentId', $deployment->getId())
+                ->setAttribute('latestDeploymentInternalId', $deployment->getSequence())
+                ->setAttribute('latestDeploymentCreatedAt', $deployment->getCreatedAt())
+                ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
+            $authorization->skip(fn () => $dbForProject->updateDocument($resource->getCollection(), $resource->getId(), $resource));
+
+            if ($resource->getCollection() === 'sites') {
+                $projectId = $project->getId();
+
+                // Deployment preview
+                $sitesDomain = $platform['sitesDomain'];
+                $domain = ID::unique() . "." . $sitesDomain;
+                $ruleId = md5($domain);
+                $previewRuleId = $ruleId;
+                $authorization->skip(
+                    fn () => $dbForPlatform->createDocument('rules', new Document([
+                        '$id' => $ruleId,
+                        'projectId' => $project->getId(),
+                        'projectInternalId' => $project->getSequence(),
+                        'domain' => $domain,
+                        'type' => 'deployment',
+                        'trigger' => 'deployment',
+                        'deploymentId' => $deployment->getId(),
+                        'deploymentInternalId' => $deployment->getSequence(),
+                        'deploymentResourceType' => 'site',
+                        'deploymentResourceId' => $resourceId,
+                        'deploymentResourceInternalId' => $resourceInternalId,
+                        'deploymentVcsProviderBranch' => $providerBranch,
+                        'status' => 'verified',
+                        'certificateId' => '',
+                        'search' => implode(' ', [$ruleId, $domain]),
+                        'owner' => 'Appwrite',
+                        'region' => $project->getAttribute('region')
+                    ]))
+                );
+
+                // VCS branch preview
+                if (!empty($providerBranch)) {
+                    $domain = (new BranchDomainFilter())->apply([
+                        'branch' => $providerBranch,
+                        'resourceId' => $resource->getId(),
+                        'projectId' => $project->getId(),
+                        'sitesDomain' => $sitesDomain,
+                    ]);
+                    $ruleId = md5($domain);
+                    try {
+                        $authorization->skip(
+                            fn () => $dbForPlatform->createDocument('rules', new Document([
+                                '$id' => $ruleId,
+                                'projectId' => $project->getId(),
+                                'projectInternalId' => $project->getSequence(),
+                                'domain' => $domain,
+                                'type' => 'deployment',
+                                'trigger' => 'deployment',
+                                'deploymentId' => $deployment->getId(),
+                                'deploymentInternalId' => $deployment->getSequence(),
+                                'deploymentResourceType' => 'site',
+                                'deploymentResourceId' => $resourceId,
+                                'deploymentResourceInternalId' => $resourceInternalId,
+                                'deploymentVcsProviderBranch' => $providerBranch,
+                                'status' => 'verified',
+                                'certificateId' => '',
+                                'search' => implode(' ', [$ruleId, $domain]),
+                                'owner' => 'Appwrite',
+                                'region' => $project->getAttribute('region')
+                            ]))
+                        );
+                    } catch (Duplicate $err) {
+                        // Ignore, rule already exists; will be updated by builds worker
+                    }
+                }
+
+                // VCS commit preview
+                if (!empty($providerCommitHash)) {
+                    $domain = "commit-" . substr($providerCommitHash, 0, 16) . ".{$sitesDomain}";
+                    $ruleId = md5($domain);
+                    try {
+                        $authorization->skip(
+                            fn () => $dbForPlatform->createDocument('rules', new Document([
+                                '$id' => $ruleId,
+                                'projectId' => $project->getId(),
+                                'projectInternalId' => $project->getSequence(),
+                                'domain' => $domain,
+                                'type' => 'deployment',
+                                'trigger' => 'deployment',
+                                'deploymentId' => $deployment->getId(),
+                                'deploymentInternalId' => $deployment->getSequence(),
+                                'deploymentResourceType' => 'site',
+                                'deploymentResourceId' => $resourceId,
+                                'deploymentResourceInternalId' => $resourceInternalId,
+                                'deploymentVcsProviderBranch' => $providerBranch,
+                                'status' => 'verified',
+                                'certificateId' => '',
+                                'search' => implode(' ', [$ruleId, $domain]),
+                                'owner' => 'Appwrite',
+                                'region' => $project->getAttribute('region')
+                            ]))
+                        );
+                    } catch (Duplicate $err) {
+                        // Ignore, rule already exists; will be updated by builds worker
+                    }
+                }
+            }
+
+            if ($resource->getCollection() === 'sites' && !empty($latestCommentId) && !empty($previewRuleId)) {
+                $retries = 0;
+                $lockAcquired = false;
+
+                while ($retries < 9) {
+                    $retries++;
+
+                    try {
+                        $dbForPlatform->createDocument('vcsCommentLocks', new Document([
+                            '$id' => $latestCommentId
+                        ]));
+                        $lockAcquired = true;
+                        break;
+                    } catch (\Throwable $err) {
+                        if ($retries >= 9) {
+                            Console::warning("Error creating vcs comment lock for " . $latestCommentId . ": " . $err->getMessage());
+                        }
+
+                        \sleep(1);
+                    }
+                }
+
+                if ($lockAcquired) {
+                    // Wrap in try/finally to ensure lock file gets deleted
+                    try {
+                        $rule = $authorization->skip(fn () => $dbForPlatform->getDocument('rules', $previewRuleId));
+
+                        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+                        $previewUrl = !empty($rule) ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '';
+
+                        if (!empty($previewUrl)) {
+                            $comment = new Comment($platform);
+                            $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
+                            $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, $previewUrl);
+                            $github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment());
+                        }
+                    } finally {
+                        $authorization->skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
+                    }
+                }
+            }
+
+            if (!empty($providerCommitHash) && $resource->getAttribute('providerSilentMode', false) === false) {
+                $resourceName = $resource->getAttribute('name');
+                $projectName = $project->getAttribute('name');
+                $region = $project->getAttribute('region', 'default');
+                $name = "{$resourceName} ({$projectName})";
+                $message = 'Starting...';
+
+                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+                try {
+                    $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
+                    if (empty($repositoryName)) {
+                        throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+                    }
+                } catch (RepositoryNotFound $e) {
+                    throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+                }
+                $owner = $github->getOwnerName($providerInstallationId);
+
+                $providerTargetUrl = $protocol . '://' . $hostname . "/console/project-$region-$projectId/$resourceCollection/$resourceType-$resourceId";
+                $github->updateCommitStatus($repositoryName, $providerCommitHash, $owner, 'pending', $message, $providerTargetUrl, $name);
+            }
+
+            $queueForBuilds
+                ->setType(BUILD_TYPE_DEPLOYMENT)
+                ->setResource($resource)
+                ->setDeployment($deployment)
+                ->setProject($project); // set the project because it won't be set for git deployments
+
+            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function/site
+
+            //TODO: Add event?
+        } catch (Throwable $e) {
+            $errors[] = $e->getMessage();
+        }
+    }
+
+    $queueForBuilds->reset(); // prevent shutdown hook from triggering again
+
+    if (!empty($errors)) {
+        throw new Exception(Exception::GENERAL_UNKNOWN, \implode("\n", $errors));
+    }
+};
+
+Http::post('/v1/vcs/github/events')
+    ->desc('Create event')
+    ->groups(['api', 'vcs'])
+    ->label('scope', 'public')
+    ->inject('gitHub')
+    ->inject('request')
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->inject('authorization')
+    ->inject('getProjectDB')
+    ->inject('queueForBuilds')
+    ->inject('platform')
+    ->action(
+        function (GitHub $github, Request $request, Response $response, Database $dbForPlatform, Authorization $authorization, callable $getProjectDB, Build $queueForBuilds, array $platform) use ($createGitDeployments) {
+            $payload = $request->getRawPayload();
+            $signatureRemote = $request->getHeader('x-hub-signature-256', '');
+            $signatureLocal = System::getEnv('_APP_VCS_GITHUB_WEBHOOK_SECRET', '');
+
+            $valid = empty($signatureRemote) ? true : $github->validateWebhookEvent($payload, $signatureRemote, $signatureLocal);
+
+            if (!$valid) {
+                throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN, "Invalid webhook payload signature. Please make sure the webhook secret has same value in your GitHub app and in the _APP_VCS_GITHUB_WEBHOOK_SECRET environment variable");
+            }
+
+            $event = $request->getHeader('x-github-event', '');
+            $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
+            $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
+            $parsedPayload = $github->getEvent($event, $payload);
+
+            if ($event == $github::EVENT_PUSH) {
+                $providerBranchCreated = $parsedPayload["branchCreated"] ?? false;
+                $providerBranchDeleted = $parsedPayload["branchDeleted"] ?? false;
+                $providerBranch = $parsedPayload["branch"] ?? '';
+                $providerBranchUrl = $parsedPayload["branchUrl"] ?? '';
+                $providerRepositoryId = $parsedPayload["repositoryId"] ?? '';
+                $providerRepositoryName = $parsedPayload["repositoryName"] ?? '';
+                $providerInstallationId = $parsedPayload["installationId"] ?? '';
+                $providerRepositoryUrl = $parsedPayload["repositoryUrl"] ?? '';
+                $providerCommitHash = $parsedPayload["commitHash"] ?? '';
+                $providerRepositoryOwner = $parsedPayload["owner"] ?? '';
+                $providerCommitAuthorName = $parsedPayload["headCommitAuthorName"] ?? '';
+                $providerCommitAuthorEmail = $parsedPayload["headCommitAuthorEmail"] ?? '';
+                $providerCommitAuthorUrl = $parsedPayload["authorUrl"] ?? '';
+                $providerCommitMessage = $parsedPayload["headCommitMessage"] ?? '';
+                $providerCommitUrl = $parsedPayload["headCommitUrl"] ?? '';
+
+                $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
+
+                //find resourceId from relevant resources table
+                $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [
+                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
+                    Query::limit(100),
+                ]));
+
+                // create new deployment only on push (not committed by us) and not when branch is created or deleted
+                if ($providerCommitAuthorEmail !== APP_VCS_GITHUB_EMAIL && !$providerBranchCreated && !$providerBranchDeleted) {
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthorName, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $request, $platform);
+                }
+            } elseif ($event == $github::EVENT_INSTALLATION) {
+                if ($parsedPayload["action"] == "deleted") {
+                    // TODO: Use worker for this job instead (update function/site as well)
+                    $providerInstallationId = $parsedPayload["installationId"];
+
+                    $installations = $dbForPlatform->find('installations', [
+                        Query::equal('providerInstallationId', [$providerInstallationId]),
+                        Query::limit(1000)
+                    ]);
+
+                    foreach ($installations as $installation) {
+                        $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [
+                            Query::equal('installationInternalId', [$installation->getSequence()]),
+                            Query::limit(1000)
+                        ]));
+
+                        foreach ($repositories as $repository) {
+                            $authorization->skip(fn () => $dbForPlatform->deleteDocument('repositories', $repository->getId()));
+                        }
+
+                        $authorization->skip(fn () => $dbForPlatform->deleteDocument('installations', $installation->getId()));
+                    }
+                }
+            } elseif ($event == $github::EVENT_PULL_REQUEST) {
+                if ($parsedPayload["action"] == "opened" || $parsedPayload["action"] == "reopened" || $parsedPayload["action"] == "synchronize") {
+                    $providerBranch = $parsedPayload["branch"] ?? '';
+                    $providerBranchUrl = $parsedPayload["branchUrl"] ?? '';
+                    $providerRepositoryId = $parsedPayload["repositoryId"] ?? '';
+                    $providerRepositoryName = $parsedPayload["repositoryName"] ?? '';
+                    $providerInstallationId = $parsedPayload["installationId"] ?? '';
+                    $providerRepositoryUrl = $parsedPayload["repositoryUrl"] ?? '';
+                    $providerPullRequestId = $parsedPayload["pullRequestNumber"] ?? '';
+                    $providerCommitHash = $parsedPayload["commitHash"] ?? '';
+                    $providerRepositoryOwner = $parsedPayload["owner"] ?? '';
+                    $external = $parsedPayload["external"] ?? true;
+                    $providerCommitUrl = $parsedPayload["headCommitUrl"] ?? '';
+                    $providerCommitAuthorUrl = $parsedPayload["authorUrl"] ?? '';
+
+                    // Ignore sync for non-external. We handle it in push webhook
+                    if (!$external && $parsedPayload["action"] == "synchronize") {
+                        return $response->json($parsedPayload);
+                    }
+
+                    $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
+
+                    $commitDetails = $github->getCommit($providerRepositoryOwner, $providerRepositoryName, $providerCommitHash);
+                    $providerCommitAuthor = $commitDetails["commitAuthor"] ?? '';
+                    $providerCommitMessage = $commitDetails["commitMessage"] ?? '';
+
+                    $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [
+                        Query::equal('providerRepositoryId', [$providerRepositoryId]),
+                        Query::orderDesc('$createdAt')
+                    ]));
+
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $request, $platform);
+                } elseif ($parsedPayload["action"] == "closed") {
+                    // Allowed external contributions cleanup
+
+                    $providerRepositoryId = $parsedPayload["repositoryId"] ?? '';
+                    $providerPullRequestId = $parsedPayload["pullRequestNumber"] ?? '';
+                    $external = $parsedPayload["external"] ?? true;
+
+                    if ($external) {
+                        $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [
+                            Query::equal('providerRepositoryId', [$providerRepositoryId]),
+                            Query::orderDesc('$createdAt')
+                        ]));
+
+                        foreach ($repositories as $repository) {
+                            $providerPullRequestIds = $repository->getAttribute('providerPullRequestIds', []);
+
+                            if (\in_array($providerPullRequestId, $providerPullRequestIds)) {
+                                $providerPullRequestIds = \array_diff($providerPullRequestIds, [$providerPullRequestId]);
+                                $repository = $repository->setAttribute('providerPullRequestIds', $providerPullRequestIds);
+                                $repository = $authorization->skip(fn () => $dbForPlatform->updateDocument('repositories', $repository->getId(), $repository));
+                            }
+                        }
+                    }
+                }
+            }
+
+            $response->json($parsedPayload);
+        }
+    );
+
+Http::patch('/v1/vcs/github/installations/:installationId/repositories/:repositoryId')
+    ->desc('Update external deployment (authorize)')
+    ->groups(['api', 'vcs'])
+    ->label('scope', 'vcs.write')
+    ->label('sdk', new Method(
+        namespace: 'vcs',
+        group: 'repositories',
+        name: 'updateExternalDeployments',
+        description: '/docs/references/vcs/update-external-deployments.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_NOCONTENT,
+                model: Response::MODEL_NONE,
+            )
+        ]
+    ))
+    ->param('installationId', '', new Text(256), 'Installation Id')
+    ->param('repositoryId', '', new Text(256), 'VCS Repository Id')
+    ->param('providerPullRequestId', '', new Text(256), 'GitHub Pull Request Id')
+    ->inject('gitHub')
+    ->inject('response')
+    ->inject('project')
+    ->inject('dbForPlatform')
+    ->inject('authorization')
+    ->inject('getProjectDB')
+    ->inject('queueForBuilds')
+    ->inject('platform')
+    ->action(function (string $installationId, string $repositoryId, string $providerPullRequestId, GitHub $github, Request $request, Response $response, Document $project, Database $dbForPlatform, Authorization $authorization, callable $getProjectDB, Build $queueForBuilds, array $platform) use ($createGitDeployments) {
+        $installation = $dbForPlatform->getDocument('installations', $installationId);
+
+        if ($installation->isEmpty()) {
+            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
+        }
+
+        $repository = $authorization->skip(fn () => $dbForPlatform->findOne('repositories', [
+            Query::equal('$id', [$repositoryId]),
+            Query::equal('projectInternalId', [$project->getSequence()])
+        ]));
+
+        if ($repository->isEmpty()) {
+            throw new Exception(Exception::REPOSITORY_NOT_FOUND);
+        }
+
+        if (\in_array($providerPullRequestId, $repository->getAttribute('providerPullRequestIds', []))) {
+            throw new Exception(Exception::PROVIDER_CONTRIBUTION_CONFLICT);
+        }
+
+        $providerPullRequestIds = \array_unique(\array_merge($repository->getAttribute('providerPullRequestIds', []), [$providerPullRequestId]));
+        $repository = $repository->setAttribute('providerPullRequestIds', $providerPullRequestIds);
+
+        // TODO: Delete from array when PR is closed
+
+        $repository = $authorization->skip(fn () => $dbForPlatform->updateDocument('repositories', $repository->getId(), $repository));
+
+        $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
+        $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
+        $providerInstallationId = $installation->getAttribute('providerInstallationId');
+        $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
+
+        $repositories = [$repository];
+        $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+
+        $owner = $github->getOwnerName($providerInstallationId);
+        try {
+            $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
+            if (empty($repositoryName)) {
+                throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+            }
+        } catch (RepositoryNotFound $e) {
+            throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
+        }
+        $pullRequestResponse = $github->getPullRequest($owner, $repositoryName, $providerPullRequestId);
+
+        $providerBranch = \explode(':', $pullRequestResponse['head']['label'])[1] ?? '';
+        $providerCommitHash = $pullRequestResponse['head']['sha'] ?? '';
+        $providerBranchUrl = $pullRequestResponse['head']['repo']['html_url'] ?? '';
+        $providerRepositoryName = $pullRequestResponse['head']['repo']['name'] ?? '';
+        $providerRepositoryUrl = $pullRequestResponse['head']['repo']['html_url'] ?? '';
+        $providerRepositoryOwner = $pullRequestResponse['head']['repo']['owner']['login'] ?? '';
+        $providerCommitAuthor = $pullRequestResponse['head']['user']['login'] ?? '';
+        $providerCommitAuthorUrl = $pullRequestResponse['head']['user']['html_url'] ?? '';
+        $providerCommitMessage = $pullRequestResponse['title'] ?? '';
+        $providerCommitUrl = $pullRequestResponse['html_url'] ?? '';
+
+        $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, '', '', '', '', $providerCommitHash, '', '', '', '', $providerPullRequestId, true, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $request, $platform);
+
+        $response->noContent();
+    });

app/controllers/general.php

@@ -115,8 +115,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             }
         }
 
-        $routerProtectionEnabled = System::getEnv('_APP_OPTIONS_ROUTER_PROTECTION', 'disabled') === 'enabled';
-        if ($routerProtectionEnabled && !in_array($host, $platformHostnames)) {
+        if (!in_array($host, $platformHostnames)) {
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Router protection does not allow accessing Appwrite over this domain. Please add it as custom domain to your project or disable _APP_OPTIONS_ROUTER_PROTECTION environment variable.', view: $errorView);
         }
 
@@ -1353,7 +1352,7 @@ Http::error()
             $log->setMessage($error->getMessage());
 
             $log->addTag('database', $dsn->getHost());
-            $log->addTag('method', $route?->getMethod() ?? $request->getMethod());
+            $log->addTag('method', $route->getMethod());
             $log->addTag('url', $request->getURI());
             $log->addTag('verboseType', get_class($error));
             $log->addTag('code', $error->getCode());
@@ -1451,14 +1450,10 @@ Http::error()
                 // don't fail the error handler
             }
 
-            $sdk = $route?->getLabel("sdk", false);
             $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
             if (!empty($sdk)) {
                 /** @var \Appwrite\SDK\Method $sdk */
                 $action = $sdk->getNamespace() . '.' . $sdk->getMethodName();
-            } elseif ($route === null) {
-                $path = ltrim(parse_url($request->getURI(), PHP_URL_PATH) ?? '/', '/') ?: 'root';
-                $action = 'http.' . $request->getMethod() . '.' . $path;
             }
 
             $log->setAction($action);

app/controllers/shared/api.php

@@ -27,7 +27,6 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Authorization\Input;
@@ -461,6 +460,12 @@ Http::init()
     ->action(function (Http $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Mail $queueForMails, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) {
 
         $route = $utopia->getRoute();
+        $path = $route->getMatchedPath();
+        $databaseType = match (true) {
+            str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
+            str_contains($path, '/vectordb') => DATABASE_TYPE_VECTORDB,
+            default => '',
+        };
 
         if (
             array_key_exists('rest', $project->getAttribute('apis', []))
@@ -930,19 +935,14 @@ Http::shutdown()
                 $accessedAt = $cacheLog->getAttribute('accessedAt', 0);
                 $now = DateTime::now();
                 if ($cacheLog->isEmpty()) {
-                    try {
-                        $authorization->skip(fn () => $dbForProject->createDocument('cache', new Document([
-                            '$id' => $key,
-                            'resource' => $resource,
-                            'resourceType' => $resourceType,
-                            'mimeType' => $response->getContentType(),
-                            'accessedAt' => $now,
-                            'signature' => $signature,
-                        ])));
-                    } catch (DuplicateException) {
-                        // Race condition: another concurrent request already created the cache document
-                        $cacheLog = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
-                    }
+                    $authorization->skip(fn () => $dbForProject->createDocument('cache', new Document([
+                        '$id' => $key,
+                        'resource' => $resource,
+                        'resourceType' => $resourceType,
+                        'mimeType' => $response->getContentType(),
+                        'accessedAt' => $now,
+                        'signature' => $signature,
+                    ])));
                 } elseif (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_CACHE_UPDATE)) > $accessedAt) {
                     $cacheLog->setAttribute('accessedAt', $now);
                     $authorization->skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), $cacheLog));

app/http.php

@@ -204,7 +204,7 @@ function createDatabase(Http $app, string $resourceKey, string $dbName, array $c
             $database = is_callable($resource) ? $resource() : $resource;
             break; // exit loop on success
         } catch (\Throwable $e) {
-            Console::warning("  └── Database not ready ({$dbName}). Retrying connection ({$attempts}): " . $e->getMessage());
+            Console::warning("  └── Database not ready. Retrying connection ({$attempts})...");
             if ($attempts >= $max) {
                 throw new \Exception('  └── Failed to connect to database: ' . $e->getMessage());
             }
@@ -219,13 +219,12 @@ function createDatabase(Http $app, string $resourceKey, string $dbName, array $c
     while (true) {
         try {
             $attempts++;
-            Console::info("  └── Creating database: $dbName...");
             $database->create();
             break; // exit loop on success
         } catch (\Exception $e) {
             if ($e instanceof DuplicateException) {
-                Span::add('database.exists', true);
                 Console::info("  └── Skip: metadata table already exists");
+                Span::add('database.exists', true);
                 break;
             }
 
@@ -405,13 +404,29 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $tot
         });
 
         $projectCollections = $collections['projects'];
+
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
         $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
         $sharedTablesV2 = \array_diff($sharedTables, $sharedTablesV1);
 
+        $documentsSharedTables = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''));
+        $documentsSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1', ''));
+        $documentsSharedTablesV2 = \array_diff($documentsSharedTables, $documentsSharedTablesV1);
+
+        $vectorSharedTables = \explode(',', System::getEnv('_APP_DATABASE_VECTORDB_SHARED_TABLES', ''));
+        $vectorSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_VECTORDB_SHARED_TABLES_V1', ''));
+        $vectorSharedTablesV2 = \array_diff($vectorSharedTables, $vectorSharedTablesV1);
+
         $cache = $app->getResource('cache');
 
-        foreach ($sharedTablesV2 as $hostname) {
+        // All shared tables V2 pools that need project metadata collections
+        $sharedTablesV2All = \array_values(\array_unique(\array_filter([
+            ...$sharedTablesV2,
+            ...$documentsSharedTablesV2,
+            ...$vectorSharedTablesV2,
+        ])));
+
+        foreach ($sharedTablesV2All as $hostname) {
             Span::init('database.setup');
             Span::add('database.hostname', $hostname);
 
@@ -428,12 +443,10 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $tot
             while (true) {
                 try {
                     $attempts++;
-                    Console::success('[Setup] - Creating project database: ' . $hostname . '...');
                     $dbForProject->create();
                     break; // exit loop on success
                 } catch (DuplicateException) {
                     Span::add('database.exists', true);
-                    Console::success('[Setup] - Skip: metadata table already exists');
                     break;
                 } catch (\Throwable $e) {
                     Console::warning("  └── Project database create failed. Retrying ({$attempts})...");
@@ -560,8 +573,8 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
             $log->setType(Log::TYPE_ERROR);
             $log->setMessage($th->getMessage());
 
-            $log->addTag('method', $route?->getMethod() ?? $request->getMethod());
-            $log->addTag('url', $route?->getPath() ?? $request->getURI());
+            $log->addTag('method', $route->getMethod());
+            $log->addTag('url', $route->getPath());
             $log->addTag('verboseType', get_class($th));
             $log->addTag('code', $th->getCode());
             // $log->addTag('projectId', $project->getId()); // TODO: Figure out how to get ProjectID, if it becomes relevant
@@ -573,15 +586,12 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
             $log->addExtra('trace', $th->getTraceAsString());
             $log->addExtra('roles', isset($authorization) ? $authorization->getRoles() : []);
 
-            $sdk = $route?->getLabel("sdk", false);
+            $sdk = $route->getLabel("sdk", false);
 
             $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
             if (!empty($sdk)) {
                 /** @var Appwrite\SDK\Method $sdk */
                 $action = $sdk->getNamespace() . '.' . $sdk->getMethodName();
-            } elseif ($route === null) {
-                $path = ltrim(parse_url($request->getURI(), PHP_URL_PATH) ?? '/', '/') ?: 'root';
-                $action = 'http.' . $request->getMethod() . '.' . $path;
             }
 
             $log->setAction($action);

app/init/constants.php

@@ -6,7 +6,6 @@ const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
 
 const APP_VIEWS_DIR = __DIR__ . '/../views';
-const APP_CE_CONFIG_DIR = __DIR__ . '/../config';
 
 // Email
 const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address
@@ -287,6 +286,45 @@ const METRIC_DATABASES_OPERATIONS_READS  = 'databases.operations.reads';
 const METRIC_DATABASE_ID_OPERATIONS_READS = '{databaseInternalId}.databases.operations.reads';
 const METRIC_DATABASES_OPERATIONS_WRITES  = 'databases.operations.writes';
 const METRIC_DATABASE_ID_OPERATIONS_WRITES = '{databaseInternalId}.databases.operations.writes';
+
+// documentsdb
+const METRIC_DATABASES_DOCUMENTSDB = 'documentsdb.databases';
+const METRIC_COLLECTIONS_DOCUMENTSDB = 'documentsdb.collections';
+const METRIC_DATABASES_STORAGE_DOCUMENTSDB = 'documentsdb.databases.storage';
+const METRIC_DATABASE_ID_COLLECTIONS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.collections';
+const METRIC_DATABASE_ID_STORAGE_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.storage';
+const METRIC_DOCUMENTS_DOCUMENTSDB = 'documentsdb.documents';
+const METRIC_DATABASE_ID_DOCUMENTS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.documents';
+const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.{collectionInternalId}.documents';
+const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.{collectionInternalId}.databases.storage';
+const METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB  = 'documentsdb.databases.operations.reads';
+const METRIC_DATABASE_ID_OPERATIONS_READS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.operations.reads';
+const METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB  = 'documentsdb.databases.operations.writes';
+const METRIC_DATABASE_ID_OPERATIONS_WRITES_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.operations.writes';
+
+// vectordb
+const METRIC_DATABASES_VECTORDB = 'vectordb.databases';
+const METRIC_COLLECTIONS_VECTORDB = 'vectordb.collections';
+const METRIC_DATABASES_STORAGE_VECTORDB = 'vectordb.databases.storage';
+const METRIC_DATABASE_ID_COLLECTIONS_VECTORDB = 'vectordb.{databaseInternalId}.collections';
+const METRIC_DATABASE_ID_STORAGE_VECTORDB = 'vectordb.{databaseInternalId}.databases.storage';
+const METRIC_DOCUMENTS_VECTORDB = 'vectordb.documents';
+const METRIC_DATABASE_ID_DOCUMENTS_VECTORDB = 'vectordb.{databaseInternalId}.documents';
+const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS_VECTORDB = 'vectordb.{databaseInternalId}.{collectionInternalId}.documents';
+const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE_VECTORDB = 'vectordb.{databaseInternalId}.{collectionInternalId}.databases.storage';
+const METRIC_DATABASES_OPERATIONS_READS_VECTORDB  = 'vectordb.databases.operations.reads';
+const METRIC_DATABASE_ID_OPERATIONS_READS_VECTORDB = 'vectordb.{databaseInternalId}.databases.operations.reads';
+const METRIC_DATABASES_OPERATIONS_WRITES_VECTORDB  = 'vectordb.databases.operations.writes';
+const METRIC_DATABASE_ID_OPERATIONS_WRITES_VECTORDB = 'vectordb.{databaseInternalId}.databases.operations.writes';
+const METRIC_EMBEDDINGS_TEXT = 'embeddings.text';
+const METRIC_EMBEDDINGS_MODEL_TEXT = 'embeddings.text.{embeddingModel}';
+const METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR = 'embeddings.text.totalErrors';
+const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_ERROR = 'embeddings.text.{embeddingModel}.totalErrors';
+const METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION = 'embeddings.text.totalDuration';
+const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_DURATION = 'embeddings.text.{embeddingModel}.totalDuration';
+const METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS = 'embeddings.text.totalTokens';
+const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_TOKENS = 'embeddings.text.{embeddingModel}.totalTokens';
+
 const METRIC_BUCKETS = 'buckets';
 const METRIC_FILES  = 'files';
 const METRIC_FILES_STORAGE  = 'files.storage';
@@ -373,6 +411,7 @@ const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers';
 const RESOURCE_TYPE_MESSAGES = 'messages';
 const RESOURCE_TYPE_EXECUTIONS = 'executions';
 const RESOURCE_TYPE_VCS = 'vcs';
+const RESOURCE_TYPE_EMBEDDINGS_TEXT = 'embeddingsText';
 
 // Resource types for Tokens
 const TOKENS_RESOURCE_TYPE_FILES = 'files';
@@ -392,8 +431,18 @@ const COOKIE_NAME_PREVIEW = 'a_jwt_console';
 const CACHE_RECONNECT_MAX_RETRIES = 2;
 const CACHE_RECONNECT_RETRY_DELAY = 1000;
 
-/* Web installer */
-const LOCAL_API_TIMEOUT = 30 * 1000; // 30 seconds
-
 // Project status
 const PROJECT_STATUS_ACTIVE = 'active';
+
+// Database types
+const DATABASE_TYPE_LEGACY = 'legacy';
+const DATABASE_TYPE_TABLESDB = 'tablesdb';
+const DATABASE_TYPE_DOCUMENTSDB = 'documentsdb';
+const DATABASE_TYPE_VECTORDB = 'vectordb';
+
+// CSV import/export allowed database types
+const CSV_ALLOWED_DATABASE_TYPES = [
+    DATABASE_TYPE_LEGACY,
+    DATABASE_TYPE_TABLESDB,
+    DATABASE_TYPE_VECTORDB
+];

app/init/database/filters.php

@@ -72,7 +72,7 @@ Database::addFilter(
         $attributes = $database->getAuthorization()->skip(fn () => $database->find('attributes', [
             Query::equal('collectionInternalId', [$document->getSequence()]),
             Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-            Query::limit($database->getLimitForAttributes() ?: APP_LIMIT_SUBQUERY),
+            Query::limit($database->getLimitForAttributes()),
         ]));
 
         foreach ($attributes as $attribute) {
@@ -88,10 +88,6 @@ Database::addFilter(
                     break;
 
                 case Database::VAR_STRING:
-                case Database::VAR_VARCHAR:
-                case Database::VAR_TEXT:
-                case Database::VAR_MEDIUMTEXT:
-                case Database::VAR_LONGTEXT:
                     $filters = $attribute->getAttribute('filters', []);
                     $attribute->setAttribute('encrypt', in_array('encrypt', $filters));
                     break;

app/init/models.php

@@ -22,6 +22,7 @@ use Appwrite\Utopia\Response\Model\AttributeLine;
 use Appwrite\Utopia\Response\Model\AttributeList;
 use Appwrite\Utopia\Response\Model\AttributeLongtext;
 use Appwrite\Utopia\Response\Model\AttributeMediumtext;
+use Appwrite\Utopia\Response\Model\AttributeObject;
 use Appwrite\Utopia\Response\Model\AttributePoint;
 use Appwrite\Utopia\Response\Model\AttributePolygon;
 use Appwrite\Utopia\Response\Model\AttributeRelationship;
@@ -29,6 +30,7 @@ use Appwrite\Utopia\Response\Model\AttributeString;
 use Appwrite\Utopia\Response\Model\AttributeText;
 use Appwrite\Utopia\Response\Model\AttributeURL;
 use Appwrite\Utopia\Response\Model\AttributeVarchar;
+use Appwrite\Utopia\Response\Model\AttributeVector;
 use Appwrite\Utopia\Response\Model\AuthProvider;
 use Appwrite\Utopia\Response\Model\BaseList;
 use Appwrite\Utopia\Response\Model\Branch;
@@ -65,6 +67,7 @@ use Appwrite\Utopia\Response\Model\DetectionRuntime;
 use Appwrite\Utopia\Response\Model\DetectionVariable;
 use Appwrite\Utopia\Response\Model\DevKey;
 use Appwrite\Utopia\Response\Model\Document as ModelDocument;
+use Appwrite\Utopia\Response\Model\Embedding;
 use Appwrite\Utopia\Response\Model\Error;
 use Appwrite\Utopia\Response\Model\ErrorDev;
 use Appwrite\Utopia\Response\Model\Execution;
@@ -136,6 +139,8 @@ use Appwrite\Utopia\Response\Model\UsageBuckets;
 use Appwrite\Utopia\Response\Model\UsageCollection;
 use Appwrite\Utopia\Response\Model\UsageDatabase;
 use Appwrite\Utopia\Response\Model\UsageDatabases;
+use Appwrite\Utopia\Response\Model\UsageDocumentsDB;
+use Appwrite\Utopia\Response\Model\UsageDocumentsDBs;
 use Appwrite\Utopia\Response\Model\UsageFunction;
 use Appwrite\Utopia\Response\Model\UsageFunctions;
 use Appwrite\Utopia\Response\Model\UsageProject;
@@ -144,9 +149,12 @@ use Appwrite\Utopia\Response\Model\UsageSites;
 use Appwrite\Utopia\Response\Model\UsageStorage;
 use Appwrite\Utopia\Response\Model\UsageTable;
 use Appwrite\Utopia\Response\Model\UsageUsers;
+use Appwrite\Utopia\Response\Model\UsageVectorDB;
+use Appwrite\Utopia\Response\Model\UsageVectorDBs;
 use Appwrite\Utopia\Response\Model\User;
 use Appwrite\Utopia\Response\Model\Variable;
 use Appwrite\Utopia\Response\Model\VcsContent;
+use Appwrite\Utopia\Response\Model\VectorDBCollection;
 use Appwrite\Utopia\Response\Model\Webhook;
 
 // General
@@ -211,9 +219,12 @@ Response::setModel(new BaseList('Migrations List', Response::MODEL_MIGRATION_LIS
 Response::setModel(new BaseList('Migrations Firebase Projects List', Response::MODEL_MIGRATION_FIREBASE_PROJECT_LIST, 'projects', Response::MODEL_MIGRATION_FIREBASE_PROJECT));
 Response::setModel(new BaseList('Specifications List', Response::MODEL_SPECIFICATION_LIST, 'specifications', Response::MODEL_SPECIFICATION));
 Response::setModel(new BaseList('VCS Content List', Response::MODEL_VCS_CONTENT_LIST, 'contents', Response::MODEL_VCS_CONTENT));
+Response::setModel(new BaseList('VectorDB Collections List', Response::MODEL_VECTORDB_COLLECTION_LIST, 'collections', Response::MODEL_VECTORDB_COLLECTION));
+Response::setModel(new BaseList('Embedding list', Response::MODEL_EMBEDDING_LIST, 'embeddings', Response::MODEL_EMBEDDING));
 
 // Entities
 Response::setModel(new Database());
+Response::setModel(new Embedding());
 
 // Collection API Models
 Response::setModel(new Collection());
@@ -237,6 +248,17 @@ Response::setModel(new AttributeText());
 Response::setModel(new AttributeMediumtext());
 Response::setModel(new AttributeLongtext());
 
+// DocumentsDB API Models
+Response::setModel(new UsageDocumentsDBs());
+Response::setModel(new UsageDocumentsDB());
+
+// VectorDB API Models
+Response::setModel(new VectorDBCollection());
+Response::setModel(new AttributeObject());
+Response::setModel(new AttributeVector());
+Response::setModel(new UsageVectorDBs());
+Response::setModel(new UsageVectorDB());
+
 // Table API Models
 Response::setModel(new Table());
 Response::setModel(new Column());

app/init/registers.php

@@ -153,14 +153,13 @@ $register->set('pools', function () {
     $group = new Group();
 
     $fallbackForDB = 'db_main=' . AppwriteURL::unparse([
-        'scheme' => System::getEnv('_APP_DB_ADAPTER', 'mongodb'),
-        'host' => System::getEnv('_APP_DB_HOST', 'mongodb'),
-        'port' => System::getEnv('_APP_DB_PORT', '27017'),
+        'scheme' => System::getEnv('_APP_DB_ADAPTER', 'mariadb'),
+        'host' => System::getEnv('_APP_DB_HOST', 'mariadb'),
+        'port' => System::getEnv('_APP_DB_PORT', '3306'),
         'user' => System::getEnv('_APP_DB_USER', ''),
         'pass' => System::getEnv('_APP_DB_PASS', ''),
         'path' => System::getEnv('_APP_DB_SCHEMA', ''),
     ]);
-
     $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([
         'scheme' => 'redis',
         'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
@@ -169,24 +168,53 @@ $register->set('pools', function () {
         'pass' => System::getEnv('_APP_REDIS_PASS', ''),
     ]);
 
+    $fallbackForDocumentsDB = 'db_main=' . AppwriteURL::unparse([
+        'scheme' => System::getEnv('_APP_DB_ADAPTER_DOCUMENTSDB', 'mongodb'),
+        'host' => System::getEnv('_APP_DB_HOST_DOCUMENTSDB', 'mongodb'),
+        'port' => System::getEnv('_APP_DB_PORT_DOCUMENTSDB', '27017'),
+        'user' => System::getEnv('_APP_DB_USER', ''),
+        'pass' => System::getEnv('_APP_DB_PASS', ''),
+        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
+    ]);
+    $fallbackForVectorDB = 'db_main=' . AppwriteURL::unparse([
+        'scheme' => System::getEnv('_APP_DB_ADAPTER_VECTORDB', 'postgresql'),
+        'host' => System::getEnv('_APP_DB_HOST_VECTORDB', 'postgresql'),
+        'port' => System::getEnv('_APP_DB_PORT_VECTORDB', '5432'),
+        'user' => System::getEnv('_APP_DB_USER', ''),
+        'pass' => System::getEnv('_APP_DB_PASS', ''),
+        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
+    ]);
+
     $connections = [
         'console' => [
             'type' => 'database',
             'dsns' => $fallbackForDB,
             'multiple' => false,
-            'schemes' => ['mariadb', 'mongodb', 'mysql', 'postgresql'],
+            'schemes' => ['mongodb','mariadb', 'mysql','postgresql'],
         ],
         'database' => [
             'type' => 'database',
             'dsns' => $fallbackForDB,
             'multiple' => true,
-            'schemes' => ['mariadb', 'mongodb', 'mysql', 'postgresql'],
+            'schemes' => ['mongodb','mariadb', 'mysql','postgresql'],
+        ],
+        'documentsdb' => [
+            'type' => 'database',
+            'dsns' => System::getEnv('_APP_CONNECTIONS_DATABASE_DOCUMENTSDB', $fallbackForDocumentsDB),
+            'multiple' => true,
+            'schemes' => ['mongodb'],
+        ],
+        'vectordb' => [
+            'type' => 'database',
+            'dsns' => System::getEnv('_APP_CONNECTIONS_DATABASE_VECTORDB', $fallbackForVectorDB),
+            'multiple' => true,
+            'schemes' => ['postgresql'],
         ],
         'logs' => [
             'type' => 'database',
             'dsns' => System::getEnv('_APP_CONNECTIONS_DB_LOGS', $fallbackForDB),
             'multiple' => false,
-            'schemes' => ['mariadb', 'mongodb', 'mysql', 'postgresql'],
+            'schemes' => ['mongodb','mariadb', 'mysql','postgresql'],
         ],
         'publisher' => [
             'type' => 'publisher',
@@ -280,6 +308,17 @@ $register->set('pools', function () {
                         ]);
                     });
                 },
+                'postgresql' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
+                    return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
+                        return new PDO("pgsql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase}", $dsnUser, $dsnPass, array(
+                            \PDO::ATTR_TIMEOUT => 3, // Seconds
+                            \PDO::ATTR_PERSISTENT => false,
+                            \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
+                            \PDO::ATTR_EMULATE_PREPARES => true,
+                            \PDO::ATTR_STRINGIFY_FETCHES => true
+                        ));
+                    });
+                },
                 'mongodb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase, $dsn) {
                     try {
                         $mongo = new MongoClient($dsnDatabase, $dsnHost, (int)$dsnPort, $dsnUser, $dsnPass, false);
@@ -292,7 +331,7 @@ $register->set('pools', function () {
                 },
                 'postgresql' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
                     return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
-                        return new PDO("pgsql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};connect_timeout=3", $dsnUser, $dsnPass, array(
+                        return new PDO("pgsql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase}", $dsnUser, $dsnPass, array(
                             \PDO::ATTR_TIMEOUT => 3, // Seconds
                             \PDO::ATTR_PERSISTENT => false,
                             \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
@@ -316,19 +355,22 @@ $register->set('pools', function () {
 
             $poolAdapter = System::getEnv('_APP_POOL_ADAPTER', default: 'stack') === 'swoole' ? new SwoolePool() : new StackPool();
 
-            $pool = new Pool($poolAdapter, $name, $poolSize, function () use ($type, $resource, $dsn) {
+            $pool = new Pool($poolAdapter, $name, $poolSize, function () use ($type, $resource, $dsn, $key) {
                 // Get Adapter
                 switch ($type) {
                     case 'database':
                         $adapter = match ($dsn->getScheme()) {
                             'mariadb' => new MariaDB($resource()),
                             'mysql' => new MySQL($resource()),
-                            'mongodb' => new Mongo($resource()),
                             'postgresql' => new Postgres($resource()),
+                            'mongodb' => new Mongo($resource()),
                             default => null
                         };
 
                         $adapter->setDatabase($dsn->getPath());
+                        if ($key === 'documentsdb') {
+                            $adapter->setSupportForAttributes(false);
+                        }
                         return $adapter;
                     case 'pubsub':
                         return match ($dsn->getScheme()) {
@@ -379,28 +421,30 @@ $register->set('db', function () {
     $dbPort = System::getEnv('_APP_DB_PORT', '');
     $dbUser = System::getEnv('_APP_DB_USER', '');
     $dbPass = System::getEnv('_APP_DB_PASS', '');
-    $dbSchema = System::getEnv('_APP_DB_SCHEMA', '');
+    $dbScheme = System::getEnv('_APP_DB_SCHEMA', '');
     $dbAdapter = System::getEnv('_APP_DB_ADAPTER', 'mongodb');
     $dsn = '';
 
     switch ($dbAdapter) {
         case 'mongodb':
             try {
-                $mongo = new MongoClient($dbSchema, $dbHost, (int)$dbPort, $dbUser, $dbPass, false);
+                $mongo = new MongoClient($dbScheme, $dbHost, (int)$dbPort, $dbUser, $dbPass, false);
                 @$mongo->connect();
+
                 return $mongo;
             } catch (\Throwable $e) {
-                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'MongoDB connection failed: ' . $e->getMessage());
+                throw new Exception(Exception::GENERAL_SERVER_ERROR, "MongoDB connection failed: " . $e->getMessage());
             }
+
+        case 'postgresql':
+            $dsn = "pgsql:host={$dbHost};port={$dbPort};dbname={$dbSchema}";
+            break;
+
         case 'mysql':
         case 'mariadb':
-            $dsn = "mysql:host={$dbHost};port={$dbPort};dbname={$dbSchema};charset=utf8mb4";
-            return new PDO($dsn, $dbUser, $dbPass, SQL::getPDOAttributes());
-        case 'postgresql':
-            $dsn = "pgsql:host={$dbHost};port={$dbPort};dbname={$dbSchema};connect_timeout=3";
-            return new PDO($dsn, $dbUser, $dbPass, SQL::getPDOAttributes());
         default:
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Invalid database adapter');
+            $dsn = "mysql:host={$dbHost};port={$dbPort};dbname={$dbScheme};charset=utf8mb4";
+            return new PDO($dsn, $dbUser, $dbPass, SQL::getPDOAttributes());
     }
 });
 

app/init/resources.php

@@ -32,6 +32,8 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Executor\Executor;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
+use Utopia\Agents\Adapters\Ollama;
+use Utopia\Agents\Agent;
 use Utopia\Audit\Adapter\Database as AdapterDatabase;
 use Utopia\Audit\Audit;
 use Utopia\Auth\Hashes\Argon2;
@@ -230,8 +232,8 @@ Http::setResource('allowedHostnames', function (array $platform, Document $proje
 /**
  * List of allowed request schemes for the request.
  */
-Http::setResource('allowedSchemes', function (array $platform, Document $project) {
-    $allowed = [...($platform['schemas'] ?? [])];
+Http::setResource('allowedSchemes', function (Document $project) {
+    $allowed = [];
 
     if (!$project->isEmpty() && $project->getId() !== 'console') {
         /* Add hardcoded schemes */
@@ -245,7 +247,7 @@ Http::setResource('allowedSchemes', function (array $platform, Document $project
     }
 
     return array_unique($allowed);
-}, ['platform', 'project']);
+}, ['project']);
 
 /**
  * Rule associated with a request origin.
@@ -412,7 +414,13 @@ Http::setResource('user', function (string $mode, Document $project, Document $c
     ) { // Validate user has valid login token
         $user = new User([]);
     }
-
+    // if (APP_MODE_ADMIN === $mode) {
+    //     if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
+    //         $authorization->setDefaultStatus(false);  // Cancel security segmentation for admin users.
+    //     } else {
+    //         $user = new Document([]);
+    //     }
+    // }
     $authJWT = $request->getHeader('x-appwrite-jwt', '');
     if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
         if (!$user->isEmpty()) {
@@ -554,7 +562,8 @@ Http::setResource('authorization', function () {
     return new Authorization();
 }, []);
 
-Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, StatsUsage $queueForStatsUsage, Authorization $authorization) {
+// TODO: check here do we really need the database listener for the dbForProject?
+Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Response $response, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime, StatsUsage $queueForStatsUsage, Authorization $authorization, Request $request) {
     if ($project->isEmpty() || $project->getId() === 'console') {
         return $dbForPlatform;
     }
@@ -662,7 +671,31 @@ Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatfor
         $dbForProject->getCache()->purge($cacheKey);
     };
 
-    $usageDatabaseListener = function (string $event, Document $document, StatsUsage $queueForStatsUsage) {
+    /**
+     * Prefix metrics with database type when applicable.
+     * Avoids prefixing for legacy and tablesdb types to preserve historical metrics.
+     */
+    $getDatabaseTypePrefixedMetric = function (string $databaseType, string $metric): string {
+        if (
+            $databaseType === '' ||
+            $databaseType === DATABASE_TYPE_LEGACY ||
+            $databaseType === DATABASE_TYPE_TABLESDB
+        ) {
+            return $metric;
+        }
+
+        return $databaseType . '.' . $metric;
+    };
+
+    // Determine database type from request path, similar to api.php
+    $path = $request->getURI();
+    $databaseType = match (true) {
+        str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
+        str_contains($path, '/vectordb') => DATABASE_TYPE_VECTORDB,
+        default => '',
+    };
+
+    $usageDatabaseListener = function (string $event, Document $document, StatsUsage $queueForStatsUsage) use ($getDatabaseTypePrefixedMetric, $databaseType) {
         $value = 1;
 
         switch ($event) {
@@ -694,7 +727,8 @@ Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatfor
                 $queueForStatsUsage->addMetric(METRIC_SESSIONS, $value); //per project
                 break;
             case $document->getCollection() === 'databases': // databases
-                $queueForStatsUsage->addMetric(METRIC_DATABASES, $value); // per project
+                $metric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASES);
+                $queueForStatsUsage->addMetric($metric, $value); // per project
 
                 if ($event === Database::EVENT_DOCUMENT_DELETE) {
                     $queueForStatsUsage->addReduce($document);
@@ -703,9 +737,11 @@ Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatfor
             case str_starts_with($document->getCollection(), 'database_') && !str_contains($document->getCollection(), 'collection'): //collections
                 $parts = explode('_', $document->getCollection());
                 $databaseInternalId = $parts[1] ?? 0;
+                $collectionMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_COLLECTIONS);
+                $databaseIdCollectionMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_COLLECTIONS);
                 $queueForStatsUsage
-                    ->addMetric(METRIC_COLLECTIONS, $value) // per project
-                    ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_COLLECTIONS), $value);
+                    ->addMetric($collectionMetric, $value) // per project
+                    ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdCollectionMetric), $value);
 
                 if ($event === Database::EVENT_DOCUMENT_DELETE) {
                     $queueForStatsUsage->addReduce($document);
@@ -715,10 +751,13 @@ Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatfor
                 $parts = explode('_', $document->getCollection());
                 $databaseInternalId   = $parts[1] ?? 0;
                 $collectionInternalId = $parts[3] ?? 0;
+                $documentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DOCUMENTS);
+                $databaseIdDocumentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_DOCUMENTS);
+                $databaseIdCollectionIdDocumentsMetric = $getDatabaseTypePrefixedMetric($databaseType, METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS);
                 $queueForStatsUsage
-                    ->addMetric(METRIC_DOCUMENTS, $value)  // per project
-                    ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_DOCUMENTS), $value) // per database
-                    ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS), $value);  // per collection
+                    ->addMetric($documentsMetric, $value)  // per project
+                    ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                    ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
                 break;
             case $document->getCollection() === 'buckets': //buckets
                 $queueForStatsUsage
@@ -776,6 +815,9 @@ Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatfor
     $queueForWebhooks = new Webhook($publisherWebhooks);
     $queueForRealtime = new Realtime();
 
+    // to get consumed in the stats worker without calling to database
+    $queueForStatsUsage->setContext('database', new Document(['type' => $databaseType]));
+
 
     $database
             ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
@@ -799,7 +841,7 @@ Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatfor
 
 
     return $database;
-}, ['pools', 'dbForPlatform', 'cache', 'project', 'response', 'publisher', 'publisherFunctions', 'publisherWebhooks', 'queueForEvents', 'queueForFunctions', 'queueForWebhooks', 'queueForRealtime', 'queueForStatsUsage', 'authorization']);
+}, ['pools', 'dbForPlatform', 'cache', 'project', 'response', 'publisher', 'publisherFunctions', 'publisherWebhooks', 'queueForEvents', 'queueForFunctions', 'queueForWebhooks', 'queueForRealtime', 'queueForStatsUsage', 'authorization', 'request']);
 
 Http::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
 
@@ -820,6 +862,270 @@ Http::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authori
     return $database;
 }, ['pools', 'cache', 'authorization']);
 
+Http::setResource('getDatabasesDB', function (Group $pools, Cache $cache, Document $project, Request $request, StatsUsage $queueForStatsUsage, Authorization $authorization) {
+
+    return function (Document $database) use ($pools, $cache, $project, $request, $queueForStatsUsage, $authorization): Database {
+        $databaseDSN = $database->getAttribute('database', '');
+        $databaseType = $database->getAttribute('type', '');
+
+        try {
+            $databaseDSN = new DSN($databaseDSN);
+        } catch (\InvalidArgumentException) {
+            // for old databases migrated through patch script
+            // databaseDSN determines the adapter
+            $databaseDSN = new DSN('mysql://'.$databaseDSN);
+        }
+        try {
+            $dsn = new DSN($project->getAttribute('database'));
+        } catch (\InvalidArgumentException) {
+            // TODO: Temporary until all projects are using shared tables
+            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
+        }
+
+        $pool = $pools->get($databaseDSN->getHost());
+
+        $adapter = new DatabasePool($pool);
+        $database = new Database($adapter, $cache);
+        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+        $database
+            ->setDatabase(APP_DATABASE)
+            ->setAuthorization($authorization)
+            ->setMetadata('host', \gethostname())
+            ->setMetadata('project', $project->getId())
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
+            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
+
+        if (\in_array($dsn->getHost(), $sharedTables)) {
+            $database
+                ->setSharedTables(true)
+                ->setTenant((int)$project->getSequence())
+                ->setNamespace($dsn->getParam('namespace'));
+        } else {
+            $database
+                ->setSharedTables(false)
+                ->setTenant(null)
+                ->setNamespace('_' . $project->getSequence());
+        }
+        $timeout = \intval($request->getHeader('x-appwrite-timeout'));
+        if (!empty($timeout) && Http::isDevelopment()) {
+            $database->setTimeout($timeout);
+        }
+
+        // Register database event listeners for usage stats collection
+        $documentsMetric = METRIC_DOCUMENTS;
+        $databaseIdDocumentsMetric = METRIC_DATABASE_ID_DOCUMENTS;
+        $databaseIdCollectionIdDocumentsMetric = METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS;
+        if ($databaseType !== DATABASE_TYPE_LEGACY && $databaseType !== DATABASE_TYPE_TABLESDB) {
+            $documentsMetric = $databaseType. '.' .$documentsMetric;
+            $databaseIdDocumentsMetric = $databaseType. '.' .$databaseIdDocumentsMetric;
+            $databaseIdCollectionIdDocumentsMetric = $databaseType . '.' .$databaseIdCollectionIdDocumentsMetric;
+        }
+        $database
+            ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = 1;
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            })
+            ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = -1;
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId,  $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            })
+            ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = $document->getAttribute('modified', 0);
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId,  $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            })
+            ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = -1 * $document->getAttribute('modified', 0);
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId,  $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            })
+            ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = $document->getAttribute('created', 0);
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId,  $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            });
+
+        return $database;
+    };
+
+}, ['pools','cache','project','request','queueForStatsUsage','authorization']);
+
+
+Http::setResource('getDatabasesDB', function (Group $pools, Cache $cache, Document $project, Request $request, StatsUsage $queueForStatsUsage, Authorization $authorization) {
+
+    return function (Document $database) use ($pools, $cache, $project, $request, $queueForStatsUsage, $authorization): Database {
+        $databaseDSN = $database->getAttribute('database', '');
+        $databaseType = $database->getAttribute('type', '');
+
+        try {
+            $databaseDSN = new DSN($databaseDSN);
+        } catch (\InvalidArgumentException) {
+            // for old databases migrated through patch script
+            // databaseDSN determines the adapter
+            $databaseDSN = new DSN('mysql://'.$databaseDSN);
+        }
+        try {
+            $dsn = new DSN($project->getAttribute('database'));
+        } catch (\InvalidArgumentException) {
+            // TODO: Temporary until all projects are using shared tables
+            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
+        }
+
+        $pool = $pools->get($databaseDSN->getHost());
+
+        $adapter = new DatabasePool($pool);
+        $database = new Database($adapter, $cache);
+        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+        $database
+            ->setDatabase(APP_DATABASE)
+            ->setAuthorization($authorization)
+            ->setMetadata('host', \gethostname())
+            ->setMetadata('project', $project->getId())
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
+            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
+
+        if (\in_array($dsn->getHost(), $sharedTables)) {
+            $database
+                ->setSharedTables(true)
+                ->setTenant((int)$project->getSequence())
+                ->setNamespace($dsn->getParam('namespace'));
+        } else {
+            $database
+                ->setSharedTables(false)
+                ->setTenant(null)
+                ->setNamespace('_' . $project->getSequence());
+        }
+        $timeout = \intval($request->getHeader('x-appwrite-timeout'));
+        if (!empty($timeout) && Http::isDevelopment()) {
+            $database->setTimeout($timeout);
+        }
+
+        // Register database event listeners for usage stats collection
+        $documentsMetric = METRIC_DOCUMENTS;
+        $databaseIdDocumentsMetric = METRIC_DATABASE_ID_DOCUMENTS;
+        $databaseIdCollectionIdDocumentsMetric = METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS;
+        if ($databaseType !== DATABASE_TYPE_LEGACY && $databaseType !== DATABASE_TYPE_TABLESDB) {
+            $documentsMetric = $databaseType. '.' .$documentsMetric;
+            $databaseIdDocumentsMetric = $databaseType. '.' .$databaseIdDocumentsMetric;
+            $databaseIdCollectionIdDocumentsMetric = $databaseType . '.' .$databaseIdCollectionIdDocumentsMetric;
+        }
+        $database
+            ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = 1;
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            })
+            ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = -1;
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId,  $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            })
+            ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = $document->getAttribute('modified', 0);
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId,  $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            })
+            ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = -1 * $document->getAttribute('modified', 0);
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId,  $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            })
+            ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', function ($event, $document) use ($queueForStatsUsage, $documentsMetric, $databaseIdDocumentsMetric, $databaseIdCollectionIdDocumentsMetric) {
+                $value = $document->getAttribute('created', 0);
+
+                if (str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_')) {
+                    $parts = explode('_', $document->getCollection());
+                    $databaseInternalId   = $parts[1] ?? 0;
+                    $collectionInternalId = $parts[3] ?? 0;
+                    $queueForStatsUsage
+                        ->addMetric($documentsMetric, $value)  // per project
+                        ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, $databaseIdDocumentsMetric), $value) // per database
+                        ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId,  $collectionInternalId], $databaseIdCollectionIdDocumentsMetric), $value);  // per collection
+                }
+            });
+
+        return $database;
+    };
+
+}, ['pools','cache','project','request','queueForStatsUsage','authorization']);
+
+
 Http::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, Authorization $authorization) {
     $databases = [];
 
@@ -1430,9 +1736,9 @@ Http::setResource('resourceToken', function ($project, $dbForProject, $request,
     return new Document([]);
 }, ['project', 'dbForProject', 'request', 'authorization']);
 
-Http::setResource('transactionState', function (Database $dbForProject, Authorization $authorization) {
-    return new TransactionState($dbForProject, $authorization);
-}, ['dbForProject', 'authorization']);
+Http::setResource('transactionState', function (Database $dbForProject, Authorization $authorization, callable $getDatabasesDB) {
+    return new TransactionState($dbForProject, $authorization, $getDatabasesDB);
+}, ['dbForProject', 'authorization', 'getDatabasesDB']);
 
 Http::setResource('executionsRetentionCount', function (Document $project, array $plan) {
     if ($project->getId() === 'console' || empty($plan)) {
@@ -1441,3 +1747,10 @@ Http::setResource('executionsRetentionCount', function (Document $project, array
 
     return (int) ($plan['executionsRetentionCount'] ?? 100);
 }, ['project', 'plan']);
+
+Http::setResource('embeddingAgent', function ($register) {
+    $adapter = new Ollama();
+    $adapter->setEndpoint(System::getEnv('_APP_EMBEDDING_ENDPOINT', 'http://ollama:11434/api/embed'));
+    $adapter->setTimeout(90000);
+    return new Agent($adapter);
+}, ['register']);

app/realtime.php

@@ -248,62 +248,48 @@ $adapter
 
 $server = new Server($adapter);
 
-// Allows overriding
-if (!function_exists('logError')) {
-    function logError(Throwable $error, string $action, array $tags = [], ?Document $project = null, ?Document $user = null, ?Authorization $authorization = null): void
-    {
-        global $register;
+$logError = function (Throwable $error, string $action) use ($register) {
+    $logger = $register->get('realtimeLogger');
 
-        $logger = $register->get('realtimeLogger');
+    if ($logger && !$error instanceof Exception) {
+        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
 
-        if ($logger && !$error instanceof Exception) {
-            $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
+        $log = new Log();
+        $log->setNamespace("realtime");
+        $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+        $log->setVersion($version);
+        $log->setType(Log::TYPE_ERROR);
+        $log->setMessage($error->getMessage());
 
-            $log = new Log();
-            $log->setNamespace("realtime");
-            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
-            $log->setVersion($version);
-            $log->setType(Log::TYPE_ERROR);
-            $log->setMessage($error->getMessage());
+        $log->addTag('code', $error->getCode());
+        $log->addTag('verboseType', get_class($error));
 
-            $log->addTag('code', $error->getCode());
-            $log->addTag('verboseType', get_class($error));
-            $log->addTag('projectId', $project?->getId() ?: 'n/a');
-            $log->addTag('userId', $user?->getId() ?: 'n/a');
+        $log->addExtra('file', $error->getFile());
+        $log->addExtra('line', $error->getLine());
+        $log->addExtra('trace', $error->getTraceAsString());
 
-            foreach ($tags as $key => $value) {
-                $log->addTag($key, $value ?: 'n/a');
-            }
+        $log->setAction($action);
 
-            $log->addExtra('file', $error->getFile());
-            $log->addExtra('line', $error->getLine());
-            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());
-            $log->addExtra('roles', $authorization?->getRoles() ?? []);
+        $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
+        $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
-            $log->setAction($action);
-
-            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
-            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
-            try {
-                $responseCode = $logger->addLog($log);
-                Console::info('Error log pushed with status code: ' . $responseCode);
-            } catch (Throwable $th) {
-                Console::error('Error pushing log: ' . $th->getMessage());
-            }
+        try {
+            $responseCode = $logger->addLog($log);
+            Console::info('Error log pushed with status code: ' . $responseCode);
+        } catch (Throwable $th) {
+            Console::error('Error pushing log: ' . $th->getMessage());
         }
-
-        Console::error('[Error] Type: ' . get_class($error));
-        Console::error('[Error] Message: ' . $error->getMessage());
-        Console::error('[Error] File: ' . $error->getFile());
-        Console::error('[Error] Line: ' . $error->getLine());
     }
-}
 
-$server->error(logError(...));
+    Console::error('[Error] Type: ' . get_class($error));
+    Console::error('[Error] Message: ' . $error->getMessage());
+    Console::error('[Error] File: ' . $error->getFile());
+    Console::error('[Error] Line: ' . $error->getLine());
+};
 
-$server->onStart(function () use ($stats, $register, $containerId, &$statsDocument) {
+$server->error($logError);
+
+$server->onStart(function () use ($stats, $register, $containerId, &$statsDocument, $logError) {
     sleep(5); // wait for the initial database schema to be ready
     Console::success('Server started successfully');
 
@@ -340,7 +326,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
      */
     // TODO: Remove this if check once it doesn't cause issues for cloud
     if (System::getEnv('_APP_EDITION', 'self-hosted') === 'self-hosted') {
-        Timer::tick(5000, function () use ($register, $stats, &$statsDocument) {
+        Timer::tick(5000, function () use ($register, $stats, &$statsDocument, $logError) {
             $payload = [];
             foreach ($stats as $projectId => $value) {
                 $payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
@@ -358,13 +344,13 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
 
                 $database->getAuthorization()->skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
             } catch (Throwable $th) {
-                logError($th, "updateWorkerDocument");
+                $logError($th, "updateWorkerDocument");
             }
         });
     }
 });
 
-$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime) {
+$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime, $logError) {
     Console::success('Worker ' . $workerId . ' started successfully');
 
     $telemetry = getTelemetry($workerId);
@@ -376,7 +362,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
     $attempts = 0;
     $start = time();
 
-    Timer::tick(5000, function () use ($server, $register, $realtime, $stats) {
+    Timer::tick(5000, function () use ($server, $register, $realtime, $stats, $logError) {
         /**
          * Sending current connections to project channels on the console project every 5 seconds.
          */
@@ -562,7 +548,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                 }
             });
         } catch (Throwable $th) {
-            logError($th, "pubSubConnection");
+            $logError($th, "pubSubConnection");
 
             Console::error('Pub/sub error: ' . $th->getMessage());
             $attempts++;
@@ -574,7 +560,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
     Console::error('Failed to restart pub/sub...');
 });
 
-$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime) {
+$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime, $logError) {
     $app = new Http('UTC');
     $request = new Request($request);
     $response = new Response(new SwooleResponse());
@@ -585,10 +571,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
     Http::setResource('request', fn () => $request);
     Http::setResource('response', fn () => $response);
 
-    $project = null;
-    $logUser = null;
-    $authorization = null;
-
     try {
         /** @var Document $project */
         $project = $app->getResource('project');
@@ -609,15 +591,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
         }
 
-        $projectRegion = $project->getAttribute('region', '');
-        $currentRegion = System::getEnv('_APP_REGION', 'default');
-        if (!empty($projectRegion) && $projectRegion !== $currentRegion) {
-            throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Project is not accessible in this region. Please make sure you are using the correct endpoint');
-        }
-
         $timelimit = $app->getResource('timelimit');
         $user = $app->getResource('user'); /** @var User $user */
-        $logUser = $user;
 
         /*
          * Abuse Check
@@ -708,11 +683,11 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         $stats->incr($project->getId(), 'connections');
         $stats->incr($project->getId(), 'connectionsTotal');
     } catch (Throwable $th) {
-        logError($th, 'realtime', project: $project, user: $logUser, authorization: $authorization);
+        $logError($th, "initServer");
 
         // Handle SQL error code is 'HY000'
         $code = $th->getCode();
-        if (!\is_int($code)) {
+        if (!is_int($code)) {
             $code = 500;
         }
 
@@ -743,10 +718,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
     }
 });
 
-$server->onMessage(function (int $connection, string $message) use ($server, $register, $realtime, $containerId) {
-    $project = null;
-    $authorization = null;
-
+$server->onMessage(function (int $connection, string $message) use ($server, $register, $realtime, $containerId, $logError) {
     try {
         $response = new Response(new SwooleResponse());
         $projectId = $realtime->connections[$connection]['projectId'] ?? null;
@@ -872,7 +844,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                 throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Message type is not valid.');
         }
     } catch (Throwable $th) {
-        logError($th, 'realtimeMessage', project: $project, authorization: $authorization);
+        $logError($th, "realtimeMessage");
         $code = $th->getCode();
         if (!is_int($code)) {
             $code = 500;

app/views/install/compose.phtml

@@ -12,12 +12,7 @@ $version = $this->getParam('version', '');
 $organization = $this->getParam('organization', '');
 $image = $this->getParam('image', '');
 $enableAssistant = $this->getParam('enableAssistant', false);
-$dbService = $this->getParam('database', 'mongodb');
-$allowedDbServices = ['mariadb', 'mongodb', 'postgresql'];
-if (!\in_array($dbService, $allowedDbServices, true)) {
-    $dbService = 'mongodb';
-}
-$hostPath = rtrim($this->getParam('hostPath', ''), '/');
+$dbService = $this->getParam('database');
 ?>services:
   traefik:
     image: traefik:3.6
@@ -67,9 +62,6 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - traefik.http.routers.appwrite_api_https.service=appwrite_api
       - traefik.http.routers.appwrite_api_https.tls=true
     volumes:
-<?php if ($version === 'local' && !empty($hostPath)): ?>
-      - <?php echo $hostPath; ?>:/usr/src/code:rw
-<?php endif; ?>
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-imports:/storage/imports:rw
       - appwrite-cache:/storage/cache:rw
@@ -192,7 +184,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:7.6.4
+    image: <?php echo $organization; ?>/console:7.5.7
     restart: unless-stopped
     networks:
       - appwrite
@@ -266,7 +258,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -294,7 +286,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -324,7 +316,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     volumes:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -389,7 +381,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -417,7 +409,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     volumes:
       - appwrite-functions:/storage/functions:rw
       - appwrite-sites:/storage/sites:rw
@@ -487,7 +479,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     volumes:
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
@@ -526,7 +518,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
       - openruntimes-executor
     environment:
       - _APP_ENV
@@ -659,7 +651,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     volumes:
       - appwrite-imports:/storage/imports:rw
     depends_on:
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -738,7 +730,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -769,7 +761,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -799,7 +791,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
     depends_on:
       - redis
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -828,7 +820,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
       - redis
     environment:
       - _APP_ENV
@@ -855,7 +847,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
       - redis
     environment:
       - _APP_ENV
@@ -882,7 +874,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     networks:
       - appwrite
     depends_on:
-      - <?= $dbService . "\n" ?>
+      - <?= $dbService  . "\n" ?>
       - redis
     environment:
       - _APP_ENV
@@ -972,7 +964,9 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - OPR_EXECUTOR_STORAGE_WASABI_REGION=$_APP_STORAGE_WASABI_REGION
       - OPR_EXECUTOR_STORAGE_WASABI_BUCKET=$_APP_STORAGE_WASABI_BUCKET
 
+
 <?php if ($dbService === 'mariadb'): ?>
+
   mariadb:
     image: mariadb:10.11
     container_name: appwrite-mariadb
@@ -989,105 +983,26 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - MARIADB_AUTO_UPGRADE=1
     command: 'mysqld --innodb-flush-method=fsync'
 
-<?php elseif ($dbService === 'mongodb'): ?>
-
-  mongodb:
-    image: mongo:8.2.5
-    container_name: appwrite-mongodb
-    <<: *x-logging
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-mongodb:/data/db
-      - appwrite-mongodb-keyfile:/data/keyfile
-    ports:
-      - "27017:27017"
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=root
-      - MONGO_INITDB_ROOT_PASSWORD=${_APP_DB_ROOT_PASS}
-      - MONGO_INITDB_DATABASE=${_APP_DB_SCHEMA}
-      - MONGO_INITDB_USERNAME=${_APP_DB_USER}
-      - MONGO_INITDB_PASSWORD=${_APP_DB_PASS}
-    entrypoint:
-      - /bin/bash
-      - -c
-      - |
-        set -e
-        KEYFILE_PATH="/data/keyfile/mongo-keyfile"
-        INIT_FLAG="/data/db/.mongodb_initialized"
-
-        # Generate keyfile if it doesn't exist
-        if [ ! -f "$$KEYFILE_PATH" ]; then
-          echo "Generating random MongoDB keyfile..."
-          mkdir -p /data/keyfile
-          openssl rand -base64 756 > "$$KEYFILE_PATH"
-        fi
-        chmod 400 "$$KEYFILE_PATH"
-        chown mongodb:mongodb "$$KEYFILE_PATH" 2>/dev/null || chown 999:999 "$$KEYFILE_PATH"
-
-        # If not initialized, start without auth first to set up replica set and users
-        if [ ! -f "$$INIT_FLAG" ]; then
-          echo "First-time initialization: starting MongoDB without auth..."
-          mongod --replSet rs0 --bind_ip_all --fork --logpath /var/log/mongodb/mongod.log --dbpath /data/db
-
-          echo "Waiting for MongoDB to start..."
-          sleep 5
-
-          echo "Initializing replica set..."
-          mongosh --eval "rs.initiate({_id: 'rs0', members: [{_id: 0, host: 'mongodb:27017'}]})"
-
-          echo "Waiting for replica set to initialize..."
-          sleep 5
-
-          echo "Creating root user..."
-          mongosh admin --eval "db.createUser({user: '$$MONGO_INITDB_ROOT_USERNAME', pwd: '$$MONGO_INITDB_ROOT_PASSWORD', roles: ['root']})"
-
-          echo "Creating application user..."
-          mongosh admin --eval "db.createUser({user: '$$MONGO_INITDB_USERNAME', pwd: '$$MONGO_INITDB_PASSWORD', roles: [{role: 'readWrite', db: '$$MONGO_INITDB_DATABASE'}]})"
-
-          echo "Shutting down MongoDB..."
-          mongod --dbpath /data/db --shutdown
-
-          touch "$$INIT_FLAG"
-          echo "Initialization complete."
-        fi
-
-        echo "Starting MongoDB with authentication..."
-        exec mongod --replSet rs0 --bind_ip_all --auth --keyFile "$$KEYFILE_PATH"
-    healthcheck:
-      test: |
-        mongosh -u root -p "$$MONGO_INITDB_ROOT_PASSWORD" --authenticationDatabase admin --quiet --eval "rs.status().ok" | grep -q 1
-      interval: 10s
-      timeout: 10s
-      retries: 10
-      start_period: 60s
-
 <?php elseif ($dbService === 'postgresql'): ?>
 
   postgresql:
-    image: appwrite/postgres:0.1.0
+    image: postgres:15
     container_name: appwrite-postgresql
     restart: unless-stopped
     networks:
       - appwrite
     volumes:
-      - appwrite-postgresql:/var/lib/postgresql:rw
+      - appwrite-postgresql:/var/lib/postgresql/data:rw
     environment:
       - POSTGRES_DB=${_APP_DB_SCHEMA}
       - POSTGRES_USER=${_APP_DB_USER}
       - POSTGRES_PASSWORD=${_APP_DB_PASS}
     command: "postgres"
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${_APP_DB_USER} -d ${_APP_DB_SCHEMA}"]
-      interval: 10s
-      timeout: 10s
-      retries: 10
-      start_period: 30s
 
 <?php endif; ?>
 
   redis:
-    image: redis:7.4.7-alpine
+    image: redis:7.2.4-alpine
     container_name: appwrite-redis
     <<: *x-logging
     restart: unless-stopped
@@ -1123,10 +1038,6 @@ volumes:
   appwrite-mariadb:
 <?php elseif ($dbService === 'postgresql'): ?>
   appwrite-postgresql:
-<?php elseif ($dbService === 'mongodb'): ?>
-  appwrite-mongodb:
-  appwrite-mongodb-keyfile:
-  appwrite-mongodb-config:
 <?php endif; ?>
   appwrite-redis:
   appwrite-cache:

app/views/install/installer.phtml

@@ -1,147 +0,0 @@
-<?php
-$isUpgrade = $isUpgrade ?? false;
-$lockedDatabase = $lockedDatabase ?? null;
-$vars = $vars ?? [];
-$defaultHttpPort = $defaultHttpPort ?? '80';
-$defaultHttpsPort = $defaultHttpsPort ?? '443';
-$defaultAppDomain = $vars['_APP_DOMAIN']['default'] ?? 'localhost';
-$defaultAppDomain = ($defaultAppDomain === 'traefik') ? 'localhost' : $defaultAppDomain;
-$defaultEmailCertificates = $defaultEmailCertificates ?? '';
-$defaultSecretKey = $vars['_APP_OPENSSL_KEY_V1']['default'] ?? '';
-$defaultAssistantOpenAIKey = $vars['_APP_ASSISTANT_OPENAI_API_KEY']['default'] ?? '';
-$defaultDatabase = $vars['_APP_DB_ADAPTER']['default'] ?? 'mongodb';
-$lockedDatabase = $isUpgrade && empty($lockedDatabase) ? $defaultDatabase : $lockedDatabase;
-$isLocalInstall = $isLocalInstall ?? false;
-
-
-$cardStep = min(4, $step);
-$stepFile = __DIR__ . "/installer/templates/steps/step-{$cardStep}.phtml";
-if (!is_file($stepFile)) {
-    $stepFile = __DIR__ . "/installer/templates/steps/step-1.phtml";
-}
-$cssVersion = @filemtime(__DIR__ . '/installer/css/styles.css') ?: time();
-$tooltipsVersion = @filemtime(__DIR__ . '/installer/js/tooltips.js') ?: time();
-$constantsVersion = @filemtime(__DIR__ . '/installer/js/constants.js') ?: time();
-$stepsContextVersion = @filemtime(__DIR__ . '/installer/js/modules/context.js') ?: time();
-$stepsStateVersion = @filemtime(__DIR__ . '/installer/js/modules/state.js') ?: time();
-$stepsValidationVersion = @filemtime(__DIR__ . '/installer/js/modules/validation.js') ?: time();
-$stepsUiVersion = @filemtime(__DIR__ . '/installer/js/modules/ui.js') ?: time();
-$stepsToastVersion = @filemtime(__DIR__ . '/installer/js/modules/toast.js') ?: time();
-$stepsProgressVersion = @filemtime(__DIR__ . '/installer/js/modules/progress.js') ?: time();
-$stepsVersion = @filemtime(__DIR__ . '/installer/js/steps.js') ?: time();
-$installerVersion = @filemtime(__DIR__ . '/installer/js/installer.js') ?: time();
-?>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title><?php echo $isUpgrade ? 'Appwrite Update' : 'Appwrite Installation'; ?></title>
-    <meta name="appwrite-installer-csrf" content="<?php echo htmlspecialchars($csrfToken ?? '', ENT_QUOTES); ?>">
-    <link rel="icon" type="image/svg+xml" href="installer/icons/appwrite-mark.svg">
-    <link rel="stylesheet" href="installer/css/styles.css?v=<?php echo $cssVersion; ?>">
-    <script src="installer/js/tooltips.js?v=<?php echo $tooltipsVersion; ?>" defer></script>
-    <script src="installer/js/constants.js?v=<?php echo $constantsVersion; ?>" defer></script>
-    <!-- Load context first; other modules depend on InstallerStepsContext. -->
-    <script src="installer/js/modules/context.js?v=<?php echo $stepsContextVersion; ?>" defer></script>
-    <script src="installer/js/modules/state.js?v=<?php echo $stepsStateVersion; ?>" defer></script>
-    <script src="installer/js/modules/validation.js?v=<?php echo $stepsValidationVersion; ?>" defer></script>
-    <script src="installer/js/modules/ui.js?v=<?php echo $stepsUiVersion; ?>" defer></script>
-    <script src="installer/js/modules/toast.js?v=<?php echo $stepsToastVersion; ?>" defer></script>
-    <script src="installer/js/modules/progress.js?v=<?php echo $stepsProgressVersion; ?>" defer></script>
-    <script src="installer/js/steps.js?v=<?php echo $stepsVersion; ?>" defer></script>
-    <script src="installer/js/installer.js?v=<?php echo $installerVersion; ?>" defer></script>
-</head>
-<body
-    class="installer-page"
-    data-step="<?php echo $step; ?>"
-    data-upgrade="<?php echo $isUpgrade ? 'true' : 'false'; ?>"
-    <?php if (!empty($lockedDatabase)) { ?>
-        data-locked-database="<?php echo htmlspecialchars((string) $lockedDatabase, ENT_QUOTES, 'UTF-8'); ?>"
-    <?php } ?>
-    data-default-http-port="<?php echo htmlspecialchars((string) $defaultHttpPort, ENT_QUOTES, 'UTF-8'); ?>"
-    data-default-https-port="<?php echo htmlspecialchars((string) $defaultHttpsPort, ENT_QUOTES, 'UTF-8'); ?>"
-    data-default-app-domain="<?php echo htmlspecialchars((string) $defaultAppDomain, ENT_QUOTES, 'UTF-8'); ?>"
-    data-default-email-certificates="<?php echo htmlspecialchars((string) $defaultEmailCertificates, ENT_QUOTES, 'UTF-8'); ?>"
-    data-default-secret-key="<?php echo htmlspecialchars((string) $defaultSecretKey, ENT_QUOTES, 'UTF-8'); ?>"
-    data-default-assistant-openai-key="<?php echo htmlspecialchars((string) $defaultAssistantOpenAIKey, ENT_QUOTES, 'UTF-8'); ?>"
-    data-default-database="<?php echo htmlspecialchars((string) $defaultDatabase, ENT_QUOTES, 'UTF-8'); ?>"
-    <?php if ($isLocalInstall) { ?>
-        data-dev-mode="true"
-    <?php } ?>
->
-    <div class="installer-backdrop" aria-hidden="true">
-        <span class="installer-gradients">
-            <span class="installer-blob blob-one">
-                <?php include __DIR__ . '/installer/icons/install-bg-1.svg'; ?>
-            </span>
-            <span class="installer-blob blob-two">
-                <?php include __DIR__ . '/installer/icons/install-bg-2.svg'; ?>
-            </span>
-        </span>
-    </div>
-
-    <main class="installer-main">
-        <div class="installer-card" data-step="<?php echo $step; ?>">
-            <div class="installer-step">
-                <div class="step-panel is-active">
-                    <?php include $stepFile; ?>
-                </div>
-            </div>
-            <div class="action-shell">
-                <div class="divider"></div>
-                <div class="action-bar">
-                    <button class="button secondary" type="button" data-action="back">
-                        <span class="button-text typography-text-m-500">Back</span>
-                    </button>
-
-                    <div class="step-indicators" aria-hidden="true">
-                        <span class="step-indicator" data-step="1">
-                            <span class="indicator-active"><?php include __DIR__ . '/installer/icons/indicator-active.svg'; ?></span>
-                            <span class="indicator-inactive"><?php include __DIR__ . '/installer/icons/indicator-inactive.svg'; ?></span>
-                        </span>
-                        <span class="step-indicator" data-step="2">
-                            <span class="indicator-active"><?php include __DIR__ . '/installer/icons/indicator-active.svg'; ?></span>
-                            <span class="indicator-inactive"><?php include __DIR__ . '/installer/icons/indicator-inactive.svg'; ?></span>
-                        </span>
-                        <span class="step-indicator" data-step="3">
-                            <span class="indicator-active"><?php include __DIR__ . '/installer/icons/indicator-active.svg'; ?></span>
-                            <span class="indicator-inactive"><?php include __DIR__ . '/installer/icons/indicator-inactive.svg'; ?></span>
-                        </span>
-                        <span class="step-indicator" data-step="4">
-                            <span class="indicator-active"><?php include __DIR__ . '/installer/icons/indicator-active.svg'; ?></span>
-                            <span class="indicator-inactive"><?php include __DIR__ . '/installer/icons/indicator-inactive.svg'; ?></span>
-                        </span>
-                    </div>
-
-                    <button class="button primary" type="button" data-action="next">
-                        <span class="button-text typography-text-m-500">Next</span>
-                    </button>
-                </div>
-            </div>
-        </div>
-        <div class="install-screen" aria-live="polite">
-            <div class="install-screen-content">
-                <?php if ($step === 5) { include __DIR__ . '/installer/templates/steps/step-5.phtml'; } ?>
-            </div>
-        </div>
-    </main>
-
-    <footer class="installer-footer">
-        <div class="appwrite-logo">
-            <?php include __DIR__ . '/installer/icons/appwrite-logo.svg'; ?>
-        </div>
-    </footer>
-
-    <template id="field-error-template">
-        <div class="field-error typography-caption-400 text-error">
-            <span class="field-error-icon">
-                <?php include __DIR__ . '/installer/icons/exclamation-circle.svg'; ?>
-            </span>
-            <span class="field-error-text"></span>
-        </div>
-    </template>
-
-    <div id="installer-toast-stack" class="installer-toast-stack" aria-live="polite" aria-atomic="true"></div>
-</body>
-</html>

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

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

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

@@ -1,4 +0,0 @@
-<svg width="25" height="22" viewBox="0 0 25 22" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <path d="M24.2577 16.4436V21.9248H10.6705C6.71194 21.9248 3.25559 19.7204 1.40636 16.4436C1.13754 15.9672 0.90225 15.4674 0.704883 14.9487C0.31744 13.9322 0.0738912 12.8415 0 11.7034V10.2214C0.0160422 9.96781 0.0413207 9.71617 0.0743773 9.46752C0.141949 8.95727 0.244035 8.45799 0.378206 7.97265C1.64748 3.37143 5.77469 0 10.6705 0C15.5662 0 19.693 3.37143 20.9622 7.97265H15.1526C14.1988 6.47279 12.5479 5.4812 10.6705 5.4812C8.79305 5.4812 7.14216 6.47279 6.18839 7.97265C5.89768 8.42859 5.67212 8.93136 5.52434 9.46752C5.39308 9.94289 5.32308 10.4442 5.32308 10.9624C5.32308 12.5335 5.96768 13.9497 7.00119 14.9487C7.95886 15.876 9.25 16.4436 10.6705 16.4436H24.2577Z" fill="#FD366E"/>
-    <path d="M24.2578 9.46753V14.9487H14.3398C15.3733 13.9497 16.018 12.5335 16.018 10.9624C16.018 10.4442 15.9479 9.9429 15.8167 9.46753H24.2578Z" fill="#FD366E"/>
-</svg>

app/views/install/installer/icons/chevron-down.svg

@@ -1,3 +0,0 @@
-<svg class="accordion-chevron" data-open="false" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M5.29289 7.29289C5.68342 6.90237 6.31658 6.90237 6.70711 7.29289L10 10.5858L13.2929 7.29289C13.6834 6.90237 14.3166 6.90237 14.7071 7.29289C15.0976 7.68342 15.0976 8.31658 14.7071 8.70711L10.7071 12.7071C10.3166 13.0976 9.68342 13.0976 9.29289 12.7071L5.29289 8.70711C4.90237 8.31658 4.90237 7.68342 5.29289 7.29289Z" fill="currentColor"/>
-</svg>

app/views/install/installer/icons/copy.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20" aria-hidden="true">
-    <path fill="currentColor" d="M7 9a2 2 0 0 1 2-2h6a2 2 0 0 1 2 2v6a2 2 0 0 1-2 2H9a2 2 0 0 1-2-2z"/>
-    <path fill="currentColor" d="M5 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2V5h8a2 2 0 0 0-2-2z"/>
-</svg>

app/views/install/installer/icons/exclamation-circle.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20" aria-hidden="true">
-    <path fill="currentColor" fill-rule="evenodd" d="M18 10a8 8 0 1 1-16 0 8 8 0 0 1 16 0m-7 4a1 1 0 1 1-2 0 1 1 0 0 1 2 0m-1-9a1 1 0 0 0-1 1v4a1 1 0 1 0 2 0V6a1 1 0 0 0-1-1" clip-rule="evenodd"/>
-</svg>

app/views/install/installer/icons/eye-off.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
-    <path fill="currentColor" fill-rule="evenodd" d="M3.707 2.293a1 1 0 1 0-1.414 1.414l14 14a1 1 0 1 0 1.414-1.414l-1.473-1.473A10 10 0 0 0 19.543 10C18.268 5.943 14.478 3 10 3a9.96 9.96 0 0 0-4.512 1.074zm4.261 4.26 1.514 1.515a2.003 2.003 0 0 1 2.45 2.45l1.515 1.514a4 4 0 0 0-5.478-5.478" clip-rule="evenodd"/>
-    <path fill="currentColor" d="M12.454 16.697 9.75 13.992a4 4 0 0 1-3.742-3.742L2.335 6.578A10 10 0 0 0 .458 10c1.274 4.057 5.065 7 9.542 7 .847 0 1.67-.105 2.454-.303"/>
-</svg>

app/views/install/installer/icons/eye.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
-    <path fill="currentColor" d="M10 12a2 2 0 1 0 0-4 2 2 0 0 0 0 4"/>
-    <path fill="currentColor" fill-rule="evenodd" d="M.457 10C1.732 5.943 5.522 3 10 3s8.267 2.943 9.542 7c-1.275 4.057-5.065 7-9.542 7-4.478 0-8.268-2.943-9.543-7M14 10a4 4 0 1 1-8 0 4 4 0 0 1 8 0" clip-rule="evenodd"/>
-</svg>

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

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

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

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

app/views/install/installer/icons/info.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20" aria-hidden="true">
-    <path fill="currentColor" fill-rule="evenodd" d="M18 10a8 8 0 1 1-16 0 8 8 0 0 1 16 0m-7-4a1 1 0 1 1-2 0 1 1 0 0 1 2 0M9 9a1 1 0 1 0 0 2v3a1 1 0 0 0 1 1h1a1 1 0 1 0 0-2v-3a1 1 0 0 0-1-1z" clip-rule="evenodd"/>
-</svg>

app/views/install/installer/icons/install-bg-1.svg

@@ -1,16 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="408" height="353" viewBox="0 0 408 353" fill="none" aria-hidden="true">
-    <g filter="url(#filter0_f_3091_1065)">
-        <path d="M216.4 88.698C162.554 64.5014 104.764 118.126 82.6001 147.963C90.6227 156.819 114.663 172.323 146.645 163.495C186.622 152.459 191.109 162.269 229.454 181.887C267.799 201.506 268.207 261.18 291.051 268.537C313.895 275.894 322.054 244.422 324.501 193.74C326.949 143.058 283.709 118.944 216.4 88.698Z" fill="url(#paint0_radial_3091_1065)"/>
-    </g>
-    <defs>
-        <filter id="filter0_f_3091_1065" x="9.91821e-05" y="-2.28882e-05" width="407.2" height="352.2" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-            <feFlood flood-opacity="0" result="BackgroundImageFix"/>
-            <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-            <feGaussianBlur stdDeviation="41.3" result="effect1_foregroundBlur_3091_1065"/>
-        </filter>
-        <radialGradient id="paint0_radial_3091_1065" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(203.6 176.1) rotate(-90) scale(93.5 121)">
-            <stop stop-color="#FE9567"/>
-            <stop offset="1" stop-color="#FE9567" stop-opacity="0"/>
-        </radialGradient>
-    </defs>
-</svg>

app/views/install/installer/icons/install-bg-2.svg

@@ -1,16 +0,0 @@
-<svg width="569" height="367" viewBox="0 0 569 367" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <g filter="url(#install-bg-2-filter)">
-        <path d="M136.265 227.973C89.0703 207.713 99.6672 144.647 110.865 115.646C130.119 111.289 176.904 102.33 210.005 101.35C251.382 100.125 288.253 121.773 333.317 135.252C378.381 148.731 466.051 125.449 467.28 160.577C468.509 195.704 412.793 254.522 402.142 242.269C391.49 230.015 319.798 227.973 246.057 254.522C172.316 281.072 195.257 253.297 136.265 227.973Z" fill="url(#install-bg-2-paint)"/>
-    </g>
-    <defs>
-        <filter id="install-bg-2-filter" x="-0.000198364" y="0.0000457764" width="568.6" height="366.6" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-            <feFlood flood-opacity="0" result="BackgroundImageFix"/>
-            <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-            <feGaussianBlur stdDeviation="50.65" result="effect1_foregroundBlur_install_bg_2"/>
-        </filter>
-        <radialGradient id="install-bg-2-paint" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(284.3 183.3) rotate(-90) scale(82 183)">
-            <stop stop-color="#FD366E"/>
-            <stop offset="1" stop-color="#FD366E" stop-opacity="0"/>
-        </radialGradient>
-    </defs>
-</svg>

app/views/install/installer/icons/install-check.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <circle class="check-bg" cx="8" cy="8" r="7" fill="var(--fgcolor-neutral-primary)"/>
-    <path class="check-mark" d="M5 8.2L7.2 10.2L11.2 6.2" fill="none" stroke="var(--fgcolor-on-invert)" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

app/views/install/installer/icons/install-spinner.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <path class="spinner-ring" opacity="0.2" d="M14.4001 7.99998C14.4001 11.5346 11.5347 14.4 8.0001 14.4C4.46548 14.4 1.6001 11.5346 1.6001 7.99998C1.6001 4.46535 4.46548 1.59998 8.0001 1.59998C11.5347 1.59998 14.4001 4.46535 14.4001 7.99998ZM2.8801 7.99998C2.8801 10.8277 5.1724 13.12 8.0001 13.12C10.8278 13.12 13.1201 10.8277 13.1201 7.99998C13.1201 5.17228 10.8278 2.87998 8.0001 2.87998C5.1724 2.87998 2.8801 5.17228 2.8801 7.99998Z" fill="var(--fgcolor-neutral-secondary)"/>
-    <path class="spinner-arc" d="M4.32921 2.7574C5.15654 2.1781 6.10923 1.80282 7.10939 1.66226C8.10955 1.5217 9.12877 1.61984 10.0837 1.94866C11.0387 2.27748 11.9023 2.82764 12.6039 3.55416C13.3055 4.28069 13.8252 5.16294 14.1204 6.1288C14.4157 7.09465 14.4782 8.11668 14.3029 9.11133C14.1275 10.106 13.7192 11.045 13.1114 11.8516C12.5035 12.6582 11.7134 13.3095 10.8057 13.7523C9.8979 14.195 8.89823 14.4166 7.8884 14.399L7.91074 13.1192C8.71861 13.1333 9.51834 12.956 10.2446 12.6018C10.9708 12.2476 11.6029 11.7266 12.0891 11.0813C12.5754 10.436 12.902 9.68477 13.0423 8.88906C13.1826 8.09334 13.1326 7.27572 12.8964 6.50303C12.6601 5.73035 12.2444 5.02454 11.6831 4.44333C11.1218 3.86211 10.431 3.42198 9.66701 3.15892C8.90304 2.89586 8.08766 2.81735 7.28753 2.9298C6.48741 3.04225 5.72525 3.34247 5.06339 3.80592L4.32921 2.7574Z" fill="var(--fgcolor-neutral-secondary)"/>
-</svg>

app/views/install/installer/icons/lock.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <path fill="currentColor" fill-rule="evenodd" d="M5 9V7a5 5 0 1 1 10 0v2a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2m8-2v2H7V7a3 3 0 1 1 6 0" clip-rule="evenodd"/>
-</svg>

app/views/install/installer/icons/mariadb.svg

@@ -1,10 +0,0 @@
-<svg width="34" height="34" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="0.5" y="0.5" width="33" height="33" rx="8.5" fill="white" stroke="#EDEDF0"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M28.3208 9.43304C27.9548 9.4451 28.0607 9.61 27.2684 9.80574C26.468 10.0028 25.5 9.88216 24.6393 10.2441C22.387 11.188 22.0224 14.8372 19.3397 16.249C17.5807 17.2424 15.7869 17.4703 14.1835 17.973C12.8965 18.4892 12.0961 18.8311 11.1523 19.6448C10.4203 20.2763 10.242 20.889 9.47647 21.6813C8.70022 22.7364 5.75747 21.7993 5 23.1225C5.39952 23.3813 5.6301 23.4523 6.33127 23.3598C6.18647 23.6346 5.26411 23.9966 5.43169 24.4015C5.43169 24.4015 7.66121 24.8077 9.54081 23.6735C10.4176 23.3169 11.2394 22.5621 12.6015 22.3811C14.3658 22.1465 16.354 22.7512 18.487 22.9214C18.046 23.7928 17.5915 24.3077 17.1048 25.0263C16.9547 25.1885 17.2335 25.3319 17.751 25.2341C18.6814 25.0035 19.3558 24.7541 20.0248 24.2916C20.8975 23.6896 21.2729 23.1386 22.009 22.2658C22.6484 23.2914 24.9034 23.5167 25.366 22.6305C24.5053 22.2658 24.3216 20.3688 24.6165 19.5497C24.9651 18.7694 25.2158 17.666 25.4974 16.6404C25.7507 15.7167 25.9076 14.3077 26.2106 13.5864C26.5726 12.6895 27.2764 12.4093 27.8046 11.9334C28.3328 11.4574 28.8584 11.0606 28.8423 9.97198C28.8369 9.61805 28.6546 9.42231 28.3208 9.43304Z" fill="#1F305F"/>
-    <path d="M5.673 24.2137C7.05522 24.2553 7.43061 24.2191 8.52324 23.7445C9.45232 23.341 10.6951 22.2537 11.7931 21.9024C13.4046 21.3849 15.1327 21.4627 16.8474 21.6651C17.4212 21.7335 17.9977 21.8287 18.4093 21.7844C19.0514 21.3903 19.0823 20.3204 19.4805 20.2346C19.3719 22.3046 18.4843 23.6292 17.5968 24.8304C19.467 24.5006 20.7165 23.3329 21.4727 21.8877C21.7019 21.4493 22.0827 20.732 22.257 20.2387C22.395 20.5658 22.0773 20.7736 22.2261 21.1302C23.43 20.1368 23.9985 19.0053 24.4865 17.3482C25.0522 15.4311 25.6327 13.7834 25.9974 13.2163C26.3527 12.6626 26.9064 12.3207 27.4118 11.9668C27.9856 11.5633 28.4991 11.1436 28.5875 10.3754C27.9816 10.3191 27.8421 10.1797 27.7523 9.87402C27.4493 10.0443 27.1705 10.0818 26.8554 10.0912C26.5819 10.0993 26.2816 10.0872 25.9143 10.1247C22.8804 10.4358 22.7396 13.4013 20.5342 15.5785C20.3921 15.7166 20.1494 15.9204 19.9886 16.0411C19.3075 16.5492 18.5782 16.828 17.81 17.1216C16.5658 17.5962 15.3861 17.7343 14.2197 18.1446C13.363 18.4449 12.5667 18.7894 11.8628 19.2707C11.6872 19.3914 11.4486 19.6059 11.2957 19.7306C10.8828 20.0684 10.612 20.4424 10.3492 20.8286C10.0784 21.2254 9.81831 21.6343 9.42014 22.0244C8.77528 22.6572 6.36746 22.2094 5.51882 22.7966C5.42497 22.8623 5.34855 22.9401 5.29761 23.0339C5.76014 23.2444 6.06982 23.1157 6.60207 23.1734C6.66776 23.6815 5.50005 23.9818 5.673 24.2137Z" fill="#C0765A"/>
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M24.9033 11.3797C25.3323 11.7524 26.2333 11.4534 26.0724 10.712C25.4047 10.6557 25.0186 10.8823 24.9033 11.3797Z" fill="#1F305F"/>
-    <path d="M27.8971 10.5123C27.7831 10.7523 27.5646 11.0606 27.5646 11.6706C27.5632 11.7752 27.4855 11.8476 27.4841 11.6854C27.4895 11.0888 27.6477 10.8314 27.8153 10.4935C27.8917 10.3554 27.9386 10.4117 27.8971 10.5123Z" fill="#1F305F"/>
-    <path d="M27.7818 10.4225C27.6464 10.6504 27.322 11.0674 27.2697 11.676C27.2603 11.7806 27.1745 11.845 27.1879 11.6841C27.2469 11.0915 27.5057 10.7202 27.7028 10.3971C27.7912 10.2657 27.8328 10.326 27.7818 10.4225Z" fill="#1F305F"/>
-    <path d="M27.6772 10.303C27.523 10.5189 27.0243 11.0203 26.9197 11.6209C26.901 11.7241 26.8112 11.7804 26.838 11.6222C26.9466 11.0364 27.3769 10.5752 27.5995 10.2708C27.6987 10.1462 27.7362 10.2105 27.6772 10.303Z" fill="#1F305F"/>
-    <path d="M27.5835 10.1688C27.4012 10.3619 26.8059 11 26.6182 11.5805C26.5847 11.6797 26.4882 11.724 26.5365 11.5698C26.7255 11.0041 27.247 10.3954 27.5111 10.1259C27.6278 10.0173 27.6546 10.087 27.5835 10.1688Z" fill="#1F305F"/>
-</svg>

app/views/install/installer/icons/mongodb.svg

@@ -1,6 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect width="32" height="32" rx="8" fill="#081E2B"/>
-    <g transform="translate(11.4, 6.1)">
-        <path d="M6.03701 2.19958C5.24603 1.21687 4.56489 0.218806 4.42574 0.0115161C4.41109 -0.00383871 4.38911 -0.00383871 4.37447 0.0115161C4.23531 0.218806 3.55418 1.21687 2.76319 2.19958C-4.02614 11.2666 3.8325 17.3856 3.8325 17.3856L3.89841 17.4316C3.95699 18.3759 4.10348 19.7348 4.10348 19.7348H4.39644H4.6894C4.6894 19.7348 4.83588 18.3836 4.89447 17.4316L4.96038 17.3779C4.9677 17.3779 12.8264 11.2666 6.03701 2.19958ZM4.39644 17.2473C4.39644 17.2473 4.04489 16.9325 3.94968 16.7713V16.756L4.37447 6.88281C4.37447 6.8521 4.41842 6.8521 4.41842 6.88281L4.8432 16.756V16.7713C4.74799 16.9325 4.39644 17.2473 4.39644 17.2473Z" fill="#00ED64"/>
-    </g>
-</svg>

app/views/install/installer/icons/postgresql.svg

@@ -1,27 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <rect x="0.5" y="0.5" width="31" height="31" rx="7.5" fill="white" stroke="#EDEDF0"/>
-    <g transform="translate(3.2, 3.2) scale(1)">
-        <svg viewBox="0 0 25.6 25.6" width="25.6" height="25.6">
-            <style><![CDATA[.B{stroke-linecap:round}.C{stroke-linejoin:round}.D{stroke-linejoin:miter}.E{stroke-width:.716}]]></style>
-            <g fill="none" stroke="#fff">
-                <path d="M18.983 18.636c.163-1.357.114-1.555 1.124-1.336l.257.023c.777.035 1.793-.125 2.4-.402 1.285-.596 2.047-1.592.78-1.33-2.89.596-3.1-.383-3.1-.383 3.053-4.53 4.33-10.28 3.227-11.687-3.004-3.84-8.205-2.024-8.292-1.976l-.028.005c-.57-.12-1.2-.19-1.93-.2-1.308-.02-2.3.343-3.054.914 0 0-9.277-3.822-8.846 4.807.092 1.836 2.63 13.9 5.66 10.25C8.29 15.987 9.36 14.86 9.36 14.86c.53.353 1.167.533 1.834.468l.052-.044a2.01 2.01 0 0 0 .021.518c-.78.872-.55 1.025-2.11 1.346-1.578.325-.65.904-.046 1.056.734.184 2.432.444 3.58-1.162l-.046.183c.306.245.285 1.76.33 2.842s.116 2.093.337 2.688.48 2.13 2.53 1.7c1.713-.367 3.023-.896 3.143-5.81" fill="#000" stroke="#000" stroke-linecap="butt" stroke-width="2.149" class="D"/>
-                <path d="M23.535 15.6c-2.89.596-3.1-.383-3.1-.383 3.053-4.53 4.33-10.28 3.228-11.687-3.004-3.84-8.205-2.023-8.292-1.976l-.028.005a10.31 10.31 0 0 0-1.929-.201c-1.308-.02-2.3.343-3.054.914 0 0-9.278-3.822-8.846 4.807.092 1.836 2.63 13.9 5.66 10.25C8.29 15.987 9.36 14.86 9.36 14.86c.53.353 1.167.533 1.834.468l.052-.044a2.02 2.02 0 0 0 .021.518c-.78.872-.55 1.025-2.11 1.346-1.578.325-.65.904-.046 1.056.734.184 2.432.444 3.58-1.162l-.046.183c.306.245.52 1.593.484 2.815s-.06 2.06.18 2.716.48 2.13 2.53 1.7c1.713-.367 2.6-1.32 2.725-2.906.088-1.128.286-.962.3-1.97l.16-.478c.183-1.53.03-2.023 1.085-1.793l.257.023c.777.035 1.794-.125 2.39-.402 1.285-.596 2.047-1.592.78-1.33z" fill="#336791" stroke="none"/>
-                <g class="E">
-                    <g class="B">
-                        <path d="M12.814 16.467c-.08 2.846.02 5.712.298 6.4s.875 2.05 2.926 1.612c1.713-.367 2.337-1.078 2.607-2.647l.633-5.017M10.356 2.2S1.072-1.596 1.504 7.033c.092 1.836 2.63 13.9 5.66 10.25C8.27 15.95 9.27 14.907 9.27 14.907m6.1-13.4c-.32.1 5.164-2.005 8.282 1.978 1.1 1.407-.175 7.157-3.228 11.687" class="C"/>
-                        <path d="M20.425 15.17s.2.98 3.1.382c1.267-.262.504.734-.78 1.33-1.054.49-3.418.615-3.457-.06-.1-1.745 1.244-1.215 1.147-1.652-.088-.394-.69-.78-1.086-1.744-.347-.84-4.76-7.29 1.224-6.333.22-.045-1.56-5.7-7.16-5.782S7.99 8.196 7.99 8.196" stroke-linejoin="bevel"/>
-                    </g>
-                    <g class="C">
-                        <path d="M11.247 15.768c-.78.872-.55 1.025-2.11 1.346-1.578.325-.65.904-.046 1.056.734.184 2.432.444 3.58-1.163.35-.49-.002-1.27-.482-1.468-.232-.096-.542-.216-.94.23z"/>
-                        <path d="M11.196 15.753c-.08-.513.168-1.122.433-1.836.398-1.07 1.316-2.14.582-5.537-.547-2.53-4.22-.527-4.22-.184s.166 1.74-.06 3.365c-.297 2.122 1.35 3.916 3.246 3.733" class="B"/>
-                    </g>
-                </g>
-                <g fill="#fff" class="D">
-                    <path d="M10.322 8.145c-.017.117.215.43.516.472s.558-.202.575-.32-.215-.246-.516-.288-.56.02-.575.136z" stroke-width=".239"/>
-                    <path d="M19.486 7.906c.016.117-.215.43-.516.472s-.56-.202-.575-.32.215-.246.516-.288.56.02.575.136z" stroke-width=".119"/>
-                </g>
-                <path d="M20.562 7.095c.05.92-.198 1.545-.23 2.524-.046 1.422.678 3.05-.413 4.68" class="B C E"/>
-            </g>
-        </svg>
-    </g>
-</svg>

app/views/install/installer/icons/refresh.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M3.99976 2C4.55204 2 4.99976 2.44772 4.99976 3V5.10125C6.26985 3.80489 8.04028 3 9.99976 3C13.0492 3 15.6407 4.94932 16.6012 7.66675C16.7852 8.18747 16.5123 8.75879 15.9916 8.94284C15.4709 9.12689 14.8996 8.85396 14.7155 8.33325C14.0286 6.38991 12.1752 5 9.99976 5C8.36482 5 6.91179 5.78502 5.99911 7H8.99976C9.55204 7 9.99976 7.44771 9.99976 8C9.99976 8.55228 9.55204 9 8.99976 9H3.99976C3.44747 9 2.99976 8.55228 2.99976 8V3C2.99976 2.44772 3.44747 2 3.99976 2ZM4.00792 11.0572C4.52864 10.8731 5.09996 11.146 5.28401 11.6668C5.97088 13.6101 7.82429 15 9.99976 15C11.6347 15 13.0877 14.215 14.0004 13L10.9998 13C10.4475 13 9.99976 12.5523 9.99976 12C9.99976 11.4477 10.4475 11 10.9998 11H15.9998C16.265 11 16.5193 11.1054 16.7069 11.2929C16.8944 11.4804 16.9998 11.7348 16.9998 12V17C16.9998 17.5523 16.552 18 15.9998 18C15.4475 18 14.9998 17.5523 14.9998 17V14.8987C13.7297 16.1951 11.9592 17 9.99976 17C6.95035 17 4.3588 15.0507 3.39833 12.3332C3.21428 11.8125 3.48721 11.2412 4.00792 11.0572Z" fill="currentColor"/>
-</svg>

app/views/install/installer/icons/step-dot.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="8" cy="8" r="3" fill="currentColor"/>
-</svg>

app/views/install/installer/icons/warning.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.25706 3.09882C9.02167 1.73952 10.9788 1.73952 11.7434 3.09882L17.3237 13.0194C18.0736 14.3526 17.1102 15.9999 15.5805 15.9999H4.4199C2.89025 15.9999 1.92682 14.3526 2.67675 13.0194L8.25706 3.09882ZM11.0001 13C11.0001 13.5523 10.5524 14 10.0001 14C9.44784 14 9.00012 13.5523 9.00012 13C9.00012 12.4477 9.44784 12 10.0001 12C10.5524 12 11.0001 12.4477 11.0001 13ZM10.0001 5C9.44784 5 9.00012 5.44772 9.00012 6V9C9.00012 9.55228 9.44784 10 10.0001 10C10.5524 10 11.0001 9.55228 11.0001 9V6C11.0001 5.44772 10.5524 5 10.0001 5Z" fill="currentColor"/>
-</svg>

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

@@ -1,11 +0,0 @@
-(() => {
-    window.InstallerConstants = Object.freeze({
-        stepTransitionMs: 260,
-        errorClearMs: 180,
-        installPollIntervalMs: 4000,
-        installFallbackDelayMs: 12000,
-        redirectDelayMs: 2500,
-        progressTransitionDelayMs: 320,
-        progressCompleteDelayMs: 140,
-    });
-})();

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

@@ -1,450 +0,0 @@
-(() => {
-    const stepContainer = document.querySelector('.installer-step');
-    const installerCard = document.querySelector('.installer-card');
-    const backButton = document.querySelector('[data-action="back"]');
-    const nextButton = document.querySelector('[data-action="next"]');
-    const installScreen = document.querySelector('.install-screen-content');
-    const indicatorNodes = Array.from(document.querySelectorAll('.step-indicator'));
-    const STEP_TRANSITION_TIMEOUT = window.InstallerConstants?.stepTransitionMs ?? 260;
-
-    if (!stepContainer || !installerCard) return;
-
-    const { validateInstallRequest } = window.InstallerStepsProgress || {};
-
-    const isUpgrade = document.body?.dataset.upgrade === 'true';
-    const stepFlow = isUpgrade ? [1, 4, 5] : [1, 2, 3, 4, 5];
-    const cardSteps = stepFlow.filter((step) => step !== 5);
-
-    const normalizeStep = (step) => {
-        const numeric = clampStep(step);
-        if (stepFlow.includes(numeric)) return numeric;
-        if (numeric <= stepFlow[0]) return stepFlow[0];
-        for (let i = 0; i < stepFlow.length; i += 1) {
-            if (numeric < stepFlow[i]) {
-                return stepFlow[i];
-            }
-        }
-        return stepFlow[stepFlow.length - 1];
-    };
-
-    const buildStepConfig = () => {
-        const config = {};
-        stepFlow.forEach((step, index) => {
-            if (step === 5) {
-                config[step] = { back: { target: null }, next: { target: null } };
-                return;
-            }
-            const prev = stepFlow[index - 1] ?? null;
-            const next = stepFlow[index + 1] ?? null;
-            const label = next === 5 ? (isUpgrade ? 'Update' : 'Install') : 'Next';
-            config[step] = {
-                back: { target: prev },
-                next: { label, target: next }
-            };
-        });
-        return config;
-    };
-
-    const STEP_CONFIG = buildStepConfig();
-
-    const stepCache = new Map();
-    let maxStepHeight = 0;
-    let isTransitioning = false;
-    let pendingStep = null;
-    let pendingPushState = false;
-
-    const clampStep = (step) => Math.max(1, Math.min(5, step));
-    const isInstallLocked = () => Boolean(window.InstallerSteps?.isInstallLocked?.());
-
-    const scrollToFirstError = (panel) => {
-        if (!panel) return;
-        const getErrorNode = () => panel.querySelector('.field-error.is-visible')
-            || panel.querySelector('.field-error')
-            || panel.querySelector('.input-field.is-error, .input-action.is-error');
-        const container = panel.closest('.step-panel') || panel;
-        const attemptScroll = () => {
-            const target = getErrorNode();
-            if (!target || typeof target.getBoundingClientRect !== 'function') return false;
-            const targetRect = target.getBoundingClientRect();
-            const containerRect = container.getBoundingClientRect();
-            const targetTop = targetRect.top - containerRect.top + container.scrollTop;
-            const targetBottom = targetTop + targetRect.height;
-            const viewTop = container.scrollTop;
-            const viewBottom = viewTop + containerRect.height;
-            const padding = 12;
-
-            let nextScrollTop = viewTop;
-            if (targetTop < viewTop + padding) {
-                nextScrollTop = Math.max(0, targetTop - padding);
-            } else if (targetBottom > viewBottom - padding) {
-                nextScrollTop = Math.max(0, targetBottom - containerRect.height + padding);
-            }
-
-            if (Math.abs(nextScrollTop - viewTop) < 1) {
-                return false;
-            }
-
-            container.scrollTo({ top: nextScrollTop, behavior: 'smooth' });
-            return true;
-        };
-
-        let remaining = 20;
-        let lastScrollTop = -1;
-        const settle = () => {
-            if (remaining <= 0) return;
-            const moved = attemptScroll();
-            remaining -= 1;
-            const currentTop = container.scrollTop;
-            const delta = Math.abs(currentTop - lastScrollTop);
-            lastScrollTop = currentTop;
-            if (!moved && delta < 0.5) {
-                return;
-            }
-            requestAnimationFrame(settle);
-        };
-        requestAnimationFrame(settle);
-    };
-
-    const getStepFromUrl = () => {
-        const url = new URL(window.location.href);
-        const step = Number(url.searchParams.get('step') || 1);
-        return normalizeStep(Number.isNaN(step) ? 1 : step);
-    };
-
-    const buildStepUrl = (step) => {
-        const url = new URL(window.location.href);
-        url.searchParams.set('step', step);
-        return url;
-    };
-
-    const setStepInUrl = (step, pushState) => {
-        const url = new URL(window.location.href);
-        url.searchParams.set('step', step);
-
-        if (pushState) {
-            window.history.pushState({ step }, '', url.toString());
-        }
-
-        return url;
-    };
-
-    const updateActionBar = (step) => {
-        const config = STEP_CONFIG[step] || STEP_CONFIG[1];
-        if (!backButton || !nextButton) return;
-        const locked = isInstallLocked();
-
-        const setButtonLabel = (button, label) => {
-            if (!button) return;
-            let text = button.querySelector('.button-text');
-            if (!text) {
-                text = document.createElement('span');
-                text.className = 'button-text typography-text-m-500';
-                button.textContent = '';
-                button.appendChild(text);
-            }
-            text.textContent = label;
-        };
-
-        if (!locked && config.back?.target) {
-            backButton.disabled = false;
-            backButton.setAttribute('data-step-target', String(config.back.target));
-        } else {
-            backButton.disabled = true;
-            backButton.removeAttribute('data-step-target');
-        }
-        setButtonLabel(backButton, 'Back');
-
-        if (!locked && config.next?.target) {
-            setButtonLabel(nextButton, config.next?.label || 'Next');
-            nextButton.setAttribute('data-step-target', String(config.next?.target || 1));
-            nextButton.disabled = false;
-        } else {
-            setButtonLabel(nextButton, config.next?.label || 'Next');
-            nextButton.removeAttribute('data-step-target');
-            nextButton.disabled = true;
-        }
-
-        indicatorNodes.forEach((node, index) => {
-            const isVisible = index < cardSteps.length;
-            node.classList.toggle('is-hidden', !isVisible);
-            if (!isVisible) {
-                node.classList.remove('is-active');
-                return;
-            }
-            node.classList.toggle('is-active', cardSteps[index] === step);
-        });
-
-        installerCard.setAttribute('data-step', String(step));
-        document.body.dataset.step = String(step);
-        if (locked) {
-            document.body.dataset.installLocked = 'true';
-        } else {
-            delete document.body.dataset.installLocked;
-        }
-    };
-
-    const measureStepHeight = (panel) => {
-        if (!panel) return;
-        const height = panel.getBoundingClientRect().height;
-        if (!height) return;
-        maxStepHeight = Math.max(maxStepHeight, height);
-        stepContainer.style.setProperty('--step-min-height', `${maxStepHeight}px`);
-    };
-
-    const runStepInit = (step, rootElement) => {
-        if (!window.InstallerSteps || typeof window.InstallerSteps.initStep !== 'function') return;
-        const root = rootElement || stepContainer;
-        window.InstallerSteps.initStep(step, root);
-        updateActionBar(step);
-    };
-
-    const fetchStepHtml = (step, url) => {
-        if (stepCache.has(step)) {
-            return Promise.resolve(stepCache.get(step));
-        }
-
-        const fetchUrl = new URL(url);
-        fetchUrl.searchParams.set('partial', '1');
-
-        return fetch(fetchUrl.toString(), {
-            headers: {
-                'X-Requested-With': 'XMLHttpRequest'
-            }
-        })
-            .then((response) => {
-                if (!response.ok) {
-                    throw new Error('Failed to load step');
-                }
-                return response.text();
-            })
-            .then((html) => {
-                stepCache.set(step, html);
-                return html;
-            });
-    };
-
-    const preloadSteps = (steps) => {
-        const current = getStepFromUrl();
-        const targets = steps.filter((step) => step !== current);
-
-        return Promise.all(
-            targets.map((step) => {
-                const url = buildStepUrl(step);
-                return fetchStepHtml(step, url)
-                    .then((html) => {
-                        const panel = document.createElement('div');
-                        panel.className = 'step-panel is-measure';
-                        panel.innerHTML = html;
-                        stepContainer.appendChild(panel);
-                        panel.getBoundingClientRect();
-                        measureStepHeight(panel);
-                        panel.remove();
-                    })
-                    .catch(() => null);
-            })
-        );
-    };
-
-    const swapPanels = (step, html, onDone) => {
-        const activePanel = stepContainer.querySelector('.step-panel');
-
-        const measurePanel = document.createElement('div');
-        measurePanel.className = 'step-panel is-measure';
-        measurePanel.innerHTML = html;
-        stepContainer.appendChild(measurePanel);
-        measurePanel.getBoundingClientRect();
-        measureStepHeight(measurePanel);
-        measurePanel.remove();
-
-        const newPanel = document.createElement('div');
-        newPanel.className = 'step-panel is-entering';
-        newPanel.innerHTML = html;
-        stepContainer.appendChild(newPanel);
-        runStepInit(step, newPanel);
-
-        newPanel.getBoundingClientRect();
-
-        requestAnimationFrame(() => {
-            newPanel.classList.remove('is-entering');
-            newPanel.classList.add('is-active');
-            if (activePanel) {
-                activePanel.classList.add('is-exiting');
-            }
-        });
-
-        const finalize = () => {
-            if (activePanel && activePanel.parentNode) {
-                activePanel.parentNode.removeChild(activePanel);
-            }
-            newPanel.classList.remove('is-entering');
-            if (typeof onDone === 'function') {
-                onDone();
-            }
-        };
-
-        const prefersReduced = window.matchMedia('(prefers-reduced-motion: reduce)').matches;
-        if (prefersReduced) {
-            finalize();
-            return;
-        }
-
-        let finished = false;
-        const finishOnce = () => {
-            if (finished) return;
-            finished = true;
-            finalize();
-        };
-
-        newPanel.addEventListener(
-            'transitionend',
-            (event) => {
-                if (event.propertyName === 'opacity') {
-                    finishOnce();
-                }
-            },
-            { once: true }
-        );
-
-        setTimeout(finishOnce, STEP_TRANSITION_TIMEOUT);
-    };
-
-    const showInstallScreen = (step, html) => {
-        if (!installScreen) return;
-        installScreen.innerHTML = html;
-        runStepInit(step, installScreen);
-    };
-
-    const hideInstallScreen = () => {
-        if (!installScreen) return;
-        installScreen.innerHTML = '';
-    };
-
-    const loadStep = (step, pushState) => {
-        const targetStep = normalizeStep(Number(step));
-        const currentStep = getStepFromUrl();
-        if (targetStep === currentStep && pushState) return;
-
-        isTransitioning = true;
-        const url = setStepInUrl(targetStep, pushState);
-
-        fetchStepHtml(targetStep, url)
-            .then((html) => {
-                if (targetStep === 5) {
-                    showInstallScreen(targetStep, html);
-                    isTransitioning = false;
-                    if (pendingStep !== null && pendingStep !== targetStep) {
-                        const nextStep = pendingStep;
-                        const nextPushState = pendingPushState;
-                        pendingStep = null;
-                        pendingPushState = false;
-                        loadStep(nextStep, nextPushState);
-                        return;
-                    }
-                    pendingStep = null;
-                    pendingPushState = false;
-                    return;
-                }
-
-                hideInstallScreen();
-                swapPanels(targetStep, html, () => {
-                    isTransitioning = false;
-                    if (pendingStep !== null && pendingStep !== targetStep) {
-                        const nextStep = pendingStep;
-                        const nextPushState = pendingPushState;
-                        pendingStep = null;
-                        pendingPushState = false;
-                        loadStep(nextStep, nextPushState);
-                        return;
-                    }
-                    pendingStep = null;
-                    pendingPushState = false;
-                });
-            })
-            .catch(() => {
-                isTransitioning = false;
-                window.location.href = url.toString();
-            });
-    };
-
-    const requestStep = (step, pushState) => {
-        const targetStep = normalizeStep(Number(step));
-        if (isInstallLocked() && targetStep !== 5) {
-            loadStep(5, true);
-            return;
-        }
-        if (isTransitioning) {
-            pendingStep = targetStep;
-            pendingPushState = pendingPushState || pushState;
-            return;
-        }
-        loadStep(targetStep, pushState);
-    };
-
-    document.addEventListener('click', async (event) => {
-        const button = event.target.closest('[data-step-target]');
-        if (!button || button.disabled) return;
-        event.preventDefault();
-        const target = button.getAttribute('data-step-target');
-        if (!target) return;
-        const action = button.getAttribute('data-action');
-        if (action === 'next') {
-            const currentStep = getStepFromUrl();
-            const panel = stepContainer.querySelector('.step-panel') || stepContainer;
-            const validator = window.InstallerSteps?.validateStep;
-            if (typeof validator === 'function') {
-                const valid = validator(currentStep, panel);
-                if (!valid) {
-                    scrollToFirstError(panel);
-                    return;
-                }
-            }
-        }
-        if (action === 'next' && String(target) === '5' && typeof validateInstallRequest === 'function') {
-            const isValid = await validateInstallRequest();
-            if (!isValid) {
-                return;
-            }
-        }
-        if (isInstallLocked() && Number(target) !== 5) {
-            requestStep(5, true);
-            return;
-        }
-        requestStep(target, true);
-    });
-
-    window.addEventListener('popstate', (event) => {
-        const step = event.state?.step || getStepFromUrl();
-        if (isInstallLocked() && Number(step) !== 5) {
-            requestStep(5, false);
-            return;
-        }
-        requestStep(step, false);
-    });
-
-    document.addEventListener('DOMContentLoaded', () => {
-        let step = getStepFromUrl();
-        if (isInstallLocked() && step !== 5) {
-            const url = buildStepUrl(5);
-            window.history.replaceState({ step: 5 }, '', url.toString());
-            step = 5;
-        } else {
-            const url = buildStepUrl(step);
-            window.history.replaceState({ step }, '', url.toString());
-        }
-        const activePanel = stepContainer.querySelector('.step-panel') || stepContainer;
-        runStepInit(step, activePanel);
-        measureStepHeight(activePanel);
-        if (step === 5 && installScreen) {
-            runStepInit(step, installScreen);
-        }
-        const preload = () => {
-            measureStepHeight(activePanel);
-            preloadSteps(cardSteps);
-        };
-        if (document.fonts && document.fonts.ready) {
-            document.fonts.ready.then(preload).catch(preload);
-        } else {
-            preload();
-        }
-    });
-})();

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

@@ -1,105 +0,0 @@
-(() => {
-    const getBodyDataset = () => document.body?.dataset ?? {};
-    const isUpgradeMode = () => getBodyDataset().upgrade === 'true';
-    const getLockedDatabase = () => getBodyDataset().lockedDatabase || '';
-
-    const STEP_IDS = Object.freeze({
-        CONFIG_FILES: 'config-files',
-        DOCKER_COMPOSE: 'docker-compose',
-        ENV_VARS: 'env-vars',
-        DOCKER_CONTAINERS: 'docker-containers',
-        ACCOUNT_SETUP: 'account-setup'
-    });
-
-    const STATUS = Object.freeze({
-        IN_PROGRESS: 'in-progress',
-        COMPLETED: 'completed',
-        ERROR: 'error'
-    });
-
-    const SSE_EVENTS = Object.freeze({
-        PING: 'ping',
-        INSTALL_ID: 'install-id',
-        PROGRESS: 'progress',
-        DONE: 'done',
-        ERROR: 'error'
-    });
-
-    const buildInstallationSteps = (upgrade) => (upgrade ? [
-        {
-            id: STEP_IDS.CONFIG_FILES,
-            inProgress: 'Updating configuration files...',
-            done: 'Configuration files updated'
-        },
-        {
-            id: STEP_IDS.DOCKER_COMPOSE,
-            inProgress: 'Updating Docker Compose file...',
-            done: 'Docker Compose file updated'
-        },
-        {
-            id: STEP_IDS.ENV_VARS,
-            inProgress: 'Updating environment variables...',
-            done: 'Environment variables updated'
-        },
-        {
-            id: STEP_IDS.DOCKER_CONTAINERS,
-            inProgress: 'Restarting Docker containers...',
-            done: 'Docker containers restarted'
-        }
-    ] : [
-        {
-            id: STEP_IDS.CONFIG_FILES,
-            inProgress: 'Creating configuration files...',
-            done: 'Configuration files created'
-        },
-        {
-            id: STEP_IDS.DOCKER_COMPOSE,
-            inProgress: 'Generating Docker Compose file...',
-            done: 'Docker Compose file generated'
-        },
-        {
-            id: STEP_IDS.ENV_VARS,
-            inProgress: 'Configuring environment variables...',
-            done: 'Environment variables configured'
-        },
-        {
-            id: STEP_IDS.DOCKER_CONTAINERS,
-            inProgress: 'Starting Docker containers...',
-            done: 'Docker containers started'
-        },
-        {
-            id: STEP_IDS.ACCOUNT_SETUP,
-            inProgress: 'Creating Appwrite account...',
-            done: 'Appwrite account created (redirecting...)'
-        }
-    ]);
-
-    const INSTALLATION_STEPS = buildInstallationSteps(isUpgradeMode());
-    const CONSTANTS = window.InstallerConstants || {};
-    const TIMINGS = {
-        errorClear: CONSTANTS.errorClearMs ?? 180,
-        installPollInterval: CONSTANTS.installPollIntervalMs ?? 4000,
-        installFallbackDelay: CONSTANTS.installFallbackDelayMs ?? 12000,
-        redirectDelay: CONSTANTS.redirectDelayMs ?? 500,
-        progressTransitionDelay: CONSTANTS.progressTransitionDelayMs ?? 140,
-        progressCompleteDelay: CONSTANTS.progressCompleteDelayMs ?? 120
-    };
-
-    const clampStep = (step) => {
-        const numeric = Number(step);
-        if (Number.isNaN(numeric)) return 1;
-        return Math.max(1, Math.min(5, numeric));
-    };
-
-    window.InstallerStepsContext = Object.freeze({
-        getBodyDataset,
-        isUpgradeMode,
-        getLockedDatabase,
-        STEP_IDS,
-        STATUS,
-        SSE_EVENTS,
-        INSTALLATION_STEPS,
-        TIMINGS,
-        clampStep
-    });
-})();

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

@@ -1,905 +0,0 @@
-(() => {
-    const {
-        INSTALLATION_STEPS,
-        TIMINGS,
-        getBodyDataset,
-        STEP_IDS,
-        STATUS,
-        SSE_EVENTS
-    } = window.InstallerStepsContext;
-    const {
-        formState,
-        applyLockPayload,
-        applyBodyDefaults,
-        setInstallLock,
-        getInstallLock,
-        clearInstallLock,
-        isInstallLocked,
-        syncInstallLockFlag,
-        getStoredInstallId,
-        storeInstallId,
-        clearInstallId
-    } = window.InstallerStepsState || {};
-    const { extractHostname, isLocalHost } = window.InstallerStepsValidation || {};
-    const { generateSecretKey } = window.InstallerStepsUI || {};
-    const { showToast } = window.InstallerToast || {};
-
-    let activeInstall = null;
-    let unloadGuard = null;
-    const csrfToken = document.querySelector('meta[name="appwrite-installer-csrf"]')?.getAttribute('content') || '';
-
-    const withCsrfHeader = (headers = {}) => {
-        if (!csrfToken) {
-            return headers;
-        }
-        return { ...headers, 'X-Appwrite-Installer-CSRF': csrfToken };
-    };
-
-    const showCsrfToast = () => {
-        showToast?.({
-            status: 'error',
-            title: 'Session expired',
-            description: 'Refresh the page and try again.',
-            dismissible: true
-        });
-    };
-
-    const validateInstallRequest = async () => {
-        try {
-            const response = await fetch('/install/validate', {
-                method: 'POST',
-                headers: withCsrfHeader({
-                    'Content-Type': 'application/json'
-                })
-            });
-            if (!response.ok) {
-                showCsrfToast();
-                return false;
-            }
-            const data = await response.json().catch(() => ({}));
-            if (!data?.success) {
-                showCsrfToast();
-                return false;
-            }
-            return true;
-        } catch (error) {
-            showCsrfToast();
-            return false;
-        }
-    };
-
-    const setUnloadGuard = (enabled) => {
-        if (!enabled && unloadGuard) {
-            window.removeEventListener('beforeunload', unloadGuard);
-            unloadGuard = null;
-            return;
-        }
-
-        if (enabled && !unloadGuard) {
-            unloadGuard = (event) => {
-                event.preventDefault();
-                event.returnValue = '';
-                return '';
-            };
-            window.addEventListener('beforeunload', unloadGuard);
-        }
-    };
-
-    const cleanupInstallFlow = () => {
-        if (activeInstall?.controller) {
-            activeInstall.controller.abort();
-            if (activeInstall.pollTimer) {
-                clearInterval(activeInstall.pollTimer);
-            }
-            if (activeInstall.fallbackTimer) {
-                clearTimeout(activeInstall.fallbackTimer);
-            }
-            activeInstall = null;
-        }
-        stopSyncedSpinnerRotation();
-        setUnloadGuard(false);
-    };
-
-    const getStepDefinition = (id) => INSTALLATION_STEPS.find((step) => step.id === id);
-
-    const getProgressLabel = (step, status, message) => {
-        if (!step) return message || '';
-        if (status === STATUS.ERROR) {
-            const normalized = normalizeInstallError(message || '');
-            return normalized.summary || 'Installation failed.';
-        }
-        if (status === STATUS.COMPLETED) return step.done;
-        return step.inProgress;
-    };
-
-    const updateInstallRow = (row, step, status, message) => {
-        if (!row || !step) return;
-        row.dataset.status = status;
-        row.dataset.step = step.id;
-        if (status !== STATUS.ERROR) {
-            row.classList.remove('is-open');
-            const toggle = row.querySelector('[data-install-toggle]');
-            if (toggle) {
-                toggle.setAttribute('aria-expanded', 'false');
-            }
-        }
-        const label = getProgressLabel(step, status, message);
-        const text = row.querySelector('[data-install-text]');
-        if (text) {
-            if (text.textContent !== label) {
-                text.classList.remove('is-enter');
-                text.textContent = label;
-                text.classList.add('is-enter');
-                requestAnimationFrame(() => {
-                    text.classList.remove('is-enter');
-                });
-            }
-        }
-
-        // Show/hide "Navigate to Console" button for account setup errors
-        const consoleBtn = row.querySelector('[data-install-console]');
-        if (consoleBtn) {
-            const shouldShow = step.id === STEP_IDS.ACCOUNT_SETUP && status === STATUS.ERROR;
-            consoleBtn.classList.toggle('is-hidden', !shouldShow);
-        }
-    };
-
-    const normalizeInstallError = (message) => {
-        const text = String(message || '').trim();
-        if (!text) {
-            return { summary: '', details: '' };
-        }
-        const colonIndex = text.indexOf(':');
-        if (colonIndex > 0 && colonIndex < 80) {
-            const summary = text.slice(0, colonIndex).trim();
-            const details = text.slice(colonIndex + 1).trim();
-            return { summary, details };
-        }
-        if (text.length > 180) {
-            return { summary: text.slice(0, 180).trim() + '…', details: text };
-        }
-        return { summary: text, details: '' };
-    };
-
-    let spinnerAnimationFrame = null;
-    const stopSyncedSpinnerRotation = () => {
-        if (spinnerAnimationFrame) {
-            cancelAnimationFrame(spinnerAnimationFrame);
-            spinnerAnimationFrame = null;
-        }
-    };
-
-    const startSyncedSpinnerRotation = (container) => {
-        stopSyncedSpinnerRotation();
-        if (!container) return;
-        let startTime = null;
-        const animate = (timestamp) => {
-            if (!startTime) startTime = timestamp;
-            const elapsed = timestamp - startTime;
-            const rotation = ((elapsed / 1000) * 360 * 1.5) % 360;
-            container.style.setProperty('--spinner-rotation', `${rotation}deg`);
-            spinnerAnimationFrame = requestAnimationFrame(animate);
-        };
-        spinnerAnimationFrame = requestAnimationFrame(animate);
-    };
-
-    const updateInstallErrorDetails = (row, error) => {
-        if (!row) return;
-        const traceNode = row.querySelector('[data-install-trace]');
-        const normalized = normalizeInstallError(error?.message || '');
-        const output = error?.output || '';
-        const trace = error?.trace || '';
-        const detailChunks = [];
-        if (normalized.details) detailChunks.push(normalized.details);
-        if (output) detailChunks.push(output);
-        if (trace) detailChunks.push(trace);
-        const detailText = detailChunks.join('\n\n');
-
-        if (traceNode) {
-            traceNode.textContent = detailText;
-            traceNode.style.display = detailText ? 'block' : 'none';
-        }
-    };
-
-    const createInstallRow = (template, step) => {
-        const fragment = template.content.cloneNode(true);
-        const row = fragment.querySelector('.install-row');
-        if (!row) return null;
-        const toggle = row.querySelector('[data-install-toggle]');
-        const setOpenState = (isOpen) => {
-            row.classList.toggle('is-open', isOpen);
-            if (toggle) {
-                toggle.setAttribute('aria-expanded', isOpen ? 'true' : 'false');
-            }
-        };
-        const toggleRow = () => {
-            if (!row.dataset.status || row.dataset.status !== STATUS?.ERROR) {
-                return;
-            }
-            setOpenState(!row.classList.contains('is-open'));
-        };
-        row.addEventListener('click', (event) => {
-            if (event.target.closest('[data-install-retry]')) {
-                return;
-            }
-            if (event.target.closest('[data-install-toggle]')) {
-                return;
-            }
-            if (event.target.closest('.install-row-details')) {
-                return;
-            }
-            toggleRow();
-        });
-        if (toggle) {
-            toggle.addEventListener('click', (event) => {
-                event.stopPropagation();
-                toggleRow();
-            });
-        }
-        updateInstallRow(row, step, STATUS.IN_PROGRESS);
-        return row;
-    };
-
-    const generateInstallId = () => {
-        if (window.crypto?.randomUUID) {
-            return window.crypto.randomUUID();
-        }
-        const bytes = new Uint8Array(16);
-        window.crypto.getRandomValues(bytes);
-        return Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('');
-    };
-
-    const buildRedirectUrl = () => {
-        const dataset = getBodyDataset?.() ?? {};
-        const rawDomain = (formState?.appDomain || dataset.defaultAppDomain || '').trim();
-        if (!rawDomain) return '';
-        const httpPort = (formState?.httpPort || dataset.defaultHttpPort || '').trim();
-        const httpsPort = (formState?.httpsPort || dataset.defaultHttpsPort || '').trim();
-        const hasPort = rawDomain.includes(':') || rawDomain.startsWith('[');
-        let host = rawDomain;
-        const hostForProtocol = extractHostname?.(rawDomain);
-        const normalizedHost = hostForProtocol?.toLowerCase?.() ?? '';
-        if (hostForProtocol === '0.0.0.0') {
-            host = rawDomain.replace('0.0.0.0', 'localhost');
-        } else if (normalizedHost === 'traefik') {
-            host = rawDomain.replace(hostForProtocol, 'localhost');
-        }
-        let protocol = 'http';
-        let port = httpPort;
-        if (httpsPort && httpsPort !== '0' && !isLocalHost?.(normalizedHost)) {
-            protocol = 'https';
-            port = httpsPort;
-        }
-        if (!hasPort && port && ((protocol === 'http' && port !== '80') || (protocol === 'https' && port !== '443'))) {
-            host = `${host}:${port}`;
-        }
-        return `${protocol}://${host}`;
-    };
-
-    const redirectToApp = () => {
-        const url = buildRedirectUrl();
-        if (!url) return;
-        // Fire-and-forget: tell the installer server it can shut down
-        fetch('/install/shutdown', { method: 'POST', headers: withCsrfHeader() }).catch(() => {});
-        window.location.href = url;
-    };
-
-    const notifyInstallComplete = (installId, session) => {
-        if (!installId) return Promise.resolve();
-        const payload = { installId };
-        const sessionSecret = session?.sessionSecret || session?.secret;
-        const sessionId = session?.sessionId || session?.id;
-        const sessionExpire = session?.sessionExpire || session?.expire;
-        if (sessionSecret) {
-            payload.sessionSecret = sessionSecret;
-        }
-        if (sessionId) {
-            payload.sessionId = sessionId;
-        }
-        if (sessionExpire) {
-            payload.sessionExpire = sessionExpire;
-        }
-        return fetch('/install/complete', {
-            method: 'POST',
-            headers: withCsrfHeader({
-                'Content-Type': 'application/json'
-            }),
-            body: JSON.stringify(payload)
-        }).catch(() => {});
-    };
-
-    const buildInstallPayload = (installId) => {
-        const normalizedSecret = (formState?.opensslKey || '').trim();
-        if (!normalizedSecret && generateSecretKey) {
-            formState.opensslKey = generateSecretKey();
-        }
-        const normalizedDomain = (formState?.appDomain || '').trim() || 'localhost';
-        const normalizedHttpPort = (formState?.httpPort || '').trim() || '80';
-        const normalizedHttpsPort = (formState?.httpsPort || '').trim() || '443';
-        const normalizedEmail = (formState?.emailCertificates || '').trim();
-        const normalizedAssistantKey = (formState?.assistantOpenAIKey || '').trim();
-        const normalizedAccountEmail = (formState?.accountEmail || '').trim();
-        const normalizedAccountPassword = (formState?.accountPassword || '').trim();
-
-        return {
-            installId,
-            httpPort: normalizedHttpPort,
-            httpsPort: normalizedHttpsPort,
-            database: formState?.database || 'mongodb',
-            appDomain: normalizedDomain,
-            emailCertificates: normalizedEmail,
-            opensslKey: (formState?.opensslKey || '').trim(),
-            assistantOpenAIKey: normalizedAssistantKey,
-            accountEmail: normalizedAccountEmail,
-            accountPassword: normalizedAccountPassword
-        };
-    };
-
-    const fetchInstallStatus = async (installId) => {
-        if (!installId) return null;
-        const response = await fetch(`/install/status?installId=${encodeURIComponent(installId)}`, {
-            cache: 'no-store'
-        });
-        if (!response.ok) return null;
-        const json = await response.json();
-        return json.progress || null;
-    };
-
-    const readEventStream = async (stream, onEvent) => {
-        const reader = stream.getReader();
-        const decoder = new TextDecoder('utf-8');
-        let buffer = '';
-
-        try {
-            const processEvent = (rawEvent) => {
-                if (!rawEvent) return;
-                const lines = rawEvent.split('\n');
-                let eventName = 'message';
-                let data = '';
-
-                lines.forEach((line) => {
-                    if (line.startsWith('event:')) {
-                        eventName = line.replace('event:', '').trim();
-                    } else if (line.startsWith('data:')) {
-                        data += line.replace('data:', '').trim();
-                    }
-                });
-
-                if (data) {
-                    try {
-                        const parsed = JSON.parse(data);
-                        onEvent(eventName, parsed);
-                    } catch (error) {
-                        onEvent(eventName, { message: data });
-                    }
-                }
-            };
-
-            while (true) {
-                const { value, done } = await reader.read();
-                if (done) {
-                    buffer = buffer.replace(/\r\n/g, '\n');
-                    if (buffer.trim()) {
-                        processEvent(buffer);
-                    }
-                    break;
-                }
-                buffer += decoder.decode(value, { stream: true });
-                buffer = buffer.replace(/\r\n/g, '\n');
-                let separatorIndex = buffer.indexOf('\n\n');
-
-                while (separatorIndex !== -1) {
-                    const rawEvent = buffer.slice(0, separatorIndex);
-                    buffer = buffer.slice(separatorIndex + 2);
-                    processEvent(rawEvent);
-                    separatorIndex = buffer.indexOf('\n\n');
-                }
-            }
-        } finally {
-            try {
-                reader.releaseLock();
-            } catch (error) {}
-        }
-    };
-
-    const initStep5 = (root) => {
-        if (!root) return;
-
-        if (activeInstall?.controller) {
-            activeInstall.controller.abort();
-        }
-        if (activeInstall?.pollTimer) {
-            clearInterval(activeInstall.pollTimer);
-        }
-        if (activeInstall?.fallbackTimer) {
-            clearTimeout(activeInstall.fallbackTimer);
-        }
-        activeInstall = null;
-
-        const list = root.querySelector('[data-install-list]');
-        const template = root.querySelector('#install-row-template');
-        if (!list || !template) return;
-        startSyncedSpinnerRotation(list);
-
-        list.innerHTML = '';
-        const rowsById = new Map();
-        const progressState = new Map();
-        syncInstallLockFlag?.();
-        applyLockPayload?.();
-        applyBodyDefaults?.();
-
-        const ensureRow = (step) => {
-            if (!step) return null;
-            if (rowsById.has(step.id)) {
-                return rowsById.get(step.id);
-            }
-            const row = createInstallRow(template, step);
-            if (!row) return null;
-            row.classList.add('is-entering');
-            list.appendChild(row);
-            row.getBoundingClientRect();
-            requestAnimationFrame(() => {
-                row.classList.remove('is-entering');
-            });
-            rowsById.set(step.id, row);
-            return row;
-        };
-
-        const installPanel = root.querySelector('.install-panel');
-        let panelHeightCleanup = null;
-        const animatePanelHeight = (mutate) => {
-            if (!installPanel) {
-                mutate();
-                return;
-            }
-            if (panelHeightCleanup) {
-                panelHeightCleanup();
-                panelHeightCleanup = null;
-            }
-            const currentHeight = installPanel.getBoundingClientRect().height;
-            installPanel.style.height = `${currentHeight}px`;
-            installPanel.getBoundingClientRect();
-            mutate();
-            const nextHeight = installPanel.getBoundingClientRect().height;
-            if (currentHeight === nextHeight) {
-                installPanel.style.height = '';
-                return;
-            }
-            installPanel.style.height = `${currentHeight}px`;
-            installPanel.getBoundingClientRect();
-            installPanel.style.height = `${nextHeight}px`;
-            const cleanup = () => {
-                installPanel.style.height = '';
-                installPanel.removeEventListener('transitionend', onEnd);
-            };
-            const onEnd = (event) => {
-                if (event.propertyName === 'height') {
-                    cleanup();
-                }
-            };
-            panelHeightCleanup = cleanup;
-            installPanel.addEventListener('transitionend', onEnd);
-        };
-
-        const renderProgress = () => {
-            animatePanelHeight(() => {
-                const visibleSteps = [];
-                for (const step of INSTALLATION_STEPS) {
-                    const state = progressState.get(step.id);
-                    if (!state) break;
-                    visibleSteps.push(step);
-                }
-
-                visibleSteps.forEach((step) => {
-                    const state = progressState.get(step.id);
-                    if (!state) return;
-                    const row = ensureRow(step);
-                    if (row) {
-                        updateInstallRow(row, step, state.status || STATUS.IN_PROGRESS, state.message);
-                        if (state.status === STATUS?.ERROR) {
-                            updateInstallErrorDetails(row, {
-                                message: state.message,
-                                trace: state.details?.trace,
-                                output: state.details?.output
-                            });
-                        }
-                    }
-                });
-            });
-        };
-
-        const firstStep = INSTALLATION_STEPS[0];
-        if (firstStep) {
-            progressState.set(firstStep.id, {
-                status: STATUS.IN_PROGRESS,
-                message: firstStep.inProgress
-            });
-        }
-        renderProgress();
-
-        const applyProgress = (payload) => {
-             const step = getStepDefinition(payload.step) || {
-                id: payload.step,
-                inProgress: payload.message || payload.step,
-                done: payload.message || payload.step
-            };
-            progressState.set(step.id, {
-                status: payload.status || STATUS.IN_PROGRESS,
-                message: payload.message,
-                details: payload.details
-            });
-            renderProgress();
-            if (activeInstall) {
-                activeInstall.lastEventAt = Date.now();
-                if (payload.status === STATUS.ERROR) {
-                    if (activeInstall.pollTimer) {
-                        clearInterval(activeInstall.pollTimer);
-                        activeInstall.pollTimer = null;
-                    }
-                    if (activeInstall.fallbackTimer) {
-                        clearTimeout(activeInstall.fallbackTimer);
-                        activeInstall.fallbackTimer = null;
-                    }
-                }
-            }
-            scheduleFallback();
-        };
-
-        const handleProgress = (payload) => {
-            if (!payload || !payload.step) return;
-
-            const existingState = progressState.get(payload.step);
-            if (existingState && existingState.status === STATUS.COMPLETED && payload.status === STATUS.IN_PROGRESS) {
-                return;
-            }
-
-            const step = getStepDefinition(payload.step) || {
-                id: payload.step,
-                inProgress: payload.message || payload.step,
-                done: payload.message || payload.step
-            };
-            if (payload.status === STATUS.IN_PROGRESS) {
-                const currentIndex = INSTALLATION_STEPS.findIndex((candidate) => candidate.id === step.id);
-                if (currentIndex > 0) {
-                    for (let i = 0; i < currentIndex; i += 1) {
-                        const previousStep = INSTALLATION_STEPS[i];
-                        const previousState = progressState.get(previousStep.id);
-                        if (previousState && previousState.status !== STATUS.COMPLETED) {
-                            progressState.set(previousStep.id, {
-                                status: STATUS.COMPLETED,
-                                message: previousStep.done,
-                                details: previousState.details
-                            });
-                        }
-                    }
-                }
-            }
-            applyProgress(payload);
-        };
-
-        const applySnapshot = (snapshot) => {
-            if (!snapshot || !snapshot.steps) return;
-            INSTALLATION_STEPS.forEach((step) => {
-                const detail = snapshot.steps[step.id];
-                if (!detail) return;
-                progressState.set(step.id, {
-                    status: detail.status,
-                    message: detail.message,
-                    details: snapshot.details?.[step.id]
-                });
-            });
-            renderProgress();
-        };
-
-        const checkAllCompleted = () => {
-            const allDone = INSTALLATION_STEPS.every((step) => {
-                const state = progressState.get(step.id);
-                return state && state.status === STATUS.COMPLETED;
-            });
-            if (!allDone) return;
-            const accountState = progressState.get(STEP_IDS.ACCOUNT_SETUP);
-            finalizeInstall();
-            notifyInstallComplete(activeInstall?.installId, accountState?.details).finally(() => {
-                setTimeout(() => redirectToApp(), TIMINGS?.redirectDelay ?? 0);
-            });
-        };
-
-        const startPolling = () => {
-            if (!activeInstall || activeInstall.pollTimer) return;
-            activeInstall.pollTimer = setInterval(async () => {
-                if (!activeInstall || activeInstall.completed) return;
-                const snapshot = await fetchInstallStatus(activeInstall.installId);
-                if (snapshot) {
-                    applySnapshot(snapshot);
-                    checkAllCompleted();
-                }
-            }, TIMINGS?.installPollInterval ?? 0);
-        };
-
-        const scheduleFallback = () => {
-            if (!activeInstall) return;
-            if (activeInstall.fallbackTimer) {
-                clearTimeout(activeInstall.fallbackTimer);
-            }
-            activeInstall.fallbackTimer = setTimeout(() => {
-                if (!activeInstall) return;
-                startPolling();
-            }, TIMINGS?.installFallbackDelay ?? 0);
-        };
-
-        const finalizeInstall = () => {
-            if (!activeInstall) return;
-            activeInstall.completed = true;
-            if (activeInstall.pollTimer) {
-                clearInterval(activeInstall.pollTimer);
-            }
-            if (activeInstall.fallbackTimer) {
-                clearTimeout(activeInstall.fallbackTimer);
-            }
-            stopSyncedSpinnerRotation();
-            setUnloadGuard(false);
-        };
-
-        const startInstallStream = async (installId, options = {}) => {
-            const isValid = await validateInstallRequest();
-            if (!isValid) {
-                return;
-            }
-            activeInstall = {
-                installId,
-                controller: new AbortController(),
-                lastEventAt: Date.now(),
-                pollTimer: null,
-                fallbackTimer: null,
-                completed: false
-            };
-
-            const payload = buildInstallPayload(installId);
-            if (options.retryStep) {
-                payload.retryStep = options.retryStep;
-            }
-            setInstallLock?.(installId, payload);
-            setUnloadGuard(true);
-
-            try {
-                scheduleFallback();
-                const response = await fetch('/install', {
-                    method: 'POST',
-                    headers: withCsrfHeader({
-                        'Content-Type': 'application/json',
-                        'Accept': 'text/event-stream'
-                    }),
-                    body: JSON.stringify(payload),
-                    signal: activeInstall.controller.signal
-                });
-
-                if (!response.ok || !response.body) {
-                    let errorMessage = null;
-                    try {
-                        const contentType = response.headers.get('Content-Type') || '';
-                        if (contentType.includes('application/json')) {
-                            const data = await response.json();
-                            errorMessage = data?.message || null;
-                        }
-                    } catch (error) {
-                        errorMessage = null;
-                    }
-                    if (errorMessage) {
-                        handleProgress({
-                            step: STEP_IDS.CONFIG_FILES,
-                            status: STATUS.ERROR,
-                            message: errorMessage
-                        });
-                        finalizeInstall();
-                        return;
-                    }
-                    startPolling();
-                    return;
-                }
-
-                await readEventStream(response.body, (event, data) => {
-                    if (!activeInstall) return;
-                    if (event === SSE_EVENTS.INSTALL_ID && data?.installId) {
-                        activeInstall.installId = data.installId;
-                        storeInstallId?.(data.installId);
-                        return;
-                    }
-                    if (event === SSE_EVENTS.PROGRESS) {
-                        handleProgress(data);
-                        return;
-                    }
-                    if (event === SSE_EVENTS.DONE) {
-                        // Mark every step as completed (preserving details
-                        // from earlier progress events, e.g. session info).
-                        INSTALLATION_STEPS.forEach((step) => {
-                            const existing = progressState.get(step.id);
-                            if (!existing || (existing.status !== STATUS.COMPLETED && existing.status !== STATUS.ERROR)) {
-                                progressState.set(step.id, {
-                                    status: STATUS.COMPLETED,
-                                    message: step.done,
-                                    details: existing?.details
-                                });
-                            }
-                        });
-                        renderProgress();
-
-                        const accountState = progressState.get(STEP_IDS.ACCOUNT_SETUP);
-                        const accountRequired = INSTALLATION_STEPS.some((step) => step.id === STEP_IDS.ACCOUNT_SETUP);
-                        if (accountRequired && accountState?.status === STATUS.ERROR) {
-                            finalizeInstall();
-                            return;
-                        }
-                        const sessionDetails = accountState?.details;
-                        if (accountRequired && !(sessionDetails?.sessionSecret || sessionDetails?.secret)) {
-                            handleProgress({
-                                step: STEP_IDS.ACCOUNT_SETUP,
-                                status: STATUS.ERROR,
-                                message: 'Account creation did not complete. Please retry.'
-                            });
-                            finalizeInstall();
-                            return;
-                        }
-                        finalizeInstall();
-                        notifyInstallComplete(activeInstall?.installId, sessionDetails).finally(() => {
-                            setTimeout(() => redirectToApp(), TIMINGS?.redirectDelay ?? 0);
-                        });
-                        return;
-                    }
-                    if (event === SSE_EVENTS.ERROR) {
-                        if (data?.message) {
-                            const existingError = Array.from(progressState.values()).some((state) => state?.status === STATUS.ERROR);
-                            if (data.step || !existingError) {
-                                let targetStep = data.step;
-                                if (!targetStep) {
-                                    for (const candidate of INSTALLATION_STEPS) {
-                                        const state = progressState.get(candidate.id);
-                                        if (!state || state.status !== STATUS.COMPLETED) {
-                                            targetStep = candidate.id;
-                                            break;
-                                        }
-                                    }
-                                }
-                                handleProgress({
-                                    step: targetStep || STEP_IDS.CONFIG_FILES,
-                                    status: STATUS.ERROR,
-                                    message: data.message,
-                                    details: data.details
-                                });
-                            }
-                        }
-                        finalizeInstall();
-                    }
-                });
-                if (activeInstall && !activeInstall.completed) {
-                    // Stream ended without a "done" event (e.g. browser
-                    // throttled the background tab). Check if we're done.
-                    checkAllCompleted();
-                    if (!activeInstall?.completed) {
-                        startPolling();
-                    }
-                }
-            } catch (error) {
-                if (!activeInstall || activeInstall.controller.signal.aborted) {
-                    return;
-                }
-                startPolling();
-            }
-        };
-
-        const resumeInstall = async (installId) => {
-            const snapshot = await fetchInstallStatus(installId);
-            if (!snapshot) return false;
-            activeInstall = {
-                installId,
-                controller: new AbortController(),
-                lastEventAt: Date.now(),
-                pollTimer: null,
-                fallbackTimer: null,
-                completed: false
-            };
-            applySnapshot(snapshot);
-            startPolling();
-            setUnloadGuard(true);
-            return true;
-        };
-
-        const resetProgressFrom = (stepId) => {
-            const index = INSTALLATION_STEPS.findIndex((step) => step.id === stepId);
-            if (index === -1) return;
-            INSTALLATION_STEPS.slice(index).forEach((step) => {
-                progressState.delete(step.id);
-                const row = rowsById.get(step.id);
-                if (row && row.parentNode) {
-                    row.parentNode.removeChild(row);
-                }
-                rowsById.delete(step.id);
-            });
-        };
-
-        const retryInstallStep = (stepId) => {
-            if (!stepId) return;
-            if (activeInstall?.controller) {
-                activeInstall.controller.abort();
-            }
-            if (activeInstall?.pollTimer) {
-                clearInterval(activeInstall.pollTimer);
-            }
-            if (activeInstall?.fallbackTimer) {
-                clearTimeout(activeInstall.fallbackTimer);
-            }
-
-            resetProgressFrom(stepId);
-
-            const step = getStepDefinition(stepId);
-            progressState.set(stepId, {
-                status: STATUS.IN_PROGRESS,
-                message: step?.inProgress || 'Retrying...'
-            });
-
-            const row = ensureRow(step);
-            if (row) {
-                updateInstallRow(row, step, STATUS.IN_PROGRESS, step.inProgress || 'Retrying...');
-            }
-
-            const installId = activeInstall?.installId || getInstallLock?.()?.installId || generateInstallId();
-            storeInstallId?.(installId);
-            startInstallStream(installId, { retryStep: stepId });
-        };
-
-        list.addEventListener('click', (event) => {
-            const consoleButton = event.target.closest('[data-install-console]');
-            const retryButton = event.target.closest('[data-install-retry]');
-
-            if (consoleButton) {
-                fetch('/install/cleanup', {
-                    method: 'POST',
-                    headers: withCsrfHeader({
-                        'Content-Type': 'application/json'
-                    })
-                }).catch(() => {});
-
-                // Redirect immediately
-                redirectToApp();
-                return;
-            }
-
-            if (retryButton) {
-                const row = retryButton.closest('.install-row');
-                const stepId = row?.dataset.step;
-                retryInstallStep(stepId);
-            }
-        });
-
-        // When the user switches back to this tab, check if installation
-        // finished while the tab was in the background.
-        document.addEventListener('visibilitychange', () => {
-            if (document.visibilityState === 'visible' && activeInstall && !activeInstall.completed) {
-                checkAllCompleted();
-            }
-        });
-
-        const lock = getInstallLock?.();
-        const existingInstallId = lock?.installId || getStoredInstallId?.();
-        if (existingInstallId) {
-            resumeInstall(existingInstallId).then((resumed) => {
-                if (!resumed) {
-                    clearInstallId?.();
-                    clearInstallLock?.();
-                    const newInstallId = generateInstallId();
-                    storeInstallId?.(newInstallId);
-                    startInstallStream(newInstallId);
-                }
-            });
-        } else {
-            const newInstallId = generateInstallId();
-            storeInstallId?.(newInstallId);
-            startInstallStream(newInstallId);
-        }
-    };
-
-    window.InstallerStepsProgress = {
-        initStep5,
-        cleanupInstallFlow,
-        validateInstallRequest
-    };
-})();

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

@@ -1,155 +0,0 @@
-(() => {
-    const {
-        getBodyDataset,
-        isUpgradeMode,
-        getLockedDatabase
-    } = window.InstallerStepsContext || {};
-
-    const INSTALL_LOCK_KEY = 'appwrite-install-lock';
-    const INSTALL_ID_KEY = 'appwrite-install-id';
-
-    const formState = {
-        appDomain: null,
-        database: null,
-        httpPort: null,
-        httpsPort: null,
-        emailCertificates: null,
-        opensslKey: null,
-        assistantOpenAIKey: null,
-        accountEmail: null,
-        accountPassword: null
-    };
-
-    const dispatchStateChange = (key) => {
-        if (!key || typeof document === 'undefined') return;
-        try {
-            document.dispatchEvent(new CustomEvent('installer:state-change', {
-                detail: { key, value: formState[key] }
-            }));
-        } catch (error) {}
-    };
-
-    const setStateIfEmpty = (key, value) => {
-        if (value === null || value === undefined || value === '') return;
-        if (formState[key] === null || formState[key] === undefined || formState[key] === '') {
-            formState[key] = value;
-        }
-    };
-
-    const applyBodyDefaults = () => {
-        const data = getBodyDataset?.() ?? {};
-        setStateIfEmpty('appDomain', data.defaultAppDomain);
-        setStateIfEmpty('httpPort', data.defaultHttpPort);
-        setStateIfEmpty('httpsPort', data.defaultHttpsPort);
-        setStateIfEmpty('emailCertificates', data.defaultEmailCertificates);
-        setStateIfEmpty('opensslKey', data.defaultSecretKey);
-        setStateIfEmpty('assistantOpenAIKey', data.defaultAssistantOpenaiKey);
-        if (data.lockedDatabase) {
-            formState.database = data.lockedDatabase;
-        }
-        if (!isUpgradeMode?.()) {
-            setStateIfEmpty('database', data.defaultDatabase);
-        }
-    };
-
-    const getInstallLock = () => {
-        try {
-            const raw = sessionStorage.getItem(INSTALL_LOCK_KEY);
-            if (!raw) return null;
-            const parsed = JSON.parse(raw);
-            if (!parsed || typeof parsed !== 'object') return null;
-            return parsed;
-        } catch (error) {
-            return null;
-        }
-    };
-
-    const setInstallLock = (installId, payload) => {
-        const lock = {
-            installId,
-            payload: payload || null,
-            startedAt: Date.now()
-        };
-        try {
-            sessionStorage.setItem(INSTALL_LOCK_KEY, JSON.stringify(lock));
-        } catch (error) {}
-        if (document.body) {
-            document.body.dataset.installLocked = 'true';
-        }
-        return lock;
-    };
-
-    const clearInstallLock = () => {
-        try {
-            sessionStorage.removeItem(INSTALL_LOCK_KEY);
-        } catch (error) {}
-        if (document.body) {
-            delete document.body.dataset.installLocked;
-        }
-    };
-
-    const isInstallLocked = () => {
-        return Boolean(getInstallLock());
-    };
-
-    const syncInstallLockFlag = () => {
-        if (!document.body) return;
-        if (isInstallLocked()) {
-            document.body.dataset.installLocked = 'true';
-        } else {
-            delete document.body.dataset.installLocked;
-        }
-    };
-
-    const applyLockPayload = () => {
-        const lock = getInstallLock();
-        if (!lock || !lock.payload) return;
-        const payload = lock.payload;
-        setStateIfEmpty('appDomain', payload.appDomain);
-        setStateIfEmpty('database', payload.database);
-        setStateIfEmpty('httpPort', payload.httpPort);
-        setStateIfEmpty('httpsPort', payload.httpsPort);
-        setStateIfEmpty('emailCertificates', payload.emailCertificates);
-        setStateIfEmpty('opensslKey', payload.opensslKey);
-        setStateIfEmpty('assistantOpenAIKey', payload.assistantOpenAIKey);
-        setStateIfEmpty('accountEmail', payload.accountEmail);
-        setStateIfEmpty('accountPassword', payload.accountPassword);
-    };
-
-    const getStoredInstallId = () => {
-        try {
-            return sessionStorage.getItem(INSTALL_ID_KEY);
-        } catch (error) {
-            return null;
-        }
-    };
-
-    const storeInstallId = (installId) => {
-        try {
-            sessionStorage.setItem(INSTALL_ID_KEY, installId);
-        } catch (error) {}
-    };
-
-    const clearInstallId = () => {
-        try {
-            sessionStorage.removeItem(INSTALL_ID_KEY);
-        } catch (error) {}
-    };
-
-    window.InstallerStepsState = {
-        formState,
-        dispatchStateChange,
-        setStateIfEmpty,
-        applyBodyDefaults,
-        applyLockPayload,
-        getInstallLock,
-        setInstallLock,
-        clearInstallLock,
-        isInstallLocked,
-        syncInstallLockFlag,
-        getStoredInstallId,
-        storeInstallId,
-        clearInstallId,
-        getLockedDatabase: getLockedDatabase || (() => '')
-    };
-})();

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

@@ -1,95 +0,0 @@
-(() => {
-    const TOAST_STACK_ID = 'installer-toast-stack';
-    const DEFAULT_TIMEOUT = 5000;
-    const MAX_TOASTS = 3;
-    const ICONS = {
-        error: '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20" aria-hidden="true"><path fill="currentColor" fill-rule="evenodd" d="M18 10a8 8 0 1 1-16 0 8 8 0 0 1 16 0m-7 4a1 1 0 1 1-2 0 1 1 0 0 1 2 0m-1-9a1 1 0 0 0-1 1v4a1 1 0 1 0 2 0V6a1 1 0 0 0-1-1" clip-rule="evenodd"/></svg>',
-        close: '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20" aria-hidden="true"><path fill="currentColor" fill-rule="evenodd" d="M5.293 5.293a1 1 0 0 1 1.414 0L10 8.586l3.293-3.293a1 1 0 1 1 1.414 1.414L11.414 10l3.293 3.293a1 1 0 0 1-1.414 1.414L10 11.414l-3.293 3.293a1 1 0 0 1-1.414-1.414L8.586 10 5.293 6.707a1 1 0 0 1 0-1.414" clip-rule="evenodd"/></svg>'
-    };
-
-    const getStack = () => document.getElementById(TOAST_STACK_ID);
-
-    const dismissToast = (toast) => {
-        if (!toast) return;
-        if (toast.classList.contains('is-leaving')) return;
-        toast.classList.add('is-leaving');
-        const remove = () => toast.remove();
-        toast.addEventListener('transitionend', remove, { once: true });
-        setTimeout(remove, 450);
-    };
-
-    const showToast = ({
-        title = '',
-        description = '',
-        status = 'error',
-        dismissible = true,
-        timeout = DEFAULT_TIMEOUT
-    } = {}) => {
-        const stack = getStack();
-        if (!stack) return;
-        const visibleToasts = Array.from(
-            stack.querySelectorAll('.installer-toast:not(.is-leaving)')
-        );
-        if (visibleToasts.length >= MAX_TOASTS) {
-            dismissToast(visibleToasts[0]);
-        }
-
-        const toast = document.createElement('div');
-        toast.className = 'installer-toast is-entering';
-        toast.dataset.status = status;
-        toast.setAttribute('role', status === 'error' ? 'alert' : 'status');
-
-        const content = document.createElement('div');
-        content.className = 'installer-toast-content';
-
-        const icon = document.createElement('span');
-        icon.className = 'installer-toast-icon';
-        icon.dataset.status = status;
-        icon.innerHTML = ICONS.error;
-        content.appendChild(icon);
-
-        const body = document.createElement('section');
-        body.className = 'installer-toast-body';
-
-        if (title) {
-            const titleNode = document.createElement('p');
-            titleNode.className = 'installer-toast-title typography-text-m-500';
-            titleNode.textContent = title;
-            body.appendChild(titleNode);
-        }
-
-        if (description) {
-            const descNode = document.createElement('p');
-            descNode.className = 'installer-toast-description typography-text-m-400';
-            descNode.textContent = description;
-            body.appendChild(descNode);
-        }
-
-        content.appendChild(body);
-        toast.appendChild(content);
-
-        if (dismissible) {
-            const close = document.createElement('button');
-            close.type = 'button';
-            close.className = 'installer-toast-close';
-            close.setAttribute('aria-label', 'Dismiss notification');
-            close.innerHTML = ICONS.close;
-            close.addEventListener('click', () => dismissToast(toast));
-            toast.appendChild(close);
-        }
-
-        stack.appendChild(toast);
-        toast.getBoundingClientRect();
-        requestAnimationFrame(() => {
-            toast.classList.remove('is-entering');
-        });
-
-        if (timeout > 0) {
-            setTimeout(() => dismissToast(toast), timeout);
-        }
-    };
-
-    window.InstallerToast = Object.freeze({
-        showToast
-    });
-})();

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

@@ -1,281 +0,0 @@
-(() => {
-    const { TIMINGS } = window.InstallerStepsContext || {};
-    const { formState } = window.InstallerStepsState || {};
-
-    const clearFieldErrors = (root) => {
-        if (!root) return;
-        root.querySelectorAll('.field-error').forEach((node) => {
-            node.classList.remove('is-visible');
-        });
-        root.querySelectorAll('.input-field.is-error, .input-action.is-error').forEach((node) => {
-            node.classList.remove('is-error');
-        });
-        root.querySelectorAll('.field-helper').forEach((helper) => {
-            helper.style.display = '';
-        });
-    };
-
-    const setFieldError = (input, message) => {
-        if (!input) return;
-        const group = input.closest('.input-group');
-        if (!group) return;
-        let error = group.querySelector('.field-error');
-        let errorText = error?.querySelector('.field-error-text');
-        const hasSameMessage = Boolean(errorText && errorText.textContent === message);
-        const alreadyVisible = Boolean(error && error.classList.contains('is-visible'));
-
-        if (hasSameMessage && alreadyVisible) {
-            return;
-        }
-
-        if (!error) {
-            const template = document.getElementById('field-error-template');
-            if (template && template.content) {
-                const fragment = template.content.cloneNode(true);
-                error = fragment.querySelector('.field-error');
-                group.appendChild(fragment);
-            }
-            errorText = error?.querySelector('.field-error-text');
-        }
-        if (errorText) {
-            errorText.textContent = message;
-        }
-
-        if (!alreadyVisible) {
-            requestAnimationFrame(() => {
-                error.classList.add('is-visible');
-            });
-        }
-
-        input.classList.add('is-error');
-        const actionWrapper = input.closest('.input-action');
-        if (actionWrapper) {
-            actionWrapper.classList.add('is-error');
-        }
-        const helper = group.querySelector('.field-helper');
-        if (helper) {
-            helper.style.display = 'none';
-        }
-    };
-
-    const bindErrorClear = (input) => {
-        if (!input) return;
-        const handler = () => {
-            const group = input.closest('.input-group');
-            const error = group?.querySelector('.field-error');
-            if (error) {
-                error.classList.remove('is-visible');
-            }
-            input.classList.remove('is-error');
-            const actionWrapper = input.closest('.input-action');
-            if (actionWrapper) {
-                actionWrapper.classList.remove('is-error');
-            }
-            const helper = group?.querySelector('.field-helper');
-            if (helper) {
-                helper.style.display = '';
-            }
-        };
-        input.addEventListener('input', handler);
-        input.addEventListener('change', handler);
-    };
-
-    const toDatabaseLabel = (value) => {
-        if (!value) return '';
-        const lower = value.toLowerCase();
-        if (lower === 'mariadb') return 'MariaDB';
-        if (lower === 'postgresql') return 'PostgreSQL';
-        return 'MongoDB';
-    };
-
-    const updateDatabaseSelection = (radio, root) => {
-        if (!radio || !root) return;
-        const allOptions = root.querySelectorAll('.selector-card');
-        allOptions.forEach((option) => option.classList.remove('selected'));
-        const selectedOption = radio.closest('.selector-card');
-        if (selectedOption) {
-            selectedOption.classList.add('selected');
-        }
-    };
-
-    const syncResetButton = (input, button) => {
-        const defaultValue = input.dataset.default ?? '';
-        button.disabled = input.value === defaultValue;
-    };
-
-    const setupResetButtons = (root) => {
-        const inputs = root.querySelectorAll('.input-field[data-default]');
-        inputs.forEach((input) => {
-            const button = root.querySelector(`[data-reset-target="${input.id}"]`);
-            if (!button) return;
-
-            syncResetButton(input, button);
-
-            input.addEventListener('input', () => syncResetButton(input, button));
-            button.addEventListener('click', () => {
-                input.value = input.dataset.default ?? '';
-                syncResetButton(input, button);
-                input.dispatchEvent(new Event('input', { bubbles: true }));
-            });
-        });
-    };
-
-    const toggleAccordion = (button) => {
-        const content = button.nextElementSibling;
-        const icon = button.querySelector('.accordion-chevron');
-        const isOpen = button.classList.contains('is-open');
-
-        button.classList.toggle('is-open', !isOpen);
-        button.setAttribute('aria-expanded', String(!isOpen));
-
-        if (content) {
-            if (!isOpen) {
-                content.classList.add('open');
-                content.style.maxHeight = `${content.scrollHeight}px`;
-            } else {
-                content.style.maxHeight = '0px';
-                content.classList.remove('open');
-            }
-        }
-
-        if (icon) {
-            icon.setAttribute('data-open', String(!isOpen));
-        }
-    };
-
-    const setupAccordion = (root) => {
-        const buttons = root.querySelectorAll('.accordion-toggle');
-        buttons.forEach((button) => {
-            button.addEventListener('click', () => toggleAccordion(button));
-        });
-    };
-
-    const openAccordion = (root) => {
-        const toggle = root.querySelector('.accordion-toggle');
-        const content = root.querySelector('.accordion-content');
-        if (!toggle || !content) return;
-        if (!toggle.classList.contains('is-open')) {
-            toggle.classList.add('is-open');
-            toggle.setAttribute('aria-expanded', 'true');
-            content.classList.add('open');
-            content.style.maxHeight = `${content.scrollHeight}px`;
-        }
-    };
-
-    const disableControls = (root) => {
-        const inputs = root.querySelectorAll('input, select, textarea');
-        inputs.forEach((input) => {
-            if (input.type === 'radio' || input.type === 'checkbox') {
-                input.disabled = true;
-            } else {
-                input.readOnly = true;
-                input.setAttribute('aria-disabled', 'true');
-            }
-        });
-
-        const buttons = root.querySelectorAll('button');
-        buttons.forEach((button) => {
-            if (button.matches('[data-copy-target]')) return;
-            button.disabled = true;
-            button.setAttribute('aria-disabled', 'true');
-        });
-
-        root.classList.add('is-locked');
-    };
-
-    const generateSecretKey = () => {
-        const array = new Uint8Array(32);
-        window.crypto.getRandomValues(array);
-        return Array.from(array, (byte) => byte.toString(16).padStart(2, '0')).join('');
-    };
-
-    const copyToClipboard = (value, input) => {
-        if (!value) return;
-        if (navigator.clipboard && navigator.clipboard.writeText) {
-            navigator.clipboard.writeText(value);
-            return;
-        }
-        if (input) {
-            input.select();
-            document.execCommand('copy');
-            input.setSelectionRange(0, 0);
-            return;
-        }
-        const textArea = document.createElement('textarea');
-        textArea.value = value;
-        textArea.style.position = 'fixed';
-        textArea.style.top = '-9999px';
-        document.body.appendChild(textArea);
-        textArea.focus();
-        textArea.select();
-        try {
-            document.execCommand('copy');
-        } catch (error) {} finally {
-            document.body.removeChild(textArea);
-        }
-    };
-
-    const setTooltipText = (wrapper, message) => {
-        if (!wrapper) return;
-        const tooltip = wrapper.querySelector('.tooltip');
-        if (tooltip && message) {
-            tooltip.textContent = message;
-        }
-    };
-
-    const resetTooltipText = (wrapper) => {
-        if (!wrapper) return;
-        const defaultText = wrapper.dataset.tooltipDefault;
-        if (!defaultText) return;
-        setTooltipText(wrapper, defaultText);
-    };
-
-    const updateReviewSummary = (root) => {
-        if (!root) return;
-        const valueNodes = root.querySelectorAll('[data-review-value]');
-        valueNodes.forEach((node) => {
-            const key = node.dataset.reviewValue;
-            if (!key) return;
-            let value = formState?.[key];
-            if (key === 'database') {
-                value = toDatabaseLabel(formState?.database);
-            }
-            if (value) {
-                node.textContent = value;
-            }
-        });
-
-        const badge = root.querySelector('[data-review-badge]');
-        if (badge) {
-            const hasKey = Boolean((formState?.opensslKey || '').trim());
-            badge.textContent = hasKey ? 'Generated' : 'Missing';
-            badge.classList.remove('badge-success', 'badge-warning');
-            badge.classList.add(hasKey ? 'badge-success' : 'badge-warning');
-        }
-
-        const assistantBadge = root.querySelector('[data-review-assistant-badge]');
-        if (assistantBadge) {
-            const hasAssistantKey = Boolean((formState?.assistantOpenAIKey || '').trim());
-            assistantBadge.textContent = hasAssistantKey ? 'Enabled' : 'Disabled';
-            assistantBadge.classList.remove('badge-success', 'badge-neutral');
-            assistantBadge.classList.add(hasAssistantKey ? 'badge-success' : 'badge-neutral');
-        }
-    };
-
-    window.InstallerStepsUI = {
-        clearFieldErrors,
-        setFieldError,
-        bindErrorClear,
-        toDatabaseLabel,
-        updateDatabaseSelection,
-        setupResetButtons,
-        setupAccordion,
-        openAccordion,
-        disableControls,
-        generateSecretKey,
-        copyToClipboard,
-        setTooltipText,
-        resetTooltipText,
-        updateReviewSummary
-    };
-})();

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

@@ -1,117 +0,0 @@
-(() => {
-    const isValidEmail = (email) => {
-        if (!email) return false;
-        const re = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-        return re.test(email);
-    };
-
-    const isValidPort = (value) => {
-        const numeric = Number(value);
-        if (!Number.isInteger(numeric)) return false;
-        return numeric >= 1 && numeric <= 65535;
-    };
-
-    const isValidPassword = (value) => {
-        if (!value) return false;
-        return value.length >= 8 && /\S/.test(value);
-    };
-
-    const isValidIPv4 = (host) => {
-        if (!/^\d{1,3}(\.\d{1,3}){3}$/.test(host)) return false;
-        return host.split('.').every((part) => {
-            const num = Number(part);
-            return num >= 0 && num <= 255;
-        });
-    };
-
-    const isValidIPv6 = (host) => {
-        try {
-            const url = new URL(`http://[${host}]`);
-            return url.hostname.toLowerCase() === host.toLowerCase();
-        } catch (error) {
-            return false;
-        }
-    };
-
-    const isValidHostnameLabel = (label) => {
-        if (!label || label.length > 63) return false;
-        if (label.startsWith('-') || label.endsWith('-')) return false;
-        return /^[a-zA-Z0-9-]+$/.test(label);
-    };
-
-    const isValidDomain = (host) => {
-        if (host.length > 253) return false;
-        const labels = host.split('.');
-        return labels.every((label) => isValidHostnameLabel(label));
-    };
-
-    const isValidHost = (host) => {
-        if (host === 'localhost') return true;
-        if (isValidIPv4(host)) return true;
-        if (isValidIPv6(host)) return true;
-        return isValidDomain(host);
-    };
-
-    const isValidHostnameInput = (value) => {
-        if (!value) return false;
-        const trimmed = value.trim();
-        if (!trimmed) return false;
-
-        let host = trimmed;
-        let port = null;
-
-        if (trimmed.startsWith('[')) {
-            const match = trimmed.match(/^\[([^\]]+)\](?::(\d+))?$/);
-            if (!match) return false;
-            host = match[1] || '';
-            port = match[2] || null;
-        } else {
-            const parts = trimmed.split(':');
-            if (parts.length > 2) return false;
-            if (parts.length === 2) {
-                host = parts[0];
-                port = parts[1];
-            }
-        }
-
-        if (port !== null && port !== '' && !isValidPort(port)) {
-            return false;
-        }
-
-        return isValidHost(host);
-    };
-
-    const extractHostname = (value) => {
-        if (!value) return '';
-        const trimmed = value.trim();
-        if (trimmed.startsWith('[')) {
-            const end = trimmed.indexOf(']');
-            if (end !== -1) {
-                return trimmed.slice(1, end);
-            }
-            return trimmed;
-        }
-        const colonCount = (trimmed.match(/:/g) || []).length;
-        if (colonCount === 1) {
-            return trimmed.split(':')[0];
-        }
-        return trimmed;
-    };
-
-    const LOCAL_HOSTS = new Set(['localhost', '127.0.0.1', '::1', '0.0.0.0']);
-
-    const isLocalHost = (host) => {
-        if (!host) return false;
-        const normalized = host.toLowerCase();
-        return LOCAL_HOSTS.has(normalized);
-    };
-
-    window.InstallerStepsValidation = {
-        isValidEmail,
-        isValidPort,
-        isValidPassword,
-        isValidHostnameInput,
-        extractHostname,
-        isLocalHost
-    };
-})();

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

@@ -1,434 +0,0 @@
-(() => {
-    const Context = window.InstallerStepsContext || {};
-    const State = window.InstallerStepsState || {};
-    const Validation = window.InstallerStepsValidation || {};
-    const UI = window.InstallerStepsUI || {};
-    const Progress = window.InstallerStepsProgress || {};
-    const Tooltips = window.InstallerTooltips || null;
-
-    const {
-        INSTALLATION_STEPS,
-        clampStep
-    } = Context;
-
-    const {
-        formState,
-        dispatchStateChange,
-        applyBodyDefaults,
-        applyLockPayload,
-        clearInstallLock,
-        clearInstallId,
-        isInstallLocked,
-        syncInstallLockFlag,
-        getInstallLock,
-        getLockedDatabase
-    } = State;
-
-    const {
-        isValidEmail,
-        isValidPort,
-        isValidHostnameInput,
-        isValidPassword
-    } = Validation;
-
-    const {
-        clearFieldErrors,
-        setFieldError,
-        bindErrorClear,
-        updateDatabaseSelection,
-        setupResetButtons,
-        setupAccordion,
-        openAccordion,
-        disableControls,
-        generateSecretKey,
-        copyToClipboard,
-        setTooltipText,
-        resetTooltipText,
-        updateReviewSummary
-    } = UI;
-
-    let reviewListener = null;
-
-    const bindInputToState = (input, key) => {
-        if (!input) return;
-        const update = () => {
-            formState[key] = input.value;
-            dispatchStateChange?.(key);
-        };
-        input.addEventListener('input', update);
-        input.addEventListener('change', update);
-        update();
-    };
-
-    const lockDatabaseSelection = (root, lockedDatabase) => {
-        if (lockedDatabase) {
-            const radios = root.querySelectorAll('input[name="database"]');
-            radios.forEach((radio) => {
-                const isLockedChoice = radio.value === lockedDatabase;
-                const card = radio.closest('.selector-card');
-                radio.disabled = !isLockedChoice;
-                if (card) {
-                    card.classList.toggle('is-disabled', !isLockedChoice);
-                }
-                if (isLockedChoice) {
-                    radio.checked = true;
-                    updateDatabaseSelection?.(radio, root);
-                }
-            });
-        }
-    };
-
-    const bindDatabaseSelection = (root) => {
-        const radios = root.querySelectorAll('input[name="database"]');
-        radios.forEach((radio) => {
-            radio.addEventListener('change', () => {
-                formState.database = radio.value;
-                updateDatabaseSelection?.(radio, root);
-            });
-        });
-    };
-
-    const hydrateStep1State = (root) => {
-        State.setStateIfEmpty?.('appDomain', root.querySelector('#hostname')?.value);
-        State.setStateIfEmpty?.('database', root.querySelector('input[name="database"]:checked')?.value);
-        State.setStateIfEmpty?.('httpPort', root.querySelector('#http-port')?.value);
-        State.setStateIfEmpty?.('httpsPort', root.querySelector('#https-port')?.value);
-        State.setStateIfEmpty?.('emailCertificates', root.querySelector('#ssl-email')?.value);
-        State.setStateIfEmpty?.('assistantOpenAIKey', root.querySelector('#assistant-openai-key')?.value);
-    };
-
-    const applyStep1State = (root) => {
-        const hostname = root.querySelector('#hostname');
-        if (hostname && formState.appDomain) hostname.value = formState.appDomain;
-
-        const httpPort = root.querySelector('#http-port');
-        if (httpPort && formState.httpPort) httpPort.value = formState.httpPort;
-
-        const httpsPort = root.querySelector('#https-port');
-        if (httpsPort && formState.httpsPort) httpsPort.value = formState.httpsPort;
-
-        const sslEmail = root.querySelector('#ssl-email');
-        if (sslEmail && formState.emailCertificates) sslEmail.value = formState.emailCertificates;
-
-        const assistantKey = root.querySelector('#assistant-openai-key');
-        if (assistantKey && formState.assistantOpenAIKey) {
-            assistantKey.value = formState.assistantOpenAIKey;
-        }
-
-        if (formState.database) {
-            const radio = root.querySelector(`input[name="database"][value="${formState.database}"]`);
-            if (radio) {
-                radio.checked = true;
-                updateDatabaseSelection?.(radio, root);
-            }
-        }
-    };
-
-    const initStep1 = (root) => {
-        if (!root) return;
-        syncInstallLockFlag?.();
-        applyLockPayload?.();
-        applyBodyDefaults?.();
-        hydrateStep1State(root);
-        applyStep1State(root);
-
-        if (isInstallLocked?.()) {
-            openAccordion?.(root);
-            disableControls?.(root);
-            return;
-        }
-
-        const lockedDatabase = getLockedDatabase?.() || '';
-        if (lockedDatabase) {
-            lockDatabaseSelection(root, lockedDatabase);
-        } else {
-            bindDatabaseSelection(root);
-        }
-
-        const hostname = root.querySelector('#hostname');
-        const httpPort = root.querySelector('#http-port');
-        const httpsPort = root.querySelector('#https-port');
-        const sslEmail = root.querySelector('#ssl-email');
-        const assistantKey = root.querySelector('#assistant-openai-key');
-
-        bindInputToState(hostname, 'appDomain');
-        bindInputToState(httpPort, 'httpPort');
-        bindInputToState(httpsPort, 'httpsPort');
-        bindInputToState(sslEmail, 'emailCertificates');
-        bindInputToState(assistantKey, 'assistantOpenAIKey');
-
-        bindErrorClear?.(hostname);
-        bindErrorClear?.(httpPort);
-        bindErrorClear?.(httpsPort);
-        bindErrorClear?.(sslEmail);
-        bindErrorClear?.(assistantKey);
-
-        const checked = root.querySelector('input[name="database"]:checked');
-        if (checked) {
-            updateDatabaseSelection?.(checked, root);
-        }
-
-        setupResetButtons?.(root);
-        setupAccordion?.(root);
-        Tooltips?.setupTooltipPortals?.(root);
-    };
-
-    const hydrateStep2State = (root) => {
-        const value = root.querySelector('#secret-key')?.value;
-        if (formState.opensslKey) return;
-        if (value) {
-            formState.opensslKey = value;
-        }
-    };
-
-    const applyStep2State = (root) => {
-        const input = root.querySelector('#secret-key');
-        if (input && formState.opensslKey) {
-            input.value = formState.opensslKey;
-        }
-    };
-
-    const initStep2 = (root) => {
-        if (!root) return;
-        syncInstallLockFlag?.();
-        applyLockPayload?.();
-        applyBodyDefaults?.();
-        hydrateStep2State(root);
-        if (!formState.opensslKey || !formState.opensslKey.trim()) {
-            formState.opensslKey = generateSecretKey?.();
-            dispatchStateChange?.('opensslKey');
-        }
-        applyStep2State(root);
-
-        const input = root.querySelector('#secret-key');
-        if (input) {
-            bindInputToState(input, 'opensslKey');
-            bindErrorClear?.(input);
-        }
-
-        const copyButton = root.querySelector('[data-copy-target]');
-        const tooltipWrapper = copyButton?.closest('.tooltip-wrapper');
-
-        if (tooltipWrapper) {
-            tooltipWrapper.addEventListener('mouseenter', () => resetTooltipText?.(tooltipWrapper));
-            tooltipWrapper.addEventListener('focusin', () => resetTooltipText?.(tooltipWrapper));
-        }
-
-        if (copyButton) {
-            copyButton.addEventListener('click', () => {
-                const targetId = copyButton.getAttribute('data-copy-target');
-                const targetInput = targetId ? root.querySelector(`#${targetId}`) : null;
-                const value = targetInput?.value || '';
-                copyToClipboard?.(value, targetInput);
-                copyButton.blur();
-
-                if (tooltipWrapper) {
-                    const successText = tooltipWrapper.dataset.tooltipSuccess || 'Copied';
-                    setTooltipText?.(tooltipWrapper, successText);
-                }
-            });
-        }
-
-        const regenerateButton = root.querySelector('[data-regenerate-target]');
-        if (regenerateButton && !isInstallLocked?.()) {
-            regenerateButton.addEventListener('click', () => {
-                const targetId = regenerateButton.getAttribute('data-regenerate-target');
-                const targetInput = targetId ? root.querySelector(`#${targetId}`) : null;
-                if (!targetInput) return;
-                regenerateButton.classList.remove('is-rotating');
-                void regenerateButton.offsetWidth;
-                regenerateButton.classList.add('is-rotating');
-                const handleAnimationEnd = () => {
-                    regenerateButton.classList.remove('is-rotating');
-                };
-                regenerateButton.addEventListener('animationend', handleAnimationEnd, { once: true });
-                targetInput.value = generateSecretKey?.();
-                targetInput.dispatchEvent(new Event('input', { bubbles: true }));
-            });
-        }
-
-        if (isInstallLocked?.()) {
-            disableControls?.(root);
-        }
-    };
-
-    const hydrateStep3State = (root) => {
-        State.setStateIfEmpty?.('accountEmail', root.querySelector('#account-email')?.value);
-        State.setStateIfEmpty?.('accountPassword', root.querySelector('#account-password')?.value);
-    };
-
-    const applyStep3State = (root) => {
-        const email = root.querySelector('#account-email');
-        if (email && formState.accountEmail) email.value = formState.accountEmail;
-
-        const password = root.querySelector('#account-password');
-        if (password && formState.accountPassword) password.value = formState.accountPassword;
-    };
-
-    const initStep3 = (root) => {
-        if (!root) return;
-        syncInstallLockFlag?.();
-        applyLockPayload?.();
-        applyBodyDefaults?.();
-        hydrateStep3State(root);
-        applyStep3State(root);
-
-        const email = root.querySelector('#account-email');
-        const password = root.querySelector('#account-password');
-        const passwordToggle = root.querySelector('[data-password-toggle="account-password"]');
-
-        bindInputToState(email, 'accountEmail');
-        bindInputToState(password, 'accountPassword');
-
-        bindErrorClear?.(email);
-        bindErrorClear?.(password);
-
-        if (password && passwordToggle) {
-            passwordToggle.addEventListener('click', () => {
-                const isVisible = passwordToggle.classList.toggle('is-visible');
-                password.type = isVisible ? 'text' : 'password';
-                passwordToggle.setAttribute('aria-label', isVisible ? 'Hide password' : 'Show password');
-            });
-        }
-
-        if (isInstallLocked?.()) {
-            disableControls?.(root);
-        }
-    };
-
-    const initStep4 = (root) => {
-        if (!root) return;
-        syncInstallLockFlag?.();
-        applyLockPayload?.();
-        applyBodyDefaults?.();
-        updateReviewSummary?.(root);
-        if (reviewListener) {
-            document.removeEventListener('installer:state-change', reviewListener);
-        }
-        reviewListener = () => updateReviewSummary?.(root);
-        document.addEventListener('installer:state-change', reviewListener);
-        if (isInstallLocked?.()) {
-            disableControls?.(root);
-        }
-    };
-
-    const initStep = (step, container) => {
-        if (!container) return;
-        const root = container.querySelector('.step-layout') || container;
-        const normalized = clampStep?.(step) ?? 1;
-        Tooltips?.cleanupTooltipPortals?.();
-        if (normalized !== 4 && reviewListener) {
-            document.removeEventListener('installer:state-change', reviewListener);
-            reviewListener = null;
-        }
-        if (normalized !== 5) {
-            Progress.cleanupInstallFlow?.();
-        }
-        if (normalized === 1) initStep1(root);
-        if (normalized === 2) initStep2(root);
-        if (normalized === 3) initStep3(root);
-        if (normalized === 4) initStep4(root);
-        if (normalized === 5) Progress.initStep5?.(root);
-    };
-
-    window.InstallerSteps = {
-        initStep1,
-        initStep2,
-        initStep3,
-        initStep4,
-        initStep5: Progress.initStep5,
-        installationSteps: INSTALLATION_STEPS || [],
-        isInstallLocked,
-        getInstallLock,
-        clearInstallLock,
-        initStep,
-        validateStep: (step, container) => {
-            const root = container?.querySelector('.step-layout') || container;
-            const normalized = clampStep?.(step) ?? 1;
-            if (normalized === 1) {
-                clearFieldErrors?.(root);
-                let valid = true;
-                const hostname = root?.querySelector('#hostname');
-                const httpPort = root?.querySelector('#http-port');
-                const httpsPort = root?.querySelector('#https-port');
-                const sslEmail = root?.querySelector('#ssl-email');
-
-                if (!hostname || !hostname.value.trim()) {
-                    setFieldError?.(hostname, 'Please enter your Appwrite hostname');
-                    valid = false;
-                } else if (!isValidHostnameInput?.(hostname.value.trim())) {
-                    setFieldError?.(hostname, 'Please enter a valid hostname');
-                    valid = false;
-                }
-
-                const parsePort = (input, label) => {
-                    const value = input?.value;
-                    if (!value || !isValidPort?.(value)) {
-                        setFieldError?.(input, `Please enter a valid ${label} port (1-65535)`);
-                        return false;
-                    }
-                    return true;
-                };
-
-                if (!parsePort(httpPort, 'HTTP')) valid = false;
-                if (!parsePort(httpsPort, 'HTTPS')) valid = false;
-
-                if (!sslEmail || !sslEmail.value.trim()) {
-                    setFieldError?.(sslEmail, 'Please enter an email address for SSL certificates');
-                    valid = false;
-                } else if (!isValidEmail?.(sslEmail.value.trim())) {
-                    setFieldError?.(sslEmail, 'Please enter a valid email address');
-                    valid = false;
-                }
-
-                if (!valid) {
-                    openAccordion?.(root);
-                }
-
-                return valid;
-            }
-
-            if (normalized === 2) {
-                clearFieldErrors?.(root);
-                const secretKey = root?.querySelector('#secret-key');
-                const secretValue = secretKey?.value.trim() || '';
-                if (!secretKey || !secretValue) {
-                    setFieldError?.(secretKey, 'Please enter or generate a secret API key');
-                    return false;
-                }
-                if (secretValue.length > 64) {
-                    setFieldError?.(secretKey, 'Secret API key must be 1-64 characters');
-                    return false;
-                }
-            }
-
-            if (normalized === 3) {
-                clearFieldErrors?.(root);
-                let valid = true;
-                const email = root?.querySelector('#account-email');
-                const password = root?.querySelector('#account-password');
-
-                if (!email || !email.value.trim()) {
-                    setFieldError?.(email, 'This field is required');
-                    valid = false;
-                } else if (!isValidEmail?.(email.value.trim())) {
-                    setFieldError?.(email, 'Please enter a valid email address');
-                    valid = false;
-                }
-
-                const passwordValue = password?.value ?? '';
-                if (!password || !/\S/.test(passwordValue)) {
-                    setFieldError?.(password, 'This field is required');
-                    valid = false;
-                } else if (!isValidPassword?.(passwordValue)) {
-                    setFieldError?.(password, 'Password must be at least 8 characters long');
-                    valid = false;
-                }
-
-                return valid;
-            }
-
-            return true;
-        }
-    };
-})();

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

@@ -1,77 +0,0 @@
-(() => {
-    const tooltipPortals = new Set();
-
-    const positionTooltipPortal = (tooltip, anchor) => {
-        if (!tooltip || !anchor) return;
-        const rect = anchor.getBoundingClientRect();
-        const tooltipRect = tooltip.getBoundingClientRect();
-        const offset = Number(tooltip.dataset.tooltipOffset || 6);
-        const padding = 8;
-        let left = rect.left + (rect.width / 2) - (tooltipRect.width / 2);
-        left = Math.max(padding, Math.min(left, window.innerWidth - tooltipRect.width - padding));
-        const top = rect.bottom + offset;
-        tooltip.style.left = `${left}px`;
-        tooltip.style.top = `${top}px`;
-    };
-
-    const attachTooltipPortal = (tooltip) => {
-        if (!tooltip || tooltip.dataset.portalInitialized === 'true') return;
-        const anchor = tooltip.parentElement;
-        if (!anchor) return;
-
-        tooltip.dataset.portalInitialized = 'true';
-        tooltip.classList.add('tooltip-portal');
-        document.body.appendChild(tooltip);
-
-        const show = () => {
-            tooltip.classList.add('is-open');
-            positionTooltipPortal(tooltip, anchor);
-        };
-        const hide = () => {
-            tooltip.classList.remove('is-open');
-        };
-        const refresh = () => {
-            if (tooltip.classList.contains('is-open')) {
-                positionTooltipPortal(tooltip, anchor);
-            }
-        };
-
-        anchor.addEventListener('mouseenter', show);
-        anchor.addEventListener('mouseleave', hide);
-        anchor.addEventListener('focusin', show);
-        anchor.addEventListener('focusout', hide);
-        window.addEventListener('scroll', refresh, true);
-        window.addEventListener('resize', refresh);
-
-        tooltipPortals.add({
-            tooltip,
-            cleanup: () => {
-                anchor.removeEventListener('mouseenter', show);
-                anchor.removeEventListener('mouseleave', hide);
-                anchor.removeEventListener('focusin', show);
-                anchor.removeEventListener('focusout', hide);
-                window.removeEventListener('scroll', refresh, true);
-                window.removeEventListener('resize', refresh);
-                if (tooltip.parentElement) {
-                    tooltip.parentElement.removeChild(tooltip);
-                }
-            }
-        });
-    };
-
-    const setupTooltipPortals = (root) => {
-        if (!root) return;
-        const portalTooltips = root.querySelectorAll('.tooltip[data-tooltip-portal]');
-        portalTooltips.forEach((tooltip) => attachTooltipPortal(tooltip));
-    };
-
-    const cleanupTooltipPortals = () => {
-        tooltipPortals.forEach((entry) => entry.cleanup());
-        tooltipPortals.clear();
-    };
-
-    window.InstallerTooltips = {
-        setupTooltipPortals,
-        cleanupTooltipPortals
-    };
-})();

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

@@ -1,184 +0,0 @@
-<?php
-$isUpgrade = $isUpgrade ?? false;
-$lockedDatabase = $lockedDatabase ?? null;
-$defaultAppDomain = $defaultAppDomain ?? 'localhost';
-$defaultHttpPort = $defaultHttpPort ?? '80';
-$defaultHttpsPort = $defaultHttpsPort ?? '443';
-$defaultEmailCertificates = $defaultEmailCertificates ?? '';
-$defaultAssistantOpenAIKey = $defaultAssistantOpenAIKey ?? '';
-$defaultDatabase = $defaultDatabase ?? 'mongodb';
-$selectedDatabase = $lockedDatabase ?: $defaultDatabase;
-$isDatabaseLocked = !empty($lockedDatabase);
-$mongoDisabled = $isDatabaseLocked && $selectedDatabase !== 'mongodb';
-$mariaDisabled = $isDatabaseLocked && $selectedDatabase !== 'mariadb';
-$postgresDisabled = $isDatabaseLocked && $selectedDatabase !== 'postgresql';
-$hostnameValue = htmlspecialchars((string) $defaultAppDomain, ENT_QUOTES, 'UTF-8');
-$httpPortValue = htmlspecialchars((string) $defaultHttpPort, ENT_QUOTES, 'UTF-8');
-$httpsPortValue = htmlspecialchars((string) $defaultHttpsPort, ENT_QUOTES, 'UTF-8');
-$sslEmailValue = htmlspecialchars((string) $defaultEmailCertificates, ENT_QUOTES, 'UTF-8');
-$assistantOpenAIKeyValue = htmlspecialchars((string) $defaultAssistantOpenAIKey, ENT_QUOTES, 'UTF-8');
-?>
-<div class="step-layout" data-step="1">
-    <div class="stack-xl">
-        <div class="stack-xxxs">
-            <h1 class="typography-title-s text-neutral-primary"><?php echo $isUpgrade ? 'Update your app' : 'Setup your app'; ?></h1>
-            <p class="typography-text-m-400 text-neutral-secondary">
-                <?php echo $isUpgrade ? 'Review your current settings before updating.' : 'Choose where your app will live and how it will store data'; ?>
-            </p>
-        </div>
-
-        <div class="stack-xl">
-            <div class="input-group stack-xs">
-                <label for="hostname" class="label-text typography-text-m-500 text-neutral-secondary">Hostname</label>
-                <input
-                    type="text"
-                    id="hostname"
-                    name="hostname"
-                    class="input-field typography-text-m-400 text-neutral-primary"
-                    placeholder="localhost"
-                    value="<?php echo $hostnameValue; ?>"
-                >
-            </div>
-
-            <div class="input-group stack-xs">
-                <label class="label-text typography-text-m-500 text-neutral-secondary">Database</label>
-                <div class="selector-group<?php echo $isDatabaseLocked ? ' is-locked' : ''; ?>">
-                    <label class="selector-card <?php echo ($selectedDatabase === 'mongodb') ? 'selected' : ''; ?><?php echo $mongoDisabled ? ' is-disabled has-tooltip' : ''; ?>"<?php echo $mongoDisabled ? ' aria-disabled="true"' : ''; ?>>
-                        <input type="radio" name="database" value="mongodb" <?php echo ($selectedDatabase === 'mongodb') ? 'checked' : ''; ?> class="sr-only" <?php echo $mongoDisabled ? 'disabled' : ''; ?>>
-                        <div class="selector-content">
-                            <div class="typography-text-m-500 text-neutral-primary">MongoDB</div>
-                            <div class="typography-text-xs-400 text-neutral-secondary">Document based database</div>
-                        </div>
-                        <img src="installer/icons/mongodb.svg" alt="MongoDB" class="selector-icon">
-                        <?php if ($mongoDisabled) { ?>
-                            <span class="tooltip tooltip-db-locked typography-text-m-400 text-on-invert" role="tooltip" data-tooltip-portal="true">Database cannot be changed after initial setup.</span>
-                        <?php } ?>
-                    </label>
-
-                    <label class="selector-card <?php echo ($selectedDatabase === 'mariadb') ? 'selected' : ''; ?><?php echo $mariaDisabled ? ' is-disabled has-tooltip' : ''; ?>"<?php echo $mariaDisabled ? ' aria-disabled="true"' : ''; ?>>
-                        <input type="radio" name="database" value="mariadb" <?php echo ($selectedDatabase === 'mariadb') ? 'checked' : ''; ?> class="sr-only" <?php echo $mariaDisabled ? 'disabled' : ''; ?>>
-                        <div class="selector-content">
-                            <div class="typography-text-m-500 text-neutral-primary">MariaDB</div>
-                            <div class="typography-text-xs-400 text-neutral-secondary">Relational SQL database</div>
-                        </div>
-                        <img src="installer/icons/mariadb.svg" alt="MariaDB" class="selector-icon">
-                        <?php if ($mariaDisabled) { ?>
-                            <span class="tooltip tooltip-db-locked typography-text-m-400 text-on-invert" role="tooltip" data-tooltip-portal="true">Database cannot be changed after initial setup.</span>
-                        <?php } ?>
-                    </label>
-
-                    <label class="selector-card <?php echo ($selectedDatabase === 'postgresql') ? 'selected' : ''; ?><?php echo $postgresDisabled ? ' is-disabled has-tooltip' : ''; ?>"<?php echo $postgresDisabled ? ' aria-disabled="true"' : ''; ?>>
-                        <input type="radio" name="database" value="postgresql" <?php echo ($selectedDatabase === 'postgresql') ? 'checked' : ''; ?> class="sr-only" <?php echo $postgresDisabled ? 'disabled' : ''; ?>>
-                        <div class="selector-content">
-                            <div class="typography-text-m-500 text-neutral-primary">PostgreSQL</div>
-                            <div class="typography-text-xs-400 text-neutral-secondary">Relational SQL database</div>
-                        </div>
-                        <img src="installer/icons/postgresql.svg" alt="PostgreSQL" class="selector-icon">
-                        <?php if ($postgresDisabled) { ?>
-                            <span class="tooltip tooltip-db-locked typography-text-m-400 text-on-invert" role="tooltip" data-tooltip-portal="true">Database cannot be changed after initial setup.</span>
-                        <?php } ?>
-                    </label>
-                </div>
-            </div>
-
-            <div class="accordion">
-                <button
-                    type="button"
-                    class="accordion-toggle"
-                    aria-expanded="false"
-                >
-                    <span class="label-text typography-text-m-500 text-neutral-secondary">Advanced settings</span>
-                    <span class="accordion-chevron" data-open="false">
-                        <?php include __DIR__ . '/../../icons/chevron-down.svg'; ?>
-                    </span>
-                </button>
-                <div class="accordion-content">
-                    <div class="input-row">
-                        <div class="input-group stack-xs">
-                            <label for="http-port" class="label-text typography-text-m-500 text-neutral-secondary">HTTP port</label>
-                            <input
-                                type="number"
-                                id="http-port"
-                                name="httpPort"
-                                class="input-field typography-text-m-400 text-neutral-primary"
-                                placeholder="<?php echo $httpPortValue; ?>"
-                                value="<?php echo $httpPortValue; ?>"
-                                data-default="<?php echo $httpPortValue; ?>"
-                                min="1"
-                                max="65535"
-                                step="1"
-                            >
-                        </div>
-                        <button type="button" class="button secondary" data-reset-target="http-port" disabled>
-                            <span class="button-text typography-text-m-500">Reset</span>
-                        </button>
-                    </div>
-
-                    <div class="input-row">
-                        <div class="input-group stack-xs">
-                            <label for="https-port" class="label-text typography-text-m-500 text-neutral-secondary">HTTPS port</label>
-                            <input
-                                type="number"
-                                id="https-port"
-                                name="httpsPort"
-                                class="input-field typography-text-m-400 text-neutral-primary"
-                                placeholder="<?php echo $httpsPortValue; ?>"
-                                value="<?php echo $httpsPortValue; ?>"
-                                data-default="<?php echo $httpsPortValue; ?>"
-                                min="1"
-                                max="65535"
-                                step="1"
-                            >
-                        </div>
-                        <button type="button" class="button secondary" data-reset-target="https-port" disabled>
-                            <span class="button-text typography-text-m-500">Reset</span>
-                        </button>
-                    </div>
-
-                    <div class="input-row">
-                        <div class="input-group stack-xs">
-                            <label for="ssl-email" class="label-text typography-text-m-500 text-neutral-secondary">SSL certificate email</label>
-                            <input
-                                type="email"
-                                id="ssl-email"
-                                name="sslEmail"
-                                class="input-field typography-text-m-400 text-neutral-primary"
-                                placeholder="you@example.com"
-                                value="<?php echo $sslEmailValue; ?>"
-                                data-default="<?php echo $sslEmailValue; ?>"
-                            >
-                        </div>
-                        <button type="button" class="button secondary" data-reset-target="ssl-email" disabled>
-                            <span class="button-text typography-text-m-500">Reset</span>
-                        </button>
-                    </div>
-
-                    <div class="input-row">
-                        <div class="input-group stack-xs">
-                            <label for="assistant-openai-key" class="label-text typography-text-m-500 text-neutral-secondary">
-                                OpenAI key
-                                <span class="label-optional typography-text-m-400 text-neutral-tertiary">optional</span>
-                                <span class="tooltip-wrapper">
-                                    <button type="button" class="label-info-button" aria-label="OpenAI key info">
-                                        <?php include __DIR__ . '/../../icons/info.svg'; ?>
-                                    </button>
-                                    <span class="tooltip tooltip-assistant typography-text-m-400 text-on-invert" role="tooltip">Add your OpenAI key to enable Appwrite Assistant. The key is stored locally and won’t be shared.</span>
-                                </span>
-                            </label>
-                            <input
-                                type="text"
-                                id="assistant-openai-key"
-                                name="assistantOpenAIKey"
-                                class="input-field typography-text-m-400 text-neutral-primary"
-                                placeholder="Enter OpenAI key for Appwrite Assistant"
-                                value="<?php echo $assistantOpenAIKeyValue; ?>"
-                                data-default="<?php echo $assistantOpenAIKeyValue; ?>"
-                            >
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-</div>

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

@@ -1,58 +0,0 @@
-<?php
-$isUpgrade = $isUpgrade ?? false;
-$defaultSecretKey = $defaultSecretKey ?? '';
-$secretKeyValue = htmlspecialchars((string) $defaultSecretKey, ENT_QUOTES, 'UTF-8');
-?>
-<div class="step-layout" data-step="2">
-    <div class="stack-xl">
-        <div class="stack-xxxs">
-            <h1 class="typography-title-s text-neutral-primary">Secure your app</h1>
-            <p class="typography-text-m-400 text-neutral-secondary">
-                <?php echo $isUpgrade ? 'Review your existing secret key or generate a new one.' : 'Your server\'s private secret key for encryption. Generate a random secure key, or provide your own.'; ?>
-            </p>
-        </div>
-
-        <div class="stack-xl">
-            <div class="inline-alert inline-alert--warning">
-                <div class="inline-alert-content">
-                    <div class="inline-alert-icon" aria-hidden="true">
-                        <?php include __DIR__ . '/../../icons/warning.svg'; ?>
-                    </div>
-                    <div class="inline-alert-text">
-                        <div class="inline-alert-title typography-text-m-500 text-warning">Save your key</div>
-                        <div class="inline-alert-description typography-text-m-400 text-neutral-primary">You won't be able to see this key again. Copy it somewhere safe before continuing.</div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="input-row">
-                <div class="input-group stack-xs">
-                    <label for="secret-key" class="label-text typography-text-m-500 text-neutral-secondary">Secret API key</label>
-                    <div class="input-action">
-                        <input
-                            type="text"
-                            id="secret-key"
-                            name="secretKey"
-                            class="input-action-input typography-text-m-400 text-neutral-primary"
-                            value="<?php echo $secretKeyValue; ?>"
-                            minlength="1"
-                            maxlength="64"
-                        >
-                        <div class="input-action-buttons">
-                            <span class="tooltip-wrapper" data-tooltip-default="Copy" data-tooltip-success="Copied">
-                                <button type="button" class="input-icon-button" aria-label="Copy secret key" aria-describedby="copy-tooltip" data-copy-target="secret-key">
-                                    <?php include __DIR__ . '/../../icons/copy.svg'; ?>
-                                </button>
-                                <span id="copy-tooltip" class="tooltip typography-text-m-400 text-on-invert" role="tooltip">Copy</span>
-                            </span>
-                        </div>
-                    </div>
-                </div>
-                <button type="button" class="icon-button" aria-label="Regenerate secret key" data-regenerate-target="secret-key">
-                    <?php include __DIR__ . '/../../icons/refresh.svg'; ?>
-                </button>
-            </div>
-        </div>
-    </div>
-
-</div>

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

@@ -1,61 +0,0 @@
-<?php
-$defaultAccountEmail = $defaultAccountEmail ?? '';
-$accountEmailValue = htmlspecialchars($defaultAccountEmail, ENT_QUOTES, 'UTF-8');
-?>
-<div class="step-layout" data-step="3">
-    <div class="stack-xl">
-        <div class="stack-xxxs">
-            <h1 class="typography-title-s text-neutral-primary">Create your account</h1>
-            <p class="typography-text-m-400 text-neutral-secondary">
-                Set up the email and password for your Appwrite account. You can use these
-                credentials to sign in later.
-            </p>
-        </div>
-
-        <div class="stack-l">
-            <div class="input-group stack-xs">
-                <label for="account-email" class="label-text typography-text-m-500 text-neutral-secondary">Email</label>
-                <input
-                        type="email"
-                        id="account-email"
-                        name="accountEmail"
-                        class="input-field typography-text-m-400 text-neutral-primary"
-                        placeholder="you@example.com"
-                        value="<?php echo $accountEmailValue; ?>"
-                        autocomplete="email"
-                >
-            </div>
-
-            <div class="input-group stack-xs">
-                <label for="account-password"
-                       class="label-text typography-text-m-500 text-neutral-secondary">Password</label>
-                <div class="input-action">
-                    <input
-                            type="password"
-                            id="account-password"
-                            name="accountPassword"
-                            class="input-action-input typography-text-m-400 text-neutral-primary"
-                            placeholder="Enter password"
-                            autocomplete="new-password"
-                    >
-                    <div class="input-action-buttons">
-                        <button type="button" class="input-icon-button password-toggle" aria-label="Show password" data-password-toggle="account-password">
-                            <span class="password-toggle-icon" data-password-icon="hide">
-                                <?php include __DIR__ . '/../../icons/eye-off.svg'; ?>
-                            </span>
-                            <span class="password-toggle-icon" data-password-icon="show">
-                                <?php include __DIR__ . '/../../icons/eye.svg'; ?>
-                            </span>
-                        </button>
-                    </div>
-                </div>
-                <div class="field-helper typography-caption-400 text-neutral-secondary">
-                    <span class="field-helper-icon">
-                        <?php include __DIR__ . '/../../icons/info.svg'; ?>
-                    </span>
-                    <span class="field-helper-text">Password must be at least 8 characters long</span>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

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

@@ -1,76 +0,0 @@
-<?php
-$isUpgrade = $isUpgrade ?? false;
-$lockedDatabase = $lockedDatabase ?? null;
-$defaultAppDomain = $defaultAppDomain ?? 'localhost';
-$defaultHttpPort = $defaultHttpPort ?? '80';
-$defaultHttpsPort = $defaultHttpsPort ?? '443';
-$defaultEmailCertificates = $defaultEmailCertificates ?? '';
-$defaultSecretKey = $defaultSecretKey ?? '';
-$defaultDatabase = $defaultDatabase ?? 'mongodb';
-$selectedDatabase = $lockedDatabase ?: $defaultDatabase;
-$defaultDatabaseLabel = match ($selectedDatabase) {
-    'mariadb' => 'MariaDB',
-    'postgresql' => 'PostgreSQL',
-    default => 'MongoDB',
-};
-$badgeLabel = $defaultSecretKey !== '' ? 'Generated' : 'Missing';
-$badgeClass = $defaultSecretKey !== '' ? 'badge-success' : 'badge-warning';
-?>
-<div class="step-layout" data-step="4">
-    <div class="stack-xl">
-        <div class="stack-xxxs">
-            <h1 class="typography-title-s text-neutral-primary"><?php echo $isUpgrade ? 'Review your update' : 'Review your setup'; ?></h1>
-            <p class="typography-text-m-400 text-neutral-secondary">
-                <?php echo $isUpgrade ? 'Confirm your settings before updating Appwrite.' : 'Check your settings below before completing the installation.'; ?>
-            </p>
-        </div>
-
-        <div class="stack-xl">
-            <div class="review-card">
-                <div class="stack-s">
-                    <div class="review-row">
-                        <div class="typography-text-m-500 text-neutral-primary" data-review-value="appDomain">
-                            <?php echo htmlspecialchars((string) $defaultAppDomain, ENT_QUOTES, 'UTF-8'); ?>
-                        </div>
-                        <div class="review-label typography-text-xs-400 text-neutral-tertiary">Hostname</div>
-                    </div>
-                    <div class="review-row">
-                        <div class="typography-text-m-500 text-neutral-primary" data-review-value="database">
-                            <?php echo htmlspecialchars((string) $defaultDatabaseLabel, ENT_QUOTES, 'UTF-8'); ?>
-                        </div>
-                        <div class="review-label typography-text-xs-400 text-neutral-tertiary">Database</div>
-                    </div>
-                    <div class="review-row">
-                        <div class="typography-text-m-500 text-neutral-primary" data-review-value="httpPort">
-                            <?php echo htmlspecialchars((string) $defaultHttpPort, ENT_QUOTES, 'UTF-8'); ?>
-                        </div>
-                        <div class="review-label typography-text-xs-400 text-neutral-tertiary">HTTP port</div>
-                    </div>
-                    <div class="review-row">
-                        <div class="typography-text-m-500 text-neutral-primary" data-review-value="httpsPort">
-                            <?php echo htmlspecialchars((string) $defaultHttpsPort, ENT_QUOTES, 'UTF-8'); ?>
-                        </div>
-                        <div class="review-label typography-text-xs-400 text-neutral-tertiary">HTTPS port</div>
-                    </div>
-                    <div class="review-row">
-                        <div class="typography-text-m-500 text-neutral-primary" data-review-value="emailCertificates">
-                            <?php echo htmlspecialchars((string) $defaultEmailCertificates, ENT_QUOTES, 'UTF-8'); ?>
-                        </div>
-                        <div class="review-label typography-text-xs-400 text-neutral-tertiary">SSL certificate email</div>
-                    </div>
-                    <div class="review-row">
-                        <span class="badge badge-neutral typography-text-xs-400" data-review-assistant-badge>Disabled</span>
-                        <div class="review-label typography-text-xs-400 text-neutral-tertiary">Appwrite Assistant</div>
-                    </div>
-                    <div class="review-row">
-                        <span class="badge <?php echo $badgeClass; ?> typography-text-xs-400" data-review-badge>
-                            <?php echo htmlspecialchars((string) $badgeLabel, ENT_QUOTES, 'UTF-8'); ?>
-                        </span>
-                        <div class="review-label typography-text-xs-400 text-neutral-tertiary">Secret API key</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-</div>

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

@@ -1,53 +0,0 @@
-<?php
-$isUpgrade = $isUpgrade ?? false;
-?>
-<div class="step-layout install-layout" data-step="5">
-    <div class="install-card">
-        <div class="install-panel">
-            <div class="install-header">
-                <div class="typography-text-m-400 text-neutral-primary">
-                    <?php echo $isUpgrade ? 'Updating your app…' : 'Installing your app…'; ?>
-                </div>
-            </div>
-            <div class="install-list" data-install-list></div>
-        </div>
-    </div>
-
-    <template id="install-row-template">
-        <div class="install-row" data-status="in-progress">
-            <div class="install-row-main">
-                <div class="install-row-label">
-                    <span class="install-icon" aria-hidden="true">
-                        <span class="install-icon-spinner">
-                            <?php include __DIR__ . '/../../icons/install-spinner.svg'; ?>
-                        </span>
-                        <span class="install-icon-check">
-                            <?php include __DIR__ . '/../../icons/install-check.svg'; ?>
-                        </span>
-                        <span class="install-icon-error">
-                            <?php include __DIR__ . '/../../icons/exclamation-circle.svg'; ?>
-                        </span>
-                    </span>
-                    <span class="install-text typography-text-m-400 text-neutral-primary" data-install-text></span>
-                </div>
-                <button type="button" class="install-row-toggle" aria-expanded="false" data-install-toggle>
-                    <?php include __DIR__ . '/../../icons/chevron-down.svg'; ?>
-                </button>
-            </div>
-            <div class="install-row-details">
-                <div class="install-row-details-inner">
-                    <pre class="install-error-code typography-text-xs-400" data-install-trace></pre>
-                    <div class="install-error-actions">
-                        <button type="button" class="button secondary" data-install-retry>
-                            <span class="button-text typography-text-m-500">Retry</span>
-                        </button>
-
-                        <button type="button" class="button primary is-hidden" data-install-console>
-                            <span class="button-text typography-text-m-500">Navigate to Console</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </template>
-</div>

app/worker.php

@@ -220,6 +220,58 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authoriza
     };
 }, ['pools', 'cache', 'authorization']);
 
+Server::setResource('getDatabasesDB', function (Cache $cache, Registry $register, Document $project, Authorization $authorization) {
+    return function (Document $database, ?Document $projectDocument = null) use ($cache, $register, $project, $authorization): Database {
+        $projectDocument ??= $project;
+        $databaseType = $database->getAttribute('database', '');
+
+        // Backwards‑compatibility: older or seeded legacy databases may not have a DSN stored
+        // in the "database" attribute. In that case, fall back to the project's database DSN.
+        if ($databaseType === '') {
+            $databaseType = $projectDocument->getAttribute('database', '');
+        }
+
+        try {
+            $databaseDSN = new DSN($databaseType);
+        } catch (\InvalidArgumentException) {
+            $databaseDSN = new DSN('mysql://'.$databaseType);
+        }
+
+        try {
+            $dsn = new DSN($projectDocument->getAttribute('database'));
+        } catch (\InvalidArgumentException) {
+            // Temporary fallback until all projects use shared tables
+            $dsn = new DSN('mysql://' . $projectDocument->getAttribute('database'));
+        }
+
+        $pools = $register->get('pools');
+        $pool = $pools->get($databaseDSN->getHost());
+
+        $adapter = new DatabasePool($pool);
+        $database = new Database($adapter, $cache);
+        $database
+            ->setDatabase(APP_DATABASE)
+            ->setAuthorization($authorization);
+
+        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+        if (\in_array($dsn->getHost(), $sharedTables, true)) {
+            $database
+                ->setSharedTables(true)
+                ->setTenant((int) $projectDocument->getSequence())
+                ->setNamespace($dsn->getParam('namespace'));
+        } else {
+            $database
+                ->setSharedTables(false)
+                ->setTenant(null)
+                ->setNamespace('_' . $projectDocument->getSequence());
+        }
+
+        $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+        return $database;
+    };
+}, ['cache', 'register', 'project', 'authorization']);
+
 Server::setResource('abuseRetention', function () {
     return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
 });

composer.json

@@ -14,10 +14,7 @@
         "lint": "vendor/bin/pint --test --config pint.json",
         "format": "vendor/bin/pint --config pint.json",
         "bench": "vendor/bin/phpbench run --report=benchmark",
-        "check": "./vendor/bin/phpstan analyse -c phpstan.neon",
-        "installer:clean": "php src/Appwrite/Platform/Installer/Server.php --clean",
-        "installer:dev": "docker compose build && composer installer:clean && php src/Appwrite/Platform/Installer/Server.php --docker",
-        "installer:dev-upgrade": "docker compose build && php src/Appwrite/Platform/Installer/Server.php --docker --upgrade"
+        "check": "./vendor/bin/phpstan analyse -c phpstan.neon"
     },
     "autoload": {
         "psr-4": {
@@ -51,7 +48,6 @@
         "appwrite/php-runtimes": "0.19.*",
         "appwrite/php-clamav": "2.0.*",
         "utopia-php/abuse": "1.2.*",
-        "utopia-php/agents": "1.2.*",
         "utopia-php/analytics": "0.15.*",
         "utopia-php/audit": "2.2.*",
         "utopia-php/auth": "0.5.*",
@@ -61,6 +57,7 @@
         "utopia-php/config": "1.*",
         "utopia-php/console": "0.1.*",
         "utopia-php/database": "5.*",
+        "utopia-php/agents": "1.*",
         "utopia-php/detector": "0.2.*",
         "utopia-php/domains": "1.*",
         "utopia-php/emails": "0.6.*",
@@ -72,7 +69,7 @@
         "utopia-php/locale": "0.8.*",
         "utopia-php/logger": "0.6.*",
         "utopia-php/messaging": "0.20.*",
-        "utopia-php/migration": "1.6.*",
+        "utopia-php/migration": "dev-remove-dsn-callables as 1.6.2",
         "utopia-php/platform": "0.7.*",
         "utopia-php/pools": "1.*",
         "utopia-php/span": "1.1.*",
@@ -82,14 +79,14 @@
         "utopia-php/storage": "1.0.*",
         "utopia-php/system": "0.10.*",
         "utopia-php/telemetry": "0.2.*",
-        "utopia-php/vcs": "2.*",
+        "utopia-php/vcs": "1.*",
         "utopia-php/websocket": "1.0.*",
         "matomo/device-detector": "6.4.*",
         "dragonmantank/cron-expression": "3.4.*",
         "phpmailer/phpmailer": "6.9.*",
         "chillerlan/php-qrcode": "4.3.*",
         "adhocore/jwt": "1.1.*",
-        "spomky-labs/otphp": "11.*",
+        "spomky-labs/otphp": "^11.4.2",
         "webonyx/graphql-php": "14.11.*",
         "league/csv": "9.14.*",
         "enshrined/svg-sanitize": "0.22.*"
@@ -97,8 +94,7 @@
     "require-dev": {
         "ext-fileinfo": "*",
         "appwrite/sdk-generator": "*",
-        "brianium/paratest": "7.*",
-        "phpunit/phpunit": "12.*",
+        "phpunit/phpunit": "9.*",
         "swoole/ide-helper": "6.*",
         "phpstan/phpstan": "1.12.*",
         "textalk/websocket": "1.5.*",
@@ -110,7 +106,6 @@
     },
     "config": {
         "platform": {
-            "php": "8.3"
         },
         "allow-plugins": {
             "php-http/discovery": true,

docker-compose.yml

@@ -64,7 +64,6 @@ services:
     networks:
       - appwrite
     dns:
-      - 127.0.0.11
       - 172.16.238.100
     labels:
       - "traefik.enable=true"
@@ -99,11 +98,12 @@ services:
       - ./public:/usr/src/code/public
       - ./src:/usr/src/code/src
       - ./dev:/usr/src/code/dev
-
+      # - ./vendor/utopia-php/framework:/usr/src/code/vendor/utopia-php/framework
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
       - redis
       - coredns
+      - ollama
       # - clamav
     entrypoint:
       - php
@@ -122,7 +122,6 @@ services:
       - _APP_CONSOLE_SESSION_ALERTS
       - _APP_CONSOLE_WHITELIST_IPS
       - _APP_CONSOLE_HOSTNAMES
-      - _APP_CONSOLE_SCHEMA
       - _APP_SYSTEM_EMAIL_NAME
       - _APP_SYSTEM_EMAIL_ADDRESS
       - _APP_SYSTEM_TEAM_EMAIL
@@ -152,7 +151,12 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER
+      - _APP_DB_ADAPTER_VECTORDB
+      - _APP_DB_HOST_VECTORDB
+      - _APP_DB_PORT_VECTORDB
+      - _APP_DB_SCHEMA_VECTORDB
+      - _APP_DB_USER_VECTORDB
+      - _APP_DB_PASS_VECTORDB
       - _APP_SMTP_HOST
       - _APP_SMTP_PORT
       - _APP_SMTP_SECURE
@@ -287,8 +291,9 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
       - redis
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -305,7 +310,12 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER
+      - _APP_DB_ADAPTER_VECTORDB
+      - _APP_DB_HOST_VECTORDB
+      - _APP_DB_PORT_VECTORDB
+      - _APP_DB_SCHEMA_VECTORDB
+      - _APP_DB_USER_VECTORDB
+      - _APP_DB_PASS_VECTORDB
       - _APP_USAGE_STATS
       - _APP_LOGGING_CONFIG
       - _APP_LOGGING_CONFIG_REALTIME
@@ -324,7 +334,8 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -356,9 +367,10 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
       - request-catcher-sms
       - request-catcher-webhook
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -389,7 +401,8 @@ services:
       - appwrite
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     volumes:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -399,6 +412,7 @@ services:
       - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
+      
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -456,9 +470,11 @@ services:
     volumes:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
+      
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -474,7 +490,12 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER
+      - _APP_DB_ADAPTER_VECTORDB
+      - _APP_DB_HOST_VECTORDB
+      - _APP_DB_PORT_VECTORDB
+      - _APP_DB_SCHEMA_VECTORDB
+      - _APP_DB_USER_VECTORDB
+      - _APP_DB_PASS_VECTORDB
       - _APP_LOGGING_CONFIG
       - _APP_WORKERS_NUM
       - _APP_QUEUE_NAME
@@ -495,7 +516,8 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -569,7 +591,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - mariadb
     environment:
       # Specific
       - _APP_BROWSER_HOST
@@ -586,7 +608,6 @@ services:
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
       - _APP_REDIS_PASS
-      - _APP_DB_ADAPTER
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -628,7 +649,8 @@ services:
       - appwrite
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     volumes:
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
@@ -673,8 +695,10 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - redis
-      - ${_APP_DB_HOST:-mongodb}
+      redis:
+        condition: service_started
+      mariadb:
+        condition: service_started
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -683,7 +707,6 @@ services:
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
       - _APP_REDIS_PASS
-      - _APP_DB_ADAPTER
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -703,8 +726,10 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
       - redis
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
+      - openruntimes-executor
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -851,8 +876,10 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
       - ./tests:/usr/src/code/tests
+      
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -894,7 +921,7 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
+      - mariadb
       - redis
     environment:
       - _APP_ENV
@@ -941,7 +968,7 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
+      - mariadb
       - redis
     environment:
       - _APP_ENV
@@ -960,7 +987,6 @@ services:
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
       - _APP_REDIS_PASS
-      - _APP_DB_ADAPTER
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -982,7 +1008,8 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1016,7 +1043,8 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1050,7 +1078,8 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1083,8 +1112,9 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
       - redis
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1114,8 +1144,9 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
       - redis
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1144,8 +1175,9 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - ${_APP_DB_HOST:-mongodb}
+      - ${_APP_DB_HOST:-mariadb}
       - redis
+      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1238,7 +1270,6 @@ services:
       start_period: 5s
 
   mariadb:
-    profiles: ["mariadb"]
     image: mariadb:10.11 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     <<: *x-logging
@@ -1257,8 +1288,7 @@ services:
     command: "mysqld --innodb-flush-method=fsync"
 
   mongodb:
-    profiles: ["mongodb"]
-    image: mongo:8.2.5
+    image: mongo:8.0.10
     container_name: appwrite-mongodb
     <<: *x-logging
     networks:
@@ -1294,7 +1324,6 @@ services:
       start_period: 30s
 
   appwrite-mongo-express:
-    profiles: ["mongodb"]
     image: mongo-express
     container_name: appwrite-mongo-express
     networks:
@@ -1305,21 +1334,17 @@ services:
       ME_CONFIG_MONGODB_URL: "mongodb://root:${_APP_DB_ROOT_PASS}@appwrite-mongodb:27017/?replicaSet=rs0&directConnection=true"
       ME_CONFIG_BASICAUTH_USERNAME: ${_APP_DB_USER}
       ME_CONFIG_BASICAUTH_PASSWORD: ${_APP_DB_PASS}
-    depends_on:
-      - mongodb
+    depends_on: []
 
   postgresql:
-    profiles: ["postgresql"]
     build:
-      context: ./tests/resources/postgresql
-      args:
-        POSTGRES_VERSION: 17
+      context: https://github.com/appwrite/docker-postgres.git#feat-dockerfile
     container_name: appwrite-postgresql
     <<: *x-logging
     networks:
       - appwrite
     volumes:
-      - appwrite-postgresql:/var/lib/postgresql:rw
+      - appwrite-postgresql:/var/lib/postgresql/data:rw
     ports:
       - "5432:5432"
     environment:
@@ -1328,8 +1353,25 @@ services:
       - POSTGRES_PASSWORD=${_APP_DB_PASS}
     command: "postgres"
 
+  ollama:
+    build: 
+      context: https://github.com/appwrite/docker-ollama.git#feat-dockerfile
+      args:
+        MODELS: ${_APP_EMBEDDING_MODELS:-embeddinggemma}
+        # duration to keep model in memory
+        OLLAMA_KEEP_ALIVE: 24h
+    container_name: ollama
+    ports:
+      - "11434:11434"
+    restart: unless-stopped
+    # persistent for caching models across restarts and preloading
+    volumes:
+      - appwrite-models:/root/.ollama
+    networks:
+      - appwrite
+
   redis:
-    image: redis:7.4.7-alpine
+    image: redis:7.2.4-alpine
     <<: *x-logging
     container_name: appwrite-redis
     command: >
@@ -1397,7 +1439,7 @@ services:
       - MAILDEV_INCOMING_PASS=${_APP_SMTP_PASSWORD}
 
   request-catcher-webhook: # used mainly for dev tests (mock HTTP webhook)
-    image: appwrite/requestcatcher:1.1.0
+    image: appwrite/requestcatcher:1.0.0
     container_name: appwrite-requestcatcher-webhook
     <<: *x-logging
     ports:
@@ -1406,7 +1448,7 @@ services:
       - appwrite
 
   request-catcher-sms: # used mainly for dev tests (mock SMS auth secret)
-    image: appwrite/requestcatcher:1.1.0
+    image: appwrite/requestcatcher:1.0.0
     container_name: appwrite-requestcatcher-sms
     <<: *x-logging
     ports:
@@ -1567,3 +1609,4 @@ volumes:
   appwrite-sites:
   appwrite-builds:
   appwrite-config:
+  appwrite-models:

docs/WEB_INSTALLER.md

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

docs/examples/0.10.x/client-android/java/account/create-anonymous-session.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createAnonymousSession(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-j-w-t.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createJWT(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-magic-u-r-l-session.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createMagicURLSession(
+            "email@example.com", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-o-auth2session.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createOAuth2Session(
+            this,
+            "amazon", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-recovery.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createRecovery(
+            "email@example.com", 
+            "https://example.com"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-session.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createSession(
+            "email@example.com", 
+            "password"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-verification.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createVerification(
+            "https://example.com"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.create(
+            "email@example.com", 
+            "password", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/delete-session.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.deleteSession(
+            "[SESSION_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/delete-sessions.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.deleteSessions(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/delete.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.delete(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/get-logs.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.getLogs(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/get-prefs.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.getPrefs(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/get-session.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.getSession(
+            "[SESSION_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/get-sessions.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.getSessions(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/get.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.get(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-email.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateEmail(
+            "email@example.com", 
+            "password"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-magic-u-r-l-session.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateMagicURLSession(
+            "[USER_ID]", 
+            "[SECRET]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-name.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateName(
+            "[NAME]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-password.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updatePassword(
+            "password", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-prefs.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updatePrefs(
+            mapOf( "a" to "b" )
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-recovery.md

@@ -0,0 +1,51 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateRecovery(
+            "[USER_ID]", 
+            "[SECRET]", 
+            "password", 
+            "password"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-verification.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateVerification(
+            "[USER_ID]", 
+            "[SECRET]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-browser.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getBrowser(
+            "aa", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-credit-card.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getCreditCard(
+            "amex", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-favicon.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getFavicon(
+            "https://example.com"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}