chore: release 1.23.1

Dev

.env.example

@@ -1,15 +1,29 @@
 # Environment
 NODE_ENV=development
 
+# Logging
+# Controls minimum log level. Options: debug | info | warn | error
+# Set to "warn" or "error" in production to suppress health-check ping noise.
+# Use "debug" to see all request logs including agent status pings.
+LOG_LEVEL=info
+
 # Database
 DATABASE_URL=postgresql://devuser:changeme@localhost:5433/devdb?schema=public
 
 # Project
 PROJECT_NAME="Portabase"
-PROJECT_DESCRIPTION="Portabase is a powerful database manager"
 PROJECT_URL=http://localhost:8887
 PROJECT_SECRET=
 
+AUTH_DEFAULT_USER_NAME="Portabase Admin"
+AUTH_DEFAULT_USER=user@example.com
+# Password must contain at least 8 characters
+# Password must contain at least 1 number
+# Password must contain at least 1 lowercase letter
+# Password must contain at least 1 uppercase letter
+# Password must contain at least 1 special character
+AUTH_DEFAULT_PASSWORD=testPASS123456!
+
 # SMTP (email)
 SMTP_HOST=
 SMTP_PORT=
@@ -40,7 +54,6 @@ AUTH_OIDC_ROLE_MAP=""
 AUTH_ALLOW_LINKING=true
 AUTH_ALLOW_UNLINKING=true
 
-
 # Social OAuth2 Authentification
 AUTH_SOCIAL_ID=""
 AUTH_SOCIAL_TITLE=""
@@ -59,3 +72,15 @@ AUTH_PASSKEY_ENABLED=true
 
 # Retention
 RETENTION_CRON="* * * * *"
+
+TRUSTED_DOMAINS="http://localhost:8887, http://localhost:3055, http://localhost:3056"
+
+#OPENAPI_ENABLED=true
+#API_ENABLED=true
+#MCP_ENABLED=true
+
+# Default to false
+#TUSD_BEHIND_PROXY=true
+
+#Skip the onboarding on fresh instance
+#SKIP_ONBOARDING=true

.eslintrc.json

@@ -1,11 +1,7 @@
 {
-  "extends": [
-    "next/core-web-vitals",
-    "plugin:tailwindcss/recommended"
-  ],
+  "extends": ["next/core-web-vitals", "plugin:tailwindcss/recommended"],
   "rules": {
     "react/no-unescaped-entities": "off",
     "react-hooks/rules-of-hooks": "off"
-
   }
 }

.github/CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-contact@soluce-technologies.com.
+contact@portabase.io.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

.github/CONTRIBUTING.md

@@ -14,8 +14,9 @@ Please take a moment to review this guide. It will help you understand how to co
 2. [Reporting Issues](#reporting-issues)
 3. [Submitting Changes](#submitting-changes)
 4. [Code Style Guidelines](#code-style-guidelines)
-5. [Pull Request Process](#pull-request-process)
-6. [Community Guidelines](#community-guidelines)
+5. [E2E Tests](#e2e-tests)
+6. [Pull Request Process](#pull-request-process)
+7. [Community Guidelines](#community-guidelines)
 
 ---
 
@@ -88,6 +89,14 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 ---
 
+## E2E Tests
+
+E2E tests now live in a dedicated repository: [Portabase/e2e-tests](https://github.com/Portabase/e2e-tests).
+
+If your contribution needs corresponding end-to-end test coverage, add it there instead of this repo.
+
+---
+
 ## Pull Request Process
 
 1. Ensure your code passes all tests and linters.

.github/SECURITY.md

@@ -18,7 +18,7 @@ We take security seriously and aim to support the following versions of the proj
 If you discover a security vulnerability in this project, we appreciate your help in disclosing it responsibly.
 
 1. **Contact Us**  
-   Please report the vulnerability by emailing **[contact@soluce-technologies.com](mailto:contact@soluce-technologies.com)**. Include the following details:
+   Please report the vulnerability by emailing **[contact@portabase.io](mailto:contact@portabase.io)**. Include the following details:
     - A detailed description of the issue.
     - Steps to reproduce the vulnerability (if applicable).
     - Any potential impacts or risks.

.github/workflows/auto-release.yml

@@ -1,70 +0,0 @@
-name: Auto Release bot
-
-on:
-  pull_request:
-    types: [ closed ]
-    branches:
-      - main
-
-jobs:
-  release:
-    if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ vars.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ steps.app-token.outputs.token }}
-          ref: ${{ github.base_ref }}
-
-      - uses: pnpm/action-setup@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: "pnpm"
-
-      - run: pnpm install --frozen-lockfile
-
-      - run: git config --global user.name 'github-actions[bot]'
-      - run: git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-
-#      - name: Run release-it
-#        id: release_step
-#        run: |
-#          git pull origin main
-#          pnpm exec release-it --ci --ci-output
-#        env:
-#          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-
-      - name: Run release-it
-        id: release_step
-        run: |
-          git pull origin main
-          TAG=$(pnpm exec release-it --ci --ci-output | grep -oE '🔗 https://github.com/.+/releases/tag/([^\s]+)' | awk -F/ '{print $NF}')
-          echo "tag=$TAG" >> $GITHUB_OUTPUT
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-
-      - name: Get new version
-        id: get_version
-        run: |
-          TAG="v$(node -p "require('./package.json').version")"
-          echo "tag=$TAG" >> $GITHUB_OUTPUT
-
-      - name: Convert release to draft
-        run: |
-          echo "Updating release $TAG to draft"
-          RELEASE_ID=$(gh release view "$TAG" --json id -q .id)
-          gh release edit "$RELEASE_ID" --draft
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/discord.yml

@@ -3,6 +3,9 @@ name: Discord Notification
 on:
   workflow_call:
     inputs:
+      release_tag:
+        required: true
+        type: string
       discord_title:
         required: true
         type: string
@@ -21,50 +24,86 @@ on:
 jobs:
   notify-discord:
     runs-on: ubuntu-latest
+
     steps:
       - name: Send Discord Notification
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          RELEASE_TAG: ${{ inputs.release_tag }}
+          DISCORD_TITLE: ${{ inputs.discord_title }}
+          DISCORD_COLOR: ${{ inputs.discord_color }}
+          DISCORD_FOOTER: ${{ inputs.discord_footer }}
         run: |
-          RELEASE_INFO=$(gh release view "${{ github.ref_name }}" -R ${{ github.repository }} --json name,url,body,author)
+          set -euo pipefail
 
-          RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r .name)
-          if [ -z "$RELEASE_TITLE" ] || [ "$RELEASE_TITLE" = "null" ]; then RELEASE_TITLE="${{ github.ref_name }}"; fi
+          RELEASE_INFO=$(gh release view "$RELEASE_TAG" -R "${{ github.repository }}" --json name,url,body,author)
 
-          RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r .url)
-          RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r .body)
+          RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r '.name // empty')
+          if [ -z "$RELEASE_TITLE" ]; then
+            RELEASE_TITLE="$RELEASE_TAG"
+          fi
+
+          RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r '.url // empty')
+          RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r '.body // ""')
 
           AUTHOR_NAME="Portabase"
           AUTHOR_ICON="https://github.com/Portabase.png"
 
-          PAYLOAD=$(jq -n \
+          jq -n \
             --arg title "$RELEASE_TITLE" \
             --arg description "$RELEASE_BODY" \
             --arg url "$RELEASE_URL" \
             --arg author "$AUTHOR_NAME" \
             --arg icon "$AUTHOR_ICON" \
-            --arg discord_title "${{ inputs.discord_title }}" \
-            --arg discord_footer "${{ inputs.discord_footer }}" \
-            --argjson discord_color ${{ inputs.discord_color }} \
+            --arg discord_title "$DISCORD_TITLE" \
+            --arg discord_footer "$DISCORD_FOOTER" \
+            --argjson discord_color "$DISCORD_COLOR" \
             '{
-              content: $discord_title,
+              content: (
+                if ($discord_title | length) > 1900
+                then ($discord_title[0:1900] + "...")
+                else $discord_title
+                end
+              ),
               embeds: [{
-                title: $title,
+                title: (
+                  if ($title | length) > 256
+                  then ($title[0:253] + "...")
+                  else $title
+                  end
+                ),
                 url: $url,
-                description: $description,
+                description: (
+                  if ($description | length) > 3800
+                  then ($description[0:3800] + "\n\n...")
+                  else $description
+                  end
+                ),
                 color: $discord_color,
                 author: {
-                  name: $author,
+                  name: (
+                    if ($author | length) > 256
+                    then ($author[0:253] + "...")
+                    else $author
+                    end
+                  ),
                   icon_url: $icon
                 },
                 footer: {
-                  text: $discord_footer
+                  text: (
+                    if ($discord_footer | length) > 512
+                    then ($discord_footer[0:509] + "...")
+                    else $discord_footer
+                    end
+                  )
                 }
               }]
-            }'
-          )
+            }' > payload.json
 
-          curl -H "Content-Type: application/json" \
-               -d "$PAYLOAD" \
-               "$DISCORD_WEBHOOK"
+          cat payload.json | jq .
+
+          curl --fail-with-body -sS \
+            -H "Content-Type: application/json" \
+            -d @payload.json \
+            "$DISCORD_WEBHOOK?wait=true"

.github/workflows/docker.yml

@@ -3,6 +3,12 @@ name: Docker Publish
 on:
   workflow_call:
     inputs:
+      version:
+        required: true
+        type: string
+      ref:
+        required: true
+        type: string
       image_name:
         required: false
         type: string
@@ -32,10 +38,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [linux/amd64, linux/arm64]
+        platform: [ linux/amd64, linux/arm64 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref }}
+          fetch-depth: 0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -50,9 +59,10 @@ jobs:
         id: prep
         run: |
           ARCH=${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
-          echo "image=${{ inputs.image_name }}:${GITHUB_REF#refs/tags/}-$ARCH" >> $GITHUB_OUTPUT
+          echo "image=${{ inputs.image_name }}:${{inputs.version}}-$ARCH" >> $GITHUB_OUTPUT
           echo "safe_platform=${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}" >> $GITHUB_OUTPUT
 
+
       - name: Build and push image
         uses: docker/build-push-action@v6
         with:
@@ -63,7 +73,7 @@ jobs:
           tags: ${{ steps.prep.outputs.image }}
           target: ${{ inputs.target }}
           cache-from: type=gha,scope=build-${{ matrix.platform }}
-          cache-to: type=gha,mode=max,scope=build-${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=build-${{ matrix.platform }},ignore-error=true
 
       - name: Save image name for manifest
         run: echo "${{ steps.prep.outputs.image }}" > image.txt
@@ -95,20 +105,38 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Generate semantic tags
+        id: tags
+        run: |
+          VERSION="${{ inputs.version }}"
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION"
+          
+          echo "VERSION_TAG=$VERSION" >> $GITHUB_OUTPUT
+          if [ -n "$MINOR" ]; then
+            echo "MINOR_TAG=$MAJOR.$MINOR" >> $GITHUB_OUTPUT
+          fi
+          if [ -n "$MAJOR" ]; then
+            echo "MAJOR_TAG=$MAJOR" >> $GITHUB_OUTPUT
+          fi
+          if [ "${{ inputs.add_latest }}" = "true" ]; then
+            echo "LATEST_TAG=latest" >> $GITHUB_OUTPUT
+          fi
+
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ inputs.image_name }}
           tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=raw,value=latest,enable=${{ inputs.add_latest }}
+            type=raw,value=${{ steps.tags.outputs.VERSION_TAG }}
+            type=raw,value=${{ steps.tags.outputs.MINOR_TAG }}
+            type=raw,value=${{ steps.tags.outputs.MAJOR_TAG }}
+            type=raw,value=${{ steps.tags.outputs.LATEST_TAG }}
 
       - name: Create and push manifest list
         working-directory: /tmp/digests
         run: |
           DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
           TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
-          docker buildx imagetools create $DOCKER_IMAGES $TAG_ARGS
+          echo $TAG_ARGS
+          docker buildx imagetools create $TAG_ARGS $DOCKER_IMAGES

.github/workflows/e2e.yml

@@ -0,0 +1,86 @@
+name: End-to-end testing
+
+on:
+  pull_request:
+    branches: [main]
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-image:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    outputs:
+      image: ${{ steps.image.outputs.ref }}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Compute image reference
+        id: image
+        run: echo "ref=ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/portabase:${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/dockerfile/Dockerfile
+          push: true
+          tags: ${{ steps.image.outputs.ref }}
+          target: prod
+
+  run-e2e:
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    needs: build-image
+    uses: portabase/e2e-tests/.github/workflows/run-e2e.yml@main
+    with:
+      server_image: ${{ needs.build-image.outputs.image }}
+    secrets:
+      E2E_NOTIFICATION_SMTP_HOST: ${{ secrets.E2E_NOTIFICATION_SMTP_HOST }}
+      E2E_NOTIFICATION_SMTP_PORT: ${{ secrets.E2E_NOTIFICATION_SMTP_PORT }}
+      E2E_NOTIFICATION_SMTP_USER: ${{ secrets.E2E_NOTIFICATION_SMTP_USER }}
+      E2E_NOTIFICATION_SMTP_PASSWORD: ${{ secrets.E2E_NOTIFICATION_SMTP_PASSWORD }}
+      E2E_NOTIFICATION_SMTP_FROM: ${{ secrets.E2E_NOTIFICATION_SMTP_FROM }}
+      E2E_NOTIFICATION_SMTP_TO: ${{ secrets.E2E_NOTIFICATION_SMTP_TO }}
+      E2E_NOTIFICATION_SLACK_WEBHOOK: ${{ secrets.E2E_NOTIFICATION_SLACK_WEBHOOK }}
+      E2E_NOTIFICATION_DISCORD_WEBHOOK: ${{ secrets.E2E_NOTIFICATION_DISCORD_WEBHOOK }}
+      E2E_NOTIFICATION_TELEGRAM_BOT_TOKEN: ${{ secrets.E2E_NOTIFICATION_TELEGRAM_BOT_TOKEN }}
+      E2E_NOTIFICATION_TELEGRAM_CHAT_ID: ${{ secrets.E2E_NOTIFICATION_TELEGRAM_CHAT_ID }}
+      E2E_NOTIFICATION_TELEGRAM_TOPIC_ID: ${{ secrets.E2E_NOTIFICATION_TELEGRAM_TOPIC_ID }}
+      E2E_NOTIFICATION_GOTIFY_SERVER_URL: ${{ secrets.E2E_NOTIFICATION_GOTIFY_SERVER_URL }}
+      E2E_NOTIFICATION_GOTIFY_APP_TOKEN: ${{ secrets.E2E_NOTIFICATION_GOTIFY_APP_TOKEN }}
+      E2E_NOTIFICATION_NTFY_TOPIC: ${{ secrets.E2E_NOTIFICATION_NTFY_TOPIC }}
+      E2E_NOTIFICATION_NTFY_SERVER_URL: ${{ secrets.E2E_NOTIFICATION_NTFY_SERVER_URL }}
+      E2E_NOTIFICATION_NTFY_TOKEN: ${{ secrets.E2E_NOTIFICATION_NTFY_TOKEN }}
+      E2E_NOTIFICATION_NTFY_USERNAME: ${{ secrets.E2E_NOTIFICATION_NTFY_USERNAME }}
+      E2E_NOTIFICATION_NTFY_PASSWORD: ${{ secrets.E2E_NOTIFICATION_NTFY_PASSWORD }}
+      E2E_NOTIFICATION_WEBHOOK_URL: ${{ secrets.E2E_NOTIFICATION_WEBHOOK_URL }}
+      E2E_NOTIFICATION_WEBHOOK_SECRET_HEADER: ${{ secrets.E2E_NOTIFICATION_WEBHOOK_SECRET_HEADER }}
+      E2E_NOTIFICATION_WEBHOOK_SECRET: ${{ secrets.E2E_NOTIFICATION_WEBHOOK_SECRET }}
+      E2E_STORAGE_AWS_S3_ENDPOINT_URL: ${{ secrets.E2E_STORAGE_AWS_S3_ENDPOINT_URL }}
+      E2E_STORAGE_AWS_S3_REGION: ${{ secrets.E2E_STORAGE_AWS_S3_REGION }}
+      E2E_STORAGE_AWS_S3_ACCESS_KEY: ${{ secrets.E2E_STORAGE_AWS_S3_ACCESS_KEY }}
+      E2E_STORAGE_AWS_S3_SECRET_KEY: ${{ secrets.E2E_STORAGE_AWS_S3_SECRET_KEY }}
+      E2E_STORAGE_AWS_S3_BUCKET_NAME: ${{ secrets.E2E_STORAGE_AWS_S3_BUCKET_NAME }}
+      E2E_STORAGE_AWS_S3_PORT: ${{ secrets.E2E_STORAGE_AWS_S3_PORT }}
+      E2E_STORAGE_R2_ENDPOINT_URL: ${{ secrets.E2E_STORAGE_R2_ENDPOINT_URL }}
+      E2E_STORAGE_R2_REGION: ${{ secrets.E2E_STORAGE_R2_REGION }}
+      E2E_STORAGE_R2_ACCESS_KEY: ${{ secrets.E2E_STORAGE_R2_ACCESS_KEY }}
+      E2E_STORAGE_R2_SECRET_KEY: ${{ secrets.E2E_STORAGE_R2_SECRET_KEY }}
+      E2E_STORAGE_R2_BUCKET_NAME: ${{ secrets.E2E_STORAGE_R2_BUCKET_NAME }}
+      E2E_STORAGE_R2_PORT: ${{ secrets.E2E_STORAGE_R2_PORT }}
+      E2E_STORAGE_GOOGLE_DRIVE_CLIENT_ID: ${{ secrets.E2E_STORAGE_GOOGLE_DRIVE_CLIENT_ID }}
+      E2E_STORAGE_GOOGLE_DRIVE_CLIENT_SECRET: ${{ secrets.E2E_STORAGE_GOOGLE_DRIVE_CLIENT_SECRET }}
+      E2E_STORAGE_GOOGLE_DRIVE_FOLDER_ID: ${{ secrets.E2E_STORAGE_GOOGLE_DRIVE_FOLDER_ID }}

.github/workflows/helm.yml

@@ -0,0 +1,37 @@
+name: Publish Helm Chart
+on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
+    secrets:
+      GH_TOKEN:
+        required: true
+
+jobs:
+  publish-helm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+
+      - name: Package Helm chart
+        run: |
+          mkdir -p ./helm-packages
+          helm package helm \
+            --version ${{ inputs.version }} \
+            --app-version ${{ inputs.version }} \
+            --destination ./helm-packages
+
+      - name: Authenticate to GitHub Packages
+        run: |
+          echo "${{ secrets.GH_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push Helm chart to GitHub Packages (OCI)
+        run: |
+          helm push ./helm-packages/portabase-${{ inputs.version }}.tgz oci://ghcr.io/portabase/charts

.github/workflows/pr-checker.yml

@@ -1,47 +0,0 @@
-name: PR Checker
-
-on:
-  pull_request:
-    branches:
-      - main
-      - dev
-
-jobs:
-  validate-code:
-    name: Code Integrity Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Check code formatting
-        run: pnpm run format:check
-        continue-on-error: true
-
-      - name: Run Linter
-        run: pnpm run lint
-        continue-on-error: true
-
-      - name: Type Check
-        run: pnpm run typecheck
-        continue-on-error: true
-
-      - name: Run Tests
-        run: pnpm run test
-        continue-on-error: true
-
-      - name: Test Application Build
-        run: pnpm run build

.github/workflows/release.yml

@@ -1,45 +1,143 @@
-name: Publish Docker image for release
+name: Auto Release & Publish
 
 on:
-  push:
-    tags:
-      - "*.*.*"
-      - "!*-*"
+  pull_request_target:
+    types: [ closed ]
+    branches:
+      - main
 
 permissions:
-  contents: read
+  contents: write
   packages: write
 
 jobs:
-  docker_publish:
+
+  check-skip:
+    runs-on: ubuntu-latest
+    outputs:
+      skip: ${{ steps.set-skip.outputs.skip }}
+    steps:
+      - name: Determine if release should be skipped
+        id: set-skip
+        run: |
+          TITLE="${{ github.event.pull_request.title }}"
+          echo "PR title: $TITLE"
+
+          if [[ "$TITLE" == *"[skip-release]"* ]]; then
+            echo "PR title contains [skip-release], skipping release jobs."
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+
+  create-release:
+    needs: check-skip
+    if: ${{ needs.check-skip.outputs.skip == 'false' && github.event.pull_request.merged == true }}
+    runs-on: ubuntu-latest
+    outputs:
+      draft_tag: ${{ steps.release_step.outputs.draft_tag }}
+      version: ${{ steps.release_step.outputs.version }}
+    steps:
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+          ref: main
+
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: "pnpm"
+
+      - run: pnpm install --frozen-lockfile
+
+      - run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+
+      - name: Run release-it
+        id: release_step
+        run: |
+          git pull origin main
+          
+          VERSION=$(pnpm exec release-it --ci --release-version)
+          echo $VERSION
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          
+          OUTPUT=$(pnpm exec release-it --ci)
+          echo "$OUTPUT"
+          
+          DRAFT_TAG=$(echo "$OUTPUT" | grep -oE 'untagged-[a-z0-9]+')
+          echo $DRAFT_TAG
+          echo "draft_tag=$DRAFT_TAG" >> $GITHUB_OUTPUT
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+
+
+  publish-docker:
+    needs: create-release
+    if: ${{ needs.create-release.result == 'success' }}
     uses: ./.github/workflows/docker.yml
     with:
+      version: ${{ needs.create-release.outputs.version }}
+      ref: ${{ needs.create-release.outputs.version }}
       add_latest: true
     secrets:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
-  publish_release:
-    needs: docker_publish
+
+  publish-helm:
+    needs: create-release
+    if: ${{ needs.create-release.result == 'success' }}
+    uses: ./.github/workflows/helm.yml
+    with:
+      version: ${{ needs.create-release.outputs.version }}
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  finalize-release:
+    needs:
+      - create-release
+      - publish-docker
+      - publish-helm
     runs-on: ubuntu-latest
+    outputs:
+      release_tag: ${{ steps.publish_release_step.outputs.release_tag }}
     steps:
-        - name: Checkout code
-          uses: actions/checkout@v4
-          with:
-            fetch-depth: 0
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-        - name: Publish GitHub Release
-          env:
-            GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          run: |
-            gh release edit v${{ github.ref_name }} --draft=false
+      - name: Publish GitHub Release
+        id: publish_release_step
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          OUTPUT=$(gh release edit ${{ needs.create-release.outputs.draft_tag }} --draft=false)
+          echo "$OUTPUT"
+          RELEASE_TAG=$(echo "$OUTPUT" | sed -E 's|.*/releases/tag/||')
+          echo "release_tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
 
-  discord_notification:
-    needs: docker_publish
+  notify-discord:
+    needs:
+      - publish-docker
+      - publish-helm
+      - create-release
+      - finalize-release
     uses: ./.github/workflows/discord.yml
     with:
-      discord_title: "New Release: v${{ github.ref_name }}"
+      release_tag: ${{ needs.create-release.outputs.version }}
+      discord_title: "New Release"
       discord_color: 3066993
       discord_footer: "Portabase"
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/security.yml

@@ -9,14 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: aquasecurity/trivy-action@0.20.0
+      - uses: aquasecurity/trivy-action@v0.35.0
         with:
           scan-type: 'fs'
           format: 'table'
           severity: 'CRITICAL,HIGH'
           ignore-unfixed: true
 
-
   secrets-gitleaks:
     if: github.event.pull_request.head.repo.fork == false
     runs-on: ubuntu-latest

.gitignore

@@ -9,6 +9,8 @@
 
 # testing
 /coverage
+gcs-data/
+gcs-storage/
 
 # next.js
 /.next/
@@ -28,6 +30,8 @@ yarn-error.log*
 
 # local env files
 .env*.local
+.env
+**/.env
 
 # vercel
 .vercel
@@ -42,8 +46,24 @@ public/uploads/*
 private/uploads/*
 private/keys/*
 
+private/telemetry/*
+
 /.env
 
 seeds/pocket-id/*.db
 
 certificates
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+/playwright/.auth/
+/e2e/local-storage.json
+
+.claude
+.codex
+/docs
+.worktrees
+.superpowers

.release-it.json

@@ -1,15 +1,15 @@
 {
   "github": {
     "release": true,
-    "draft": false,
+    "draft": true,
     "tokenRef": "GITHUB_TOKEN"
   },
   "git": {
     "commit": true,
-    "commitMessage": "chore: release v${version}",
+    "commitMessage": "chore: release ${version}",
     "requireCleanWorkingDir": true,
     "tag": true,
-    "tagName": "v${version}",
+    "tagName": "${version}",
     "push": true
   },
   "plugins": {

CITATION.cff

@@ -21,6 +21,8 @@ keywords:
   - backups
   - postgresql
   - mysql
+  - firebird
+  - mssql
   - mariadb
   - devops
   - database
@@ -31,5 +33,5 @@ keywords:
   - web-ui
   - agent
 license: Apache-2.0
-version: 1.4.32
+version: 1.23.1
 date-released: '2026-03-02'

Makefile

@@ -16,7 +16,7 @@ seed-pocket:
 	@docker compose -f docker-compose.func.yml stop pocket-id >/dev/null 2>&1 || true
 	@docker compose -f docker-compose.func.yml rm -f -s pocket-id >/dev/null 2>&1 || true
 	@docker volume rm portabase-dev-func_pocket-id-data >/dev/null 2>&1 || true
-	@docker compose -f docker-compose.func.yml run --rm -v ./seeds/pocket-id/portabase.zip:/tmp/portabase.zip pocket-id ./pocket-id import --yes --path /tmp/portabase.zip >/dev/null
+	@docker compose -f docker-compose.func.yml run --rm -v $$(pwd)/seeds/pocket-id/portabase.zip:/tmp/portabase.zip pocket-id ./pocket-id import --yes --path /tmp/portabase.zip >/dev/null
 	@docker compose -f docker-compose.func.yml up -d pocket-id
 	@sleep 2
 	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id one-time-access-token admin
@@ -46,3 +46,11 @@ export-keycloak:
 	@docker rm -f kc-exporter >/dev/null 2>&1
 	@docker compose -f docker-compose.func.yml start keycloak >/dev/null 2>&1
 	@echo "Keycloak configuration and users exported to seeds/keycloak/*.json"
+
+seed-blob:
+	@chmod +x seeds/azurite/azurite-seed.sh
+	@bash seeds/azurite/azurite-seed.sh
+
+list-blob:
+	@chmod +x seeds/azurite/azurite-list.sh
+	@bash seeds/azurite/azurite-list.sh

README.md

@@ -12,7 +12,8 @@
 
 
 [![License: Apache](https://img.shields.io/badge/License-apache-yellow.svg)](LICENSE)
-[![Docker Pulls](https://img.shields.io/docker/pulls/solucetechnologies/portabase?color=brightgreen)](https://hub.docker.com/r/solucetechnologies/portabase)
+[![Docker Pulls](https://img.shields.io/docker/pulls/portabase/portabase?color=brightgreen)](https://hub.docker.com/r/portabase/portabase)
+[![Helm Chart](https://img.shields.io/badge/Helm-Kubernetes-326ce5?logo=helm&logoColor=white)](https://github.com/Portabase/portabase/pkgs/container/charts%2Fportabase)
 [![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey)](https://github.com/Portabase/portabase)
 [![Support Portabase](https://img.shields.io/badge/Support-Portabase-orange)](https://www.buymeacoffee.com/portabase)
 
@@ -20,7 +21,12 @@
 [![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)](https://www.mysql.com/)
 [![MariaDB](https://img.shields.io/badge/MariaDB-003545?logo=mariadb&logoColor=white)](https://mariadb.org/)
 [![SQLite](https://img.shields.io/badge/-SQLite-blue?logo=sqlite&logoColor=white)](https://sqlite.org/)
+[![Redis](https://img.shields.io/badge/Redis-DC382D?style=flat&logo=Redis&logoColor=white)](https://redis.io/)
 [![MongoDB](https://img.shields.io/badge/-MongoDB-13aa52?logo=mongodb&logoColor=white)](https://www.mongodb.com/)
+[![Valkey](https://img.shields.io/badge/Valkey-6284fc?style=flat&logo=Valkey&logoColor=white)](https://valkey.io/)
+[![Firebird](https://img.shields.io/badge/Firebird-f55b14?style=flat&logo=Firebird&logoColor=white)](https://firebirdsql.org/)
+[![Microsoft SQL Server](https://img.shields.io/badge/Microsoft%20SQL%20Server-CC2927?style=flat&logo=microsoftsqlserver&logoColor=white)](https://www.microsoft.com/en-us/sql-server)
+
 [![Self Hosted](https://img.shields.io/badge/self--hosted-yes-brightgreen)](https://github.com/Portabase/portabase)
 [![Open Source](https://img.shields.io/badge/open%20source-❤️-red)](https://github.com/Portabase/portabase)
 
@@ -48,16 +54,34 @@
 
 ## Installation
 
-You have 4 ways to install Portabase:
+You have 5 ways to install Portabase:
 
 - Automated CLI (recommended) - [details](https://portabase.io/docs/dashboard/setup#cli)
 - Docker Run - [details](https://portabase.io/docs/dashboard/setup#docker)
 - Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker-compose)
-- Kubernetes with Helm (soon)
+- Unraid Community Apps - [details](https://ca.unraid.net/apps/portabase-dashboard-1sdc97m05ufd7q) - [unraid support thread](https://forums.unraid.net/topic/199072-support-portabase-dashboard-agent-dockers/)
+- Kubernetes with Helm - [details](https://portabase.io/docs/dashboard/setup#helm)
 - Development setup - [details](https://portabase.io/docs/dashboard/setup#development)
 
 **Ensure Docker is installed on your machine before getting started.**
 
+## Supported databases
+
+| Engine             | Support   | Supported Versions            | Restore |
+|:-------------------|:----------|:------------------------------|:--------|
+| **PostgreSQL**     | ✅ Stable  | 12, 13, 14, 15, 16, 17 and 18 | Yes     |
+| **MySQL**          | ✅ Stable  | 5.7, 8 and 9                  | Yes     |
+| **MariaDB**        | ✅ Stable  | 10 and 11                     | Yes     |
+| **MongoDB**        | ✅ Stable  | 4, 5, 6, 7 and 8              | Yes     |
+| **SQLite**         | ✅ Stable  | 3.x                           | Yes     |
+| **Redis**          | ✅ Stable  | 2.8+                          | No      |
+| **Valkey**         | ✅ Stable  | 7.2+                          | No      |
+| **Firebird**       | ✅ Stable  | 3.0, 4.0, 5.0                 | Yes     |
+| **MSSQL Server**   | ✅ Stable  | 2017, 2019, 2022, Azure SQL         | Yes     |
+| **Docker Volume**  | ✅ Stable  | Docker Engine 20.10+  | Yes |
+
+See the [Database Servers documentation](https://portabase.io/docs/agent/db) for version-specific backup and restore details.
+
 ## Contributors
 
 [![Contributors](https://contrib.rocks/image?repo=Portabase/portabase)](https://github.com/Portabase/portabase/graphs/contributors)
@@ -66,7 +90,7 @@ You have 4 ways to install Portabase:
 
 ## License
 
-Distributed under the Apache License. See `LICENSE.txt` for more details.
+Distributed under the Apache License. See `LICENSE.txt` for more details. 
 
 
 [Docker]: https://img.shields.io/badge/Docker-2496ED?logo=docker&logoColor=fff&style=for-the-badge

app/(auth)/forgot-password/page.tsx

@@ -1,9 +1,9 @@
 import { CardContent, CardHeader } from "@/components/ui/card";
 
 import { TooltipProvider } from "@/components/ui/tooltip";
-import { ForgotPasswordForm } from "@/components/wrappers/auth/login/forgot-password-form/forgot-password-form";
+import { ForgotPasswordForm } from "@/features/auth/components/forgot-password-form";
 import { env } from "@/env.mjs";
-import { CardAuth } from "@/features/layout/card-auth";
+import { CardAuth } from "@/features/layout/components/card-auth";
 import { redirect } from "next/navigation";
 
 export default async function RoutePage(props: { searchParams: Promise<{ callbackUrl: string | undefined }> }) {

app/(auth)/guard/page.tsx

@@ -1,9 +1,9 @@
 import {CardContent, CardHeader} from "@/components/ui/card";
 import {TooltipProvider} from "@/components/ui/tooltip";
-import {GuardForm} from "@/components/wrappers/auth/guard/guard-form";
+import {GuardForm} from "@/features/auth/components/guard-form";
 import {cookies} from "next/headers";
 import {redirect} from "next/navigation";
-import {CardAuth} from "@/features/layout/card-auth";
+import {CardAuth} from "@/features/layout/components/card-auth";
 
 export default async function GuardPage() {
 

app/(auth)/layout.tsx

@@ -1,16 +1,20 @@
-import React, { Suspense } from "react";
+import React from "react";
 import { redirect } from "next/navigation";
 import { currentUser } from "@/lib/auth/current-user";
-import { AuthLogoSection } from "@/components/wrappers/auth/auth-logo-section";
+import { isOnboardingDone } from "@/db/services/setting";
+import { AuthLogoSection } from "@/features/auth/components/auth-logo-section";
 import { env } from "@/env.mjs";
 import { Heart } from "lucide-react";
-import { ErrorLayout } from "@/components/wrappers/common/error-layout";
 
 export default async function Layout({
   children,
 }: {
   children: React.ReactNode;
 }) {
+  if (env.SKIP_ONBOARDING !== "true" && !(await isOnboardingDone())) {
+    redirect("/welcome");
+  }
+
   const user = await currentUser();
 
   if (user && !user.banned && user.role !== "pending") {
@@ -31,7 +35,6 @@ export default async function Layout({
           <Heart className="size-3 fill-red-500 text-red-500 animate-pulse" />{" "}
           by <span className="font-medium text-foreground">Portabase</span>
         </p>
-        <p>v{env.NEXT_PUBLIC_PROJECT_VERSION}</p>
       </footer>
     </div>
   );

app/(auth)/login/page.tsx

@@ -1,14 +1,13 @@
-import { LoginForm } from "@/components/wrappers/auth/login/login-form/login-form";
+import { LoginForm } from "@/features/auth/components/login-form";
 import { Metadata } from "next";
 import { SUPPORTED_PROVIDERS } from "@/lib/auth/config";
-import { SocialAuthButtons } from "@/components/wrappers/auth/social-buttons";
+import { SocialAuthButtons } from "@/features/auth/components/social-buttons";
 import { TooltipProvider } from "@/components/ui/tooltip";
 import { CardContent, CardHeader } from "@/components/ui/card";
 import Link from "next/link";
 import { Separator } from "@/components/ui/separator";
-import { CardAuth } from "@/features/layout/card-auth";
+import { CardAuth } from "@/features/layout/components/card-auth";
 import { env } from "@/env.mjs";
-import { en } from "zod/v4/locales";
 
 export const metadata: Metadata = {
   title: "Login",

app/(auth)/register/page.tsx

@@ -1,5 +1,5 @@
 import { PageParams } from "@/types/next";
-import { RegisterForm } from "@/components/wrappers/auth/register/register-form/register-form";
+import { RegisterForm } from "@/features/auth/components/register-form";
 import { Metadata } from "next";
 import { redirect } from "next/navigation";
 import { env } from "@/env.mjs";

app/(auth)/reset-password/page.tsx

@@ -1,10 +1,10 @@
 import { CardContent, CardHeader } from "@/components/ui/card";
 import { TooltipProvider } from "@/components/ui/tooltip";
-import { ResetPasswordForm } from "@/components/wrappers/auth/login/reset-password-form/reset-password-form";
+import { ResetPasswordForm } from "@/features/auth/components/reset-password-form";
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth/auth";
 import { Avatar, AvatarImage, AvatarFallback } from "@radix-ui/react-avatar";
-import { CardAuth } from "@/features/layout/card-auth";
+import { CardAuth } from "@/features/layout/components/card-auth";
 import { env } from "@/env.mjs";
 
 export default async function RoutePage(props: { searchParams: Promise<{ token: string | undefined }> }) {

app/(customer)/dashboard/(admin)/admin/organizations/[organizationId]/page.tsx

@@ -3,8 +3,8 @@ import {eq} from "drizzle-orm";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
 import {PageParams} from "@/types/next";
-import {Page} from "@/features/layout/page";
-import {OrganizationManagement} from "@/components/wrappers/dashboard/admin/organizations/organization/organization-management";
+import {Page} from "@/features/layout/components/page";
+import {OrganizationManagement} from "@/features/organizations/components/admin-organization-management";
 import {buildOrganizationWithMembers} from "@/utils/common";
 import {isUUID} from "@/utils/text";
 import {user} from "@/db/schema/02_user";

app/(customer)/dashboard/(admin)/admin/organizations/page.tsx

@@ -1,10 +1,10 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {db} from "@/db";
 import {
     AdminOrganizationAddModal
-} from "@/components/wrappers/dashboard/admin/organizations/organization/admin-organization-add-modal";
-import {AdminOrganizationList} from "@/components/wrappers/dashboard/admin/organizations/organization/admin-orgnization-list";
+} from "@/features/organizations/components/admin-organization-add-modal";
+import {AdminOrganizationList} from "@/features/organizations/components/admin-organization-list";
 import {isNull} from "drizzle-orm";
 
 export default async function RoutePage(props: PageParams<{}>) {

app/(customer)/dashboard/(admin)/admin/settings/page.tsx

@@ -1,11 +1,15 @@
 import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {db} from "@/db";
+import {logger} from "@/lib/logger";
 import {notFound} from "next/navigation";
-import {SettingsTabs} from "@/components/wrappers/dashboard/admin/settings/settings-tabs";
+import {SettingsTabs} from "@/features/settings/components/settings-tabs";
 import {desc, isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {StorageChannelWith} from "@/db/schema/12_storage-channel";
+import {NotificationChannelWith} from "@/db/schema/09_notification-channel";
+
+const log = logger.child({module: "dashboard/admin/settings"});
 
 export default async function RoutePage(props: PageParams<{}>) {
 
@@ -13,6 +17,8 @@ export default async function RoutePage(props: PageParams<{}>) {
         where: (fields, {eq}) => eq(fields.name, "system"),
     });
 
+    log.debug({settings}, "Settings loaded");
+
     const storageChannels = await db.query.storageChannel.findMany({
         with: {
             organizations: true
@@ -21,7 +27,16 @@ export default async function RoutePage(props: PageParams<{}>) {
         orderBy: desc(drizzleDb.schemas.storageChannel.createdAt)
     }) as StorageChannelWith[]
 
-    if (!settings || !storageChannels ) {
+    const notificationChannels = await db.query.notificationChannel.findMany({
+        with: {
+            organizations: true
+        },
+        where: isNull(drizzleDb.schemas.notificationChannel.organizationId),
+        orderBy: desc(drizzleDb.schemas.notificationChannel.createdAt)
+    }) as NotificationChannelWith[]
+
+
+    if (!settings || !storageChannels || !notificationChannels) {
         notFound()
     }
 
@@ -33,7 +48,8 @@ export default async function RoutePage(props: PageParams<{}>) {
                 </div>
             </PageHeader>
             <PageContent className="flex flex-col gap-5">
-                <SettingsTabs storageChannels={storageChannels} settings={settings} />
+                <SettingsTabs storageChannels={storageChannels} notificationChannels={notificationChannels}
+                              settings={settings}/>
             </PageContent>
         </Page>
     );

app/(customer)/dashboard/(admin)/admin/users/page.tsx

@@ -1,21 +1,28 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {db} from "@/db";
 import {desc, isNull} from "drizzle-orm";
-import {AdminUserList} from "@/components/wrappers/dashboard/admin/users/admin-user-list";
-import {AdminUserAddModal} from "@/components/wrappers/dashboard/admin/users/admin-user-add-modal";
+import {AdminUserList} from "@/features/users/components/admin-user-list";
+import {AdminUserAddModal} from "@/features/users/components/admin-user-add-modal";
 import {SUPPORTED_PROVIDERS} from "@/lib/auth/config";
+import {getSettings} from "@/db/services/setting";
+import {resolveAvatarUrl} from "@/utils/resolve-avatar-url";
 
 export default async function RoutePage(props: PageParams<{}>) {
 
-    const users = await db.query.user.findMany({
-        where: (fields) => isNull(fields.deletedAt),
-        with: {
-            accounts: true
-        },
-        orderBy: (fields) => desc(fields.createdAt),
+    const [settings, users] = await Promise.all([
+        getSettings(),
+        db.query.user.findMany({
+            where: (fields) => isNull(fields.deletedAt),
+            with: { accounts: true },
+            orderBy: (fields) => desc(fields.createdAt),
+        }),
+    ]);
+
+    const avatarUrls = Object.fromEntries(
+        users.map((u) => [u.id, resolveAvatarUrl(u, settings)])
+    );
 
-    });
     const organizations = await db.query.organization.findMany({
         with: {
             members: true,
@@ -30,13 +37,15 @@ export default async function RoutePage(props: PageParams<{}>) {
             <PageHeader className="flex flex-col">
                 <div className="flex justify-between">
                     <PageTitle className="mb-3">Active users</PageTitle>
-                    <PageActions>
-                        <AdminUserAddModal organizations={organizations}/>
-                    </PageActions>
+                    {isPasswordAuthEnabled && (
+                        <PageActions>
+                            <AdminUserAddModal organizations={organizations}/>
+                        </PageActions>
+                    )}
                 </div>
             </PageHeader>
             <PageContent className="flex flex-col gap-5">
-                <AdminUserList users={users} isPasswordAuthEnabled={isPasswordAuthEnabled}/>
+                <AdminUserList users={users} isPasswordAuthEnabled={isPasswordAuthEnabled} avatarUrls={avatarUrls}/>
             </PageContent>
         </Page>
     );

app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx

@@ -4,18 +4,18 @@ import {
   PageContent,
   PageDescription,
   PageTitle,
-} from "@/features/layout/page";
+} from "@/features/layout/components/page";
 import { db } from "@/db";
 import * as drizzleDb from "@/db";
-import { eq } from "drizzle-orm";
+import {eq, isNull} from "drizzle-orm";
 import { notFound } from "next/navigation";
-import { ButtonDeleteAgent } from "@/components/wrappers/dashboard/agent/button-delete-agent/button-delete-agent";
+import { ButtonDeleteAgent } from "@/features/agents/components/agent-delete-button";
 import { capitalizeFirstLetter } from "@/utils/text";
 import { generateEdgeKey } from "@/utils/edge_key";
 import { getServerUrl } from "@/utils/get-server-url";
-import { AgentContentPage } from "@/components/wrappers/dashboard/agent/agent-content";
-import { AgentDialog } from "@/features/agents/components/agent.dialog";
-import { AgentType } from "@/features/agents/agents.schema";
+import { AgentContentPage } from "@/features/agents/components/agent-content";
+import { AgentDialog } from "@/features/agents/components/agent-dialog";
+
 
 export default async function RoutePage(
   props: PageParams<{ agentId: string }>,
@@ -26,13 +26,30 @@ export default async function RoutePage(
     where: eq(drizzleDb.schemas.agent.id, agentId),
     with: {
       databases: true,
+      organizations: true,
     },
   });
 
+  const organizations = await db.query.organization.findMany({
+    where: (fields) => isNull(fields.deletedAt),
+    with: {
+      members: true,
+    },
+  });
+
+
   if (!agent) {
     notFound();
   }
 
+  const isOwnerByAnOrganization = agent.organizationId
+
+  if (isOwnerByAnOrganization){
+    notFound();
+  }
+
+  const organizationIds = agent.organizations.map(org => org.organizationId)
+
   const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
 
   return (
@@ -45,12 +62,14 @@ export default async function RoutePage(
           <div className="flex items-center gap-2 md:justify-between w-full ">
             <div className="flex items-center gap-2">
               <AgentDialog
-                agent={agent as AgentType & { id: string }}
+                agent={agent}
                 typeTrigger={"edit"}
+                adminView={true}
+                organizations={organizations}
               />
             </div>
             <div className="flex items-center gap-2">
-              <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"} />
+              <ButtonDeleteAgent organizationIds={organizationIds} agentId={agentId} text={"Delete Agent"} />
             </div>
           </div>
         </PageTitle>
@@ -62,7 +81,7 @@ export default async function RoutePage(
         </PageDescription>
       )}
       <PageContent className="flex flex-col w-full h-full justify-between gap-6">
-        <AgentContentPage agent={agent} edgeKey={edgeKey} />
+        <AgentContentPage agent={agent} edgeKey={edgeKey} canDeleteDatabases={true} />
       </PageContent>
     </Page>
   );

app/(customer)/dashboard/(admin)/agents/page.tsx

@@ -1,13 +1,13 @@
 import {PageParams} from "@/types/next";
-import {AgentCard} from "@/components/wrappers/dashboard/agent/agent-card/agent-card";
-import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {AgentCard} from "@/features/agents/components/agent-card";
+import {CardsWithPagination} from "@/components/common/cards-with-pagination";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
-import {desc, eq, not} from "drizzle-orm";
+import {and, desc, eq, isNull, not} from "drizzle-orm";
 import {Metadata} from "next";
-import {AgentDialog} from "@/features/agents/components/agent.dialog";
+import {AgentDialog} from "@/features/agents/components/agent-dialog";
 
 export const metadata: Metadata = {
     title: "Agents",
@@ -16,13 +16,13 @@ export const metadata: Metadata = {
 export default async function RoutePage(props: PageParams<{}>) {
 
     const agents = await db.query.agent.findMany({
-        where: not(eq(drizzleDb.schemas.agent.isArchived, true)),
+        where: and(not(eq(drizzleDb.schemas.agent.isArchived, true)),isNull(drizzleDb.schemas.agent.organizationId)),
         with: {
             databases: true
         },
         orderBy: (fields) => desc(fields.lastContact),
     });
-
+    
     if (!agents) {
         notFound();
     }

app/(customer)/dashboard/(admin)/notifications/channels/page.tsx

@@ -1,11 +1,11 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Metadata} from "next";
 import {db} from "@/db";
 import {notificationChannel, NotificationChannelWith} from "@/db/schema/09_notification-channel";
 import {desc, isNull} from "drizzle-orm";
-import {ChannelsSection} from "@/components/wrappers/dashboard/admin/channels/channels-section";
-import {ChannelAddEditModal} from "@/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal";
+import {ChannelsSection} from "@/features/channel/components/channels-section";
+import {ChannelAddEditModal} from "@/features/channel/components/channel-add-edit-modal";
 import * as drizzleDb from "@/db";
 
 export const metadata: Metadata = {

app/(customer)/dashboard/(admin)/notifications/logs/page.tsx

@@ -1,7 +1,7 @@
 import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Metadata} from "next";
-import {NotificationLogsList} from "@/components/wrappers/dashboard/admin/notifications/logs/notification-logs-list";
+import {NotificationLogsList} from "@/features/notifications/components/notification-logs-list";
 import {notFound} from "next/navigation";
 import {getNotificationHistory} from "@/db/services/notification-log";
 

app/(customer)/dashboard/(admin)/storages/channels/page.tsx

@@ -1,12 +1,12 @@
 import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Metadata} from "next";
-import {ChannelsSection} from "@/components/wrappers/dashboard/admin/channels/channels-section";
+import {ChannelsSection} from "@/features/channel/components/channels-section";
 import {db} from "@/db";
 import {desc, eq, isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {StorageChannelWith} from "@/db/schema/12_storage-channel";
-import {ChannelAddEditModal} from "@/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal";
+import {ChannelAddEditModal} from "@/features/channel/components/channel-add-edit-modal";
 
 export const metadata: Metadata = {
     title: "Storage Channels",

app/(customer)/dashboard/(organization)/migration/page.tsx

@@ -0,0 +1,65 @@
+import {PageParams} from "@/types/next";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
+import {notFound} from "next/navigation";
+import {getOrganization} from "@/lib/auth/auth";
+import {Metadata} from "next";
+import {db} from "@/db";
+import {MigrationTool} from "@/features/migration/components/migration-tool";
+
+export const metadata: Metadata = {
+    title: "Projects",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const organization = await getOrganization({});
+
+    if (!organization) {
+        notFound();
+    }
+
+    const projects = await db.query.project.findMany({
+        where: (project, {eq, and, not}) =>
+            and(
+                eq(project.organizationId, organization.id),
+                not(eq(project.isArchived, true))
+            ),
+        with: {
+            organization: true,
+            databases: {
+                where: (database, { isNull, not, inArray, and }) =>
+                    and(
+                        isNull(database.deletedAt),
+                        not(inArray(database.dbms, ["valkey", "redis"]))
+                    ),
+
+                with: {
+                    backups: {
+                        where: (backup, { isNull, eq, and }) =>
+                            and(
+                                isNull(backup.deletedAt),
+                                eq(backup.status, "success")
+                            ),
+                        orderBy: (backup, {desc}) => [desc(backup.createdAt)],
+                        limit: 15,
+                    }
+                }
+            },
+        },
+    });
+    return (
+        <Page>
+            <PageHeader className="flex flex-col items-start justify-between mb-6">
+                <PageTitle className="mb-2">
+                    Database Migration
+                </PageTitle>
+                <p className="text-sm text-muted-foreground">
+                    Import backups from a source project into your target database
+                </p>
+            </PageHeader>
+            <PageContent>
+                <MigrationTool projects={projects}/>
+            </PageContent>
+        </Page>
+    );
+}

app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx

@@ -1,111 +1,128 @@
-import {PageParams} from "@/types/next";
-import {notFound, redirect} from "next/navigation";
-import {Page} from "@/features/layout/page";
-import {db} from "@/db";
-import {eq, and, inArray} from "drizzle-orm";
+import { PageParams } from "@/types/next";
+import { notFound, redirect } from "next/navigation";
+import { Page } from "@/features/layout/components/page";
+import { db } from "@/db";
+import { eq, and, inArray, isNull } from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {getOrganizationProjectDatabases} from "@/lib/services";
-import {getActiveMember, getOrganization} from "@/lib/auth/auth";
-import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
-import {DatabaseContent} from "@/components/wrappers/dashboard/projects/database/database-content";
+import { getOrganizationProjectDatabases } from "@/db/services/project";
+import { getActiveMember, getOrganization } from "@/lib/auth/auth";
+import { BackupModalProvider } from "@/features/database/components/backup-modal-context";
+import { DatabaseContent } from "@/features/database/components/database-content";
+import { getHealthLast12hLogs } from "@/db/services/healthcheck";
+import { LogsModalProvider } from "@/features/logs/components/logs-modal-context";
 
-export default async function RoutePage(props: PageParams<{
+export default async function RoutePage(
+  props: PageParams<{
     projectId: string;
-    databaseId: string
-}>) {
-    const {projectId, databaseId} = await props.params;
+    databaseId: string;
+  }>,
+) {
+  const { projectId, databaseId } = await props.params;
 
-    const organization = await getOrganization({});
-    const activeMember = await getActiveMember()
+  const organization = await getOrganization({});
+  const activeMember = await getActiveMember();
 
-    if (!organization || !activeMember) {
-        notFound();
-    }
+  if (!organization || !activeMember) {
+    notFound();
+  }
 
-    const databasesProject = await getOrganizationProjectDatabases({
-        organizationSlug: organization.slug,
-        projectId: projectId
-    })
+  const databasesProject = await getOrganizationProjectDatabases({
+    organizationSlug: organization.slug,
+    projectId: projectId,
+  });
 
-    const dbItem = await db.query.database.findFirst({
-        where: and(inArray(drizzleDb.schemas.backup.id, databasesProject.ids ?? []), eq(drizzleDb.schemas.database.id, databaseId), eq(drizzleDb.schemas.database.projectId, projectId)),
-        with: {
-            project: true,
-            retentionPolicy: true,
-            alertPolicies: true,
-            storagePolicies: true
-        }
-    });
+  const dbItem = await db.query.database.findFirst({
+    where: and(
+      inArray(drizzleDb.schemas.backup.id, databasesProject.ids ?? []),
+      eq(drizzleDb.schemas.database.id, databaseId),
+      eq(drizzleDb.schemas.database.projectId, projectId),
+    ),
+    with: {
+      project: true,
+      retentionPolicy: true,
+      alertPolicies: true,
+      storagePolicies: true,
+    },
+  });
 
-    if (!dbItem) {
-        redirect("/dashboard/projects");
-    }
+  if (!dbItem) {
+    redirect("/dashboard/projects");
+  }
 
-    const backups = await db.query.backup.findMany({
-        where: eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
-        with: {
-            restorations: true,
-            storages: {
-                with: {
-                    storageChannel: true
-                }
-            }
-        },
-        orderBy: (b, {desc}) => [desc(b.createdAt)],
-    });
+  const totalBackups = await db
+    .select({ count: drizzleDb.schemas.backup.id })
+    .from(drizzleDb.schemas.backup)
+    .where(eq(drizzleDb.schemas.backup.databaseId, dbItem.id))
+    .then((rows) => rows.length);
 
-    const restorations = await db.query.restoration.findMany({
-        where: eq(drizzleDb.schemas.restoration.databaseId, dbItem.id),
-        orderBy: (r, {desc}) => [desc(r.createdAt)],
-    });
+  const availableBackups = await db
+    .select({ count: drizzleDb.schemas.backup.id })
+    .from(drizzleDb.schemas.backup)
+    .where(
+      and(
+        eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
+        isNull(drizzleDb.schemas.backup.deletedAt),
+      ),
+    )
+    .then((rows) => rows.length);
 
-    const isAlreadyBackup = backups.some((b) => b.status === "waiting" || b.status === "ongoing");
-    const isAlreadyRestore = restorations.some((r) => r.status === "waiting");
+  const successfulBackups = await db
+    .select({ count: drizzleDb.schemas.backup.id })
+    .from(drizzleDb.schemas.backup)
+    .where(
+      and(
+        eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
+        eq(drizzleDb.schemas.backup.status, "success"),
+      ),
+    )
+    .then((rows) => rows.length);
 
-    const totalBackups = await db.select({count: drizzleDb.schemas.backup.id})
-        .from(drizzleDb.schemas.backup)
-        .where(eq(drizzleDb.schemas.backup.databaseId, dbItem.id))
-        .then(rows => rows.length);
+  const isAlreadyRestore = await db
+    .select({ count: drizzleDb.schemas.restoration.id })
+    .from(drizzleDb.schemas.restoration)
+    .where(
+      and(
+        eq(drizzleDb.schemas.restoration.databaseId, dbItem.id),
+        eq(drizzleDb.schemas.restoration.status, "waiting"),
+      ),
+    )
+    .then((rows) => rows.length > 0);
 
-    const availableBackups = backups.filter(b => !b.deletedAt).length;
+  const [settings] = await db
+    .select()
+    .from(drizzleDb.schemas.setting)
+    .where(eq(drizzleDb.schemas.setting.name, "system"))
+    .limit(1);
+  if (!settings) {
+    notFound();
+  }
 
-    const successfulBackups = await db.select({count: drizzleDb.schemas.backup.id})
-        .from(drizzleDb.schemas.backup)
-        .where(and(
-            eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
-            eq(drizzleDb.schemas.backup.status, "success")
-        ))
-        .then(rows => rows.length);
+  const databaseHealthLogs = dbItem
+    ? await getHealthLast12hLogs({ id: dbItem.id })
+    : [];
 
+  const successRate =
+    totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
 
-    const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
-    if (!settings) {
-        notFound();
-    }
-
-
-    const successRate = totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
-
-    const isMember = activeMember?.role === "member";
-
-    return (
-        <Page>
-            <BackupModalProvider>
-                <DatabaseContent
-                    activeMember={activeMember}
-                    settings={settings}
-                    database={dbItem}
-                    isAlreadyRestore={isAlreadyRestore}
-                    restorations={restorations}
-                    backups={backups}
-                    totalBackups={totalBackups}
-                    availableBackups={availableBackups}
-                    successRate={successRate}
-                    organizationId={organization.id}
-                    activeOrganizationChannels={[]}
-                    activeOrganizationStorageChannels={[]}
-                />
-            </BackupModalProvider>
-        </Page>
-    );
-}
+  return (
+    <Page>
+      <LogsModalProvider>
+        <BackupModalProvider>
+          <DatabaseContent
+            activeMember={activeMember}
+            settings={settings}
+            database={dbItem}
+            databaseHealthLogs={databaseHealthLogs}
+            isAlreadyRestore={isAlreadyRestore}
+            totalBackups={totalBackups}
+            availableBackups={availableBackups}
+            successRate={successRate}
+            organizationId={organization.id}
+            activeOrganizationChannels={[]}
+            activeOrganizationStorageChannels={[]}
+          />
+        </BackupModalProvider>
+      </LogsModalProvider>
+    </Page>
+  );
+}

app/(customer)/dashboard/(organization)/projects/[projectId]/page.tsx

@@ -1,118 +1,123 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageTitle} from "@/features/layout/page";
-import {
-    ButtonDeleteProject
-} from "@/components/wrappers/dashboard/projects/button-delete-project/button-delete-project";
-import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {ProjectDatabaseCard} from "@/components/wrappers/dashboard/projects/project-card/project-database-card";
-import {notFound, redirect} from "next/navigation";
-
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import {getActiveMember, getOrganization} from "@/lib/auth/auth";
+import { PageParams } from "@/types/next";
+import { Page, PageContent, PageTitle } from "@/features/layout/components/page";
+import { ButtonDeleteProject } from "@/features/projects/components/project-delete-button";
+import { CardsWithPagination } from "@/components/common/cards-with-pagination";
+import { ProjectDatabaseCard } from "@/features/projects/components/project-database-card";
+import { ProjectDatabaseSelection } from "@/features/projects/components/project-database-selection";
+import { notFound, redirect } from "next/navigation";
+import { db } from "@/db";
+import { eq } from "drizzle-orm";
+import { getActiveMember, getOrganization } from "@/lib/auth/auth";
 import * as drizzleDb from "@/db";
-import {capitalizeFirstLetter} from "@/utils/text";
-import {ProjectDialog} from "@/features/projects/components/project.dialog";
-import {DatabaseWith} from "@/db/schema/07_database";
-import {ProjectWith} from "@/db/schema/06_project";
-import {isUuidv4} from "@/utils/verify-uuid";
+import { capitalizeFirstLetter, isUUID } from "@/utils/text";
+import { ProjectDialog } from "@/features/projects/components/project-dialog";
+import { ProjectWith } from "@/db/schema/06_project";
+import { getOrganizationAvailableDatabases } from "@/db/services/database";
 
+export default async function RoutePage(
+  props: PageParams<{
+    projectId: string;
+  }>,
+) {
+  const { projectId } = await props.params;
 
-export default async function RoutePage(props: PageParams<{
-    projectId: string
-}>) {
-    const {
-        projectId
-    } = await props.params;
+  if (!isUUID(projectId)) {
+    notFound();
+  }
 
-    if (!isUuidv4(projectId)) {
-        notFound()
-    }
+  const organization = await getOrganization({});
+  const activeMember = await getActiveMember();
 
-    const organization = await getOrganization({});
-    const activeMember = await getActiveMember()
+  if (!organization) {
+    notFound();
+  }
+  const org = await db.query.organization.findFirst({
+    where: eq(drizzleDb.schemas.organization.slug, organization.slug),
+  });
 
-    if (!organization) {
-        notFound();
-    }
-    const org = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.slug, organization.slug),
-    });
+  if (!org) notFound();
 
-    if (!org) notFound();
+  const proj = await db.query.project.findFirst({
+    where: (proj, { and, eq, not }) =>
+      and(
+        eq(proj.id, projectId),
+        eq(proj.organizationId, org.id),
+        not(eq(proj.isArchived, true)),
+      ),
+    with: {
+      databases: true,
+    },
+  });
 
-    const proj = await db.query.project.findFirst({
-        where: (proj, {
-            and,
-            eq,
-            not
-        }) => and(eq(proj.id, projectId), eq(proj.organizationId, org.id), not(eq(proj.isArchived, true))),
-        with: {
-            databases: true,
-        },
-    });
+  if (!proj) {
+    redirect("/dashboard/projects");
+  }
 
-    if (!proj) {
-        redirect("/dashboard/projects");
-    }
+  const availableDatabases = await getOrganizationAvailableDatabases(
+    organization.id,
+    proj.id,
+  );
+  const isMember = activeMember?.role === "member";
 
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {or, eq, isNull}) => or(isNull(db.projectId), eq(db.projectId, proj.id)),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    ) as DatabaseWith[];
-
-    const isMember = activeMember?.role === "member";
-
-    return (
-        <Page>
-            <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-                    <div className="min-w-full md:min-w-fit ">
-                        {capitalizeFirstLetter(proj.name)}
-                    </div>
-                    {!isMember && (
-                        <div className="flex items-center gap-2 md:justify-between w-full ">
-                            <div className="flex items-center gap-2">
-                                <ProjectDialog
-                                    databases={availableDatabases}
-                                    organization={org}
-                                    project={proj as ProjectWith}
-                                    isEdit={true}
-                                />
-                            </div>
-                            <div className="flex items-center gap-2">
-                                <ButtonDeleteProject projectId={projectId} text={"Delete Project"}/>
-                            </div>
-                        </div>
-                    )}
-                </PageTitle>
+  return (
+    <Page>
+      <div className="justify-between gap-2 sm:flex">
+        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+          <div className="min-w-full md:min-w-fit ">
+            {capitalizeFirstLetter(proj.name)}
+          </div>
+          {!isMember && (
+            <div className="flex items-center gap-2 md:justify-between w-full ">
+              <div className="flex items-center gap-2">
+                <ProjectDialog
+                  databases={availableDatabases}
+                  organization={org}
+                  project={proj as ProjectWith}
+                  isEdit={true}
+                />
+              </div>
+              <div className="flex items-center gap-2">
+                <ButtonDeleteProject
+                  projectId={projectId}
+                  text={"Delete Project"}
+                />
+              </div>
             </div>
-            <PageContent className="flex flex-col w-full h-full">
-                {proj.databases.length > 0 ? (
-                    <CardsWithPagination
-                        data={proj.databases}
-                        organizationSlug={organization.slug}
-                        // @ts-ignore
-                        cardItem={ProjectDatabaseCard}
-                        cardsPerPage={6}
-                        numberOfColumns={3}
-                        extendedProps={proj}
-                    />
-                ) : (
-                    <div className="flex flex-col items-center justify-center h-full text-muted-foreground py-20">
-                        <p className="text-lg font-medium">No databases found</p>
-                        <p className="text-sm mt-2">You haven’t added any databases to this project yet.</p>
-                    </div>
-                )}
-            </PageContent>
-        </Page>
-    );
-}
+          )}
+        </PageTitle>
+      </div>
+      <PageContent className="flex flex-col w-full h-full">
+        {proj.databases.length > 0 ? (
+          isMember ? (
+            <CardsWithPagination
+              data={[...proj.databases].sort(
+                (a, b) =>
+                  new Date(b.createdAt).getTime() -
+                  new Date(a.createdAt).getTime(),
+              )}
+              organizationSlug={organization.slug}
+              // @ts-ignore
+              cardItem={ProjectDatabaseCard}
+              cardsPerPage={20}
+              numberOfColumns={3}
+              pageSizeOptions={[10, 20, 50]}
+              extendedProps={proj}
+            />
+          ) : (
+            <ProjectDatabaseSelection
+              projectId={proj.id}
+              databases={proj.databases}
+            />
+          )
+        ) : (
+          <div className="flex flex-col items-center justify-center h-full text-muted-foreground py-20">
+            <p className="text-lg font-medium">No databases found</p>
+            <p className="text-sm mt-2">
+              You haven’t added any databases to this project yet.
+            </p>
+          </div>
+        )}
+      </PageContent>
+    </Page>
+  );
+}

app/(customer)/dashboard/(organization)/projects/page.tsx

@@ -1,14 +1,15 @@
 import {PageParams} from "@/types/next";
-import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectCard} from "@/components/wrappers/dashboard/projects/project-card/project-card";
+import {CardsWithPagination} from "@/components/common/cards-with-pagination";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
+import {ProjectCard} from "@/features/projects/components/project-card";
 import {db} from "@/db";
 import {notFound} from "next/navigation";
 import {getActiveMember, getOrganization} from "@/lib/auth/auth";
-import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
+import {EmptyStatePlaceholder} from "@/components/common/empty-state-placeholder";
 import {Metadata} from "next";
-import {ProjectDialog} from "@/features/projects/components/project.dialog";
+import {ProjectDialog} from "@/features/projects/components/project-dialog";
 import {DatabaseWith} from "@/db/schema/07_database";
+import {getOrganizationAvailableDatabases} from "@/db/services/database";
 
 export const metadata: Metadata = {
     title: "Projects",
@@ -35,18 +36,7 @@ export default async function RoutePage(props: PageParams<{}>) {
     });
     const isMember = activeMember?.role === "member";
 
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {isNull}) => isNull(db.projectId),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    ).filter((db) => db.project == null) as DatabaseWith[];
+    const availableDatabases = await getOrganizationAvailableDatabases(organization.id)
 
 
     return (
@@ -66,11 +56,12 @@ export default async function RoutePage(props: PageParams<{}>) {
                         organizationSlug={organization.slug}
                         data={projects}
                         cardItem={ProjectCard}
-                        cardsPerPage={9}
+                        cardsPerPage={12}
                         numberOfColumns={3}
+                        pageSizeOptions={[12, 24, 48]}
                     />
                 ) : isMember ? (
-                    <EmptyStatePlaceholder text="No project available"/>
+                    <EmptyStatePlaceholder state={"empty"} text="No project available"/>
                 ) : (
                     <ProjectDialog databases={availableDatabases} organization={organization} isEmpty={true}/>
                 )}

app/(customer)/dashboard/(organization)/settings/agents/[agentId]/page.tsx

@@ -0,0 +1,101 @@
+import {PageParams} from "@/types/next";
+import {
+    Page,
+    PageContent,
+    PageDescription,
+    PageTitle,
+} from "@/features/layout/components/page";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
+import {eq} from "drizzle-orm";
+import {notFound} from "next/navigation";
+import {ButtonDeleteAgent} from "@/features/agents/components/agent-delete-button";
+import {capitalizeFirstLetter} from "@/utils/text";
+import {generateEdgeKey} from "@/utils/edge_key";
+import {getServerUrl} from "@/utils/get-server-url";
+import {AgentContentPage} from "@/features/agents/components/agent-content";
+import {AgentDialog} from "@/features/agents/components/agent-dialog";
+import {getActiveMember, getOrganization} from "@/lib/auth/auth";
+import {currentUser} from "@/lib/auth/current-user";
+import {computeOrganizationPermissions} from "@/lib/acl/organization-acl";
+
+
+export default async function RoutePage(
+    props: PageParams<{ agentId: string }>,
+) {
+    const {agentId} = await props.params;
+
+    const organization = await getOrganization({});
+    const user = await currentUser();
+    const activeMember = await getActiveMember();
+
+    if (!organization || !activeMember || !user) {
+        notFound();
+    }
+
+
+
+    const {canManageAgents} = computeOrganizationPermissions(activeMember);
+
+    if (!canManageAgents){
+        notFound();
+    }
+
+    const agent = await db.query.agent.findFirst({
+        where: eq(drizzleDb.schemas.agent.id, agentId),
+        with: {
+            databases: true,
+            organizations: true,
+        },
+    });
+
+
+    if (!agent) {
+        notFound();
+    }
+
+    const hasAccess =
+        agent.organizationId === organization.id ||
+        agent.organizations.some(org => org.organizationId === organization.id);
+
+    if (!hasAccess) {
+        notFound();
+    }
+
+    const isOwned = agent.organizationId
+    const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
+
+    return (
+        <Page>
+            <div className="justify-between gap-2 sm:flex">
+                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    <div className="min-w-full md:min-w-fit ">
+                        {capitalizeFirstLetter(agent.name)}
+                    </div>
+                    {isOwned && (
+                        <div className="flex items-center gap-2 md:justify-between w-full ">
+                            <div className="flex items-center gap-2">
+                                <AgentDialog
+                                    agent={agent}
+                                    typeTrigger={"edit"}
+                                />
+                            </div>
+                            <div className="flex items-center gap-2">
+                                <ButtonDeleteAgent organizationId={organization.id ?? null} agentId={agentId} text={"Delete Agent"}/>
+                            </div>
+                        </div>
+                    )}
+                </PageTitle>
+            </div>
+
+            {agent.description && (
+                <PageDescription className="mt-5 sm:mt-0">
+                    {agent.description}
+                </PageDescription>
+            )}
+            <PageContent className="flex flex-col w-full h-full justify-between gap-6">
+                <AgentContentPage agent={agent} edgeKey={edgeKey} canDeleteDatabases={!!agent.organizationId}/>
+            </PageContent>
+        </Page>
+    );
+}

app/(customer)/dashboard/(organization)/settings/agents/page.tsx

@@ -0,0 +1,5 @@
+import { redirect } from "next/navigation";
+
+export default async function RoutePage() {
+    redirect("/dashboard/settings?tab=agents");
+}

app/(customer)/dashboard/(organization)/settings/page.tsx

@@ -1,95 +1,116 @@
-import { PageParams } from "@/types/next";
+import {PageParams} from "@/types/next";
 import {
-  Page,
-  PageActions,
-  PageContent,
-  PageHeader,
-  PageTitle,
-} from "@/features/layout/page";
-import { currentUser } from "@/lib/auth/current-user";
-import { getActiveMember, getOrganization } from "@/lib/auth/auth";
-import { notFound } from "next/navigation";
-import { Metadata } from "next";
-import { OrganizationTabs } from "@/components/wrappers/dashboard/organization/tabs/organization-tabs";
-import { getOrganizationChannels } from "@/db/services/notification-channel";
-import { computeOrganizationPermissions } from "@/lib/acl/organization-acl";
-import { getOrganizationStorageChannels } from "@/db/services/storage-channel";
-import { DeleteOrganizationButton } from "@/components/wrappers/dashboard/organization/delete-organization-button";
-import { EditOrganizationDialog } from "@/features/organization/components/edit-organization.dialog";
-import { db } from "@/db";
-import { isNull } from "drizzle-orm";
+    Page,
+    PageContent,
+    PageHeader,
+    PageTitle,
+} from "@/features/layout/components/page";
+import {currentUser} from "@/lib/auth/current-user";
+import {getActiveMember, getOrganization} from "@/lib/auth/auth";
+import {notFound} from "next/navigation";
+import {Metadata} from "next";
+import {OrganizationTabs} from "@/features/organizations/components/organization-tabs";
+import {getOrganizationChannels} from "@/db/services/notification-channel";
+import {computeOrganizationPermissions} from "@/lib/acl/organization-acl";
+import {getOrganizationStorageChannels} from "@/db/services/storage-channel";
+import {DeleteOrganizationButton} from "@/features/organizations/components/organization-delete-button";
+import {EditOrganizationDialog} from "@/features/organizations/components/organization-edit-dialog";
+import {db} from "@/db";
+import {isNull} from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import { eq } from "drizzle-orm";
+import {eq} from "drizzle-orm";
+import {getOrganizationAgents} from "@/db/services/agent";
+import {Tooltip, TooltipContent, TooltipTrigger} from "@/components/ui/tooltip";
 
 export const metadata: Metadata = {
-  title: "Settings",
+    title: "Settings",
 };
 
 export default async function RoutePage(props: PageParams<{ slug: string }>) {
-  const organization = await getOrganization({});
-  const user = await currentUser();
-  const activeMember = await getActiveMember();
+    const organization = await getOrganization({});
+    const user = await currentUser();
+    const activeMember = await getActiveMember();
 
-  if (!organization || !activeMember || !user) {
-    notFound();
-  }
+    if (!organization || !activeMember || !user) {
+        notFound();
+    }
 
-  const notificationChannels = await getOrganizationChannels(organization.id);
-  const storageChannels = await getOrganizationStorageChannels(organization.id);
-  const permissions = computeOrganizationPermissions(activeMember);
+    const notificationChannels = await getOrganizationChannels(organization.id);
+    const storageChannels = await getOrganizationStorageChannels(organization.id);
+    const agents = await getOrganizationAgents(organization.id);
+    const permissions = computeOrganizationPermissions(activeMember);
 
-  const users = await db.query.user.findMany({
-    where: (fields) => isNull(fields.deletedAt),
-  });
+    const users = await db.query.user.findMany({
+        where: (fields) => isNull(fields.deletedAt),
+    });
 
-  const organizationWithMembers = await db.query.organization.findFirst({
-    where: eq(drizzleDb.schemas.organization.id, organization.id),
-    with: {
-      members: {
+    const organizationWithMembers = await db.query.organization.findFirst({
+        where: eq(drizzleDb.schemas.organization.id, organization.id),
         with: {
-          user: true,
+            projects: {
+                where: eq(drizzleDb.schemas.project.isArchived, false),
+            },
+            members: {
+                with: {
+                    user: true,
+                },
+            },
         },
-      },
-    },
-  });
+    });
 
-  if (!organizationWithMembers) notFound();
+    if (!organizationWithMembers) notFound();
 
-  return (
-    <Page>
-      <PageHeader>
-        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-          <div className="min-w-full md:min-w-fit ">Organization settings</div>
-          <div className="flex items-center gap-2 md:justify-between w-full ">
-            <div className="flex items-center gap-2">
-              {permissions.canManageSettings &&
-                organization.slug !== "default" && (
-                  <EditOrganizationDialog
-                    organization={organizationWithMembers}
-                    users={users}
-                    currentUser={user}
-                  />
-                )}
-            </div>
-            <div className="flex items-center gap-2">
-              {permissions.canManageDangerZone &&
-                organization.slug !== "default" && (
-                  <DeleteOrganizationButton
-                    organizationSlug={organization.slug}
-                  />
-                )}
-            </div>
-          </div>
-        </PageTitle>
-      </PageHeader>
-      <PageContent>
-        <OrganizationTabs
-          activeMember={activeMember}
-          organization={organization}
-          notificationChannels={notificationChannels}
-          storageChannels={storageChannels}
-        />
-      </PageContent>
-    </Page>
-  );
+    return (
+        <Page>
+            <PageHeader>
+                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    <div className="min-w-full md:min-w-fit ">Organization settings</div>
+                    <div className="flex items-center gap-2 md:justify-between w-full ">
+                        <div className="flex items-center gap-2">
+                            {permissions.canManageSettings &&
+                                organization.slug !== "default" && (
+                                    <EditOrganizationDialog
+                                        organization={organizationWithMembers}
+                                        users={users}
+                                        currentUser={user}
+                                    />
+                                )}
+                        </div>
+                        <div className="flex items-center gap-2">
+                            {permissions.canManageDangerZone &&
+                                organization.slug !== "default" && (
+
+                                    <Tooltip>
+                                        <TooltipTrigger asChild>
+                                            <div>
+                                                <DeleteOrganizationButton
+                                                    disabled={organizationWithMembers.projects.length > 0}
+                                                    organizationSlug={organization.slug}
+                                                />
+                                            </div>
+
+                                        </TooltipTrigger>
+                                        {organizationWithMembers.projects.length > 0 && (
+                                            <TooltipContent>
+                                                <p>Your organization has some projects associated with it. Please delete them before deleting the organization.</p>
+                                            </TooltipContent>
+                                        )}
+                                    </Tooltip>
+
+                                )}
+                        </div>
+                    </div>
+                </PageTitle>
+            </PageHeader>
+            <PageContent>
+                <OrganizationTabs
+                    activeMember={activeMember}
+                    organization={organization}
+                    notificationChannels={notificationChannels}
+                    storageChannels={storageChannels}
+                    agents={agents}
+                />
+            </PageContent>
+        </Page>
+    );
 }

app/(customer)/dashboard/(organization)/statistics/page.tsx

@@ -1,8 +1,8 @@
 import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
-import {EvolutionLineChart} from "@/components/wrappers/dashboard/statistics/charts/evolution-line-chart";
-import {PercentageLineChart} from "@/components/wrappers/dashboard/statistics/charts/percentage-line-chart";
+import {EvolutionLineChart} from "@/features/statistics/components/evolution-line-chart";
+import {PercentageLineChart} from "@/features/statistics/components/percentage-line-chart";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
 import {and, asc, count, eq, inArray} from "drizzle-orm";
@@ -29,7 +29,7 @@ export default async function RoutePage(props: PageParams<{}>) {
     if (!org) notFound();
 
     const projects = await db.query.project.findMany({
-        where: eq(drizzleDb.schemas.project.organizationId, org.id),
+        where: and(eq(drizzleDb.schemas.project.organizationId, org.id), eq(drizzleDb.schemas.project.isArchived, false))
     });
 
     const projectIds = projects.map(project => project.id);

app/(customer)/dashboard/home/page.tsx

@@ -1,11 +1,12 @@
 import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page";
 import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
 import {Building2, Database, DatabaseBackup, Folder, RefreshCcw, Server, Workflow} from "lucide-react";
 import {currentUser} from "@/lib/auth/current-user";
 import {notFound} from "next/navigation";
 import {db} from "@/db";
-import {asc, inArray} from "drizzle-orm";
+
+import {and, asc, eq, inArray, not} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {listOrganizations} from "@/lib/auth/auth";
 import {Metadata} from "next";
@@ -23,10 +24,12 @@ export default async function RoutePage(props: PageParams<{}>) {
 
     const organizationIds = organizations.map(project => project.id);
 
-    const agents = await db.query.agent.findMany({});
+    const agents = await db.query.agent.findMany({
+        where: not(eq(drizzleDb.schemas.agent.isArchived, true)),
+    });
 
     const projects = await db.query.project.findMany({
-        where: inArray(drizzleDb.schemas.project.organizationId, organizationIds),
+        where: and(inArray(drizzleDb.schemas.project.organizationId, organizationIds), eq(drizzleDb.schemas.project.isArchived, false)),
     });
 
     const projectIds = projects.map(project => project.id);

app/(customer)/dashboard/layout.tsx

@@ -2,22 +2,28 @@ import { ReactNode } from "react";
 import { redirect } from "next/navigation";
 
 import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
-import { AppSidebar } from "@/components/wrappers/dashboard/common/sidebar/app-sidebar";
-import { Header } from "@/features/layout/Header";
+import { AppSidebar } from "@/features/layout/components/app-sidebar";
+import { Header } from "@/features/layout/components/header";
 import { currentUser } from "@/lib/auth/current-user";
-import { ThemeMetaUpdater } from "@/features/browser/theme-meta-updater";
+import { isOnboardingDone } from "@/db/services/setting";
+import { env } from "@/env.mjs";
+import { ModeToggle } from "@/features/theme/components/mode-toggle";
+import { UpdateNotification } from "@/features/updates/components/update-notification";
 
 export default async function Layout({ children }: { children: ReactNode }) {
+  if (env.SKIP_ONBOARDING !== "true" && !(await isOnboardingDone())) {
+    redirect("/welcome");
+  }
+
   const user = await currentUser();
   if (!user) redirect("/login");
 
   return (
     <SidebarProvider>
       <div className="flex flex-col lg:flex-row w-full">
-        <ThemeMetaUpdater />
-        <AppSidebar />
+        <AppSidebar updateNotification={<UpdateNotification />} />
         <SidebarInset>
-          <Header />
+          <Header actions={<ModeToggle />} />
           <main className="h-full">{children}</main>
         </SidebarInset>
       </div>

app/(customer)/dashboard/loading.tsx

@@ -1,4 +1,4 @@
-import { LoadingSpinner } from "@/components/wrappers/common/loading/loading-spinner";
+import { LoadingSpinner } from "@/components/common/loading-spinner";
 
 export default function Loading() {
     return (

app/(landing)/page.tsx

@@ -1,16 +1,18 @@
 import { redirect } from "next/navigation";
-import { getCurrentOrganizationSlug } from "@/features/dashboard/organization-cookie";
+import { getCurrentOrganizationSlug } from "@/features/organizations/utils/organization-cookie";
 import { currentUser } from "@/lib/auth/current-user";
+import { isOnboardingDone } from "@/db/services/setting";
+import { env } from "@/env.mjs";
 
 export default async function Index() {
+    if (env.SKIP_ONBOARDING !== "true" && !(await isOnboardingDone())) {
+        redirect("/welcome");
+    }
+
     const user = await currentUser();
     if (user) {
         const currentOrganizationSlug = await getCurrentOrganizationSlug();
         redirect(`/dashboard/home`);
     }
     redirect("/login");
-    //Do not delete
-    // return (
-    //     <Home/>
-    // );
 }

app/(welcome)/welcome/onboarding-client.tsx

@@ -0,0 +1,29 @@
+"use client";
+
+import { useRouter } from "next/navigation";
+import { OnboardingProvider } from "@onboardjs/react";
+import { onboardingSteps } from "@/features/onboarding/onboarding-steps";
+import { OnboardingShell } from "@/features/onboarding/onboarding-shell";
+import type { OnboardingFlowData } from "@/features/onboarding/types";
+
+type Props = {
+    initialStepId: string;
+    initialFlowData: Partial<OnboardingFlowData>;
+};
+
+export const OnboardingClient = ({ initialStepId, initialFlowData }: Props) => {
+    const router = useRouter();
+
+    return (
+        <OnboardingProvider
+            steps={onboardingSteps}
+            initialStepId={initialStepId}
+            initialContext={{ flowData: initialFlowData }}
+            onFlowComplete={async () => {
+                router.push("/dashboard/home");
+            }}
+        >
+            <OnboardingShell />
+        </OnboardingProvider>
+    );
+};

app/(welcome)/welcome/page.tsx

@@ -0,0 +1,19 @@
+import { redirect } from "next/navigation";
+import { resolveOnboardingState } from "@/features/onboarding/onboarding-state";
+import { OnboardingClient } from "./onboarding-client";
+
+export default async function WelcomePage() {
+    const result = await resolveOnboardingState();
+
+    if ("redirect" in result) {
+        redirect(result.redirect);
+    }
+
+    return (
+        <OnboardingClient
+            key={result.stepId}
+            initialStepId={result.stepId}
+            initialFlowData={result.flowData}
+        />
+    );
+}

app/api/agent/[agentId]/backup/helpers.ts

@@ -1,7 +1,10 @@
-import { NextResponse } from "next/server";
-import { eq } from "drizzle-orm";
-import { db } from "@/db";
+import {NextResponse} from "next/server";
+import {and, eq} from "drizzle-orm";
+import {db} from "@/db";
 import * as drizzleDb from "@/db";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/backup/helpers"});
 
 export function withAgentCheck(handler: Function) {
     return async (request: Request, context: { params: Promise<{ agentId: string }> }) => {
@@ -9,28 +12,27 @@ export function withAgentCheck(handler: Function) {
             const agentId = (await context.params).agentId;
 
             const agent = await db.query.agent.findFirst({
-                where: eq(drizzleDb.schemas.agent.id, agentId),
+                where: and(eq(drizzleDb.schemas.agent.id, agentId), eq(drizzleDb.schemas.agent.isArchived, false)),
             });
 
             if (!agent) {
                 return NextResponse.json(
-                    { error: "Agent not found" },
-                    { status: 404 }
+                    {error: "Agent not found"},
+                    {status: 404}
                 );
             }
 
-            return handler(request, { ...context, agent });
+            return handler(request, {...context, agent});
         } catch (err) {
-            console.error("Error in agent middleware:", err);
+            log.error({error: err, name: "withAgentCheck"}, "Error in agent middleware");
             return NextResponse.json(
-                { error: "Internal server error" },
-                { status: 500 }
+                {error: "Internal server error"},
+                {status: 500}
             );
         }
     };
 }
 
-
 export async function getDatabaseOrThrow(generatedId: string) {
     const database = await db.query.database.findFirst({
         where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
@@ -43,8 +45,8 @@ export async function getDatabaseOrThrow(generatedId: string) {
 
     if (!database) {
         throw NextResponse.json(
-            { error: "Database associated with generatedId not found" },
-            { status: 404 }
+            {error: "Database associated with generatedId not found"},
+            {status: 404}
         );
     }
 

app/api/agent/[agentId]/backup/route.ts

@@ -5,9 +5,13 @@ import {db as dbClient, db} from "@/db";
 import {getDatabaseOrThrow, withAgentCheck} from "./helpers";
 import {Backup} from "@/db/schema/07_database";
 import {withUpdatedAt} from "@/db/utils";
-import {eventEmitter} from "@/features/shared/event";
-import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {eventEmitter} from "@/lib/event";
+import {sendNotificationsBackupRestore} from "@/features/notifications/utils/notifications.helpers";
 import {EventKind} from "@/features/notifications/types";
+import {logger} from "@/lib/logger";
+import {JobLogEntry} from "@/features/logs/types";
+
+const log = logger.child({module: "api/agent/backup/route"});
 
 export type BodyPost = {
     method: "manual" | "automatic"
@@ -19,6 +23,8 @@ export type BodyPatch = {
     status: "success" | "failed"
     size: number
     generatedId: string
+    logs: JobLogEntry[]
+    durationMs: number
 }
 
 export const POST = withAgentCheck(async (request: Request, {params, agent}: {
@@ -27,6 +33,7 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
 }) => {
     try {
         const body: BodyPost = await request.json();
+
         const method = body.method
         const database = await getDatabaseOrThrow(body.generatedId);
 
@@ -77,7 +84,6 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
             }
         }
 
-
         eventEmitter.emit('modification', {update: true});
 
         return NextResponse.json(
@@ -88,7 +94,7 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
             {status: 200}
         );
     } catch (error) {
-        console.error("Error in POST for INIT backup:", error);
+        log.error({error: error}, "Error in POST for INIT backup");
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}
@@ -102,7 +108,6 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
 }) => {
     try {
         const body: BodyPatch = await request.json();
-        console.log("body", body);
 
         const status = body.status
         const backupId = body.backupId
@@ -125,12 +130,37 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
             .update(drizzleDb.schemas.backup)
             .set(withUpdatedAt({
                 status: status,
-                fileSize: backupSize
+                fileSize: backupSize,
+                durationMs: body.durationMs
             }))
             .where(eq(drizzleDb.schemas.backup.id, backup.id))
             .returning();
 
 
+        const logsToInsert = body.logs.map((entry) => ({
+            backupId: backup.id,
+            restorationId: null,
+
+            loggedAt: new Date(entry.timestamp),
+
+            entryType: entry.type,
+            level: entry.level,
+
+            message: entry.message,
+            command: entry.command ?? null,
+            output: entry.output ?? null,
+
+            exitCode: entry.exit_code ?? null,
+            durationMs: entry.duration_ms ?? null,
+        }));
+
+        if (logsToInsert.length > 0) {
+            await dbClient
+                .insert(drizzleDb.schemas.jobLog)
+                .values(logsToInsert);
+        }
+
+
         eventEmitter.emit('modification', {update: true});
         await sendNotificationsBackupRestore(database, status == "failed" ? "error_backup" : "success_backup" as EventKind);
 
@@ -142,9 +172,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
             {status: 200}
         );
     } catch (error) {
-
-
-        console.error("Error in PATCH backup:", error);
+        log.error({error: error}, "Error in PATCH backup")
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}

app/api/agent/[agentId]/backup/upload/init/route.ts

@@ -1,76 +1,86 @@
-import {NextResponse} from "next/server";
-import {and, eq} from "drizzle-orm";
+import { NextResponse } from "next/server";
+import { and, eq } from "drizzle-orm";
 import * as drizzleDb from "@/db";
-import {db} from "@/db";
-import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
-import {isUuidv4} from "@/utils/verify-uuid";
-import {eventEmitter} from "@/features/shared/event";
+import { db } from "@/db";
+import { getDatabaseOrThrow, withAgentCheck } from "../../helpers";
+import { eventEmitter } from "@/lib/event";
+import { logger } from "@/lib/logger";
+import { isUUID } from "@/utils/text";
+
+const log = logger.child({ module: "api/agent/backup/upload/init" });
 
 export type Body = {
-    generatedId: string
-    storageChannelId: string
-    backupId: string
-}
-export const POST = withAgentCheck(async (request: Request, {params, agent}: {
-    params: Promise<{ agentId: string }>,
-    agent: any
-}) => {
+  generatedId: string;
+  storageChannelId: string;
+  backupId: string;
+};
+export const POST = withAgentCheck(
+  async (
+    request: Request,
+    {
+      params,
+      agent,
+    }: {
+      params: Promise<{ agentId: string }>;
+      agent: any;
+    },
+  ) => {
     try {
-        const body: Body = await request.json();
+      const body: Body = await request.json();
 
-        console.log("body", body);
+      log.info({ data: body }, "Body for backup upload init");
 
-        const generatedId = body.generatedId;
-        const storageChannelId = body.storageChannelId;
-        const backupId = body.backupId;
-
-        if (!generatedId || !isUuidv4(generatedId)) {
-            return NextResponse.json(
-                {error: "generatedId is not a valid UUID"},
-                {status: 400}
-            );
-        }
-
-        const database = await getDatabaseOrThrow(generatedId);
-
-        const backup = await db.query.backup.findFirst({
-            where: and(
-                eq(drizzleDb.schemas.backup.id, backupId),
-                eq(drizzleDb.schemas.backup.databaseId, database.id),
-            ),
-        });
-
-        if (!backup) {
-            return NextResponse.json(
-                {error: "Unable to find the corresponding backup"},
-                {status: 404}
-            );
-        }
-
-        const [backupStorage] = await db
-            .insert(drizzleDb.schemas.backupStorage)
-            .values({
-                backupId: backup.id,
-                storageChannelId: storageChannelId,
-                status: "pending",
-            })
-            .returning();
-
-        eventEmitter.emit('modification', {update: true});
+      const generatedId = body.generatedId;
+      const storageChannelId = body.storageChannelId;
+      const backupId = body.backupId;
 
+      if (!generatedId || !isUUID(generatedId)) {
         return NextResponse.json(
-            {
-                message: "Backup storage successfully created",
-                backupStorage: backupStorage
-            },
-            {status: 200}
+          { error: "generatedId is not a valid UUID" },
+          { status: 400 },
         );
+      }
+
+      const database = await getDatabaseOrThrow(generatedId);
+
+      const backup = await db.query.backup.findFirst({
+        where: and(
+          eq(drizzleDb.schemas.backup.id, backupId),
+          eq(drizzleDb.schemas.backup.databaseId, database.id),
+        ),
+      });
+
+      if (!backup) {
+        return NextResponse.json(
+          { error: "Unable to find the corresponding backup" },
+          { status: 404 },
+        );
+      }
+
+      const [backupStorage] = await db
+        .insert(drizzleDb.schemas.backupStorage)
+        .values({
+          backupId: backup.id,
+          storageChannelId: storageChannelId,
+          status: "pending",
+        })
+        .returning();
+
+      eventEmitter.emit("modification", { update: true });
+
+      return NextResponse.json(
+        {
+          message: "Backup storage successfully created",
+          backupStorage: backupStorage,
+        },
+        { status: 200 },
+      );
     } catch (error) {
-        console.error("Error in POST for INIT backup:", error);
-        return NextResponse.json(
-            {error: "Internal server error"},
-            {status: 500}
-        );
+      log.error({ error: error }, "Error in POST for INIT backup");
+      return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 },
+      );
     }
-});
-
+  },
+);

app/api/agent/[agentId]/backup/upload/status/route.ts

@@ -4,7 +4,10 @@ import * as drizzleDb from "@/db";
 import {db as dbClient, db} from "@/db";
 import {withUpdatedAt} from "@/db/utils";
 import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
-import {eventEmitter} from "@/features/shared/event";
+import {eventEmitter} from "@/lib/event";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/agent/backup/upload/status"});
 
 export type Body = {
     generatedId: string
@@ -27,8 +30,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
         const backupStorageId = body.backupStorageId;
         const backupId = body.backupId;
 
-
-        console.log("body", body);
+        log.info({data: body}, "Body for backup upload status");
 
         const database = await getDatabaseOrThrow(generatedId);
 
@@ -68,10 +70,10 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
             if (hasSuccessfulStorage && backup.status !== "success") {
                 await db
                     .update(drizzleDb.schemas.backup)
-                    .set({
+                    .set(withUpdatedAt({
                         status: "success",
                         fileSize: fileSize,
-                    })
+                    }))
                     .where(eq(drizzleDb.schemas.backup.id, backup.id));
             }
         }
@@ -85,7 +87,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
             {status: 200}
         );
     } catch (error) {
-        console.error("Error in POST for INIT backup:", error);
+        log.error({error: error},"Error in POST for INIT backup");
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}

app/api/agent/[agentId]/restore/route.ts

@@ -1,82 +1,124 @@
-import {NextResponse} from "next/server";
-import {isUuidv4} from "@/utils/verify-uuid";
+import { NextResponse } from "next/server";
 import * as drizzleDb from "@/db";
-import {db} from "@/db";
-import {and, eq} from "drizzle-orm";
-import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
-import {eventEmitter} from "@/features/shared/event";
+import { db as dbClient, db } from "@/db";
+import { and, eq } from "drizzle-orm";
+import { sendNotificationsBackupRestore } from "@/features/notifications/utils/notifications.helpers";
+import { logger } from "@/lib/logger";
+import { withUpdatedAt } from "@/db/utils";
+import { JobLogEntry } from "@/features/logs/types";
+import { isUUID } from "@/utils/text";
+
+const log = logger.child({ module: "api/agent/restore" });
 
 export type BodyResultRestore = {
-    generatedId: string
-    status: string
-}
-type RestorationStatus = 'waiting' | 'ongoing' | 'failed' | 'success';
-
+  generatedId: string;
+  status: string;
+  logs: JobLogEntry[];
+  durationMs: number;
+};
+type RestorationStatus = "waiting" | "ongoing" | "failed" | "success";
 
 export async function POST(
-    request: Request,
-    {params}: { params: Promise<{ agentId: string }> }
+  request: Request,
+  { params }: { params: Promise<{ agentId: string }> },
 ) {
+  try {
+    const agentId = (await params).agentId;
+    const body: BodyResultRestore = await request.json();
 
-    try {
-
-        const agentId = (await params).agentId
-        const body: BodyResultRestore = await request.json();
-
-
-        if (!isUuidv4(body.generatedId)) {
-            return NextResponse.json(
-                {error: "generatedId is not a valid uuid"},
-                {status: 500}
-            );
-        }
-
-        const agent = await db.query.agent.findFirst({
-            where: eq(drizzleDb.schemas.agent.id, agentId)
-        })
-        if (!agent) {
-            return NextResponse.json({error: "Agent not found"}, {status: 404})
-        }
-
-        const database = await db.query.database.findFirst({
-            where: eq(drizzleDb.schemas.database.agentDatabaseId, body.generatedId),
-            with: {
-                alertPolicies: true
-            }
-        })
-
-        if (!database) {
-            return NextResponse.json({error: "Database associated with generatedId provided not found"}, {status: 404})
-        }
-
-        const restoration = await db.query.restoration.findFirst({
-            where: and(eq(drizzleDb.schemas.restoration.status, "ongoing"), eq(drizzleDb.schemas.restoration.databaseId, database.id),)
-        })
-
-        if (!restoration) {
-            return NextResponse.json({error: "Unable to fin the corresponding restoration"}, {status: 404})
-        }
-
-
-        await db
-            .update(drizzleDb.schemas.restoration)
-            .set({status: body.status as RestorationStatus})
-            .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
-
-        await sendNotificationsBackupRestore(database, body.status == "failed" ? "error_restore" : "success_restore");
-
-        const response = {
-            message: true,
-            details: "Restoration successfully updated"
-        }
-
-
-        return Response.json(response, {status: 200})
-    } catch (error) {
-        console.error('Error in POST handler:', error);
-        return NextResponse.json(
-            {error: 'Internal server error'},
-            {status: 500}
-        );
+    if (!isUUID(body.generatedId)) {
+      return NextResponse.json(
+        { error: "generatedId is not a valid uuid" },
+        { status: 500 },
+      );
     }
-}
+
+    const agent = await db.query.agent.findFirst({
+      where: and(
+        eq(drizzleDb.schemas.agent.id, agentId),
+        eq(drizzleDb.schemas.agent.isArchived, false),
+      ),
+    });
+    if (!agent) {
+      return NextResponse.json({ error: "Agent not found" }, { status: 404 });
+    }
+
+    const database = await db.query.database.findFirst({
+      where: eq(drizzleDb.schemas.database.agentDatabaseId, body.generatedId),
+      with: {
+        alertPolicies: true,
+      },
+    });
+
+    if (!database) {
+      return NextResponse.json(
+        { error: "Database associated with generatedId provided not found" },
+        { status: 404 },
+      );
+    }
+
+    const restoration = await db.query.restoration.findFirst({
+      where: and(
+        eq(drizzleDb.schemas.restoration.status, "ongoing"),
+        eq(drizzleDb.schemas.restoration.databaseId, database.id),
+      ),
+    });
+
+    if (!restoration) {
+      return NextResponse.json(
+        { error: "Unable to fin the corresponding restoration" },
+        { status: 404 },
+      );
+    }
+
+    const [restorationUpdated] = await db
+      .update(drizzleDb.schemas.restoration)
+      .set(
+        withUpdatedAt({
+          status: body.status as RestorationStatus,
+          durationMs: body.durationMs,
+        }),
+      )
+      .where(eq(drizzleDb.schemas.restoration.id, restoration.id))
+      .returning();
+
+    const logsToInsert = body.logs.map((entry) => ({
+      backupId: null,
+      restorationId: restorationUpdated.id,
+
+      loggedAt: new Date(entry.timestamp),
+
+      entryType: entry.type,
+      level: entry.level,
+
+      message: entry.message,
+      command: entry.command ?? null,
+      output: entry.output ?? null,
+
+      exitCode: entry.exit_code ?? null,
+      durationMs: entry.duration_ms ?? null,
+    }));
+
+    if (logsToInsert.length > 0) {
+      await dbClient.insert(drizzleDb.schemas.jobLog).values(logsToInsert);
+    }
+
+    await sendNotificationsBackupRestore(
+      database,
+      body.status == "failed" ? "error_restore" : "success_restore",
+    );
+
+    const response = {
+      status: true,
+      message: "Restoration successfully updated",
+    };
+
+    return Response.json(response, { status: 200 });
+  } catch (error) {
+    log.error({ error: error }, "Error in POST handler");
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}

app/api/agent/[agentId]/status/route.ts

@@ -1,88 +1,95 @@
-import {NextResponse} from "next/server";
-import {handleDatabases} from "./helpers";
+import { NextResponse } from "next/server";
+import { handleDatabases } from "@/features/agents/utils/status/status.helpers";
+import { Body } from "@/features/agents/types";
 import * as drizzleDb from "@/db";
-import {db} from "@/db";
-import {EDbmsSchema} from "@/db/schema/types";
-import {eq} from "drizzle-orm";
-import {isUuidv4} from "@/utils/verify-uuid";
-import {withUpdatedAt} from "@/db/utils";
-import {eventEmitter} from "@/features/shared/event";
-import {notFound} from "next/navigation";
-
-export type databaseAgent = {
-    name: string,
-    dbms: EDbmsSchema,
-    generatedId: string
-}
-
-export type Body = {
-    version: string,
-    databases: databaseAgent[]
-}
+import { db } from "@/db";
+import { and, eq } from "drizzle-orm";
+import { withUpdatedAt } from "@/db/utils";
+import { logger } from "@/lib/logger";
+import { isUUID } from "@/utils/text";
 
+const log = logger.child({ module: "api/agent/status/route" });
 
 export async function POST(
-    request: Request,
-    {params}: { params: Promise<{ agentId: string }> }
+  request: Request,
+  { params }: { params: Promise<{ agentId: string }> },
 ) {
-    try {
-        const agentId = (await params).agentId
-        console.log(agentId)
-        const body: Body = await request.json();
-        const lastContact = new Date();
-        let message: string
+  try {
+    const agentId = (await params).agentId;
+    log.debug(`Agent ID: ${agentId}`);
+    const body: Body = await request.json();
+    const lastContact = new Date();
+    let message: string;
 
-        if (!isUuidv4(agentId)) {
-            message = "agentId is not a valid uuid"
-            console.error(message)
-            return NextResponse.json(
-                {error: "agentId is not a valid uuid"},
-                {status: 500}
-            );
-        }
-
-        const agent = await db.query.agent.findFirst({
-            where: eq(drizzleDb.schemas.agent.id, agentId),
-        })
-
-        if (!agent) {
-            message = "Agent not found"
-            return NextResponse.json({error: message}, {status: 404})
-        }
-
-        const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
-        if (!settings) {
-            return NextResponse.json({error: "An error occured"}, {status: 404})
-        }
-
-
-        const databasesResponse = await handleDatabases(body, agent, lastContact, settings)
-
-        await db
-            .update(drizzleDb.schemas.agent)
-            .set(withUpdatedAt({
-                version: body.version,
-                lastContact: lastContact
-            }))
-            .where(eq(drizzleDb.schemas.agent.id, agentId));
-
-
-        const response = {
-            agent: {
-                id: agentId,
-                lastContact: lastContact
-            },
-            databases: databasesResponse
-        }
-
-
-        return Response.json(response)
-    } catch (error) {
-        console.error('Error in POST handler:', error);
-        return NextResponse.json(
-            {error: 'Internal server error'},
-            {status: 500}
-        );
+    if (!isUUID(agentId)) {
+      message = "agentId is not a valid uuid";
+      log.error({ error: message }, "An error occurred");
+      return NextResponse.json(
+        { error: "agentId is not a valid uuid" },
+        { status: 500 },
+      );
     }
-}
 
+    const agent = await db.query.agent.findFirst({
+      where: and(
+        eq(drizzleDb.schemas.agent.id, agentId),
+        eq(drizzleDb.schemas.agent.isArchived, false),
+      ),
+    });
+
+    if (!agent) {
+      message = "Agent not found";
+      return NextResponse.json({ error: message }, { status: 404 });
+    }
+
+    const [settings] = await db
+      .select()
+      .from(drizzleDb.schemas.setting)
+      .where(eq(drizzleDb.schemas.setting.name, "system"))
+      .limit(1);
+    if (!settings) {
+      return NextResponse.json({ error: "An error occurred" }, { status: 404 });
+    }
+
+    const databasesResponse = await handleDatabases(
+      body,
+      agent,
+      lastContact,
+      settings,
+    );
+
+    await db
+      .update(drizzleDb.schemas.agent)
+      .set(
+        withUpdatedAt({
+          version: body.version,
+          lastContact: lastContact,
+          healthErrorCount: null,
+        }),
+      )
+      .where(eq(drizzleDb.schemas.agent.id, agentId));
+
+    await db.insert(drizzleDb.schemas.healthcheckLog).values({
+      kind: "agent",
+      status: "success",
+      objectId: agentId,
+      date: lastContact,
+    });
+
+    const response = {
+      agent: {
+        id: agentId,
+        lastContact: lastContact,
+      },
+      databases: databasesResponse,
+    };
+
+    return Response.json(response);
+  } catch (error) {
+    log.error({ error: error }, "Error in POST handler");
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}

app/api/auth/[...all]/route.ts

@@ -1,4 +1,37 @@
 import { auth } from "@/lib/auth/auth";
 import { toNextJsHandler } from "better-auth/next-js";
+import { NextRequest, NextResponse } from "next/server";
+import { headers } from "next/headers";
 
-export const { GET, POST } = toNextJsHandler(auth.handler);
+const authHandler = toNextJsHandler(auth.handler);
+
+async function blockApiKeyCreateForRestrictedUsers(
+  req: NextRequest,
+): Promise<NextResponse | null> {
+  const url = req.nextUrl;
+  if (req.method !== "POST" || !url.pathname.endsWith("/api-key/create")) {
+    return null;
+  }
+  const session = await auth.api.getSession({ headers: await headers() });
+  if (!session?.user) {
+    return null;
+  }
+  // @ts-ignore
+  if (session.user.banned || (session.user.role as string) === "pending") {
+    return NextResponse.json(
+      { error: "Account not eligible to create API keys" },
+      { status: 403 },
+    );
+  }
+  return null;
+}
+
+export async function GET(req: NextRequest) {
+  return authHandler.GET(req);
+}
+
+export async function POST(req: NextRequest) {
+  const guard = await blockApiKeyCreateForRestrictedUsers(req);
+  if (guard) return guard;
+  return authHandler.POST(req);
+}

app/api/config/route.ts

@@ -4,6 +4,6 @@ export async function GET() {
   return NextResponse.json({
     PROJECT_URL: process.env.PROJECT_URL,
     PROJECT_NAME: process.env.PROJECT_NAME,
-    PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION,
+    PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION
   });
 }

app/api/events/route.ts

@@ -1,7 +1,10 @@
 import {auth} from "@/lib/auth/auth";
 import {headers} from "next/headers";
 import {NextResponse} from "next/server";
-import {eventEmitter} from "@/features/shared/event";
+import {eventEmitter} from "@/lib/event";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/events"});
 
 export async function GET(request: Request) {
 
@@ -16,9 +19,9 @@ export async function GET(request: Request) {
     return new Response(
         new ReadableStream({
             start(controller) {
-                console.log('Stream started');
+                log.info("Stream started");
                 const handleModification = (data: any) => {
-                    console.log('Modification event triggered:', data);
+                    log.info({data: data},"Modification event triggered");
                     controller.enqueue(`event: modification\n`);
                     controller.enqueue(`data: ${JSON.stringify(data)}\n\n`);
                 };
@@ -26,7 +29,7 @@ export async function GET(request: Request) {
                 eventEmitter.on('modification', handleModification);
 
                 request.signal.addEventListener('abort', () => {
-                    console.log('Client disconnected');
+                    log.info("Client disconnected");
                     controller.close();
                     eventEmitter.off('modification', handleModification);
                 });

app/api/files/backups/route.ts

@@ -1,8 +1,11 @@
 import {NextResponse} from "next/server";
 import path from "path";
 import type {StorageInput} from "@/features/storages/types";
-import {dispatchStorage} from "@/features/storages/dispatch";
+import {dispatchStorage} from "@/features/storages/utils/storages.dispatch";
 import {Readable} from "node:stream";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/files/backups"});
 
 export async function GET(
     request: Request,
@@ -30,7 +33,7 @@ export async function GET(
         }
     };
 
-    console.debug(input);
+    log.info({input: input}, "Dispatch Storage");
 
     const result = await dispatchStorage(input, undefined, storageId);
 

app/api/files/images/[fileName]/route.ts

@@ -1,12 +1,12 @@
 import {NextResponse} from "next/server";
 import {auth} from "@/lib/auth/auth";
 import {headers} from "next/headers";
-import {db} from "@/db";
-import * as drizzleDb from "@/db";
-import {eq} from "drizzle-orm";
 import {StorageInput} from "@/features/storages/types";
-import {dispatchStorage} from "@/features/storages/dispatch";
+import {dispatchStorage} from "@/features/storages/utils/storages.dispatch";
 import {Readable} from "node:stream";
+import {logger} from "@/lib/logger";
+
+const log = logger.child({module: "api/files/images"});
 
 export async function GET(
     req: Request,
@@ -56,7 +56,7 @@ export async function GET(
         const result = await dispatchStorage(input, undefined, storageId);
 
         if (!result.file || !(result.file instanceof Readable)) {
-            console.error(`An error occurred while getting file :`, result);
+            log.error({error: result}, `An error occurred while getting file`);
             return NextResponse.json(
                 {error: "Invalid file payload"},
                 {status: 500}
@@ -82,7 +82,7 @@ export async function GET(
         });
 
     } catch (err) {
-        console.error("Error streaming image:", err);
+        log.error({error: err}, `Error streaming image`);
         return NextResponse.json({error: "Error fetching file"}, {status: 500});
     }
 }

app/api/health/route.ts

@@ -0,0 +1,5 @@
+import { NextResponse } from "next/server";
+
+export async function GET() {
+  return NextResponse.json({ success: true });
+}

app/api/tus/hooks/route.ts

@@ -1,8 +1,15 @@
 import {NextResponse} from "next/server";
 import fs from "fs";
 import path from "path";
+import {and, eq} from "drizzle-orm";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
 import {env} from "@/env.mjs";
+import {logger} from "@/lib/logger";
 
+const log = logger.child({module: "api/tus/hooks"});
+
+const FILE_PATH_RE = /^backups\/\d{4}-\d{2}-\d{2}\/[A-Za-z0-9._-]+$/;
 
 export async function POST(request: Request) {
     try {
@@ -13,7 +20,7 @@ export async function POST(request: Request) {
         const uploadOffset = headers["Upload-Offset"]?.[0];
         const status = headers["X-Status"]?.[0];
 
-        console.log(`Upload ID : ${event.Upload.ID} (${uploadOffset}/${uploadLength})`);
+        log.info(`Upload ID : ${event.Upload.ID} (${uploadOffset}/${uploadLength})`);
 
         if (status === "success") {
             if (
@@ -22,19 +29,61 @@ export async function POST(request: Request) {
                 event.Upload.Offset === event.Upload.Size
             ) {
                 const id = event.Upload.ID;
-                const fileName = headers["X-File-Name"]?.[0];
                 const filePath = headers["X-File-Path"]?.[0];
 
-                if (!filePath) {
-                    return NextResponse.json({error: "Missing X-File-Path"}, {status: 500});
+                if (!filePath || !FILE_PATH_RE.test(filePath)) {
+                    log.warn({filePath}, "Rejected invalid X-File-Path in TUS hook");
+                    return NextResponse.json({error: "Invalid file path"}, {status: 400});
                 }
 
+                const generatedId = headers["X-Generated-Id"]?.[0];
+                const backupStorageId = headers["X-Backup-Storage-Id"]?.[0];
 
-                // const uploadDir = path.join(process.cwd(), "/private/uploads/");
-                const uploadDir = path.join(env.PRIVATE_PATH, "/uploads/");
+
+                console.log(`Backup Storage ID : ${backupStorageId}`);
+                console.log(`generatedId : ${generatedId}`);
+
+                if (backupStorageId) {
+                    if (!generatedId) {
+                        log.warn("Missing X-Generated-Id in TUS hook");
+                        return NextResponse.json({error: "Forbidden"}, {status: 403});
+                    }
+
+                    const database = await db.query.database.findFirst({
+                        where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
+                    });
+
+                    if (!database) {
+                        log.warn({generatedId}, "No database for X-Generated-Id in TUS hook");
+                        return NextResponse.json({error: "Forbidden"}, {status: 403});
+                    }
+
+                    const storage = await db.query.backupStorage.findFirst({
+                        where: and(
+                            eq(drizzleDb.schemas.backupStorage.id, backupStorageId),
+                        ),
+                        with: {backup: true},
+                    });
+
+                    if (!storage || storage.backup?.databaseId !== database.id) {
+                        log.warn({backupStorageId, generatedId}, "No pending backup storage matches TUS hook");
+                        return NextResponse.json({error: "Forbidden"}, {status: 403});
+                    }
+                } else {
+                    log.warn("TUS hook without X-Backup-Storage-Id (legacy agent)");
+                }
+
+                const uploadDir = path.join(env.PRIVATE_PATH!, "/uploads/");
 
                 const oldFilePath = path.join(uploadDir, "tmp", id);
-                const newFilePath = path.join(uploadDir, filePath);
+
+                const resolvedBase = path.resolve(uploadDir);
+                const newFilePath = path.resolve(resolvedBase, filePath);
+                const rel = path.relative(resolvedBase, newFilePath);
+                if (rel.startsWith("..") || path.isAbsolute(rel)) {
+                    log.warn({filePath}, "Rejected path traversal in TUS hook");
+                    return NextResponse.json({error: "Invalid file path"}, {status: 400});
+                }
 
                 fs.mkdirSync(path.dirname(newFilePath), {recursive: true});
 
@@ -74,7 +123,7 @@ export async function POST(request: Request) {
         }
         return NextResponse.json({});
     } catch (error) {
-        console.error("Hook error:", error);
+        log.error({error: error}, "TUS Hook error");
         return NextResponse.json({error: "Internal server error"}, {status: 500});
     }
-}
+}

app/api/v1/agents/[id]/key/route.ts

@@ -0,0 +1,34 @@
+import {withApiKey} from "@/lib/api-v1/middleware";
+import {ApiKeyContext} from "@/lib/api-v1/types";
+import {NextResponse} from "next/server";
+import {getAgent, resolveAgentAccess} from "@/lib/api-v1/services/agents";
+import {logger} from "@/lib/logger";
+import {generateEdgeKey} from "@/utils/edge_key";
+import {getServerUrl} from "@/utils/get-server-url";
+
+const log = logger.child({ module: "api/v1/agents/[id]/key" });
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+        try {
+            const id = params?.id;
+            if (!id) return NextResponse.json({ error: "Not found" }, { status: 404 });
+
+            const access = await resolveAgentAccess(id, ctx.user);
+
+            if (access === "forbidden") return NextResponse.json({ error: "Forbidden" }, { status: 403 });
+            if (access === "not_found") return NextResponse.json({ error: "Not found" }, { status: 404 });
+
+            const agent = await getAgent(id);
+
+            if (!agent) return NextResponse.json({ error: "Agent not found" }, { status: 404 });
+
+            const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
+
+            return NextResponse.json({ data: edgeKey });
+        } catch (error) {
+            log.error({ error }, "Error in GET /api/v1/agents/[id]");
+            return NextResponse.json({ error: "Internal server error" }, { status: 500 });
+        }
+    }
+);

app/api/v1/agents/[id]/route.ts

@@ -0,0 +1,77 @@
+import {NextResponse} from "next/server";
+import {withApiKey} from "@/lib/api-v1/middleware";
+import {logger} from "@/lib/logger";
+import {ApiKeyContext} from "@/lib/api-v1/types";
+import {getAgent, resolveAgentAccess} from "@/lib/api-v1/services/agents";
+import {deleteAgentService} from "@/features/agents/actions/agent-delete.action";
+
+const log = logger.child({module: "api/v1/agents/[id]"});
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+        try {
+            const id = params?.id;
+            if (!id) return NextResponse.json({error: "Not found"}, {status: 404});
+
+            const access = await resolveAgentAccess(id, ctx.user);
+
+            if (access === "forbidden") return NextResponse.json({error: "Forbidden"}, {status: 403});
+            if (access === "not_found") return NextResponse.json({error: "Not found"}, {status: 404});
+
+            const agent = await getAgent(id, {
+                includeDatabases: true,
+                includeOrganizations: false,
+            });
+
+            if (!agent) return NextResponse.json({error: "Not found"}, {status: 404});
+            return NextResponse.json({data: agent});
+        } catch (error) {
+            log.error({error}, "Error in GET /api/v1/agents/[id]");
+            return NextResponse.json({error: "Internal server error"}, {status: 500});
+        }
+    }
+);
+
+export const DELETE = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+        try {
+            const id = params?.id;
+            if (!id) return NextResponse.json({error: "Not found"}, {status: 404});
+
+            const access = await resolveAgentAccess(id, ctx.user);
+            if (access === "forbidden") return NextResponse.json({error: "Forbidden"}, {status: 403});
+            if (access === "not_found") return NextResponse.json({error: "Not found"}, {status: 404});
+
+
+            const agent = await getAgent(id, {
+                includeDatabases: false,
+                includeOrganizations: true,
+            });
+
+            if (!agent) return NextResponse.json({error: "Agent no found"}, {status: 404});
+
+            const organizationIds = agent.organizations.map(org => org.organizationId)
+
+            const canDeleteGlobalAgent =
+                ctx.user.permissions.isAdmin || ctx.user.permissions.isSuperAdmin;
+
+            if (!agent.organizationId && !canDeleteGlobalAgent) {
+                return NextResponse.json(
+                    { error: "Forbidden" },
+                    { status: 403 }
+                );
+            }
+
+            await deleteAgentService({
+                agentId: agent.id,
+                organizationId: agent.organizationId ?? undefined,
+                organizationIds: organizationIds
+            });
+
+            return new Response(null, {status: 204});
+        } catch (error) {
+            log.error({error}, "Error in DELETE /api/v1/agents/[id]");
+            return NextResponse.json({error: "Internal server error"}, {status: 500});
+        }
+    }
+);

app/api/v1/agents/route.ts

@@ -0,0 +1,112 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import { inArray, eq, and, or, isNull } from "drizzle-orm";
+import { z } from "zod";
+import { logger } from "@/lib/logger";
+import {createAgentService} from "@/features/agents/actions/agents.action";
+import { ActionError } from "@/lib/safe-actions/actions";
+import {getAccessibleAgentIds} from "@/lib/api-v1/services/agents";
+import {ApiKeyContext} from "@/lib/api-v1/types";
+import {parseJsonBody} from "@/lib/api-v1/validation/json-body";
+
+const log = logger.child({ module: "api/v1/agents" });
+
+export const GET = withApiKey(async (_req: Request, ctx: ApiKeyContext) => {
+  try {
+    const agentIds = await getAccessibleAgentIds(ctx.user);
+
+    if (agentIds.length === 0) {
+      return NextResponse.json({ data: [] });
+    }
+
+    const agents = await db.query.agent.findMany({
+      where: and(
+        inArray(drizzleDb.schemas.agent.id, agentIds),
+        or(
+          eq(drizzleDb.schemas.agent.isArchived, false),
+          isNull(drizzleDb.schemas.agent.isArchived)
+        )
+      ),
+    });
+
+    return NextResponse.json({ data: agents });
+  } catch (error) {
+    log.error({ error }, "Error in GET /api/v1/agents");
+    return NextResponse.json({ error: "Internal server error" }, { status: 500 });
+  }
+});
+
+const CreateAgentSchema = z.object({
+  name: z.string().min(1, "name is required"),
+  organizationId: z.string().uuid("organizationId must be a valid UUID").optional(),
+});
+
+export const POST = withApiKey(
+    async (req: Request, ctx: ApiKeyContext) => {
+      try {
+
+        const body = await parseJsonBody(req, CreateAgentSchema);
+
+        if (!body.ok) {
+          return body.response;
+        }
+
+        const { name, organizationId } = body.data;
+
+        const org = ctx.organizations.find(
+            (org) => org.id === organizationId
+        );
+
+        if (
+            organizationId &&
+            (!org || !org.permissions.canManageAgents)
+        ) {
+          return NextResponse.json(
+              { error: "Forbidden" },
+              { status: 403 }
+          );
+        }
+
+        const canCreateGlobalAgent =
+            ctx.user.permissions.isAdmin || ctx.user.permissions.isSuperAdmin;
+
+        if (!organizationId && !canCreateGlobalAgent) {
+          return NextResponse.json(
+              { error: "Forbidden" },
+              { status: 403 }
+          );
+        }
+
+        const createdAgent = await createAgentService({
+          organizationId,
+          data: {
+            name,
+            description: "",
+          },
+        });
+
+        return NextResponse.json(
+            { data: createdAgent },
+            { status: 201 }
+        );
+      } catch (error: unknown) {
+        if (error instanceof ActionError) {
+          return NextResponse.json(
+              { error: error.message },
+              { status: 400 }
+          );
+        }
+
+        log.error({error},
+            "Error in POST /api/v1/agents"
+        );
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/backup/[backupId]/route.ts

@@ -0,0 +1,61 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import { and, eq, isNull } from "drizzle-orm";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({
+  module: "api/v1/databases/[id]/backup/[backupId]",
+});
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+        const backupId = params?.backupId;
+
+        if (!backupId) {
+          return NextResponse.json({ error: "Not found" }, { status: 404 });
+        }
+
+        const backup = await db.query.backup.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.backup.id, backupId),
+              eq(drizzleDb.schemas.backup.databaseId, id),
+              isNull(drizzleDb.schemas.backup.deletedAt)
+          ),
+          with: {
+            storages: {
+              where: (backupStorage, { isNull }) =>
+                  isNull(backupStorage.deletedAt),
+            },
+          },
+        });
+
+        if (!backup) {
+          return NextResponse.json({ error: "Not found" }, { status: 404 });
+        }
+
+        return NextResponse.json({ data: backup });
+      } catch (error) {
+        log.error(
+            { error },
+            "Error in GET /api/v1/databases/[id]/backup/[backupId]"
+        );
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/backup/route.ts

@@ -0,0 +1,96 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import {and, desc, eq, inArray, isNull} from "drizzle-orm";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases/[id]/backup" });
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const backups = await db.query.backup.findMany({
+          where: and(
+              eq(drizzleDb.schemas.backup.databaseId, id),
+              isNull(drizzleDb.schemas.backup.deletedAt)
+          ),
+          orderBy: [desc(drizzleDb.schemas.backup.createdAt)],
+        });
+
+        return NextResponse.json({ data: backups });
+      } catch (error) {
+        log.error({ error }, "Error in GET /api/v1/databases/[id]/backup");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);
+
+export const POST = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const existingBackup = await db.query.backup.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.backup.databaseId, id),
+              inArray(drizzleDb.schemas.backup.status, ["waiting", "ongoing"])
+          ),
+        });
+
+        if (existingBackup) {
+          return NextResponse.json(
+              {
+                error:
+                    "A backup is already waiting or ongoing for this database",
+              },
+              { status: 409 }
+          );
+        }
+
+        const [createdBackup] = await db
+            .insert(drizzleDb.schemas.backup)
+            .values({
+              databaseId: id,
+              status: "waiting",
+            })
+            .returning();
+
+        if (!createdBackup) {
+          return NextResponse.json(
+              { error: "Failed to create backup" },
+              { status: 500 }
+          );
+        }
+
+        return NextResponse.json({ data: createdBackup }, { status: 201 });
+      } catch (error) {
+        log.error({ error }, "Error in POST /api/v1/databases/[id]/backup");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/restore/route.ts

@@ -0,0 +1,122 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import {and, eq, inArray, isNull} from "drizzle-orm";
+import { z } from "zod";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import { parseJsonBody } from "@/lib/api-v1/validation/json-body";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases/[id]/restore" });
+
+const RestoreSchema = z.object({
+  backupId: z.string().uuid("backupId must be a valid UUID"),
+  backupStorageId: z.string().uuid("backupStorageId must be a valid UUID"),
+});
+
+export const POST = withApiKey(
+    async (req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const body = await parseJsonBody(req, RestoreSchema);
+
+        if (!body.ok) {
+          return body.response;
+        }
+
+        const { backupId, backupStorageId } = body.data;
+
+        const backupRecord = await db.query.backup.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.backup.id, backupId),
+              eq(drizzleDb.schemas.backup.databaseId, id),
+              isNull(drizzleDb.schemas.backup.deletedAt)
+          ),
+          columns: {
+            id: true,
+          },
+        });
+
+        if (!backupRecord) {
+          return NextResponse.json(
+              { error: "Backup not found for this database" },
+              { status: 404 }
+          );
+        }
+
+        const backupStorage = await db.query.backupStorage.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.backupStorage.id, backupStorageId),
+              eq(drizzleDb.schemas.backupStorage.backupId, backupId),
+              isNull(drizzleDb.schemas.backupStorage.deletedAt)
+          ),
+        });
+
+        if (!backupStorage) {
+          return NextResponse.json(
+              { error: "Backup storage not found" },
+              { status: 404 }
+          );
+        }
+
+        if (backupStorage.status !== "success") {
+          return NextResponse.json(
+              { error: "Backup storage is not in a successful state" },
+              { status: 422 }
+          );
+        }
+
+        const existingRestorationBackup = await db.query.restoration.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.restoration.databaseId, id),
+              inArray(drizzleDb.schemas.restoration.status, ["waiting", "ongoing"])
+          ),
+        });
+
+        if (existingRestorationBackup) {
+          return NextResponse.json(
+              {
+                error:
+                    "A restoration is already waiting or ongoing for this database",
+              },
+              { status: 409 }
+          );
+        }
+
+        const [restoration] = await db
+            .insert(drizzleDb.schemas.restoration)
+            .values({
+              databaseId: id,
+              backupId,
+              backupStorageId,
+              status: "waiting",
+            })
+            .returning();
+
+        if (!restoration) {
+          return NextResponse.json(
+              { error: "Failed to create restoration" },
+              { status: 500 }
+          );
+        }
+
+        return NextResponse.json({ data: restoration }, { status: 201 });
+      } catch (error) {
+        log.error({ error }, "Error in POST /api/v1/databases/[id]/restore");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/route.ts

@@ -0,0 +1,44 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import { and, eq, isNull } from "drizzle-orm";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases/[id]" });
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const database = await db.query.database.findFirst({
+          where: and(
+              eq(drizzleDb.schemas.database.id, id),
+              isNull(drizzleDb.schemas.database.deletedAt)
+          ),
+        });
+
+        if (!database) {
+          return NextResponse.json({ error: "Not found" }, { status: 404 });
+        }
+
+        return NextResponse.json({ data: database });
+      } catch (error) {
+        log.error({ error }, "Error in GET /api/v1/databases/[id]");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/[id]/status/route.ts

@@ -0,0 +1,72 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+import { and, desc, eq, isNull } from "drizzle-orm";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import {requireDatabaseAccess} from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases/[id]/status" });
+
+export const GET = withApiKey(
+    async (_req: Request, ctx: ApiKeyContext, params?: Record<string, string>) => {
+      try {
+        const guard = await requireDatabaseAccess(params, ctx.user);
+
+        if (!guard.ok) {
+          return guard.response;
+        }
+
+        const { id } = guard.data;
+
+        const [database, latestBackup, latestRestoration] = await Promise.all([
+          db.query.database.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.database.id, id),
+                isNull(drizzleDb.schemas.database.deletedAt)
+            ),
+          }),
+
+          db.query.backup.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.backup.databaseId, id),
+                isNull(drizzleDb.schemas.backup.deletedAt)
+            ),
+            orderBy: [desc(drizzleDb.schemas.backup.createdAt)],
+          }),
+
+          db.query.restoration.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.restoration.databaseId, id),
+                isNull(drizzleDb.schemas.restoration.deletedAt)
+            ),
+            orderBy: [desc(drizzleDb.schemas.restoration.createdAt)],
+          }),
+        ]);
+
+        if (!database) {
+          return NextResponse.json(
+              { error: "Database not found" },
+              { status: 404 }
+          );
+        }
+
+        return NextResponse.json({
+          data: {
+            isWaitingForBackup: database.isWaitingForBackup,
+            lastContact: database.lastContact,
+            latestBackup: latestBackup ?? null,
+            latestRestoration: latestRestoration ?? null,
+          },
+        });
+      } catch (error) {
+        log.error({ error }, "Error in GET /api/v1/databases/[id]/status");
+
+        return NextResponse.json(
+            { error: "Internal server error" },
+            { status: 500 }
+        );
+      }
+    }
+);

app/api/v1/databases/route.ts

@@ -0,0 +1,24 @@
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { logger } from "@/lib/logger";
+import { ApiKeyContext } from "@/lib/api-v1/types";
+import { getAccessibleDatabases } from "@/lib/api-v1/services/databases";
+
+const log = logger.child({ module: "api/v1/databases" });
+
+export const GET = withApiKey(async (_req: Request, ctx: ApiKeyContext) => {
+  try {
+    const databases = await getAccessibleDatabases(ctx.user);
+
+    return NextResponse.json({
+      data: databases,
+    });
+  } catch (error) {
+    log.error({ error }, "Error in GET /api/v1/databases");
+
+    return NextResponse.json(
+        { error: "Internal server error" },
+        { status: 500 }
+    );
+  }
+});

app/api/v1/docs/route.ts

@@ -0,0 +1,45 @@
+export const dynamic = "force-dynamic";
+
+const html = `<!DOCTYPE html>
+<html>
+  <head>
+    <title>Portabase API Docs</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link
+      rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.32.6/swagger-ui.css"
+      integrity="sha384-9Q2fpS+xeS4ffJy6CagnwoUl+4ldAYhOs9pgZuEKxypVModhmZFzeMlvVsAjf7uT"
+      crossorigin="anonymous"
+    />
+    <style>
+      body { margin: 0; }
+    </style>
+  </head>
+  <body>
+    <div id="swagger-ui"></div>
+    <script src="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.32.6/swagger-ui-bundle.js" integrity="sha384-EYdOaiRwn44zNjrw+Tfs06qYz9BGQVo2f4/pLY5i7VorbjnZNhdplAbTBk8FXHUJ" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5.32.6/swagger-ui-standalone-preset.js" integrity="sha384-49fpFaVrAWI/qdgl9Vv5E/4NXxRUiJX5vGuLws1NUpTWGtEqzWEx8gHTw2UTehFK" crossorigin="anonymous"></script>
+    <script>
+      window.onload = function () {
+        SwaggerUIBundle({
+          url: "/api/v1/openapi",
+          dom_id: "#swagger-ui",
+          presets: [
+            SwaggerUIBundle.presets.apis,
+            SwaggerUIStandalonePreset,
+          ],
+          layout: "StandaloneLayout",
+          persistAuthorization: true,
+          filter: true,
+        });
+      };
+    </script>
+  </body>
+</html>`;
+
+export function GET() {
+  return new Response(html, {
+    headers: { "Content-Type": "text/html; charset=utf-8" },
+  });
+}

app/api/v1/mcp/route.ts

@@ -0,0 +1,31 @@
+import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
+import { NextResponse } from "next/server";
+import { withApiKey } from "@/lib/api-v1/middleware";
+import { createPortabaseMcpServer } from "@/lib/mcp/server";
+import type { ApiKeyContext } from "@/lib/api-v1/types";
+import { env } from "@/env.mjs";
+
+/**
+ * MCP endpoint — Streamable HTTP transport, stateless mode.
+ *
+ * Auth is handled by withApiKey before MCP is ever touched.
+ * The validated key is forwarded by MCP tools to downstream /api/v1 REST calls.
+ */
+const apiEnabled = env.API_ENABLED;
+const mcpEnabled = env.MCP_ENABLED;
+
+export const POST = apiEnabled && mcpEnabled
+  ? withApiKey(async (req: Request, ctx: ApiKeyContext) => {
+      const apiKey = req.headers.get("x-api-key")!;
+
+      const server = createPortabaseMcpServer(ctx, apiKey);
+
+      const transport = new WebStandardStreamableHTTPServerTransport({
+        sessionIdGenerator: undefined,
+      });
+
+      await server.connect(transport);
+
+      return transport.handleRequest(req);
+    })
+  : () => NextResponse.json({ error: "Not found" }, { status: 404 });

app/api/v1/openapi/route.ts

@@ -0,0 +1,8 @@
+import { NextResponse } from "next/server";
+import { buildSpec } from "@/lib/api-v1/openapi/spec";
+
+export const dynamic = "force-dynamic";
+
+export function GET() {
+  return NextResponse.json(buildSpec());
+}

app/layout.tsx

@@ -1,12 +1,12 @@
 import type { Metadata } from "next";
 import type React from "react";
 import "./globals.css";
-import { ConsoleSilencer } from "@/components/wrappers/common/console-silencer";
+import { ConsoleSilencer } from "@/components/common/console-silencer";
 import { author, geistMono, poppins } from "@/fonts/fonts";
 import { cn } from "@/lib/utils";
 import { Providers } from "./providers";
 
-const title = process.env.PROJECT_NAME ?? "App Title";
+const title = process.env.PROJECT_NAME ?? "Portabase";
 
 export const metadata: Metadata = {
   title: {

app/not-found.tsx

@@ -1,4 +1,5 @@
-import BackButton from "@/components/wrappers/common/button/back-button";
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
 
 export default async function NotFound() {
   return (
@@ -12,7 +13,9 @@ export default async function NotFound() {
             The content you are trying to view is not available.
           </p>
         </div>
-        <BackButton>Go home</BackButton>
+        <Button asChild>
+          <Link href="/">Go home</Link>
+        </Button>
       </div>
     </div>
   );

app/providers.tsx

@@ -4,9 +4,9 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { type PropsWithChildren, Suspense } from "react";
 
 import { Toaster } from "@/components/ui/sonner";
-import { ErrorLayout } from "@/components/wrappers/common/error-layout";
-import { ThemeMetaUpdaterRoot } from "@/features/browser/theme-meta-updater-root";
-import { ThemeProvider } from "@/features/theme/theme-provider";
+import { ErrorLayout } from "@/components/common/error-layout";
+import { ThemeMetaUpdater } from "@/features/theme/components/theme-meta-updater";
+import { ThemeProvider } from "@/features/theme/components/theme-provider";
 
 export type ProviderProps = PropsWithChildren<{}>;
 const queryClient = new QueryClient();
@@ -14,8 +14,13 @@ const queryClient = new QueryClient();
 export const Providers = (props: ProviderProps) => {
   return (
     <Suspense fallback={null}>
-      <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-        <ThemeMetaUpdaterRoot />
+      <ThemeProvider
+        attribute="class"
+        defaultTheme="light"
+        enableSystem
+        storageKey="portabase_theme"
+      >
+        <ThemeMetaUpdater />
         <QueryClientProvider client={queryClient}>
           <ErrorLayout>
             <Toaster />

docker-compose.prod.yml

@@ -1,12 +1,12 @@
 services:
   app:
-#        build:
-#          context: .
-#          dockerfile: docker/dockerfile/Dockerfile
-#          target: prod
-    image: portabase/portabase:1.4.0
+    build:
+     context: .
+     dockerfile: docker/dockerfile/Dockerfile
+     target: prod
+#    image: portabase/portabase:1
     ports:
-      - '8887:80'
+      - "8887:80"
     environment:
       TZ: "Europe/Paris"
     env_file:
@@ -17,6 +17,12 @@ services:
       db:
         condition: service_healthy
     container_name: portabase-app-prod
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost/api/health"]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 60s
 
   db:
     image: postgres:16-alpine
@@ -29,7 +35,7 @@ services:
       - POSTGRES_USER=devuser
       - POSTGRES_PASSWORD=changeme
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U devuser -d devdb" ]
+      test: ["CMD-SHELL", "pg_isready -U devuser -d devdb"]
       interval: 10s
       timeout: 5s
       retries: 5

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - POSTGRES_USER=devuser
       - POSTGRES_PASSWORD=changeme
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U devuser -d devdb"]
+      test: [ "CMD-SHELL", "pg_isready -U devuser -d devdb" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -32,5 +32,127 @@ services:
       - ./private/uploads/tmp:/data/uploads/tmp
     user: "1000:1000"
 
+  mailpit:
+    image: axllent/mailpit:latest
+    container_name: portabase-mailpit-dev
+    hostname: mailpit
+    restart: unless-stopped
+    ports:
+      - "8025:8025"
+      - "1025:1025"
+
+  azurite:
+    image: mcr.microsoft.com/azure-storage/azurite
+    command: azurite --blobHost 0.0.0.0 --skipApiVersionCheck
+    ports:
+      - "10000:10000"
+    volumes:
+      - azurite-data:/data
+    extra_hosts:
+      - "localhost:host-gateway"
+    networks:
+      - portabase
+
+    #  DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;
+
+  gcs:
+    image: fsouza/fake-gcs-server:latest
+    container_name: fake-gcs
+    ports:
+      - "4443:4443"
+    command:
+      - "-scheme"
+      - "http"
+      - "-port"
+      - "4443"
+      - "-public-host"
+      - "localhost:4443"
+      - "-external-url"
+      - "http://localhost:4443"
+      - "-backend"
+      - "filesystem"
+      - "-filesystem-root"
+      - "/storage"
+    volumes:
+      - gcs-data:/data
+      - gcs-storage:/storage
+    networks:
+      - portabase
+
+  gcs-init:
+    image: curlimages/curl:latest
+    depends_on:
+      - gcs
+    entrypoint: ["/bin/sh", "-c"]
+    command: >
+      'until curl -fsS http://gcs:4443/storage/v1/b >/dev/null; do sleep 1; done;
+      curl -fsS http://gcs:4443/storage/v1/b/portabase >/dev/null
+      || curl -fsS -X POST "http://gcs:4443/storage/v1/b?project=local"
+      -H "Content-Type: application/json"
+      -d "{\"name\":\"portabase\"}"'
+    networks:
+      - portabase
+
+  #   curl http://localhost:4443/storage/v1/b
+  #   projectId: "test-project",
+  #   bucketName: "portabase",
+  #   clientEmail: "fake@test.iam.gserviceaccount.com",
+  #   privateKey: "unused-when-emulated",
+
+  rustfs:
+    image: rustfs/rustfs:latest
+    container_name: rustfs
+    environment:
+      - RUSTFS_ROOT_USER=admin
+      - RUSTFS_ROOT_PASSWORD=root-password
+      - RUSTFS_ACCESS_KEY=access-key
+      - RUSTFS_SECRET_KEY=secret-key
+      - RUSTFS_VOLUMES=/data
+      - RUSTFS_ADDRESS=:9000
+      - RUSTFS_CONSOLE_ENABLE=true
+      - RUSTFS_CONSOLE_ADDRESS=:9001
+    volumes:
+      - rustfs-data:/data
+    healthcheck:
+      test: [ "CMD", "curl", "-sf", "http://localhost:9000/health" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+    ports:
+      - "9001:9001"
+      - "9000:9000"
+    extra_hosts:
+      - "localhost:host-gateway"
+    networks:
+      - portabase
+
+  rustfs-init:
+    image: rustfs/rc:latest
+    container_name: rustfs-init
+    depends_on:
+      rustfs:
+        condition: service_healthy
+    entrypoint: >
+      /bin/sh -c "
+      until (/usr/bin/rc alias set rustfs http://rustfs:9000 access-key secret-key) do echo '...waiting...' && sleep 1; done;
+      /usr/bin/rc mb rustfs/portabase;
+      echo 'RustFS initialization complete';
+      tail -f /dev/null
+      "
+    networks:
+      - portabase
+
+
+
 volumes:
   postgres-data:
+  azurite-data:
+  gcs-data:
+  gcs-storage:
+  rustfs-data:
+
+networks:
+  portabase:
+    name: portabase_network
+    external: true

docker/dockerfile/Dockerfile

@@ -1,11 +1,33 @@
-FROM --platform=$BUILDPLATFORM node:22-bullseye AS base
+FROM --platform=$BUILDPLATFORM node:22-slim AS runtime-base
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     curl \
     ca-certificates \
     bash \
     tzdata \
     libc6 \
+    nginx \
+    gnupg \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    | gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" \
+    > /etc/apt/sources.list.d/pgdg.list
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    postgresql-18 \
+    postgresql-client-18 \
+    postgresql-contrib-18 \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV PATH="/usr/lib/postgresql/18/bin:${PATH}"
+
+
+FROM runtime-base AS build-base
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
     g++ \
     make \
@@ -13,25 +35,9 @@ RUN apt-get update && apt-get install -y \
     automake \
     libtool \
     git \
-    nginx \
     && rm -rf /var/lib/apt/lists/*
 
 
-RUN mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
-    | gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" \
-    > /etc/apt/sources.list.d/pgdg.list
-
-RUN apt-get update && apt-get install -y \
-    postgresql-18 \
-    postgresql-client-18 \
-    postgresql-contrib-18 \
-    && rm -rf /var/lib/apt/lists/*
-
-ENV PATH="/usr/lib/postgresql/18/bin:${PATH}"
-
-
 FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS tusd-base
 
 ARG TUSD_VERSION=2.8.0
@@ -51,7 +57,7 @@ FROM scratch AS tusd-dist
 COPY --from=tusd-base /tusddist/tusd /tusd
 
 
-FROM base AS build-env
+FROM build-base AS build-env
 
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
@@ -83,7 +89,7 @@ COPY . .
 ENV NEXT_TELEMETRY_DISABLED=1
 RUN pnpm run build
 
-FROM base AS prod
+FROM runtime-base AS prod
 
 WORKDIR /app
 ENV NODE_ENV=production
@@ -92,6 +98,7 @@ ENV PORT=80
 ENV HOSTNAME="0.0.0.0"
 ENV PGDATA=/data/postgres
 ENV PRIVATE_PATH=/data/private
+ENV TUSD_BEHIND_PROXY=false
 
 
 RUN addgroup --system --gid 1001 nodejs
@@ -104,7 +111,6 @@ COPY --from=builder /app/drizzle.config.ts ./
 COPY --from=builder --chown=1001:1001 /app/.next/standalone ./
 COPY --from=builder --chown=1001:1001 /app/.next/static ./.next/static
 COPY --chown=1001:1001 src/db ./src/db
-COPY --from=deps /app/node_modules ./node_modules
 
 COPY --from=tusd-dist /tusd /usr/local/bin/tusd
 RUN chmod +x /usr/local/bin/tusd

docker/entrypoints/app-prod-entrypoint.sh

@@ -72,7 +72,18 @@ fi
 
 mkdir -p /data/private/uploads/tmp
 echo "▶ Starting tusd server..."
-tusd --base-path /tus/files/ --upload-dir /data/private/uploads/tmp --hooks-http http://127.0.0.1:3000/api/tus/hooks --port 1080 --max-size 21474836480 &
+TUSD_BEHIND_PROXY_FLAG=""
+if [ "${TUSD_BEHIND_PROXY:-false}" = "true" ]; then
+    TUSD_BEHIND_PROXY_FLAG="--behind-proxy"
+    echo "[INFO] TUSD_BEHIND_PROXY=true, enabling tusd proxy mode"
+fi
+tusd \
+    --base-path /tus/files/ \
+    --upload-dir /data/private/uploads/tmp \
+    --hooks-http http://127.0.0.1:3000/api/tus/hooks \
+    --port 1080 \
+    --max-size 21474836480 \
+    $TUSD_BEHIND_PROXY_FLAG &
 
 echo "▶ Starting Next.js server..."
 PORT=3000 node server.js &

docker/nginx/nginx.conf

@@ -1,6 +1,11 @@
 events {}
 
 http {
+    map $http_x_forwarded_proto $forwarded_proto {
+        default $scheme;
+        "~*^\s*(https?)\s*(?:,|$)" $1;
+    }
+
     client_max_body_size 20G;
     ignore_invalid_headers  off;
 
@@ -18,13 +23,18 @@ http {
 
             proxy_set_header Host $http_host;
             proxy_set_header X-Forwarded-Host $http_host;
-            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Proto $forwarded_proto;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
             proxy_set_header         Upgrade $http_upgrade;
             proxy_set_header         Connection "upgrade";
         }
 
+        location = /api/tus/hooks {
+            deny all;
+            return 404;
+        }
+
         location / {
             proxy_pass http://127.0.0.1:3000;
 
@@ -34,7 +44,7 @@ http {
 
             proxy_set_header Host $http_host;
             proxy_set_header X-Forwarded-Host $http_host;
-            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Proto $forwarded_proto;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         }
     }

helm/.helmignore

@@ -0,0 +1,17 @@
+.DS_Store
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+.project
+.idea/
+*.tmproj
+.vscode/

helm/Chart.yaml

@@ -0,0 +1,28 @@
+apiVersion: v2
+name: portabase
+description: Helm chart for Portabase
+type: application
+version: 0.0.0
+appVersion: "latest"
+keywords:
+  - postgresql
+  - mariadb
+  - mongodb
+  - mysql
+  - sqlite
+  - backup
+  - database
+  - restore
+home: https://github.com/Portabase/portabase
+
+sources:
+  - https://github.com/Portabase/portabase
+  - https://github.com/Portabase/portabase/tree/main/helm
+
+maintainers:
+  - name: Charles Gauthereau
+    url: https://github.com/RambokDev
+  - name: Killian Larcher
+    url: https://github.com/KillianLarcher
+
+icon: https://raw.githubusercontent.com/Portabase/portabase/main/.github/assets/logo.png

helm/README.md

@@ -0,0 +1,32 @@
+# Development Notes
+
+## Check that Kubernetes is reachable locally
+
+```bash
+kubectl get nodes
+```
+
+## Install the local Portabase Helm chart
+
+```bash
+helm install portabase . \
+--set project.secret=$(openssl rand -hex 32)
+```
+
+## Check the pods
+
+```bash
+kubectl get pods
+```
+
+## Check the services
+
+```bash
+kubectl get svc
+```
+
+## If the service type is ClusterIP, expose it locally using port forwarding:
+
+```bash
+kubectl port-forward svc/portabase 8887:80
+```

helm/templates/deployment.yaml

@@ -0,0 +1,59 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: portabase
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: portabase
+  template:
+    metadata:
+      labels:
+        app: portabase
+    spec:
+      containers:
+        - name: portabase
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          ports:
+            - containerPort: 80
+          env:
+            - name: TZ
+              value: {{ .Values.timezone }}
+            - name: PROJECT_URL
+              value: {{ .Values.project.url }}
+            - name: PROJECT_SECRET
+              value: {{ .Values.project.secret }}
+            - name: TUSD_BEHIND_PROXY
+              value: {{ .Values.project.behindProxy | quote }}
+          volumeMounts:
+            - name: data
+              mountPath: /data
+          startupProbe:
+            httpGet:
+              path: /api/health
+              port: 80
+            initialDelaySeconds: 10
+            periodSeconds: 10
+            failureThreshold: 12
+            timeoutSeconds: 5
+          livenessProbe:
+            httpGet:
+              path: /api/health
+              port: 80
+            initialDelaySeconds: 0
+            periodSeconds: 30
+            timeoutSeconds: 5
+            failureThreshold: 3
+          readinessProbe:
+            httpGet:
+              path: /api/health
+              port: 80
+            initialDelaySeconds: 0
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 3
+      volumes:
+        - name: data
+          persistentVolumeClaim:
+            claimName: portabase-data

helm/templates/pvc.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: portabase-data
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size }}

helm/templates/service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: portabase
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    app: portabase
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: 80
+      nodePort: {{ .Values.service.nodePort }}

helm/values.yaml

@@ -0,0 +1,48 @@
+image:
+  repository: portabase/portabase
+  tag: latest
+  pullPolicy: Always
+
+replicaCount: 1
+
+service:
+  type: ClusterIP
+  port: 80
+  targetPort: 80
+
+resources:
+  requests:
+    memory: "1Gi"
+    cpu: "1"
+  limits:
+    memory: "1Gi"
+    cpu: "1"
+
+timezone: Europe/Paris
+
+project:
+  url: http://localhost:8887
+  secret: "change_me_generate_secure_secret"
+  behindProxy: false
+
+persistence:
+  enabled: true
+  storageClassName: ""
+  accessMode: ReadWriteOnce
+  size: 10Gi
+  mountPath: /data
+
+ingress:
+  enabled: false
+  className: nginx
+  hosts:
+    - host: portabase.example.com
+      paths:
+        - path: /
+          pathType: Prefix
+  tls: []
+
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    partition: 0

knip.json

@@ -0,0 +1,3 @@
+{
+  "ignoreDependencies": ["pino-pretty"]
+}

next.config.ts

@@ -1,99 +1,100 @@
-import type {NextConfig} from "next";
-import {PORTABASE_DEFAULT_SETTINGS} from "./portabase.config";
+import type { NextConfig } from "next";
+import { PORTABASE_DEFAULT_SETTINGS } from "./portabase.config";
 
 const isDev = process.env.NODE_ENV === "development";
 
-
 function buildCSPHeader(): string {
-    const {CSP} = PORTABASE_DEFAULT_SETTINGS.SECURITY;
+  const { CSP } = PORTABASE_DEFAULT_SETTINGS.SECURITY;
 
-    const directives = [
-        `default-src ${CSP.DEFAULT_SRC.join(" ")}`,
-        `script-src ${CSP.SCRIPT_SRC.join(" ")}`,
-        `style-src ${CSP.STYLE_SRC.join(" ")}`,
-        `img-src ${CSP.IMG_SRC.join(" ")}`,
-        `font-src ${CSP.FONT_SRC.join(" ")}`,
-        `object-src ${CSP.OBJECT_SRC.join(" ")}`,
-        `connect-src ${CSP.CONNECT_SRC.join(" ")}`,
-        `base-uri ${CSP.BASE_URI.join(" ")}`,
-        `form-action ${CSP.FORM_ACTION.join(" ")}`,
-        `frame-ancestors ${CSP.FRAME_ANCESTORS.join(" ")}`,
-    ];
+  const directives = [
+    `default-src ${CSP.DEFAULT_SRC.join(" ")}`,
+    `script-src ${CSP.SCRIPT_SRC.join(" ")}`,
+    `style-src ${CSP.STYLE_SRC.join(" ")}`,
+    `img-src ${CSP.IMG_SRC.join(" ")}`,
+    `font-src ${CSP.FONT_SRC.join(" ")}`,
+    `object-src ${CSP.OBJECT_SRC.join(" ")}`,
+    `connect-src ${CSP.CONNECT_SRC.join(" ")}`,
+    `base-uri ${CSP.BASE_URI.join(" ")}`,
+    `form-action ${CSP.FORM_ACTION.join(" ")}`,
+    `frame-ancestors ${CSP.FRAME_ANCESTORS.join(" ")}`,
+  ];
 
-    if (CSP.BLOCK_ALL_MIXED_CONTENT) {
-        directives.push("block-all-mixed-content");
-    }
+  if (CSP.BLOCK_ALL_MIXED_CONTENT) {
+    directives.push("block-all-mixed-content");
+  }
 
-    if (CSP.UPGRADE_INSECURE_REQUESTS) {
-        directives.push("upgrade-insecure-requests");
-    }
+  if (CSP.UPGRADE_INSECURE_REQUESTS) {
+    directives.push("upgrade-insecure-requests");
+  }
 
-    return directives.join("; ");
+  return directives.join("; ");
 }
 
 function buildPermissionsPolicy(): string {
-    return Object.entries(PORTABASE_DEFAULT_SETTINGS.SECURITY.PERMISSIONS_POLICY)
-        .map(([feature, values]) => `${feature.toLowerCase()}=${values.join(", ")}`)
-        .join(", ");
+  return Object.entries(PORTABASE_DEFAULT_SETTINGS.SECURITY.PERMISSIONS_POLICY)
+    .map(([feature, values]) => `${feature.toLowerCase()}=${values.join(", ")}`)
+    .join(", ");
 }
 
-
 const nextConfig: NextConfig = {
-    output: "standalone",
-    typescript: {
-        ignoreBuildErrors: true,
+  output: "standalone",
+  devIndicators: false,
+  typescript: {
+    ignoreBuildErrors: true,
+  },
+  logging: {
+    browserToTerminal: false,
+  },
+  experimental: {
+    serverActions: {
+      bodySizeLimit: "10gb",
     },
-    experimental: {
-        serverActions: {
-            bodySizeLimit: "10gb",
-        },
-        proxyClientMaxBodySize: '10gb',
-    },
-    async rewrites() {
-        if (!isDev) return [];
+    proxyClientMaxBodySize: "10gb",
+  },
+  async rewrites() {
+    if (!isDev) return [];
 
-        return [
-            {
-                source: "/tus/:path*",
-                destination: "http://localhost:1080/tus/:path*",
-            },
-        ];
-    },
+    return [
+      {
+        source: "/tus/:path*",
+        destination: "http://localhost:1080/tus/:path*",
+      },
+    ];
+  },
 
-    async headers() {
-        return [
-            {
-                source: "/(.*)",
-                headers: [
-                    {
-                        key: "Content-Security-Policy",
-                        value: buildCSPHeader(),
-                    },
-                    {
-                        key: "Permissions-Policy",
-                        value: buildPermissionsPolicy(),
-                    },
-                    {
-                        key: 'X-Content-Type-Options',
-                        value: 'nosniff',
-                    },
-                    {
-                        key: 'X-Frame-Options',
-                        value: 'DENY',
-                    },
-                    {
-                        key: 'Referrer-Policy',
-                        value: 'strict-origin-when-cross-origin',
-                    },
-                    {
-                        key: 'Strict-Transport-Security',
-                        value: 'max-age=63072000; includeSubDomains; preload',
-                    }
-                    // ...other security headers
-                ],
-            },
-        ];
-    },
+  async headers() {
+    return [
+      {
+        source: "/(.*)",
+        headers: [
+          {
+            key: "Content-Security-Policy",
+            value: buildCSPHeader(),
+          },
+          {
+            key: "Permissions-Policy",
+            value: buildPermissionsPolicy(),
+          },
+          {
+            key: "X-Content-Type-Options",
+            value: "nosniff",
+          },
+          {
+            key: "X-Frame-Options",
+            value: "DENY",
+          },
+          {
+            key: "Referrer-Policy",
+            value: "strict-origin-when-cross-origin",
+          },
+          {
+            key: "Strict-Transport-Security",
+            value: "max-age=63072000; includeSubDomains; preload",
+          },
+        ],
+      },
+    ];
+  },
 };
 
 export default nextConfig;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "portabase",
-  "version": "1.4.32",
+  "version": "1.23.1",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack -p 8887",
@@ -15,121 +15,107 @@
     "release": "release-it"
   },
   "dependencies": {
-    "@better-auth/passkey": "^1.4.19",
-    "@better-auth/sso": "^1.4.19",
-    "@hookform/resolvers": "^5.2.2",
+    "@asteasolutions/zod-to-openapi": "^8.5.0",
+    "@azure/storage-blob": "^12.32.0",
+    "@better-auth/api-key": "1.6.11",
+    "@better-auth/core": "1.6.11",
+    "@better-auth/passkey": "1.6.11",
+    "@better-auth/sso": "1.6.11",
+    "@google-cloud/storage": "^7.19.0",
+    "@hookform/resolvers": "^5.4.0",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@onboardjs/react": "1.0.0-rc.5",
+    "@opentelemetry/api": "^1.9.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.220.0",
+    "@opentelemetry/resources": "^2.9.0",
+    "@opentelemetry/sdk-metrics": "^2.9.0",
+    "@opentelemetry/semantic-conventions": "^1.42.0",
     "@radix-ui/react-accordion": "^1.2.12",
     "@radix-ui/react-alert-dialog": "^1.1.15",
-    "@radix-ui/react-aspect-ratio": "^1.1.8",
     "@radix-ui/react-avatar": "^1.1.11",
     "@radix-ui/react-checkbox": "^1.3.3",
     "@radix-ui/react-collapsible": "^1.1.12",
-    "@radix-ui/react-context-menu": "^2.2.16",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
-    "@radix-ui/react-hover-card": "^1.1.15",
     "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-label": "^2.1.8",
-    "@radix-ui/react-menubar": "^1.1.16",
-    "@radix-ui/react-navigation-menu": "^1.2.14",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-progress": "^1.1.8",
     "@radix-ui/react-radio-group": "^1.3.8",
     "@radix-ui/react-scroll-area": "^1.2.10",
     "@radix-ui/react-select": "^2.2.6",
     "@radix-ui/react-separator": "^1.1.8",
-    "@radix-ui/react-slider": "^1.3.6",
     "@radix-ui/react-slot": "^1.2.4",
     "@radix-ui/react-switch": "^1.2.6",
     "@radix-ui/react-tabs": "^1.1.13",
-    "@radix-ui/react-toast": "^1.2.15",
     "@radix-ui/react-toggle": "^1.1.10",
-    "@radix-ui/react-toggle-group": "^1.1.11",
     "@radix-ui/react-tooltip": "^1.2.8",
     "@react-email/components": "^0.0.41",
-    "@t3-oss/env-nextjs": "^0.13.10",
-    "@tanstack/react-query": "^5.90.21",
+    "@t3-oss/env-nextjs": "^0.13.11",
+    "@tanstack/react-query": "^5.100.14",
     "@tanstack/react-table": "^8.21.3",
     "@types/nodemailer": "^6.4.23",
-    "@types/ws": "^8.18.1",
-    "@zenstackhq/runtime": "2.14.2",
-    "argon2": "^0.43.1",
-    "bcrypt": "^6.0.0",
-    "better-auth": "1.4.18",
+    "better-auth": "1.6.11",
+    "canvas-confetti": "^1.9.4",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "date-fns": "^4.1.0",
-    "dockerode": "^4.0.9",
+    "date-fns": "^4.3.0",
     "dotenv": "^16.6.1",
-    "drizzle-orm": "^0.43.1",
-    "drizzle-zod": "^0.7.1",
-    "embla-carousel-react": "^8.6.0",
+    "drizzle-orm": "0.45.2",
+    "drizzle-zod": "0.8.3",
     "googleapis": "^170.1.0",
     "input-otp": "^1.4.2",
     "lucide-react": "^0.553.0",
-    "minio": "^8.0.6",
-    "motion": "^12.34.3",
-    "next": "16.1.5",
+    "minio": "^8.0.7",
+    "motion": "^12.40.0",
+    "next": "16.2.3",
     "next-safe-action": "^7.10.8",
     "next-themes": "^0.4.6",
     "node-cron": "^4.2.1",
-    "node-forge": "^1.3.3",
-    "nodemailer": "^7.0.13",
-    "npm-check-updates": "^18.3.1",
-    "pg": "^8.18.0",
-    "prettier": "^3.8.1",
-    "react": "^19.2.4",
-    "react-day-picker": "9.7.0",
-    "react-dom": "^19.2.4",
+    "nodemailer": "8.0.5",
+    "pg": "^8.21.0",
+    "pino": "^10.3.1",
+    "react": "^19.2.6",
+    "react-dom": "^19.2.6",
     "react-dropzone": "^14.4.1",
     "react-email": "^4.3.2",
-    "react-hook-form": "^7.71.2",
-    "react-qr-code": "^2.0.18",
-    "react-resizable-panels": "^3.0.6",
+    "react-hook-form": "^7.76.1",
+    "react-qr-code": "^2.0.21",
     "react-twc": "^1.5.1",
-    "react-use-measure": "^2.1.7",
     "recharts": "^2.15.4",
+    "server-only": "^0.0.1",
     "sharp": "^0.34.5",
-    "socket.io": "^4.8.3",
-    "socket.io-client": "^4.8.3",
     "sonner": "^2.0.7",
-    "swiper": "^12.1.2",
-    "tailwind-merge": "^3.5.0",
-    "uuid": "^11.1.0",
-    "vaul": "^1.1.2",
-    "ws": "^8.19.0",
-    "zod": "^3.25.76"
+    "tailwind-merge": "^3.6.0",
+    "tar-stream": "^3.2.0",
+    "uuid": "^11.1.1",
+    "zod": "4.3.6"
   },
   "devDependencies": {
     "@iconify/react": "^6.0.2",
     "@react-email/preview-server": "4.3.2",
-    "@react-email/render": "^2.0.4",
+    "@react-email/render": "^2.0.8",
     "@release-it/bumper": "^7.0.5",
-    "@release-it/conventional-changelog": "^10.0.5",
-    "@tailwindcss/postcss": "^4.2.1",
-    "@types/eslint-plugin-tailwindcss": "^3.17.0",
-    "@types/node": "^22.19.11",
-    "@types/node-forge": "^1.3.14",
-    "@types/pg": "^8.16.0",
-    "@types/react": "^19.2.14",
+    "@release-it/conventional-changelog": "^10.0.6",
+    "@tailwindcss/postcss": "^4.3.0",
+    "@types/canvas-confetti": "^1.9.0",
+    "@types/node": "^22.19.19",
+    "@types/pg": "^8.20.0",
+    "@types/react": "^19.2.15",
     "@types/react-dom": "^19.2.3",
-    "@zenstackhq/openapi": "^2.22.1",
-    "@zenstackhq/tanstack-query": "^2.22.2",
-    "baseline-browser-mapping": "^2.10.0",
-    "drizzle-kit": "^0.31.9",
-    "esbuild": "^0.27.3",
-    "eslint": "^9.39.3",
-    "eslint-config-next": "^16.1.6",
-    "eslint-plugin-tailwindcss": "^3.18.2",
-    "framer-motion": "^12.34.3",
-    "postcss": "^8.5.6",
+    "@types/tar-stream": "^3.1.4",
+    "drizzle-kit": "^0.31.10",
+    "eslint": "^9.39.4",
+    "eslint-config-next": "^16.2.6",
+    "framer-motion": "^12.40.0",
+    "pino-pretty": "^13.1.3",
+    "postcss": "8.5.10",
+    "postcss-load-config": "^6.0.1",
     "release-it": "^19.2.4",
-    "tailwindcss": "^4.2.1",
-    "tsx": "^4.21.0",
+    "tailwindcss": "^4.3.0",
     "tw-animate-css": "^1.4.0",
-    "typescript": "^5.9.3",
-    "zenstack": "2.14.2"
+    "typescript": "^5.9.3"
   },
-  "packageManager": "pnpm@10.30.1+sha512.3590e550d5384caa39bd5c7c739f72270234b2f6059e13018f975c313b1eb9fefcc09714048765d4d9efe961382c312e624572c0420762bdc5d5940cdf9be73a"
+  "packageManager": "pnpm@11.8.0+sha512.c1f5e7c4cb241c8f174b743851d82f42b802324afc8b0f116b96adb15aa06664948dde36960a3ba1079ba5b4b29dd0140135b94b5b5f5263592249d68e555f26"
 }

pnpm-workspace.yaml

@@ -1,3 +1,19 @@
+allowBuilds:
+  '@prisma/client': true
+  '@prisma/engines': true
+  argon2: true
+  bcrypt: true
+  cpu-features: true
+  esbuild: true
+  node-pty: true
+  prisma: true
+  protobufjs: true
+  sharp: true
+  ssh2: true
+  unrs-resolver: true
+  zenstack: true
+ignoredBuiltDependencies:
+  - node-pty
 onlyBuiltDependencies:
   - '@prisma/client'
   - '@prisma/engines'

portabase.config.ts

@@ -23,6 +23,7 @@ export const PORTABASE_DEFAULT_SETTINGS = {
                 "https://code.iconify.design",
                 "https://cdn.iconify.design",
                 "https://code.iconify.com",
+                "https://cdn.jsdelivr.net",
             ],
             IMG_SRC: [
                 "'self'",
@@ -45,7 +46,7 @@ export const PORTABASE_DEFAULT_SETTINGS = {
                 "https://api.iconify.design",
                 "https://code.iconify.design",
                 "https://api.github.com",
-
+                "https://api.dicebear.com",
             ],
             OBJECT_SRC: ["'none'"],
             BASE_URI: ["'self'"],

proxy.ts

@@ -3,6 +3,8 @@ import { loggingMiddleware } from "@/middleware/loggingMiddleware";
 import { errorHandler } from "@/middleware/errorHandler";
 import { auth } from "@/lib/auth/auth";
 import { headers } from "next/headers";
+import { env } from "@/env.mjs";
+import { User } from "@/db/schema/02_user";
 
 export async function proxy(request: NextRequest) {
   const url = request.nextUrl.clone();
@@ -17,11 +19,13 @@ export async function proxy(request: NextRequest) {
         new URL(`/login?redirect=${redirectUrl}`, request.url),
       );
     }
-    if (session.user.banned) {
+    const user = session.user as User;
+
+    if (user.banned) {
       await auth.api.signOut({ headers: await headers() });
       return NextResponse.redirect(new URL("/login?error=banned", request.url));
     }
-    if (session.user.role === "pending") {
+    if (user.role === "pending") {
       await auth.api.signOut({ headers: await headers() });
       return NextResponse.redirect(
         new URL(`/login?error=pending?redirect=${redirectUrl}`, request.url),
@@ -38,6 +42,33 @@ export async function proxy(request: NextRequest) {
   }
 
   if (url.pathname.startsWith("/api")) {
+    if (url.pathname.startsWith("/api/v1")) {
+      const apiEnabled = env.API_ENABLED;
+      if (!apiEnabled) {
+        return new NextResponse(
+          JSON.stringify({
+            message: "This API route does not exist.",
+            status: 404,
+          }),
+          { status: 404, headers: { "Content-Type": "application/json" } },
+        );
+      }
+      const openapiEnabled = env.OPENAPI_ENABLED;
+      if (
+        !openapiEnabled &&
+        (url.pathname.startsWith("/api/v1/docs") ||
+          url.pathname.startsWith("/api/v1/openapi"))
+      ) {
+        return new NextResponse(
+          JSON.stringify({
+            message: "This API route does not exist.",
+            status: 404,
+          }),
+          { status: 404, headers: { "Content-Type": "application/json" } },
+        );
+      }
+    }
+
     const routeExists = checkRouteExists(url.pathname);
     if (!routeExists) {
       return new NextResponse(
@@ -71,7 +102,22 @@ function checkRouteExists(pathname: string) {
     /^\/api\/tus\/hooks\/?$/,
     /^\/api\/events\/?$/,
     /^\/api\/config\/?$/,
+    /^\/api\/health\/?$/,
     /^\/api\/google\/drive\/callback\/?$/,
+    /^\/api\/avatar\/?$/,
+    // v1 external API
+    /^\/api\/v1\/mcp\/?$/,
+    /^\/api\/v1\/docs\/?$/,
+    /^\/api\/v1\/openapi\/?$/,
+    /^\/api\/v1\/agents\/?$/,
+    /^\/api\/v1\/agents\/[^/]+\/?$/,
+    /^\/api\/v1\/agents\/[^/]+\/key\/?$/,
+    /^\/api\/v1\/databases\/?$/,
+    /^\/api\/v1\/databases\/[^/]+\/?$/,
+    /^\/api\/v1\/databases\/[^/]+\/backup\/?$/,
+    /^\/api\/v1\/databases\/[^/]+\/backup\/[^/]+\/?$/,
+    /^\/api\/v1\/databases\/[^/]+\/restore\/?$/,
+    /^\/api\/v1\/databases\/[^/]+\/status\/?$/,
   ];
   return routePatterns.some((pattern) => pattern.test(pathname));
 }