updated

Refactor path parameter detection in OpenAPI3 and Swagger2 by utilizing array flipping for improved performance and clarity in matching aliases.
Refactor URL parameter replacement logic in OpenAPI3 and Swagger2 to ensure accurate matching of path parameters by checking for trailing characters.
2026-05-26 13:51:13 +00:00 · 2026-05-08 15:21:52 +05:30 · 2026-05-08 14:39:26 +05:30 · 2026-05-08 14:19:51 +05:30 · 2026-05-08 14:08:27 +05:30 · 2026-05-08 14:01:04 +05:30
235 changed files with 10410 additions and 3430 deletions
@@ -0,0 +1,174 @@
+# Parallel Chunk Upload Support for utopia-php/storage
+
+## Context
+
+The Appwrite API now supports out-of-order chunked uploads (chunks can arrive in any sequence). The next step is **parallel uploads** — multiple chunks uploaded simultaneously via separate HTTP requests. The SDK guarantees the first chunk is sent before any parallel chunks, so the document creation race is handled at the API layer. However, the storage device layer has a race condition that must be fixed.
+
+## Problem: `Local::joinChunks()` Race
+
+When two requests upload the final missing chunks in parallel, both can observe `countChunks() == $chunks` and call `joinChunks()` simultaneously.
+
+### Current behavior (loser throws)
+
+```php
+// Local::joinChunks()
+$dest = \fopen($tmpAssemble, 'wb');
+// ... stream all parts into $tmpAssemble ...
+
+if (! \rename($tmpAssemble, $path)) {
+    \unlink($tmpAssemble);
+    throw new Exception('Failed to finalize assembled file '.$path);
+}
+```
+
+The winner succeeds with `rename()`. The loser gets `false` from `rename()` (file already exists at `$path`) and throws a 500-error exception. The client that lost the race receives an error even though the file is fully assembled.
+
+### Required behavior
+
+If `$path` already exists, another request already assembled the file. The loser should **silently succeed** — the file is complete, nothing more to do.
+
+## Proposed Changes
+
+### 1. `Local::joinChunks()` — Handle assembly race
+
+Before opening `$tmpAssemble`, check if the final file already exists. If it does, skip assembly entirely.
+
+```php
+private function joinChunks(string $path, int $chunks): void
+{
+    // Race winner already assembled the file
+    if (\file_exists($path)) {
+        return;
+    }
+
+    $tmp = \dirname($path).DIRECTORY_SEPARATOR.'tmp_'.asename($path);
+    $tmpAssemble = \dirname($path).DIRECTORY_SEPARATOR.'tmp_assemble_'.asename($path);
+
+    // ... rest of assembly logic ...
+
+    if (! \rename($tmpAssemble, $path)) {
+        // Another request may have won the race between fclose and rename
+        if (\file_exists($path)) {
+            \unlink($tmpAssemble);
+            return;
+        }
+        \unlink($tmpAssemble);
+        throw new Exception('Failed to finalize assembled file '.$path);
+    }
+
+    // ... cleanup ...
+}
+```
+
+### 2. `Local::countChunks()` — Reliability under concurrent writes
+
+`countChunks()` uses `glob()` on the temp directory. Under heavy parallel load, `glob()` might miss files or return inconsistent counts. The current implementation is already fairly robust (it validates `.part.\d+` suffix), but we should document that the return value is a best-effort snapshot.
+
+No code change needed here unless tests reveal issues.
+
+### 3. Tests — Concurrent chunk uploads
+
+Add a test that simulates two parallel requests completing a multi-chunk upload:
+
+```php
+public function testParallelChunkUpload(): void
+{
+    $storage = $this->makeJoinTestStorage();
+    $dest = $storage->getRoot().DIRECTORY_SEPARATOR.'parallel.dat';
+
+    // Upload chunk 1 (creates temp directory)
+    $storage->uploadData('AAAA', $dest, 'application/octet-stream', 1, 2);
+
+    // Simulate two parallel requests uploading the last chunk
+    // In a real test, use pcntl_fork() or pthreads for true concurrency
+    // For the test suite, sequential calls are sufficient if we verify
+    // the second call doesn't throw after the first completed assembly
+    $storage->uploadData('BBBB', $dest, 'application/octet-stream', 2, 2);
+
+    // Verify file exists and is correct
+    $this->assertTrue(\file_exists($dest));
+    $this->assertSame('AAAABBBB', \file_get_contents($dest));
+
+    // Verify second assembly attempt doesn't throw
+    // (This simulates the race where another request already assembled)
+    try {
+        $storage->uploadData('BBBB', $dest, 'application/octet-stream', 2, 2);
+    } catch (\Exception $e) {
+        $this->fail('Duplicate assembly should not throw: '.$e->getMessage());
+    }
+
+    $storage->delete($storage->getRoot(), true);
+}
+```
+
+A more realistic concurrent test using `pcntl_fork()`:
+
+```php
+public function testParallelChunkUploadWithFork(): void
+{
+    if (!\function_exists('pcntl_fork')) {
+        $this->markTestSkipped('pcntl extension required for fork-based concurrency test');
+    }
+
+    $storage = $this->makeJoinTestStorage();
+    $dest = $storage->getRoot().DIRECTORY_SEPARATOR.'parallel-fork.dat';
+
+    // Pre-upload chunk 1
+    $storage->uploadData('AAAA', $dest, 'application/octet-stream', 1, 2);
+
+    $pid = pcntl_fork();
+    if ($pid === -1) {
+        $this->fail('Failed to fork');
+    } elseif ($pid === 0) {
+        // Child process: upload chunk 2
+        try {
+            $storage->uploadData('BBBB', $dest, 'application/octet-stream', 2, 2);
+            exit(0);
+        } catch (\Exception $e) {
+            exit(1);
+        }
+    }
+
+    // Parent process: also upload chunk 2 (race condition)
+    $parentSuccess = true;
+    try {
+        $storage->uploadData('BBBB', $dest, 'application/octet-stream', 2, 2);
+    } catch (\Exception $e) {
+        $parentSuccess = false;
+    }
+
+    pcntl_waitpid($pid, $status);
+    $childSuccess = pcntl_wexitstatus($status) === 0;
+
+    // At least one should succeed
+    $this->assertTrue($parentSuccess || $childSuccess, 'At least one parallel upload should succeed');
+
+    // File should be correctly assembled
+    $this->assertTrue(\file_exists($dest));
+    $this->assertSame('AAAABBBB', \file_get_contents($dest));
+
+    $storage->delete($storage->getRoot(), true);
+}
+```
+
+## S3 Device
+
+S3 already handles out-of-order multipart uploads natively. The `completeMultipartUpload` call with `ksort()` sorts parts by number regardless of upload order. However, parallel `completeMultipartUpload` calls for the same `uploadId` would still be problematic.
+
+This is an **API-layer concern** — the Appwrite API should ensure only one request calls `completeMultipartUpload` per upload. The S3 device itself does not need changes.
+
+## Files to Change
+
+| File | Change |
+|------|--------|
+| `src/Storage/Device/Local.php` | Add `file_exists($path)` guard at start of `joinChunks()` and in `rename()` failure handler |
+| `tests/Storage/Device/LocalTest.php` | Add `testParallelChunkUpload` and `testParallelChunkUploadWithFork` |
+
+## Backwards Compatibility
+
+Fully backwards compatible. The change only affects the error path when `rename()` fails due to an existing file. Previously it threw; now it returns silently. No public API signatures change.
+
+## Related PRs
+
+- Appwrite server PR: https://github.com/appwrite/appwrite/pull/12138 (out-of-order upload support)
+- This storage PR is a prerequisite for the follow-up Appwrite PR that enables parallel chunk uploads at the API level.
@@ -47,6 +47,8 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
+_APP_DATABASE_SHARED_TABLES=
+_APP_DATABASE_SHARED_NAMESPACE=
 _APP_DB_ADAPTER_DOCUMENTSDB=mongodb
 _APP_DB_HOST_DOCUMENTSDB=mongodb
 _APP_DB_PORT_DOCUMENTSDB=27017
@@ -7,6 +7,7 @@ concurrency:
 env:
  COMPOSE_FILE: docker-compose.yml
  IMAGE: appwrite-dev
+  REGISTRY_IMAGE: ghcr.io/${{ github.repository }}/appwrite-dev
  K6_VERSION: '0.53.0'

 on:
@@ -19,6 +20,10 @@ on:
        type: string
        default: ''

+permissions:
+  contents: read
+  packages: write
+
 jobs:
  dependencies:
    name: Checks / Dependencies
@@ -258,32 +263,30 @@ jobs:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

+      - name: Login to GHCR
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v4

-      - name: Build Appwrite
+      - name: Build and push Appwrite
        uses: docker/build-push-action@v6
        with:
          context: .
-          push: false
-          tags: ${{ env.IMAGE }}
-          load: true
+          push: true
+          tags: ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
          cache-from: type=gha
          cache-to: type=gha,mode=max
-          outputs: type=docker,dest=/tmp/${{ env.IMAGE }}.tar
          target: development
          build-args: |
            DEBUG=false
            TESTING=true
            VERSION=dev

-      - name: Upload Docker Image
-        uses: actions/upload-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp/${{ env.IMAGE }}.tar
-          retention-days: 1
-
  unit:
    name: Tests / Unit
    runs-on: ubuntu-latest
@@ -291,26 +294,32 @@ jobs:
    permissions:
      contents: read
      pull-requests: write
+      packages: read
    steps:
      - name: checkout
        uses: actions/checkout@v6

-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
      - name: Login to Docker Hub
        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

+      - name: Login to GHCR
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull Docker Image
+        run: |
+          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
+
      - name: Load and Start Appwrite
        timeout-minutes: 5
        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose pull --quiet --ignore-buildable
          docker compose up -d --quiet-pull --wait

@@ -338,26 +347,32 @@ jobs:
    permissions:
      contents: read
      pull-requests: write
+      packages: read
    steps:
      - name: checkout
        uses: actions/checkout@v6

-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
      - name: Login to Docker Hub
        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

+      - name: Login to GHCR
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull Docker Image
+        run: |
+          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
+
      - name: Load and Start Appwrite
        timeout-minutes: 5
        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose pull --quiet --ignore-buildable
          docker compose up -d --quiet-pull --wait

@@ -396,6 +411,7 @@ jobs:
    permissions:
      contents: read
      pull-requests: write
+      packages: read
    strategy:
      fail-fast: false
      matrix:
@@ -450,16 +466,10 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v6

-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
      - name: Set environment
        run: |
          echo "_APP_OPTIONS_ROUTER_PROTECTION=enabled" >> $GITHUB_ENV
-          
+
          if [ "${{ matrix.database }}" = "MariaDB" ]; then
            echo "COMPOSE_PROFILES=mariadb" >> $GITHUB_ENV
            echo "_APP_DB_ADAPTER=mariadb" >> $GITHUB_ENV
@@ -483,6 +493,18 @@ jobs:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

+      - name: Login to GHCR
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull Docker Image
+        run: |
+          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
+
      - name: Load and Start Appwrite
        timeout-minutes: 5
        env:
@@ -491,7 +513,6 @@ jobs:
          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose pull --quiet --ignore-buildable
          docker compose up -d --quiet-pull --wait

@@ -545,6 +566,7 @@ jobs:
    permissions:
      contents: read
      pull-requests: write
+      packages: read
    strategy:
      fail-fast: false
      matrix:
@@ -555,18 +577,24 @@ jobs:
        with:
          fetch-depth: 1

-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
      - name: Login to Docker Hub
        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

+      - name: Login to GHCR
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull Docker Image
+        run: |
+          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
+
      - name: Load and Start Appwrite
        timeout-minutes: 5
        env:
@@ -575,7 +603,6 @@ jobs:
          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose pull --quiet --ignore-buildable
          docker compose up -d --quiet-pull --wait

@@ -606,6 +633,7 @@ jobs:
    permissions:
      contents: read
      pull-requests: write
+      packages: read
    strategy:
      fail-fast: false
      matrix:
@@ -614,18 +642,24 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v6

-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
      - name: Login to Docker Hub
        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

+      - name: Login to GHCR
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull Docker Image
+        run: |
+          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
+
      - name: Load and Start Appwrite
        timeout-minutes: 5
        env:
@@ -633,7 +667,6 @@ jobs:
          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose pull --quiet --ignore-buildable
          docker compose up -d --quiet-pull --wait

@@ -675,28 +708,31 @@ jobs:
      contents: read
      issues: write
      pull-requests: write
+      packages: read
    steps:
      - name: Checkout repository
        uses: actions/checkout@v6
        with:
          fetch-depth: 1

-      - name: Download Docker Image
-        uses: actions/download-artifact@v7
-        with:
-          name: ${{ env.IMAGE }}
-          path: /tmp
-
      - name: Login to Docker Hub
        uses: docker/login-action@v4
        with:
          username: ${{ vars.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

-      - name: Load Appwrite image
+      - name: Login to GHCR
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pull Appwrite image
        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker tag ${{ env.IMAGE }} ${{ env.IMAGE }}:after
+          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
+          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}:after

      - name: Setup k6
        uses: grafana/setup-k6-action@ffe7d7290dfa715e48c2ccc924d068444c94bde2
@@ -5,6 +5,11 @@ on:
    types:
      - closed

+permissions:
+  actions: write
+  contents: read
+  packages: write
+
 jobs:
  cleanup:
    runs-on: ubuntu-latest
@@ -36,4 +41,29 @@ jobs:
            done
          done
        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Cleanup GHCR image
+        continue-on-error: true
+        run: |
+          package_path="${GITHUB_REPOSITORY#*/}/appwrite-dev"
+          encoded_path="$(printf '%s' "$package_path" | jq -Rr @uri)"
+
+          gh api --paginate "/repos/${GITHUB_REPOSITORY}/pulls/${{ github.event.pull_request.number }}/commits" --jq '.[].sha' | while read -r sha; do
+            version_ids=$(gh api --paginate -H "Accept: application/vnd.github+json" \
+              "/orgs/${GITHUB_REPOSITORY_OWNER}/packages/container/${encoded_path}/versions" \
+              --jq ".[] | select(.metadata.container.tags | index(\"${sha}\")) | .id")
+
+            if [ -z "$version_ids" ]; then
+              echo "No GHCR version found for SHA ${sha}"
+              continue
+            fi
+
+            echo "$version_ids" | while read -r version_id; do
+              gh api --method DELETE -H "Accept: application/vnd.github+json" \
+                "/orgs/${GITHUB_REPOSITORY_OWNER}/packages/container/${encoded_path}/versions/${version_id}"
+              echo "Deleted ${package_path}:${sha} (version ${version_id})"
+            done
+          done
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -24,9 +24,11 @@ jobs:
          ignore-unfixed: 'false'
          severity: 'CRITICAL,HIGH'
      - name: Upload Docker Image Scan Results
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v4
+        if: always() && hashFiles('trivy-image-results.sarif') != ''
        with:
          sarif_file: 'trivy-image-results.sarif'
+          category: 'trivy-image'

  scan-code:
    name: Scan Code
@@ -42,6 +44,8 @@ jobs:
          output: 'trivy-fs-results.sarif'
          severity: 'CRITICAL,HIGH'
      - name: Upload Code Scan Results
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v4
+        if: always() && hashFiles('trivy-fs-results.sarif') != ''
        with:
          sarif_file: 'trivy-fs-results.sarif'
+          category: 'trivy-source'
@@ -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.4.1 AS base

 LABEL maintainer="team@appwrite.io"

@@ -24,6 +24,10 @@ ENV _APP_VERSION=$VERSION \
    _APP_HOME=https://appwrite.io

 RUN \
+    if [ "$DEBUG" != "true" ]; then \
+    rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
+    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-*/xdebug.so; \
+    fi && \
    if [ "$DEBUG" == "true" ]; then \
    apk add boost boost-dev; \
    fi
@@ -100,7 +104,8 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
 FROM base AS production

 RUN rm -rf /usr/src/code/app/config/specs && \
-    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20240924/xdebug.so && \
+    rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini && \
+    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-*/xdebug.so && \
    find /usr -name '*.a' -delete 2>/dev/null || true && \
    find /usr -type d -name '__pycache__' -exec rm -rf {} + 2>/dev/null || true && \
    find /usr -name '*.pyc' -delete 2>/dev/null || true
@@ -157,12 +157,19 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
        }

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

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

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

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

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

@@ -1523,6 +1523,13 @@ return [
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
+            [
+                '$id' => ID::custom('_key_team_confirm'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['teamInternalId', 'confirm'],
+                'lengths' => [],
+                'orders' => [],
+            ],
        ],
    ],

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

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

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

@@ -384,7 +384,7 @@ return [
    ],
    Exception::API_KEY_EXPIRED => [
        'name' => Exception::API_KEY_EXPIRED,
-        'description' => 'The dynamic API key has expired. Please don\'t use dynamic API keys for more than duration of the execution.',
+        'description' => 'The ephemeral API key has expired. Please don\'t use ephemeral API keys for more than duration of the execution.',
        'code' => 401,
    ],

@@ -623,6 +623,11 @@ return [
        'description' => 'Synchronous function execution timed out. Use asynchronous execution instead, or ensure the execution duration doesn\'t exceed 30 seconds.',
        'code' => 408,
    ],
+    Exception::FUNCTION_ASYNCHRONOUS_TIMEOUT => [
+        'name' => Exception::FUNCTION_ASYNCHRONOUS_TIMEOUT,
+        'description' => 'Asynchronous function execution timed out. Ensure the execution duration doesn\'t exceed the configured function timeout.',
+        'code' => 408,
+    ],
    Exception::FUNCTION_TEMPLATE_NOT_FOUND => [
        'name' => Exception::FUNCTION_TEMPLATE_NOT_FOUND,
        'description' => 'Function Template with the requested ID could not be found.',
@@ -687,6 +692,11 @@ return [
        'description' => 'Build with the requested ID failed. Please check the logs for more information.',
        'code' => 400,
    ],
+    Exception::BUILD_TIMEOUT => [
+        'name' => Exception::BUILD_TIMEOUT,
+        'description' => 'Build timed out. Increase the build timeout via the `_APP_COMPUTE_BUILD_TIMEOUT` environment variable, or simplify the build to complete within the limit.',
+        'code' => 408,
+    ],

    /** Deployments */
    Exception::DEPLOYMENT_NOT_FOUND => [
@@ -28,6 +28,16 @@
    "emails.invitation.thanks": "Gracias.,",
    "emails.invitation.buttonText": "Aceptar invitación a {{team}}",
    "emails.invitation.signature": "El equipo de {{project}}",
+    "emails.sessionAlert.subject": "Alerta de seguridad: nueva sesión en tu cuenta de {{project}}",
+    "emails.sessionAlert.preview": "Nuevo inicio de sesión detectado en {{project}} a las {{time}} UTC.",
+    "emails.sessionAlert.hello": "Hola {{user}},",
+    "emails.sessionAlert.body": "Se ha creado una nueva sesión en tu cuenta de {{b}}{{project}}{{/b}}, {{b}}el {{date}} de {{year}} a las {{time}} UTC{{/b}}.\nEstos son los detalles de la nueva sesión:",
+    "emails.sessionAlert.listDevice": "Dispositivo: {{b}}{{device}}{{/b}}",
+    "emails.sessionAlert.listIpAddress": "Dirección IP: {{b}}{{ipAddress}}{{/b}}",
+    "emails.sessionAlert.listCountry": "País: {{b}}{{country}}{{/b}}",
+    "emails.sessionAlert.footer": "Si has sido tú, no tienes que hacer nada más.\nSi no has iniciado esta sesión o sospechas actividad no autorizada, protege tu cuenta.",
+    "emails.sessionAlert.thanks": "Gracias,",
+    "emails.sessionAlert.signature": "El equipo de {{project}}",
    "locale.country.unknown": "Desconocido",
    "countries.af": "Afganistán",
    "countries.ao": "Angola",
@@ -21,8 +21,8 @@ $member = [
    'projects.read',
    'locale.read',
    'avatars.read',
-    'execution.read',
-    'execution.write',
+    'executions.read',
+    'executions.write',
    'targets.read',
    'targets.write',
    'subscribers.write',
@@ -59,8 +59,8 @@ $admins = [
    'oauth2.write',
    'mocks.read',
    'mocks.write',
-    'policies.read',
-    'policies.write',
+    'project.policies.read',
+    'project.policies.write',
    'templates.read',
    'templates.write',
    'projects.write',
@@ -81,8 +81,8 @@ $admins = [
    'sites.write',
    'log.read',
    'log.write',
-    'execution.read',
-    'execution.write',
+    'executions.read',
+    'executions.write',
    'rules.read',
    'rules.write',
    'migrations.read',
@@ -123,7 +123,7 @@ return [
            'files.write',
            'locale.read',
            'avatars.read',
-            'execution.write',
+            'executions.write',
        ],
    ],
    User::ROLE_USERS => [
@@ -1,239 +1,364 @@
 <?php

-return [ // List of publicly visible scopes
-    'sessions.write' => [
-        'description' => 'Access to create, update, and delete user sessions',
-    ],
-    'users.read' => [
-        'description' => 'Access to read your project\'s users',
-    ],
-    'users.write' => [
-        'description' => 'Access to create, update, and delete your project\'s users',
-    ],
-    'teams.read' => [
-        'description' => 'Access to read your project\'s teams',
-    ],
-    'teams.write' => [
-        'description' => 'Access to create, update, and delete your project\'s teams',
-    ],
-    'databases.read' => [
-        'description' => 'Access to read your project\'s databases',
-    ],
-    'databases.write' => [
-        'description' => 'Access to create, update, and delete your project\'s databases',
-    ],
-    'collections.read' => [
-        'description' => 'Access to read your project\'s database collections',
-    ],
-    'collections.write' => [
-        'description' => 'Access to create, update, and delete your project\'s database collections',
-    ],
-    'tables.read' => [
-        'description' => 'Access to read your project\'s database tables',
-    ],
-    'tables.write' => [
-        'description' => 'Access to create, update, and delete your project\'s database tables',
-    ],
-    'attributes.read' => [
-        'description' => 'Access to read your project\'s database collection\'s attributes',
-    ],
-    'attributes.write' => [
-        'description' => 'Access to create, update, and delete your project\'s database collection\'s attributes',
-    ],
-    'columns.read' => [
-        'description' => 'Access to read your project\'s database table\'s columns',
-    ],
-    'columns.write' => [
-        'description' => 'Access to create, update, and delete your project\'s database table\'s columns',
-    ],
-    'indexes.read' => [
-        'description' => 'Access to read your project\'s database table\'s indexes',
-    ],
-    'indexes.write' => [
-        'description' => 'Access to create, update, and delete your project\'s database table\'s indexes',
-    ],
-    'documents.read'  => [
-        'description' => 'Access to read your project\'s database documents',
-    ],
-    'documents.write' => [
-        'description' => 'Access to create, update, and delete your project\'s database documents',
-    ],
-    'rows.read'  => [
-        'description' => 'Access to read your project\'s database rows',
-    ],
-    'rows.write' => [
-        'description' => 'Access to create, update, and delete your project\'s database rows',
-    ],
-    'files.read' => [
-        'description' => 'Access to read your project\'s storage files and preview images',
-    ],
-    'files.write' => [
-        'description' => 'Access to create, update, and delete your project\'s storage files',
-    ],
-    'buckets.read' => [
-        'description' => 'Access to read your project\'s storage buckets',
-    ],
-    'buckets.write' => [
-        'description' => 'Access to create, update, and delete your project\'s storage buckets',
-    ],
-    'functions.read' => [
-        'description' => 'Access to read your project\'s functions and code deployments',
-    ],
-    'functions.write' => [
-        'description' => 'Access to create, update, and delete your project\'s functions and code deployments',
-    ],
-    'sites.read' => [
-        'description' => 'Access to read your project\'s sites and deployments',
-    ],
-    'sites.write' => [
-        'description' => 'Access to create, update, and delete your project\'s sites and deployments',
-    ],
-    'log.read' => [
-        'description' => 'Access to read your site\'s logs',
-    ],
-    'log.write' => [
-        'description' => 'Access to update, and delete your site\'s logs',
-    ],
-    'execution.read' => [
-        'description' => 'Access to read your project\'s execution logs',
-    ],
-    'execution.write' => [
-        'description' => 'Access to execute your project\'s functions',
-    ],
-    'locale.read' => [
-        'description' => 'Access to access your project\'s Locale service',
-    ],
-    'avatars.read' => [
-        'description' => 'Access to access your project\'s Avatars service',
-    ],
-    'health.read' => [
-        'description' => 'Access to read your project\'s health status',
-    ],
-    'providers.read' => [
-        'description' => 'Access to read your project\'s providers',
-    ],
-    'providers.write' => [
-        'description' => 'Access to create, update, and delete your project\'s providers',
-    ],
-    'messages.read' => [
-        'description' => 'Access to read your project\'s messages',
-    ],
-    'messages.write' => [
-        'description' => 'Access to create, update, and delete your project\'s messages',
-    ],
-    'topics.read' => [
-        'description' => 'Access to read your project\'s topics',
-    ],
-    'topics.write' => [
-        'description' => 'Access to create, update, and delete your project\'s topics',
-    ],
-    'subscribers.read' => [
-        'description' => 'Access to read your project\'s subscribers',
-    ],
-    'subscribers.write' => [
-        'description' => 'Access to create, update, and delete your project\'s subscribers',
-    ],
-    'targets.read' => [
-        'description' => 'Access to read your project\'s targets',
-    ],
-    'targets.write' => [
-        'description' => 'Access to create, update, and delete your project\'s targets',
-    ],
-    'rules.read' => [
-        'description' => 'Access to read your project\'s proxy rules',
-    ],
-    'rules.write' => [
-        'description' => 'Access to create, update, and delete your project\'s proxy rules',
-    ],
-    'schedules.read' => [
-        'description' => 'Access to read your project\'s schedules',
-    ],
-    'schedules.write' => [
-        'description' => 'Access to create, update, and delete your project\'s schedules',
-    ],
-    'migrations.read' => [
-        'description' => 'Access to read your project\'s migrations',
-    ],
-    'migrations.write' => [
-        'description' => 'Access to create, update, and delete your project\'s migrations.',
-    ],
-    'vcs.read' => [
-        'description' => 'Access to read your project\'s VCS repositories',
-    ],
-    'vcs.write' => [
-        'description' => 'Access to create, update, and delete your project\'s VCS repositories',
-    ],
-    'assistant.read' => [
-        'description' => 'Access to read the Assistant service',
-    ],
-    'tokens.read' => [
-        'description' => 'Access to read your project\'s tokens',
-    ],
-    'tokens.write' => [
-        'description' => 'Access to create, update, and delete your project\'s tokens',
-    ],
-    "webhooks.read" => [
-        "description" =>
-            "Access to read project\'s webhooks",
-    ],
-    "webhooks.write" => [
-        "description" =>
-            "Access to create, update, and delete project\'s webhooks",
-    ],
+// List of publicly visible scopes
+return [
+    // Project
    "project.read" => [
        "description" =>
            "Access to read project\'s information",
+        "category" => "Project",
    ],
    "project.write" => [
        "description" =>
            "Access to update project\'s information",
+        "category" => "Project",
    ],
    "keys.read" => [
        "description" =>
            "Access to read project\'s keys",
+        "category" => "Project",
    ],
    "keys.write" => [
        "description" =>
            "Access to create, update, and delete project\'s keys",
+        "category" => "Project",
    ],
    "platforms.read" => [
        "description" =>
            "Access to read project\'s platforms",
+        "category" => "Project",
    ],
    "platforms.write" => [
        "description" =>
            "Access to create, update, and delete project\'s platforms",
+        "category" => "Project",
    ],
    "mocks.read" => [
        "description" =>
            "Access to read project\'s mocks",
+        "category" => "Project",
    ],
    "mocks.write" => [
        "description" =>
            "Access to create, update, and delete project\'s mocks",
+        "category" => "Project",
    ],
    "policies.read" => [
        "description" =>
-            "Access to read project\'s policies",
+            "Access to read project\'s policies. Replaced by \'project.policies.read\' for more granular control",
+        "category" => "Project",
+        'deprecated' => true,
    ],
    "policies.write" => [
+        "description" =>
+            "Access to update project\'s policies. Replaces by \'project.policies.write\' for more granular control",
+        "category" => "Project",
+        'deprecated' => true,
+    ],
+    "project.policies.read" => [
+        "description" =>
+            "Access to read project\'s policies",
+        "category" => "Project",
+    ],
+    "project.policies.write" => [
        "description" =>
            "Access to update project\'s policies",
+        "category" => "Project",
    ],
    "templates.read" => [
        "description" =>
            "Access to read project\'s templates",
+        "category" => "Project",
    ],
    "templates.write" => [
        "description" =>
            "Access to create, update, and delete project\'s templates",
+        "category" => "Project",
    ],
    "oauth2.read" => [
        "description" =>
            "Access to read project\'s OAuth2 configuration",
+        "category" => "Project",
    ],
    "oauth2.write" => [
        "description" =>
            "Access to update project\'s OAuth2 configuration",
+        "category" => "Project",
+    ],
+
+    // Auth
+    'users.read' => [
+        'description' => 'Access to read users',
+        'category' => 'Auth',
+    ],
+    'users.write' => [
+        'description' => 'Access to create, update, and delete users',
+        'category' => 'Auth',
+    ],
+    'sessions.read' => [
+        'description' => 'Access to read user sessions',
+        'category' => 'Auth',
+    ],
+    'sessions.write' => [
+        'description' => 'Access to create, update, and delete user sessions',
+        'category' => 'Auth',
+    ],
+    'teams.read' => [
+        'description' => 'Access to read teams',
+        'category' => 'Auth',
+    ],
+    'teams.write' => [
+        'description' => 'Access to create, update, and delete teams',
+        'category' => 'Auth',
+    ],
+
+    // Databases
+    'databases.read' => [
+        'description' => 'Access to read databases',
+        'category' => 'Databases',
+    ],
+    'databases.write' => [
+        'description' => 'Access to create, update, and delete databases',
+        'category' => 'Databases',
+    ],
+    'tables.read' => [
+        'description' => 'Access to read database tables',
+        'category' => 'Databases',
+    ],
+    'tables.write' => [
+        'description' => 'Access to create, update, and delete database tables',
+        'category' => 'Databases',
+    ],
+    'columns.read' => [
+        'description' => 'Access to read database table columns',
+        'category' => 'Databases',
+    ],
+    'columns.write' => [
+        'description' => 'Access to create, update, and delete database table columns',
+        'category' => 'Databases',
+    ],
+    'indexes.read' => [
+        'description' => 'Access to read database table indexes',
+        'category' => 'Databases',
+    ],
+    'indexes.write' => [
+        'description' => 'Access to create, update, and delete database table indexes',
+        'category' => 'Databases',
+    ],
+    'rows.read'  => [
+        'description' => 'Access to read database table rows',
+        'category' => 'Databases',
+    ],
+    'rows.write' => [
+        'description' => 'Access to create, update, and delete database table rows',
+        'category' => 'Databases',
+    ],
+    'collections.read' => [
+        'description' => 'Access to read database collections',
+        'category' => 'Databases',
+        'deprecated' => true,
+    ],
+    'collections.write' => [
+        'description' => 'Access to create, update, and delete database collections',
+        'category' => 'Databases',
+        'deprecated' => true,
+    ],
+    'attributes.read' => [
+        'description' => 'Access to read database collection attributes',
+        'category' => 'Databases',
+        'deprecated' => true,
+    ],
+    'attributes.write' => [
+        'description' => 'Access to create, update, and delete database collection attributes',
+        'category' => 'Databases',
+        'deprecated' => true,
+    ],
+    'documents.read'  => [
+        'description' => 'Access to read database collection documents',
+        'category' => 'Databases',
+        'deprecated' => true,
+    ],
+    'documents.write' => [
+        'description' => 'Access to create, update, and delete database collection documents',
+        'category' => 'Databases',
+        'deprecated' => true,
+    ],
+
+    // Storage
+    'buckets.read' => [
+        'description' => 'Access to read storage buckets',
+        'category' => 'Storage',
+    ],
+    'buckets.write' => [
+        'description' => 'Access to create, update, and delete storage buckets',
+        'category' => 'Storage',
+    ],
+    'files.read' => [
+        'description' => 'Access to read storage files and preview images',
+        'category' => 'Storage',
+    ],
+    'files.write' => [
+        'description' => 'Access to create, update, and delete storage files',
+        'category' => 'Storage',
+    ],
+    'tokens.read' => [
+        'description' => 'Access to read storage file tokens',
+        'category' => 'Storage',
+    ],
+    'tokens.write' => [
+        'description' => 'Access to create, update, and delete storage file tokens',
+        'category' => 'Storage',
+    ],
+
+    // Functions
+    'functions.read' => [
+        'description' => 'Access to read functions and deployments',
+        'category' => 'Functions',
+    ],
+    'functions.write' => [
+        'description' => 'Access to create, update, and delete functions and deployments',
+        'category' => 'Functions',
+    ],
+    'executions.read' => [
+        'description' => 'Access to read function executions',
+        'category' => 'Functions',
+    ],
+    'executions.write' => [
+        'description' => 'Access to create function executions',
+        'category' => 'Functions',
+    ],
+    'execution.read' => [
+        'description' => 'Access to read function executions. This scope is deprecated for consistency purposes, and replaced by `executions.read`.',
+        'category' => 'Functions',
+        'deprecated' => true,
+    ],
+    'execution.write' => [
+        'description' => 'Access to create function executions. This scope is deprecated for consistency purposes, and replaced by `executions.write`.',
+        'category' => 'Functions',
+        'deprecated' => true,
+    ],
+
+    // Sites
+    'sites.read' => [
+        'description' => 'Access to read sites and deployments',
+        'category' => 'Sites',
+    ],
+    'sites.write' => [
+        'description' => 'Access to create, update, and delete sites and deployments',
+        'category' => 'Sites',
+    ],
+    'log.read' => [
+        'description' => 'Access to read site logs',
+        'category' => 'Sites',
+    ],
+    'log.write' => [
+        'description' => 'Access to update, and delete site logs',
+        'category' => 'Sites',
+    ],
+
+    // Messaging
+    'providers.read' => [
+        'description' => 'Access to read messaging providers',
+        'category' => 'Messaging',
+    ],
+    'providers.write' => [
+        'description' => 'Access to create, update, and delete messaging providers',
+        'category' => 'Messaging',
+    ],
+    'topics.read' => [
+        'description' => 'Access to read messaging topics',
+        'category' => 'Messaging',
+    ],
+    'topics.write' => [
+        'description' => 'Access to create, update, and delete messaging topics',
+        'category' => 'Messaging',
+    ],
+    'subscribers.read' => [
+        'description' => 'Access to read messaging subscribers',
+        'category' => 'Messaging',
+    ],
+    'subscribers.write' => [
+        'description' => 'Access to create, update, and delete messaging subscribers',
+        'category' => 'Messaging',
+    ],
+    'targets.read' => [
+        'description' => 'Access to read messaging targets',
+        'category' => 'Messaging',
+    ],
+    'targets.write' => [
+        'description' => 'Access to create, update, and delete messaging targets',
+        'category' => 'Messaging',
+    ],
+    'messages.read' => [
+        'description' => 'Access to read messaging messages',
+        'category' => 'Messaging',
+    ],
+    'messages.write' => [
+        'description' => 'Access to create, update, and delete messaging messages',
+        'category' => 'Messaging',
+    ],
+
+    // Proxy
+    'rules.read' => [
+        'description' => 'Access to read proxy rules.',
+        'category' => 'Proxy',
+    ],
+    'rules.write' => [
+        'description' => 'Access to create, update, and delete proxy rules.',
+        'category' => 'Proxy',
+    ],
+
+    // Other
+    "webhooks.read" => [
+        "description" =>
+            "Access to read webhooks",
+        'category' => 'Other',
+    ],
+    "webhooks.write" => [
+        "description" =>
+            "Access to create, update, and delete webhooks",
+        'category' => 'Other',
+    ],
+    'locale.read' => [
+        'description' => 'Access to use Locale service',
+        'category' => 'Other',
+    ],
+    'avatars.read' => [
+        'description' => 'Access to use Avatars service',
+        'category' => 'Other',
+    ],
+    'health.read' => [
+        'description' => 'Access to use Health service',
+        'category' => 'Other',
+    ],
+    'assistant.read' => [
+        'description' => 'Access to use Assistant service',
+        'category' => 'Other',
+    ],
+    'migrations.read' => [
+        'description' => 'Access to read migrations',
+        'category' => 'Other',
+    ],
+    'migrations.write' => [
+        'description' => 'Access to create, update, and delete migrations.',
+        'category' => 'Other',
+    ],
+
+    // TODO: Figure out where to move those
+    'schedules.read' => [
+        'description' => 'Access to read schedules.',
+        'category' => 'Other',
+    ],
+    'schedules.write' => [
+        'description' => 'Access to create, update, and delete schedules.',
+        'category' => 'Other',
+    ],
+    'vcs.read' => [
+        'description' => 'Access to read resources under VCS service.',
+        'category' => 'Other',
+    ],
+    'vcs.write' => [
+        'description' => 'Access to create, update, and delete resources under VCS service.',
+        'category' => 'Other',
    ],
 ];
@@ -286,7 +286,7 @@ return [
        'name' => 'Migrations',
        'subtitle' => 'The Migrations service allows you to migrate third-party data to your Appwrite project.',
        'description' => '/docs/services/migrations.md',
-        'controller' => 'api/migrations.php',
+        'controller' => '', // Uses modules
        'sdk' => true,
        'docs' => true,
        'docsUrl' => 'https://appwrite.io/docs/migrations',
@@ -79,12 +79,13 @@ return [
            ...getRuntimes($templateRuntimes['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter', $allowList),
            ...getRuntimes($templateRuntimes['BUN'], 'bun install', 'src/main.ts', 'bun/starter', $allowList),
            ...getRuntimes($templateRuntimes['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter', $allowList),
+            ...getRuntimes($templateRuntimes['RUST'], '', 'main.rs', 'rust/starter', $allowList),
        ],
-        'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/starter">file</a>.',
+        'instructions' => 'For documentation and instructions check out the <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates">templates repository</a>.',
        'vcsProvider' => 'github',
        'providerRepositoryId' => 'templates',
        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
+        'providerVersion' => '0.3.*',
        'variables' => [],
        'scopes' => ['users.read']
    ],
@@ -830,11 +830,11 @@ Http::patch('/v1/account/sessions/:sessionId')
        $refreshToken = $session->getAttribute('providerRefreshToken', '');
        $oAuthProviders = Config::getParam('oAuthProviders') ?? [];
        $className = $oAuthProviders[$provider]['class'] ?? null;
-        if (!empty($provider) && ($className === null || !\class_exists($className))) {
+        if (!empty($refreshToken) && ($className === null || !\class_exists($className))) {
            throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
        }

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

@@ -856,7 +856,7 @@ Http::get('/v1/users/:userId/targets/:targetId')
 Http::get('/v1/users/:userId/sessions')
    ->desc('List user sessions')
    ->groups(['api', 'users'])
-    ->label('scope', 'users.read')
+    ->label('scope', ['users.read', 'sessions.read'])
    ->label('sdk', new Method(
        namespace: 'users',
        group: 'sessions',
@@ -2314,7 +2314,7 @@ Http::post('/v1/users/:userId/sessions')
    ->desc('Create session')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].sessions.[sessionId].create')
-    ->label('scope', 'users.write')
+    ->label('scope', ['users.write', 'sessions.write'])
    ->label('audits.event', 'session.create')
    ->label('audits.resource', 'user/{request.userId}')
    ->label('usage.metric', 'sessions.{scope}.requests.create')
@@ -2470,7 +2470,7 @@ Http::delete('/v1/users/:userId/sessions/:sessionId')
    ->desc('Delete user session')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].sessions.[sessionId].delete')
-    ->label('scope', 'users.write')
+    ->label('scope', ['users.write', 'sessions.write'])
    ->label('audits.event', 'session.delete')
    ->label('audits.resource', 'user/{request.userId}')
    ->label('sdk', new Method(
@@ -2521,7 +2521,7 @@ Http::delete('/v1/users/:userId/sessions')
    ->desc('Delete user sessions')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].sessions.delete')
-    ->label('scope', 'users.write')
+    ->label('scope', ['users.write', 'sessions.write'])
    ->label('audits.event', 'session.delete')
    ->label('audits.resource', 'user/{user.$id}')
    ->label('sdk', new Method(
@@ -27,6 +27,8 @@ use Appwrite\Utopia\Request\Filters\V20 as RequestV20;
 use Appwrite\Utopia\Request\Filters\V21 as RequestV21;
 use Appwrite\Utopia\Request\Filters\V22 as RequestV22;
 use Appwrite\Utopia\Request\Filters\V23 as RequestV23;
+use Appwrite\Utopia\Request\Filters\V24 as RequestV24;
+use Appwrite\Utopia\Request\Filters\V25 as RequestV25;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Filters\V16 as ResponseV16;
 use Appwrite\Utopia\Response\Filters\V17 as ResponseV17;
@@ -36,7 +38,10 @@ use Appwrite\Utopia\Response\Filters\V20 as ResponseV20;
 use Appwrite\Utopia\Response\Filters\V21 as ResponseV21;
 use Appwrite\Utopia\Response\Filters\V22 as ResponseV22;
 use Appwrite\Utopia\Response\Filters\V23 as ResponseV23;
+use Appwrite\Utopia\Response\Filters\V24 as ResponseV24;
+use Appwrite\Utopia\Response\Filters\V25 as ResponseV25;
 use Appwrite\Utopia\View;
+use Executor\Exception\Timeout as ExecutorTimeout;
 use Executor\Executor;
 use MaxMind\Db\Reader;
 use Swoole\Http\Request as SwooleRequest;
@@ -397,7 +402,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
            'projectId' => $project->getId(),
            'scopes' => $resource->getAttribute('scopes', [])
        ]);
-        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $jwtKey;
+        $headers['x-appwrite-key'] = API_KEY_EPHEMERAL . '_' . $jwtKey;
        $headers['x-appwrite-trigger'] = 'http';
        $headers['x-appwrite-user-jwt'] = '';

@@ -577,26 +582,30 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
                'site' => '',
            };

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

            $headerOverrides = [];

@@ -899,6 +908,12 @@ Http::init()
            if (version_compare($requestFormat, '1.9.2', '<')) {
                $request->addFilter(new RequestV23());
            }
+            if (version_compare($requestFormat, '1.9.3', '<')) {
+                $request->addFilter(new RequestV24());
+            }
+            if (version_compare($requestFormat, '1.9.4', '<')) {
+                $request->addFilter(new RequestV25());
+            }
        }

        $localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
@@ -923,6 +938,12 @@ Http::init()
         */
        $responseFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
        if ($responseFormat) {
+            if (version_compare($responseFormat, '1.9.4', '<')) {
+                $response->addFilter(new ResponseV25());
+            }
+            if (version_compare($responseFormat, '1.9.3', '<')) {
+                $response->addFilter(new ResponseV24());
+            }
            if (version_compare($responseFormat, '1.9.2', '<')) {
                $response->addFilter(new ResponseV23());
            }
@@ -183,7 +183,8 @@ Http::init()
            // Handle special app role case
            if ($apiKey->getRole() === User::ROLE_APPS) {
                // Disable authorization checks for project API keys
-                if (($apiKey->getType() === API_KEY_STANDARD || $apiKey->getType() === API_KEY_DYNAMIC) && $apiKey->getProjectId() === $project->getId()) {
+                // Dynamic supported for backwards compatibility
+                if (($apiKey->getType() === API_KEY_STANDARD || $apiKey->getType() === API_KEY_EPHEMERAL || $apiKey->getType() === 'dynamic') && $apiKey->getProjectId() === $project->getId()) {
                    $authorization->setDefaultStatus(false);
                }

@@ -44,14 +44,15 @@ const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_RESOURCE_TOKEN_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 4323;
-const APP_VERSION_STABLE = '1.9.2';
+const APP_CACHE_BUSTER = 4325;
+const APP_VERSION_STABLE = '1.9.4';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
 const APP_DATABASE_ATTRIBUTE_DATETIME = 'datetime';
 const APP_DATABASE_ATTRIBUTE_URL = 'url';
 const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
+const APP_DATABASE_ATTRIBUTE_BIGINT_RANGE = 'bigintRange';
 const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
 const APP_DATABASE_ATTRIBUTE_POINT = 'point';
 const APP_DATABASE_ATTRIBUTE_LINE = 'line';
@@ -244,6 +245,7 @@ const APP_AUTH_TYPE_KEY = 'Key';
 const APP_AUTH_TYPE_ADMIN = 'Admin';
 // Response related
 const MAX_OUTPUT_CHUNK_SIZE = 10 * 1024 * 1024; // 10MB
+const APP_LIMIT_UPLOAD_CHUNK_SIZE = 5 * 1024 * 1024; // 5MB
 const APP_FUNCTION_LOG_LENGTH_LIMIT = 1000000;
 const APP_FUNCTION_ERROR_LENGTH_LIMIT = 1000000;
 // Function headers
@@ -255,7 +257,7 @@ const MESSAGE_TYPE_SMS = 'sms';
 const MESSAGE_TYPE_PUSH = 'push';
 // API key types
 const API_KEY_STANDARD = 'standard';
-const API_KEY_DYNAMIC = 'dynamic';
+const API_KEY_EPHEMERAL = 'ephemeral';
 const API_KEY_ORGANIZATION = 'organization';
 const API_KEY_ACCOUNT = 'account';
 // Usage metrics
@@ -36,6 +36,13 @@ Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function ($attribute) {
    return new Range($min, $max, Range::TYPE_INTEGER);
 }, Database::VAR_INTEGER);

+// BigInt uses a dedicated bigintRange format name to avoid clobbering `intRange`.
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_BIGINT_RANGE, function ($attribute) {
+    $min = $attribute['formatOptions']['min'] ?? -INF;
+    $max = $attribute['formatOptions']['max'] ?? INF;
+    return new Range($min, $max, Range::TYPE_INTEGER);
+}, Database::VAR_BIGINT);
+
 Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
    $min = $attribute['formatOptions']['min'] ?? -INF;
    $max = $attribute['formatOptions']['max'] ?? INF;
@@ -11,6 +11,7 @@ use Appwrite\Utopia\Response\Model\AlgoScryptModified;
 use Appwrite\Utopia\Response\Model\AlgoSha;
 use Appwrite\Utopia\Response\Model\Any;
 use Appwrite\Utopia\Response\Model\Attribute;
+use Appwrite\Utopia\Response\Model\AttributeBigInt;
 use Appwrite\Utopia\Response\Model\AttributeBoolean;
 use Appwrite\Utopia\Response\Model\AttributeDatetime;
 use Appwrite\Utopia\Response\Model\AttributeEmail;
@@ -37,6 +38,7 @@ use Appwrite\Utopia\Response\Model\Branch;
 use Appwrite\Utopia\Response\Model\Bucket;
 use Appwrite\Utopia\Response\Model\Collection;
 use Appwrite\Utopia\Response\Model\Column;
+use Appwrite\Utopia\Response\Model\ColumnBigInt;
 use Appwrite\Utopia\Response\Model\ColumnBoolean;
 use Appwrite\Utopia\Response\Model\ColumnDatetime;
 use Appwrite\Utopia\Response\Model\ColumnEmail;
@@ -56,6 +58,8 @@ use Appwrite\Utopia\Response\Model\ColumnString;
 use Appwrite\Utopia\Response\Model\ColumnText;
 use Appwrite\Utopia\Response\Model\ColumnURL;
 use Appwrite\Utopia\Response\Model\ColumnVarchar;
+use Appwrite\Utopia\Response\Model\ConsoleKeyScope;
+use Appwrite\Utopia\Response\Model\ConsoleKeyScopeList;
 use Appwrite\Utopia\Response\Model\ConsoleOAuth2Provider;
 use Appwrite\Utopia\Response\Model\ConsoleOAuth2ProviderList;
 use Appwrite\Utopia\Response\Model\ConsoleOAuth2ProviderParameter;
@@ -71,6 +75,7 @@ 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\EphemeralKey;
 use Appwrite\Utopia\Response\Model\Error;
 use Appwrite\Utopia\Response\Model\ErrorDev;
 use Appwrite\Utopia\Response\Model\Execution;
@@ -294,6 +299,7 @@ Response::setModel(new Attribute());
 Response::setModel(new AttributeList());
 Response::setModel(new AttributeString());
 Response::setModel(new AttributeInteger());
+Response::setModel(new AttributeBigInt());
 Response::setModel(new AttributeFloat());
 Response::setModel(new AttributeBoolean());
 Response::setModel(new AttributeEmail());
@@ -327,6 +333,7 @@ Response::setModel(new Column());
 Response::setModel(new ColumnList());
 Response::setModel(new ColumnString());
 Response::setModel(new ColumnInteger());
+Response::setModel(new ColumnBigInt());
 Response::setModel(new ColumnFloat());
 Response::setModel(new ColumnBoolean());
 Response::setModel(new ColumnEmail());
@@ -392,6 +399,7 @@ Response::setModel(new Execution());
 Response::setModel(new Project());
 Response::setModel(new Webhook());
 Response::setModel(new Key());
+Response::setModel(new EphemeralKey());
 Response::setModel(new DevKey());
 Response::setModel(new MockNumber());
 Response::setModel(new OAuth2GitHub());
@@ -486,6 +494,8 @@ Response::setModel(new ConsoleVariables());
 Response::setModel(new ConsoleOAuth2ProviderParameter());
 Response::setModel(new ConsoleOAuth2Provider());
 Response::setModel(new ConsoleOAuth2ProviderList());
+Response::setModel(new ConsoleKeyScope());
+Response::setModel(new ConsoleKeyScopeList());
 Response::setModel(new MFAChallenge());
 Response::setModel(new MFARecoveryCodes());
 Response::setModel(new MFAType());
@@ -159,10 +159,16 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
        $adapter = new DatabasePool($pools->get('logs'));
        $database = new Database($adapter, $cache);

+        /** @var array $collections */
+        $collections = Config::getParam('collections', []);
+        $logsCollections = $collections['logs'] ?? [];
+        $logsCollections = array_keys($logsCollections);
+
        $database
            ->setDatabase(APP_DATABASE)
            ->setAuthorization($authorization)
            ->setSharedTables(true)
+            ->setGlobalCollections($logsCollections)
            ->setNamespace('logsV1')
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
@@ -204,9 +204,16 @@ return function (Container $container): void {
            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

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

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

@@ -230,6 +242,7 @@ return function (Container $container): void {
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
                ->setSharedTables(true)
+                ->setGlobalCollections($logsCollections)
                ->setNamespace('logsV1')
                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
@@ -690,8 +703,15 @@ return function (Container $container): void {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

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

+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
            $database
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
@@ -1314,6 +1340,7 @@ return function (Container $container): void {
                if (\in_array($databaseHost, $dbTypeSharedTables)) {
                    $database
                        ->setSharedTables(true)
+                        ->setGlobalCollections($projectsGlobalCollections)
                        ->setTenant($project->getSequence())
                        ->setNamespace($databaseDSN->getParam('namespace'));
                } else {
@@ -1325,6 +1352,7 @@ return function (Container $container): void {
            } elseif (\in_array($dsn->getHost(), $sharedTables)) {
                $database
                    ->setSharedTables(true)
+                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -14,6 +14,7 @@ use Appwrite\Utopia\Database\Documents\User;
 use Utopia\Audit\Adapter\Database as AdapterDatabase;
 use Utopia\Audit\Audit as UtopiaAudit;
 use Utopia\Cache\Cache;
+use Utopia\Config\Config;
 use Utopia\Console;
 use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
@@ -90,8 +91,15 @@ return function (Container $container): void {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

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

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

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

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

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

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

@@ -264,6 +301,7 @@ return function (Container $container): void {
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
                ->setSharedTables(true)
+                ->setGlobalCollections($logsCollections)
                ->setNamespace('logsV1')
                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
@@ -45,7 +45,10 @@ use Utopia\WebSocket\Adapter;
 use Utopia\WebSocket\Server;

 require_once __DIR__ . '/init.php';
-require_once __DIR__ . '/init/span.php';
+
+if (System::getEnv('_APP_EDITION', 'self-hosted') === 'self-hosted') {
+    require_once __DIR__ . '/init/span.php';
+}

 /** @var Registry $register */
 $register = $GLOBALS['register'] ?? throw new \RuntimeException('Registry not initialized');
@@ -127,8 +130,14 @@ if (!function_exists('getProjectDB')) {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
            $database
                ->setSharedTables(true)
+                ->setGlobalCollections($projectsGlobalCollections)
                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
@@ -49,7 +49,7 @@
        "ext-openssl": "*",
        "ext-zlib": "*",
        "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.19.*",
+        "appwrite/php-runtimes": "0.20.*",
        "appwrite/php-clamav": "2.0.*",
        "utopia-php/abuse": "1.2.*",
        "utopia-php/agents": "1.2.*",
@@ -74,15 +74,15 @@
        "utopia-php/locale": "0.8.*",
        "utopia-php/logger": "0.6.*",
        "utopia-php/messaging": "0.22.*",
-        "utopia-php/migration": "1.9.*",
+        "utopia-php/migration": "1.*",
        "utopia-php/platform": "0.13.*",
        "utopia-php/pools": "1.*",
        "utopia-php/span": "1.1.*",
        "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.17.*",
-        "utopia-php/servers": "0.3.*",
+        "utopia-php/queue": "0.18.*",
+        "utopia-php/servers": "0.4.*",
        "utopia-php/registry": "0.5.*",
-        "utopia-php/storage": "1.0.*",
+        "utopia-php/storage": "2.*",
        "utopia-php/system": "0.10.*",
        "utopia-php/telemetry": "0.2.*",
        "utopia-php/vcs": "3.*",
@@ -93,7 +93,7 @@
        "chillerlan/php-qrcode": "4.3.*",
        "adhocore/jwt": "1.1.*",
        "spomky-labs/otphp": "11.*",
-        "webonyx/graphql-php": "15.31.*",
+        "webonyx/graphql-php": "15.32.*",
        "league/csv": "9.14.*",
        "enshrined/svg-sanitize": "0.22.*"
    },
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "805802552f7482eaeae4bdaa505ae982",
+    "content-hash": "ec2ad489c60f0102f0dfab223b6d1fe4",
    "packages": [
        {
            "name": "adhocore/jwt",
@@ -161,16 +161,16 @@
        },
        {
            "name": "appwrite/php-runtimes",
-            "version": "0.19.5",
+            "version": "0.20.0",
            "source": {
                "type": "git",
                "url": "https://github.com/appwrite/runtimes.git",
-                "reference": "aa2f7760cd0493c0880209b92df812c9386b3546"
+                "reference": "7d9b7f4eef5c0a142a60907b06de2219d025c5c3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/runtimes/zipball/aa2f7760cd0493c0880209b92df812c9386b3546",
-                "reference": "aa2f7760cd0493c0880209b92df812c9386b3546",
+                "url": "https://api.github.com/repos/appwrite/runtimes/zipball/7d9b7f4eef5c0a142a60907b06de2219d025c5c3",
+                "reference": "7d9b7f4eef5c0a142a60907b06de2219d025c5c3",
                "shasum": ""
            },
            "require": {
@@ -210,9 +210,9 @@
            ],
            "support": {
                "issues": "https://github.com/appwrite/runtimes/issues",
-                "source": "https://github.com/appwrite/runtimes/tree/0.19.5"
+                "source": "https://github.com/appwrite/runtimes/tree/0.20.0"
            },
-            "time": "2026-04-01T01:39:23+00:00"
+            "time": "2026-05-01T07:47:07+00:00"
        },
        {
            "name": "brick/math",
@@ -2708,16 +2708,16 @@
        },
        {
            "name": "symfony/http-client",
-            "version": "v7.4.8",
+            "version": "v7.4.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client.git",
-                "reference": "01933e626c3de76bea1e22641e205e78f6a34342"
+                "reference": "7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/01933e626c3de76bea1e22641e205e78f6a34342",
-                "reference": "01933e626c3de76bea1e22641e205e78f6a34342",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6",
+                "reference": "7e941c6abf4e3bf7dca160bf0e11ef36a9f832f6",
                "shasum": ""
            },
            "require": {
@@ -2785,7 +2785,7 @@
                "http"
            ],
            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.4.8"
+                "source": "https://github.com/symfony/http-client/tree/v7.4.9"
            },
            "funding": [
                {
@@ -2805,7 +2805,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-03-30T12:55:43+00:00"
+            "time": "2026-04-29T13:25:15+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@@ -3351,16 +3351,16 @@
        },
        {
            "name": "utopia-php/abuse",
-            "version": "1.2.2",
+            "version": "1.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/abuse.git",
-                "reference": "20bee84fd14dbe81d50ecabf1ffd81cceca06152"
+                "reference": "53f4274939353522ba331f55bcff6e6011ffc56c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/20bee84fd14dbe81d50ecabf1ffd81cceca06152",
-                "reference": "20bee84fd14dbe81d50ecabf1ffd81cceca06152",
+                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/53f4274939353522ba331f55bcff6e6011ffc56c",
+                "reference": "53f4274939353522ba331f55bcff6e6011ffc56c",
                "shasum": ""
            },
            "require": {
@@ -3397,9 +3397,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/abuse/issues",
-                "source": "https://github.com/utopia-php/abuse/tree/1.2.2"
+                "source": "https://github.com/utopia-php/abuse/tree/1.2.3"
            },
-            "time": "2026-02-02T10:43:10+00:00"
+            "time": "2026-04-29T11:19:08+00:00"
        },
        {
            "name": "utopia-php/agents",
@@ -3502,16 +3502,16 @@
        },
        {
            "name": "utopia-php/audit",
-            "version": "2.2.1",
+            "version": "2.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/audit.git",
-                "reference": "e3e2d6ad5c7f6377d9237df296a12eb7943892fd"
+                "reference": "90886c202e7983999e6b6a8201004d5ab61d4b57"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/audit/zipball/e3e2d6ad5c7f6377d9237df296a12eb7943892fd",
-                "reference": "e3e2d6ad5c7f6377d9237df296a12eb7943892fd",
+                "url": "https://api.github.com/repos/utopia-php/audit/zipball/90886c202e7983999e6b6a8201004d5ab61d4b57",
+                "reference": "90886c202e7983999e6b6a8201004d5ab61d4b57",
                "shasum": ""
            },
            "require": {
@@ -3545,9 +3545,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/audit/issues",
-                "source": "https://github.com/utopia-php/audit/tree/2.2.1"
+                "source": "https://github.com/utopia-php/audit/tree/2.2.2"
            },
-            "time": "2026-02-02T10:39:25+00:00"
+            "time": "2026-05-04T06:48:58+00:00"
        },
        {
            "name": "utopia-php/auth",
@@ -3658,21 +3658,21 @@
        },
        {
            "name": "utopia-php/cli",
-            "version": "0.23.2",
+            "version": "0.23.3",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/cli.git",
-                "reference": "145b91fef827853bcceaa3ab8ca2b1d6faaca2ab"
+                "reference": "3c45ae5bcdcd3c7916e1909d74c60b8e771610db"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cli/zipball/145b91fef827853bcceaa3ab8ca2b1d6faaca2ab",
-                "reference": "145b91fef827853bcceaa3ab8ca2b1d6faaca2ab",
+                "url": "https://api.github.com/repos/utopia-php/cli/zipball/3c45ae5bcdcd3c7916e1909d74c60b8e771610db",
+                "reference": "3c45ae5bcdcd3c7916e1909d74c60b8e771610db",
                "shasum": ""
            },
            "require": {
                "php": ">=7.4",
-                "utopia-php/servers": "0.3.*"
+                "utopia-php/servers": "0.4.0"
            },
            "require-dev": {
                "laravel/pint": "1.2.*",
@@ -3703,9 +3703,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/cli/issues",
-                "source": "https://github.com/utopia-php/cli/tree/0.23.2"
+                "source": "https://github.com/utopia-php/cli/tree/0.23.3"
            },
-            "time": "2026-04-27T09:19:04+00:00"
+            "time": "2026-05-05T04:38:59+00:00"
        },
        {
            "name": "utopia-php/compression",
@@ -3850,22 +3850,23 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "5.3.22",
+            "version": "5.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "d765945da6b3141852014b2f96ecf1fe7e3d6ba7"
+                "reference": "eb35e68f7f90932d5a60bd72e70158ae7a4e0511"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/d765945da6b3141852014b2f96ecf1fe7e3d6ba7",
-                "reference": "d765945da6b3141852014b2f96ecf1fe7e3d6ba7",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/eb35e68f7f90932d5a60bd72e70158ae7a4e0511",
+                "reference": "eb35e68f7f90932d5a60bd72e70158ae7a4e0511",
                "shasum": ""
            },
            "require": {
                "ext-mbstring": "*",
                "ext-mongodb": "*",
                "ext-pdo": "*",
+                "ext-redis": "*",
                "php": ">=8.4",
                "utopia-php/cache": "1.*",
                "utopia-php/console": "0.1.*",
@@ -3903,9 +3904,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/5.3.22"
+                "source": "https://github.com/utopia-php/database/tree/5.7.0"
            },
-            "time": "2026-04-20T07:12:46+00:00"
+            "time": "2026-05-06T01:04:08+00:00"
        },
        {
            "name": "utopia-php/detector",
@@ -4062,16 +4063,16 @@
        },
        {
            "name": "utopia-php/domains",
-            "version": "1.0.5",
+            "version": "1.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/domains.git",
-                "reference": "0edf6bb2b07f30db849a267027077bf5abb994c6"
+                "reference": "c87ba0a1da4cbf75d2cff9d3ea0262b78f1d86f6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/domains/zipball/0edf6bb2b07f30db849a267027077bf5abb994c6",
-                "reference": "0edf6bb2b07f30db849a267027077bf5abb994c6",
+                "url": "https://api.github.com/repos/utopia-php/domains/zipball/c87ba0a1da4cbf75d2cff9d3ea0262b78f1d86f6",
+                "reference": "c87ba0a1da4cbf75d2cff9d3ea0262b78f1d86f6",
                "shasum": ""
            },
            "require": {
@@ -4118,9 +4119,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/domains/issues",
-                "source": "https://github.com/utopia-php/domains/tree/1.0.5"
+                "source": "https://github.com/utopia-php/domains/tree/1.0.6"
            },
-            "time": "2026-03-03T09:20:50+00:00"
+            "time": "2026-04-29T11:08:10+00:00"
        },
        {
            "name": "utopia-php/dsn",
@@ -4271,23 +4272,23 @@
        },
        {
            "name": "utopia-php/http",
-            "version": "0.34.24",
+            "version": "0.34.25",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/http.git",
-                "reference": "d1eced0627c5a9fceddf53992ed97d664b810d33"
+                "reference": "76be330d4197bae680eb4ccc29c573456fe91904"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/http/zipball/d1eced0627c5a9fceddf53992ed97d664b810d33",
-                "reference": "d1eced0627c5a9fceddf53992ed97d664b810d33",
+                "url": "https://api.github.com/repos/utopia-php/http/zipball/76be330d4197bae680eb4ccc29c573456fe91904",
+                "reference": "76be330d4197bae680eb4ccc29c573456fe91904",
                "shasum": ""
            },
            "require": {
                "php": ">=8.3",
                "utopia-php/compression": "0.1.*",
                "utopia-php/di": "0.3.*",
-                "utopia-php/servers": "0.3.*",
+                "utopia-php/servers": "0.4.0",
                "utopia-php/telemetry": "0.2.*",
                "utopia-php/validators": "0.2.*"
            },
@@ -4321,9 +4322,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/http/issues",
-                "source": "https://github.com/utopia-php/http/tree/0.34.24"
+                "source": "https://github.com/utopia-php/http/tree/0.34.25"
            },
-            "time": "2026-04-24T12:16:53+00:00"
+            "time": "2026-05-05T04:39:15+00:00"
        },
        {
            "name": "utopia-php/image",
@@ -4530,16 +4531,16 @@
        },
        {
            "name": "utopia-php/migration",
-            "version": "1.9.3",
+            "version": "1.10.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/migration.git",
-                "reference": "111f6221d04578a6f721c23ac872002375f176ae"
+                "reference": "55f4863d690e775f44fec3cae4bd1f4491fed5ea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/migration/zipball/111f6221d04578a6f721c23ac872002375f176ae",
-                "reference": "111f6221d04578a6f721c23ac872002375f176ae",
+                "url": "https://api.github.com/repos/utopia-php/migration/zipball/55f4863d690e775f44fec3cae4bd1f4491fed5ea",
+                "reference": "55f4863d690e775f44fec3cae4bd1f4491fed5ea",
                "shasum": ""
            },
            "require": {
@@ -4550,7 +4551,7 @@
                "php": ">=8.1",
                "utopia-php/database": "5.*",
                "utopia-php/dsn": "0.2.*",
-                "utopia-php/storage": "1.0.*"
+                "utopia-php/storage": "2.*"
            },
            "require-dev": {
                "ext-pdo": "*",
@@ -4579,9 +4580,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/migration/issues",
-                "source": "https://github.com/utopia-php/migration/tree/1.9.3"
+                "source": "https://github.com/utopia-php/migration/tree/1.10.0"
            },
-            "time": "2026-04-22T07:13:26+00:00"
+            "time": "2026-05-06T04:35:32+00:00"
        },
        {
            "name": "utopia-php/mongo",
@@ -4646,26 +4647,26 @@
        },
        {
            "name": "utopia-php/platform",
-            "version": "0.13.0",
+            "version": "0.13.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/platform.git",
-                "reference": "d23af5349a7ea9ee11f9920a13626226f985522e"
+                "reference": "a20cb8b20a1e4c9886309c2d033a0292ba0937b9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/platform/zipball/d23af5349a7ea9ee11f9920a13626226f985522e",
-                "reference": "d23af5349a7ea9ee11f9920a13626226f985522e",
+                "url": "https://api.github.com/repos/utopia-php/platform/zipball/a20cb8b20a1e4c9886309c2d033a0292ba0937b9",
+                "reference": "a20cb8b20a1e4c9886309c2d033a0292ba0937b9",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
                "ext-redis": "*",
-                "php": ">=8.1",
-                "utopia-php/cli": "0.23.*",
-                "utopia-php/http": "0.34.*",
-                "utopia-php/queue": "0.17.*",
-                "utopia-php/servers": "0.3.*"
+                "php": ">=8.3",
+                "utopia-php/cli": "0.23.3",
+                "utopia-php/http": "0.34.25",
+                "utopia-php/queue": "0.18.2",
+                "utopia-php/servers": "0.4.0"
            },
            "require-dev": {
                "laravel/pint": "1.2.*",
@@ -4691,9 +4692,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/platform/issues",
-                "source": "https://github.com/utopia-php/platform/tree/0.13.0"
+                "source": "https://github.com/utopia-php/platform/tree/0.13.2"
            },
-            "time": "2026-04-17T09:57:18+00:00"
+            "time": "2026-05-05T06:00:26+00:00"
        },
        {
            "name": "utopia-php/pools",
@@ -4803,25 +4804,24 @@
        },
        {
            "name": "utopia-php/queue",
-            "version": "0.17.0",
+            "version": "0.18.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/queue.git",
-                "reference": "0fbc7d7312f5cf76ec112513fb93317000901f5f"
+                "reference": "f85ca003c99ff475708c05466643d067403c0c22"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/queue/zipball/0fbc7d7312f5cf76ec112513fb93317000901f5f",
-                "reference": "0fbc7d7312f5cf76ec112513fb93317000901f5f",
+                "url": "https://api.github.com/repos/utopia-php/queue/zipball/f85ca003c99ff475708c05466643d067403c0c22",
+                "reference": "f85ca003c99ff475708c05466643d067403c0c22",
                "shasum": ""
            },
            "require": {
                "php": ">=8.3",
                "php-amqplib/php-amqplib": "^3.7",
                "utopia-php/di": "0.3.*",
-                "utopia-php/fetch": "0.5.*",
                "utopia-php/pools": "1.*",
-                "utopia-php/servers": "0.3.*",
+                "utopia-php/servers": "0.4.0",
                "utopia-php/telemetry": "0.2.*",
                "utopia-php/validators": "0.2.*"
            },
@@ -4864,9 +4864,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/queue/issues",
-                "source": "https://github.com/utopia-php/queue/tree/0.17.0"
+                "source": "https://github.com/utopia-php/queue/tree/0.18.2"
            },
-            "time": "2026-03-23T16:21:31+00:00"
+            "time": "2026-05-05T04:38:59+00:00"
        },
        {
            "name": "utopia-php/registry",
@@ -4922,16 +4922,16 @@
        },
        {
            "name": "utopia-php/servers",
-            "version": "0.3.0",
+            "version": "0.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/servers.git",
-                "reference": "235be31200df9437fc96a1c270ffef4c64fafe52"
+                "reference": "7db346ef377503efe0acafe0791085270cd9ed70"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/servers/zipball/235be31200df9437fc96a1c270ffef4c64fafe52",
-                "reference": "235be31200df9437fc96a1c270ffef4c64fafe52",
+                "url": "https://api.github.com/repos/utopia-php/servers/zipball/7db346ef377503efe0acafe0791085270cd9ed70",
+                "reference": "7db346ef377503efe0acafe0791085270cd9ed70",
                "shasum": ""
            },
            "require": {
@@ -4970,9 +4970,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/servers/issues",
-                "source": "https://github.com/utopia-php/servers/tree/0.3.0"
+                "source": "https://github.com/utopia-php/servers/tree/0.4.0"
            },
-            "time": "2026-03-13T11:31:42+00:00"
+            "time": "2026-05-05T04:08:30+00:00"
        },
        {
            "name": "utopia-php/span",
@@ -5020,16 +5020,16 @@
        },
        {
            "name": "utopia-php/storage",
-            "version": "1.0.1",
+            "version": "2.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/storage.git",
-                "reference": "f014be445f0baa635d0764e1673196f412511618"
+                "reference": "64e132a3768e22243eda36fe4262da22fd204f3c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/f014be445f0baa635d0764e1673196f412511618",
-                "reference": "f014be445f0baa635d0764e1673196f412511618",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/64e132a3768e22243eda36fe4262da22fd204f3c",
+                "reference": "64e132a3768e22243eda36fe4262da22fd204f3c",
                "shasum": ""
            },
            "require": {
@@ -5043,9 +5043,8 @@
                "utopia-php/validators": "0.2.*"
            },
            "require-dev": {
-                "laravel/pint": "1.2.*",
-                "phpunit/phpunit": "^9.3",
-                "vimeo/psalm": "4.0.1"
+                "laravel/pint": "^1.21",
+                "phpunit/phpunit": "^9.3"
            },
            "type": "library",
            "autoload": {
@@ -5067,22 +5066,22 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/1.0.1"
+                "source": "https://github.com/utopia-php/storage/tree/2.0.2"
            },
-            "time": "2026-02-23T05:59:32+00:00"
+            "time": "2026-05-01T15:06:16+00:00"
        },
        {
            "name": "utopia-php/system",
-            "version": "0.10.1",
+            "version": "0.10.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/system.git",
-                "reference": "7c1669533bb9c285de19191270c8c1439161a78a"
+                "reference": "04229a822b147c1abaf1a92fb42c2d7aad4625df"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/system/zipball/7c1669533bb9c285de19191270c8c1439161a78a",
-                "reference": "7c1669533bb9c285de19191270c8c1439161a78a",
+                "url": "https://api.github.com/repos/utopia-php/system/zipball/04229a822b147c1abaf1a92fb42c2d7aad4625df",
+                "reference": "04229a822b147c1abaf1a92fb42c2d7aad4625df",
                "shasum": ""
            },
            "require": {
@@ -5123,9 +5122,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/system/issues",
-                "source": "https://github.com/utopia-php/system/tree/0.10.1"
+                "source": "https://github.com/utopia-php/system/tree/0.10.2"
            },
-            "time": "2026-03-15T21:07:41+00:00"
+            "time": "2026-05-05T14:33:41+00:00"
        },
        {
            "name": "utopia-php/telemetry",
@@ -5385,16 +5384,16 @@
        },
        {
            "name": "webonyx/graphql-php",
-            "version": "v15.31.5",
+            "version": "v15.32.3",
            "source": {
                "type": "git",
                "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "089c4ef7e112df85788cfe06596278a8f99f4aa9"
+                "reference": "993bf0bea17f870412ad8a90f60c41cb8d5f1145"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/089c4ef7e112df85788cfe06596278a8f99f4aa9",
-                "reference": "089c4ef7e112df85788cfe06596278a8f99f4aa9",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/993bf0bea17f870412ad8a90f60c41cb8d5f1145",
+                "reference": "993bf0bea17f870412ad8a90f60c41cb8d5f1145",
                "shasum": ""
            },
            "require": {
@@ -5403,16 +5402,16 @@
                "php": "^7.4 || ^8"
            },
            "require-dev": {
-                "amphp/amp": "^2.6",
-                "amphp/http-server": "^2.1",
+                "amphp/amp": "^2.6 || ^3",
+                "amphp/http-server": "^2.1 || ^3",
                "dms/phpunit-arraysubset-asserts": "dev-master",
                "ergebnis/composer-normalize": "^2.28",
-                "friendsofphp/php-cs-fixer": "3.94.2",
+                "friendsofphp/php-cs-fixer": "3.95.1",
                "mll-lab/php-cs-fixer-config": "5.13.0",
                "nyholm/psr7": "^1.5",
                "phpbench/phpbench": "^1.2",
                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "2.1.46",
+                "phpstan/phpstan": "2.1.51",
                "phpstan/phpstan-phpunit": "2.0.16",
                "phpstan/phpstan-strict-rules": "2.0.10",
                "phpunit/phpunit": "^9.5 || ^10.5.21 || ^11",
@@ -5426,6 +5425,7 @@
                "ticketswap/phpstan-error-formatter": "1.3.0"
            },
            "suggest": {
+                "amphp/amp": "To leverage async resolving on AMPHP platform (v3 with AmpFutureAdapter, v2 with AmpPromiseAdapter)",
                "amphp/http-server": "To leverage async resolving with webserver on AMPHP platform",
                "psr/http-message": "To use standard GraphQL server",
                "react/promise": "To leverage async resolving on React PHP platform"
@@ -5448,7 +5448,7 @@
            ],
            "support": {
                "issues": "https://github.com/webonyx/graphql-php/issues",
-                "source": "https://github.com/webonyx/graphql-php/tree/v15.31.5"
+                "source": "https://github.com/webonyx/graphql-php/tree/v15.32.3"
            },
            "funding": [
                {
@@ -5460,22 +5460,22 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2026-04-11T18:06:15+00:00"
+            "time": "2026-04-24T13:49:35+00:00"
        }
    ],
    "packages-dev": [
        {
            "name": "appwrite/sdk-generator",
-            "version": "1.24.0",
+            "version": "1.27.5",
            "source": {
                "type": "git",
                "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "6d4d26659bc7a1c347c1d4d8dae3b77b5562e0cb"
+                "reference": "9faa38b48d422f3da764a719712905c83b3922cb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/6d4d26659bc7a1c347c1d4d8dae3b77b5562e0cb",
-                "reference": "6d4d26659bc7a1c347c1d4d8dae3b77b5562e0cb",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/9faa38b48d422f3da764a719712905c83b3922cb",
+                "reference": "9faa38b48d422f3da764a719712905c83b3922cb",
                "shasum": ""
            },
            "require": {
@@ -5511,9 +5511,9 @@
            "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
            "support": {
                "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/1.24.0"
+                "source": "https://github.com/appwrite/sdk-generator/tree/1.27.5"
            },
-            "time": "2026-04-24T12:50:05+00:00"
+            "time": "2026-05-05T12:09:40+00:00"
        },
        {
            "name": "brianium/paratest",
@@ -6222,11 +6222,11 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.51",
+            "version": "2.1.54",
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc3b523c45e714c70de2ac5113b958223b55dc59",
-                "reference": "dc3b523c45e714c70de2ac5113b958223b55dc59",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8be50c3992107dc837b17da4d140fbbdf9a5c5bd",
+                "reference": "8be50c3992107dc837b17da4d140fbbdf9a5c5bd",
                "shasum": ""
            },
            "require": {
@@ -6271,7 +6271,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-04-21T18:22:01+00:00"
+            "time": "2026-04-29T13:31:09+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
@@ -6620,16 +6620,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.5.23",
+            "version": "12.5.24",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c54fcf3d6bcb6e96ac2f7e40097dc37b5f139969"
+                "reference": "d75dd30597caa80e72fad2ef7904601a30ef1046"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c54fcf3d6bcb6e96ac2f7e40097dc37b5f139969",
-                "reference": "c54fcf3d6bcb6e96ac2f7e40097dc37b5f139969",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d75dd30597caa80e72fad2ef7904601a30ef1046",
+                "reference": "d75dd30597caa80e72fad2ef7904601a30ef1046",
                "shasum": ""
            },
            "require": {
@@ -6698,7 +6698,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.23"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.24"
            },
            "funding": [
                {
@@ -6706,7 +6706,7 @@
                    "type": "other"
                }
            ],
-            "time": "2026-04-18T06:12:49+00:00"
+            "time": "2026-05-01T04:21:04+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@@ -7691,16 +7691,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v8.0.8",
+            "version": "v8.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "5b66d385dc58f69652e56f78a4184615e3f2b7f7"
+                "reference": "7113778e2e91f4709cb3194a75dfa9c0d028d94d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5b66d385dc58f69652e56f78a4184615e3f2b7f7",
-                "reference": "5b66d385dc58f69652e56f78a4184615e3f2b7f7",
+                "url": "https://api.github.com/repos/symfony/console/zipball/7113778e2e91f4709cb3194a75dfa9c0d028d94d",
+                "reference": "7113778e2e91f4709cb3194a75dfa9c0d028d94d",
                "shasum": ""
            },
            "require": {
@@ -7757,7 +7757,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v8.0.8"
+                "source": "https://github.com/symfony/console/tree/v8.0.9"
            },
            "funding": [
                {
@@ -7777,7 +7777,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-03-30T15:14:47+00:00"
+            "time": "2026-04-29T15:02:55+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -1 +0,0 @@
-List all OAuth2 providers supported by the Appwrite server, along with the parameters required to configure each provider. The response excludes mock providers but includes sandbox providers.
@@ -1 +0,0 @@
-Get all Environment Variables that are relevant for the console.
@@ -0,0 +1 @@
+Create a bigint attribute. Optionally, minimum and maximum values can be provided.
@@ -0,0 +1 @@
+Update a bigint attribute. Changing the `default` value will not update already existing documents.
@@ -0,0 +1 @@
+Create a bigint column. Optionally, minimum and maximum values can be provided.
@@ -0,0 +1 @@
+Update a bigint column. Changing the `default` value will not update already existing rows.
@@ -105,7 +105,7 @@ class Key

    /**
     * Decode the given secret key into a Key object, containing the project ID, type, role, scopes, and name.
-     * Can be a stored API key or a dynamic key (JWT).
+     * Can be a stored API key or an ephemeral key (JWT).
     *
     * @throws Exception
     */
@@ -138,7 +138,9 @@ class Key
        );

        switch ($type) {
-            case API_KEY_DYNAMIC:
+            // Dynamic supported for backwards compatibility
+            case API_KEY_EPHEMERAL:
+            case 'dynamic':
                $jwtObj = new JWT(
                    key: System::getEnv('_APP_OPENSSL_KEY_V1'),
                    algo: 'HS256',
@@ -153,7 +155,7 @@ class Key
                    $expired = true;
                }

-                $name = $payload['name'] ?? 'Dynamic Key';
+                $name = $payload['name'] ?? 'Ephemeral Key';
                $projectId = $payload['projectId'] ?? '';
                $disabledMetrics = $payload['disabledMetrics'] ?? [];
                $hostnameOverride = $payload['hostnameOverride'] ?? false;
@@ -206,8 +206,6 @@ abstract class OAuth2

        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);

-        \curl_close($ch);
-
        if ($code >= 400) {
            throw new Exception($response, $code);
        }
@@ -37,6 +37,13 @@ class Authentik extends OAuth2
        return 'authentik';
    }

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

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

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

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

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

-        return $secret['tenantID'] ?? 'common';
+        return $secret['tenantID'] ?? '';
    }
 }
@@ -178,6 +178,7 @@ class Exception extends \Exception
    public const string FUNCTION_RUNTIME_UNSUPPORTED = 'function_runtime_unsupported';
    public const string FUNCTION_ENTRYPOINT_MISSING = 'function_entrypoint_missing';
    public const string FUNCTION_SYNCHRONOUS_TIMEOUT = 'function_synchronous_timeout';
+    public const string FUNCTION_ASYNCHRONOUS_TIMEOUT = 'function_asynchronous_timeout';
    public const string FUNCTION_TEMPLATE_NOT_FOUND = 'function_template_not_found';
    public const string FUNCTION_RUNTIME_NOT_DETECTED = 'function_runtime_not_detected';
    public const string FUNCTION_EXECUTE_PERMISSION_MISSING = 'function_execute_permission_missing';
@@ -192,6 +193,7 @@ class Exception extends \Exception
    public const string BUILD_ALREADY_COMPLETED = 'build_already_completed';
    public const string BUILD_CANCELED = 'build_canceled';
    public const string BUILD_FAILED = 'build_failed';
+    public const string BUILD_TIMEOUT = 'build_timeout';

    /** Execution */
    public const string EXECUTION_NOT_FOUND = 'execution_not_found';
@@ -95,6 +95,8 @@ abstract class Migration
        '1.9.0' => 'V24',
        '1.9.1' => 'V24',
        '1.9.2' => 'V24',
+        '1.9.3' => 'V24',
+        '1.9.4' => 'V24',
    ];

    /**
@@ -9,6 +9,7 @@ use Appwrite\Platform\Modules\Core;
 use Appwrite\Platform\Modules\Databases;
 use Appwrite\Platform\Modules\Functions;
 use Appwrite\Platform\Modules\Health;
+use Appwrite\Platform\Modules\Migrations;
 use Appwrite\Platform\Modules\Project;
 use Appwrite\Platform\Modules\Projects;
 use Appwrite\Platform\Modules\Proxy;
@@ -39,6 +40,7 @@ class Appwrite extends Platform
        $this->addModule(new Storage\Module());
        $this->addModule(new VCS\Module());
        $this->addModule(new Webhooks\Module());
+        $this->addModule(new Migrations\Module());
        $this->addModule(new Project\Module());
    }
 }
@@ -62,7 +62,6 @@ class Get extends Action
        curl_setopt_array($ch, $options);
        curl_exec($ch);
        $errno = curl_errno($ch);
-        curl_close($ch);

        return $errno === 0;
    }
@@ -85,8 +85,6 @@ class Create extends Action

        curl_exec($ch);

-        curl_close($ch);
-
        $response->chunk('', true);
    }
 }
@@ -34,7 +34,7 @@ class XList extends Action
                namespace: 'console',
                group: 'console',
                name: 'listOAuth2Providers',
-                description: '/docs/references/console/list-oauth2-providers.md',
+                description: 'List all OAuth2 providers supported by the Appwrite server, along with the parameters required to configure each provider. The response excludes mock providers but includes sandbox providers.',
                auth: [AuthType::ADMIN],
                responses: [
                    new SDKResponse(
@@ -54,9 +54,9 @@ class XList extends Action
        $actions = OAuth2Base::getProviderActions();

        $providers = [];
-        foreach ($actions as $providerId => $updateClass) {
-            $config = $providersConfig[$providerId] ?? null;
-            if ($config === null) {
+        foreach ($providersConfig as $providerId => $config) {
+            $updateClass = $actions[$providerId] ?? null;
+            if ($updateClass === null) {
                continue;
            }
            if (!($config['enabled'] ?? false)) {
@@ -0,0 +1,69 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Console\Http\Scopes\Key;
+
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response;
+use Utopia\Config\Config;
+use Utopia\Database\Document;
+use Utopia\Platform\Action;
+use Utopia\Platform\Scope\HTTP;
+
+class XList extends Action
+{
+    use HTTP;
+
+    public static function getName(): string
+    {
+        return 'listConsoleProjectScopes';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
+            ->setHttpPath('/v1/console/scopes/project')
+            ->desc('List project scopes')
+            ->groups(['api'])
+            ->label('scope', 'public')
+            ->label('sdk', new Method(
+                namespace: 'console',
+                group: 'console',
+                name: 'listProjectScopes',
+                description: 'List all scopes available for project API keys, along with a description for each scope.',
+                auth: [AuthType::ADMIN],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_OK,
+                        model: Response::MODEL_CONSOLE_KEY_SCOPE_LIST,
+                    )
+                ],
+                contentType: ContentType::JSON
+            ))
+            ->inject('response')
+            ->callback($this->action(...));
+    }
+
+    public function action(Response $response): void
+    {
+        $scopesConfig = Config::getParam('projectScopes', []);
+
+        $scopes = [];
+        foreach ($scopesConfig as $scopeId => $scope) {
+            $scopes[] = new Document([
+                '$id' => $scopeId,
+                'description' => $scope['description'] ?? '',
+                'category' => $scope['category'] ?? '',
+                'deprecated' => $scope['deprecated'] ?? false,
+            ]);
+        }
+
+        $response->dynamic(new Document([
+            'total' => \count($scopes),
+            'scopes' => $scopes,
+        ]), Response::MODEL_CONSOLE_KEY_SCOPE_LIST);
+    }
+}
@@ -36,7 +36,7 @@ class Get extends Action
                namespace: 'console',
                group: 'console',
                name: 'variables',
-                description: '/docs/references/console/variables.md',
+                description: 'Get all Environment Variables that are relevant for the console.',
                auth: [AuthType::ADMIN],
                responses: [
                    new SDKResponse(
@@ -15,6 +15,7 @@ use Appwrite\Platform\Modules\Console\Http\Redirects\Recover\Get as RedirectReco
 use Appwrite\Platform\Modules\Console\Http\Redirects\Register\Get as RedirectRegister;
 use Appwrite\Platform\Modules\Console\Http\Redirects\Root\Get as RedirectRoot;
 use Appwrite\Platform\Modules\Console\Http\Resources\Get as GetResourceAvailability;
+use Appwrite\Platform\Modules\Console\Http\Scopes\Key\XList as ListKeyScopes;
 use Appwrite\Platform\Modules\Console\Http\Variables\Get as GetVariables;
 use Utopia\Platform\Service;

@@ -30,6 +31,7 @@ class Http extends Service

        $this->addAction(GetVariables::getName(), new GetVariables());
        $this->addAction(ListOAuth2Providers::getName(), new ListOAuth2Providers());
+        $this->addAction(ListKeyScopes::getName(), new ListKeyScopes());
        $this->addAction(CreateAssistantQuery::getName(), new CreateAssistantQuery());
        $this->addAction(GetResourceAvailability::getName(), new GetResourceAvailability());

@@ -241,6 +241,10 @@ abstract class Action extends UtopiaAction
                ? UtopiaResponse::MODEL_ATTRIBUTE_INTEGER
                : UtopiaResponse::MODEL_COLUMN_INTEGER,

+            Database::VAR_BIGINT => $isCollections
+                ? UtopiaResponse::MODEL_ATTRIBUTE_BIGINT
+                : UtopiaResponse::MODEL_COLUMN_BIGINT,
+
            Database::VAR_FLOAT => $isCollections
                ? UtopiaResponse::MODEL_ATTRIBUTE_FLOAT
                : UtopiaResponse::MODEL_COLUMN_FLOAT,
@@ -540,6 +544,7 @@ abstract class Action extends UtopiaAction

        switch ($attribute->getAttribute('format')) {
            case APP_DATABASE_ATTRIBUTE_INT_RANGE:
+            case APP_DATABASE_ATTRIBUTE_BIGINT_RANGE:
            case APP_DATABASE_ATTRIBUTE_FLOAT_RANGE:
                $min ??= $attribute->getAttribute('formatOptions')['min'];
                $max ??= $attribute->getAttribute('formatOptions')['max'];
@@ -548,14 +553,15 @@ abstract class Action extends UtopiaAction
                    throw new Exception($this->getInvalidValueException(), 'Minimum value must be lesser than maximum value');
                }

-                if ($attribute->getAttribute('format') === APP_DATABASE_ATTRIBUTE_INT_RANGE) {
-                    $validator = new Range($min, $max, Database::VAR_INTEGER);
-                } else {
+                if ($attribute->getAttribute('format') === APP_DATABASE_ATTRIBUTE_FLOAT_RANGE) {
                    $validator = new Range($min, $max, Database::VAR_FLOAT);

                    if (!is_null($default)) {
                        $default = \floatval($default);
                    }
+                } else {
+                    // intRange and bigintRange share the same integer range semantics
+                    $validator = new Range($min, $max, Range::TYPE_INTEGER);
                }

                if (!is_null($default) && !$validator->isValid($default)) {
@@ -0,0 +1,117 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt;
+
+use Appwrite\Event\Database as EventDatabase;
+use Appwrite\Event\Event;
+use Appwrite\Extend\Exception;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Deprecated;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
+use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Nullable;
+use Utopia\Validator\Range;
+
+class Create extends Action
+{
+    public static function getName(): string
+    {
+        return 'createBigIntAttribute';
+    }
+
+    protected function getResponseModel(): string|array
+    {
+        return UtopiaResponse::MODEL_ATTRIBUTE_BIGINT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
+            ->setHttpPath('/v1/databases/:databaseId/collections/:collectionId/attributes/bigint')
+            ->desc('Create bigint attribute')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', 'collections.write')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
+            ->label('audits.event', 'attribute.create')
+            ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
+            ->label('sdk', new Method(
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
+                name: self::getName(),
+                description: '/docs/references/databases/create-bigint-attribute.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_ACCEPTED,
+                        model: $this->getResponseModel(),
+                    )
+                ],
+                deprecated: new Deprecated(
+                    since: '1.8.0',
+                    replaceWith: 'tablesDB.createBigIntColumn',
+                ),
+            ))
+            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
+            ->param('collectionId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Collection ID.', false, ['dbForProject'])
+            ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Attribute Key.', false, ['dbForProject'])
+            ->param('required', null, new Boolean(), 'Is attribute required?')
+            ->param('min', null, new Nullable(new Integer(false, 64)), 'Minimum value', true)
+            ->param('max', null, new Nullable(new Integer(false, 64)), 'Maximum value', true)
+            ->param('default', null, new Nullable(new Integer(false, 64)), 'Default value. Cannot be set when attribute is required.', true)
+            ->param('array', false, new Boolean(), 'Is attribute an array?', true)
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForDatabase')
+            ->inject('queueForEvents')
+            ->inject('authorization')
+            ->callback($this->action(...));
+    }
+
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    {
+        $min ??= \PHP_INT_MIN;
+        $max ??= \PHP_INT_MAX;
+
+        if ($min > $max) {
+            throw new Exception($this->getInvalidValueException(), 'Minimum value must be lesser than maximum value');
+        }
+
+        $validator = new Range($min, $max, Range::TYPE_INTEGER);
+        if (!\is_null($default) && !$validator->isValid($default)) {
+            throw new Exception($this->getInvalidValueException(), $validator->getDescription());
+        }
+
+        $attribute = $this->createAttribute($databaseId, $collectionId, new Document([
+            'key' => $key,
+            'type' => Database::VAR_BIGINT,
+            'size' => 8,
+            'required' => $required,
+            'default' => $default,
+            'array' => $array,
+            'format' => APP_DATABASE_ATTRIBUTE_BIGINT_RANGE,
+            'formatOptions' => ['min' => $min, 'max' => $max],
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+
+        $formatOptions = $attribute->getAttribute('formatOptions', []);
+        if (!empty($formatOptions)) {
+            $attribute->setAttribute('min', \intval($formatOptions['min']));
+            $attribute->setAttribute('max', \intval($formatOptions['max']));
+        }
+
+        $response
+            ->setStatusCode(SwooleResponse::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, $this->getResponseModel());
+    }
+}
@@ -0,0 +1,106 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt;
+
+use Appwrite\Event\Event;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Deprecated;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
+use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Nullable;
+
+class Update extends Action
+{
+    public static function getName(): string
+    {
+        return 'updateBigIntAttribute';
+    }
+
+    protected function getResponseModel(): string|array
+    {
+        return UtopiaResponse::MODEL_ATTRIBUTE_BIGINT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
+            ->setHttpPath('/v1/databases/:databaseId/collections/:collectionId/attributes/bigint/:key')
+            ->desc('Update bigint attribute')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', 'collections.write')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
+            ->label('audits.event', 'attribute.update')
+            ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
+            ->label('sdk', new Method(
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
+                name: self::getName(),
+                description: '/docs/references/databases/update-bigint-attribute.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_OK,
+                        model: $this->getResponseModel(),
+                    )
+                ],
+                contentType: ContentType::JSON,
+                deprecated: new Deprecated(
+                    since: '1.8.0',
+                    replaceWith: 'tablesDB.updateBigIntColumn',
+                ),
+            ))
+            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
+            ->param('collectionId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Collection ID.', false, ['dbForProject'])
+            ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Attribute Key.', false, ['dbForProject'])
+            ->param('required', null, new Boolean(), 'Is attribute required?')
+            ->param('min', null, new Nullable(new Integer(false, 64)), 'Minimum value', true)
+            ->param('max', null, new Nullable(new Integer(false, 64)), 'Maximum value', true)
+            ->param('default', null, new Nullable(new Integer(false, 64)), 'Default value. Cannot be set when attribute is required.')
+            ->param('newKey', null, fn (Database $dbForProject) => new Nullable(new Key(false, $dbForProject->getAdapter()->getMaxUIDLength())), 'New Attribute Key.', true, ['dbForProject'])
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForEvents')
+            ->inject('authorization')
+            ->callback($this->action(...));
+    }
+
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, ?string $newKey, UtopiaResponse $response, Database $dbForProject, Event $queueForEvents, Authorization $authorization): void
+    {
+        $attribute = $this->updateAttribute(
+            databaseId: $databaseId,
+            collectionId: $collectionId,
+            key: $key,
+            dbForProject: $dbForProject,
+            queueForEvents: $queueForEvents,
+            authorization: $authorization,
+            type: Database::VAR_BIGINT,
+            default: $default,
+            required: $required,
+            min: $min,
+            max: $max,
+            newKey: $newKey
+        );
+
+        $formatOptions = $attribute->getAttribute('formatOptions', []);
+        if (!empty($formatOptions)) {
+            $attribute->setAttribute('min', \intval($formatOptions['min']));
+            $attribute->setAttribute('max', \intval($formatOptions['max']));
+        }
+
+        $response
+            ->setStatusCode(SwooleResponse::STATUS_CODE_OK)
+            ->dynamic($attribute, $this->getResponseModel());
+    }
+}
@@ -290,13 +290,15 @@ class Create extends Action
        }

        if (isset($attribute['min']) || isset($attribute['max'])) {
-            $format = $type === Database::VAR_INTEGER
-                ? APP_DATABASE_ATTRIBUTE_INT_RANGE
-                : APP_DATABASE_ATTRIBUTE_FLOAT_RANGE;
+            $format = match($type) {
+                Database::VAR_INTEGER => APP_DATABASE_ATTRIBUTE_INT_RANGE,
+                Database::VAR_BIGINT => APP_DATABASE_ATTRIBUTE_BIGINT_RANGE,
+                default => APP_DATABASE_ATTRIBUTE_FLOAT_RANGE,
+            };

            $formatOptions = [
-                'min' => $attribute['min'] ?? ($type === Database::VAR_INTEGER ? \PHP_INT_MIN : -\PHP_FLOAT_MAX),
-                'max' => $attribute['max'] ?? ($type === Database::VAR_INTEGER ? \PHP_INT_MAX : \PHP_FLOAT_MAX),
+                'min' => $attribute['min'] ?? ($type === Database::VAR_INTEGER || $type === Database::VAR_BIGINT ? \PHP_INT_MIN : -\PHP_FLOAT_MAX),
+                'max' => $attribute['max'] ?? ($type === Database::VAR_INTEGER || $type === Database::VAR_BIGINT ? \PHP_INT_MAX : \PHP_FLOAT_MAX),
            ];
        }

@@ -0,0 +1,70 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\BigInt;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt\Create as BigIntCreate;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
+use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Nullable;
+
+class Create extends BigIntCreate
+{
+    public static function getName(): string
+    {
+        return 'createBigIntColumn';
+    }
+
+    protected function getResponseModel(): string|array
+    {
+        return UtopiaResponse::MODEL_COLUMN_BIGINT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/bigint')
+            ->desc('Create bigint column')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
+            ->label('audits.event', 'column.create')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
+            ->label('sdk', new Method(
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
+                name: self::getName(),
+                description: '/docs/references/tablesdb/create-bigint-column.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_ACCEPTED,
+                        model: $this->getResponseModel(),
+                    )
+                ]
+            ))
+            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
+            ->param('tableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Table ID.', false, ['dbForProject'])
+            ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Column Key.', false, ['dbForProject'])
+            ->param('required', null, new Boolean(), 'Is column required?')
+            ->param('min', null, new Nullable(new Integer(false, 64)), 'Minimum value', true)
+            ->param('max', null, new Nullable(new Integer(false, 64)), 'Maximum value', true)
+            ->param('default', null, new Nullable(new Integer(false, 64)), 'Default value. Cannot be set when column is required.', true)
+            ->param('array', false, new Boolean(), 'Is column an array?', true)
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForDatabase')
+            ->inject('queueForEvents')
+            ->inject('authorization')
+            ->callback($this->action(...));
+    }
+}
@@ -0,0 +1,71 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\BigInt;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt\Update as BigIntUpdate;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
+use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Nullable;
+
+class Update extends BigIntUpdate
+{
+    public static function getName(): string
+    {
+        return 'updateBigIntColumn';
+    }
+
+    protected function getResponseModel(): string|array
+    {
+        return UtopiaResponse::MODEL_COLUMN_BIGINT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/bigint/:key')
+            ->desc('Update bigint column')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
+            ->label('audits.event', 'column.update')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
+            ->label('sdk', new Method(
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
+                name: self::getName(),
+                description: '/docs/references/tablesdb/update-bigint-column.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_OK,
+                        model: $this->getResponseModel(),
+                    )
+                ],
+                contentType: ContentType::JSON
+            ))
+            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
+            ->param('tableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Table ID.', false, ['dbForProject'])
+            ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Column Key.', false, ['dbForProject'])
+            ->param('required', null, new Boolean(), 'Is column required?')
+            ->param('min', null, new Nullable(new Integer(false, 64)), 'Minimum value', true)
+            ->param('max', null, new Nullable(new Integer(false, 64)), 'Maximum value', true)
+            ->param('default', null, new Nullable(new Integer(false, 64)), 'Default value. Cannot be set when column is required.')
+            ->param('newKey', null, fn (Database $dbForProject) => new Nullable(new Key(false, $dbForProject->getAdapter()->getMaxUIDLength())), 'New Column Key.', true, ['dbForProject'])
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForEvents')
+            ->inject('authorization')
+            ->callback($this->action(...));
+    }
+}
@@ -34,7 +34,7 @@ class Create extends BooleanCreate
            ->desc('Create boolean column')
            ->groups(['api', 'database', 'schema'])
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('audits.event', 'column.create')
            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
@@ -34,7 +34,7 @@ class Update extends BooleanUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/boolean/:key')
            ->desc('Update boolean column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -34,7 +34,7 @@ class Create extends DatetimeCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/datetime')
            ->desc('Create datetime column')
            ->groups(['api', 'database'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -35,7 +35,7 @@ class Update extends DatetimeUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/datetime/:key')
            ->desc('Update dateTime column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -33,7 +33,7 @@ class Delete extends AttributesDelete
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key')
            ->desc('Delete column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.delete')
@@ -34,7 +34,7 @@ class Create extends EmailCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/email')
            ->desc('Create email column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -35,7 +35,7 @@ class Update extends EmailUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/email/:key')
            ->desc('Update email column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -35,7 +35,7 @@ class Create extends EnumCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/enum')
            ->desc('Create enum column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -36,7 +36,7 @@ class Update extends EnumUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/enum/:key')
            ->desc('Update enum column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -34,7 +34,7 @@ class Create extends FloatCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/float')
            ->desc('Create float column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -35,7 +35,7 @@ class Update extends FloatUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/float/:key')
            ->desc('Update float column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -42,7 +42,7 @@ class Get extends AttributesGet
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key')
            ->desc('Get column')
            ->groups(['api', 'database'])
-            ->label('scope', ['tables.read', 'collections.read'])
+            ->label('scope', ['tables.read', 'collections.read', 'columns.read', 'attributes.read'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('sdk', new Method(
                namespace: $this->getSDKNamespace(),
@@ -34,7 +34,7 @@ class Create extends IPCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/ip')
            ->desc('Create IP address column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -35,7 +35,7 @@ class Update extends IPUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/ip/:key')
            ->desc('Update IP address column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -34,7 +34,7 @@ class Create extends IntegerCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/integer')
            ->desc('Create integer column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -35,7 +35,7 @@ class Update extends IntegerUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/integer/:key')
            ->desc('Update integer column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -35,7 +35,7 @@ class Create extends LineCreate
            ->desc('Create line column')
            ->groups(['api', 'database', 'schema'])
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('audits.event', 'column.create')
            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
@@ -35,7 +35,7 @@ class Update extends LineUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/line/:key')
            ->desc('Update line column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -33,7 +33,7 @@ class Create extends LongtextCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/longtext')
            ->desc('Create longtext column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -34,7 +34,7 @@ class Update extends LongtextUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/longtext/:key')
            ->desc('Update longtext column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -33,7 +33,7 @@ class Create extends MediumtextCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/mediumtext')
            ->desc('Create mediumtext column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -34,7 +34,7 @@ class Update extends MediumtextUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/mediumtext/:key')
            ->desc('Update mediumtext column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -35,7 +35,7 @@ class Create extends PointCreate
            ->desc('Create point column')
            ->groups(['api', 'database', 'schema'])
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('audits.event', 'column.create')
            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
@@ -35,7 +35,7 @@ class Update extends PointUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/point/:key')
            ->desc('Update point column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -35,7 +35,7 @@ class Create extends PolygonCreate
            ->desc('Create polygon column')
            ->groups(['api', 'database', 'schema'])
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('audits.event', 'column.create')
            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
@@ -35,7 +35,7 @@ class Update extends PolygonUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/polygon/:key')
            ->desc('Update polygon column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -34,7 +34,7 @@ class Create extends RelationshipCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/relationship')
            ->desc('Create relationship column')
            ->groups(['api', 'database'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -34,7 +34,7 @@ class Update extends RelationshipUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key/relationship')
            ->desc('Update relationship column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -37,7 +37,7 @@ class Create extends StringCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/string')
            ->desc('Create string column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -37,7 +37,7 @@ class Update extends StringUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/string/:key')
            ->desc('Update string column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -33,7 +33,7 @@ class Create extends TextCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/text')
            ->desc('Create text column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -34,7 +34,7 @@ class Update extends TextUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/text/:key')
            ->desc('Update text column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -34,7 +34,7 @@ class Create extends URLCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/url')
            ->desc('Create URL column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -35,7 +35,7 @@ class Update extends URLUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/url/:key')
            ->desc('Update URL column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -35,7 +35,7 @@ class Create extends VarcharCreate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/varchar')
            ->desc('Create varchar column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
            ->label('audits.event', 'column.create')
@@ -36,7 +36,7 @@ class Update extends VarcharUpdate
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/varchar/:key')
            ->desc('Update varchar column')
            ->groups(['api', 'database', 'schema'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
            ->label('audits.event', 'column.update')
@@ -33,7 +33,7 @@ class XList extends AttributesXList
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns')
            ->desc('List columns')
            ->groups(['api', 'database'])
-            ->label('scope', ['tables.read', 'collections.read'])
+            ->label('scope', ['tables.read', 'collections.read', 'columns.read', 'attributes.read'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('sdk', new Method(
                namespace: $this->getSDKNamespace(),
@@ -37,7 +37,7 @@ class Create extends IndexCreate
            ->desc('Create index')
            ->groups(['api', 'database'])
            ->label('event', 'databases.[databaseId].tables.[tableId].indexes.[indexId].create')
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'indexes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('audits.event', 'index.create')
            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
@@ -36,7 +36,7 @@ class Delete extends IndexDelete
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes/:key')
            ->desc('Delete index')
            ->groups(['api', 'database'])
-            ->label('scope', ['tables.write', 'collections.write'])
+            ->label('scope', ['tables.write', 'collections.write', 'indexes.write'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('event', 'databases.[databaseId].tables.[tableId].indexes.[indexId].update')
            ->label('audits.event', 'index.delete')
@@ -32,7 +32,7 @@ class Get extends IndexGet
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes/:key')
            ->desc('Get index')
            ->groups(['api', 'database'])
-            ->label('scope', ['tables.read', 'collections.read'])
+            ->label('scope', ['tables.read', 'collections.read', 'indexes.read'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('sdk', new Method(
                namespace: $this->getSDKNamespace(),
@@ -33,7 +33,7 @@ class XList extends IndexXList
            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes')
            ->desc('List indexes')
            ->groups(['api', 'database'])
-            ->label('scope', ['tables.read', 'collections.read'])
+            ->label('scope', ['tables.read', 'collections.read', 'indexes.read'])
            ->label('resourceType', RESOURCE_TYPE_DATABASES)
            ->label('sdk', new Method(
                namespace: $this->getSDKNamespace(),
@@ -2,6 +2,8 @@

 namespace Appwrite\Platform\Modules\Databases\Services\Registry;

+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt\Create as CreateBigIntAttribute;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt\Update as UpdateBigIntAttribute;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean\Create as CreateBooleanAttribute;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean\Update as UpdateBooleanAttribute;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Datetime\Create as CreateDatetimeAttribute;
@@ -171,6 +173,10 @@ class Legacy extends Base
        $service->addAction(CreateIntegerAttribute::getName(), new CreateIntegerAttribute());
        $service->addAction(UpdateIntegerAttribute::getName(), new UpdateIntegerAttribute());

+        // Attribute: BigInt
+        $service->addAction(CreateBigIntAttribute::getName(), new CreateBigIntAttribute());
+        $service->addAction(UpdateBigIntAttribute::getName(), new UpdateBigIntAttribute());
+
        // Attribute: IP
        $service->addAction(CreateIPAttribute::getName(), new CreateIPAttribute());
        $service->addAction(UpdateIPAttribute::getName(), new UpdateIPAttribute());
@@ -5,6 +5,8 @@ namespace Appwrite\Platform\Modules\Databases\Services\Registry;
 use Appwrite\Platform\Modules\Databases\Http\TablesDB\Create as CreateTablesDatabase;
 use Appwrite\Platform\Modules\Databases\Http\TablesDB\Delete as DeleteTablesDatabase;
 use Appwrite\Platform\Modules\Databases\Http\TablesDB\Get as GetTablesDatabase;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\BigInt\Create as CreateBigInt;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\BigInt\Update as UpdateBigInt;
 use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Boolean\Create as CreateBoolean;
 use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Boolean\Update as UpdateBoolean;
 use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Datetime\Create as CreateDatetime;
@@ -151,6 +153,10 @@ class TablesDB extends Base
        $service->addAction(CreateInteger::getName(), new CreateInteger());
        $service->addAction(UpdateInteger::getName(), new UpdateInteger());

+        // Column: BigInt
+        $service->addAction(CreateBigInt::getName(), new CreateBigInt());
+        $service->addAction(UpdateBigInt::getName(), new UpdateBigInt());
+
        // Column: IP
        $service->addAction(CreateIP::getName(), new CreateIP());
        $service->addAction(UpdateIP::getName(), new UpdateIP());
@@ -175,15 +175,8 @@ class Create extends Action
                throw new Exception(Exception::STORAGE_INVALID_CONTENT_RANGE);
            }

-            // TODO remove the condition that checks `$end === $fileSize` in next breaking version
-            if ($end === $fileSize - 1 || $end === $fileSize) {
-                //if it's a last chunks the chunk size might differ, so we set the $chunks and $chunk to notify it's last chunk
-                $chunks = $chunk = -1;
-            } else {
-                // Calculate total number of chunks based on the chunk size i.e ($rangeEnd - $rangeStart)
-                $chunks = (int) ceil($fileSize / ($end + 1 - $start));
-                $chunk = (int) ($start / ($end + 1 - $start)) + 1;
-            }
+            $chunks = (int) ceil($fileSize / APP_LIMIT_UPLOAD_CHUNK_SIZE);
+            $chunk = (int) ($start / APP_LIMIT_UPLOAD_CHUNK_SIZE) + 1;
        }

        if (!$fileSizeValidator->isValid($fileSize) && $functionSizeLimit !== 0) { // Check if file size is exceeding allowed limit
@@ -202,15 +195,14 @@ class Create extends Action
        $metadata = ['content_type' => $deviceForLocal->getFileMimeType($fileTmpName)];
        if (!$deployment->isEmpty()) {
            $chunks = $deployment->getAttribute('sourceChunksTotal', 1);
+            $uploaded = $deployment->getAttribute('sourceChunksUploaded', 0);
            $metadata = $deployment->getAttribute('sourceMetadata', []);
-            if ($chunk === -1) {
-                $chunk = $chunks;
-            }
-        } else {
-            // Guard against manually setting range header for single chunk upload
-            if ($chunks === -1) {
-                $chunks = 1;
-                $chunk = 1;
+
+            if ($uploaded === $chunks) {
+                $response
+                    ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+                    ->dynamic($deployment, Response::MODEL_DEPLOYMENT);
+                return;
            }
        }

@@ -258,6 +250,8 @@ class Create extends Action
                    'sourcePath' => $path,
                    'sourceSize' => $fileSize,
                    'totalSize' => $fileSize,
+                    'sourceChunksTotal' => $chunks,
+                    'sourceChunksUploaded' => $chunksUploaded,
                    'activate' => $activate,
                    'sourceMetadata' => $metadata,
                    'type' => $type
@@ -272,6 +266,7 @@ class Create extends Action
            } else {
                $deployment = $dbForProject->updateDocument('deployments', $deploymentId, new Document([
                    'sourceSize' => $fileSize,
+                    'sourceChunksUploaded' => $chunksUploaded,
                    'sourceMetadata' => $metadata,
                ]));
            }
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`List all OAuth2 providers supported by the Appwrite server, along with the parameters required to configure each provider. The response excludes mock providers but includes sandbox providers.`
				`@@ -1 +0,0 @@`
				`Get all Environment Variables that are relevant for the console.`
				`@@ -0,0 +1 @@`
				`Create a bigint attribute. Optionally, minimum and maximum values can be provided.`
				`@@ -0,0 +1 @@`
				Update a bigint attribute. Changing the `default` value will not update already existing documents.
				`@@ -0,0 +1 @@`
				`Create a bigint column. Optionally, minimum and maximum values can be provided.`
				`@@ -0,0 +1 @@`
				Update a bigint column. Changing the `default` value will not update already existing rows.