🐛 Fix typography on shortcuts list

* 🐛 Add backend password validation with complexity rules and dictionary check

Enforce minimum 8-character password length, require at least 1 lowercase
letter, 1 uppercase letter, 1 digit, and 1 special character, and reject
common passwords using Passay library with a 10k-entry wordlist from
SecLists during registration and password change flows.

AI-assisted-by: mimo-v2.5-pro

* ✨ Improve user feedback

When the password is invalid, the user now gets extra indications to make it stronger, so it can be valid.

* 🐛 Fix remove unneeded common password check

The dictionary check is only relevant for passwords that meet all other requirements, but all 10,000 common passwords would fail the character requirements, so this check is not needed

---------

Co-authored-by: Luis de Dios <luis.dedios@kaleidos.net>

.clj-kondo/config.edn

@@ -88,6 +88,9 @@
   :dynamic-var-not-earmuffed
   {:level :off}
 
+  :type-mismatch
+  {:level :off}
+
   :used-underscored-binding
   {:level :warning}
 

.env.example

@@ -0,0 +1,3 @@
+# Penpot API configuration for error-reports CLI tool
+PENPOT_API_URI=http://localhost:3450
+PENPOT_ACCESS_TOKEN=your-access-token-here

.github/workflows/auto-label.yml

@@ -3,7 +3,7 @@ name: Auto Label and Add to Project
 on:
   issues:
     types: [opened]
-  pull_request:
+  pull_request_target:
     types: [opened]
 
 jobs:

.github/workflows/build-bundle.yml

@@ -9,16 +9,6 @@ on:
         type: string
         required: true
         default: 'develop'
-      build_wasm:
-        description: 'BUILD_WASM. Valid values: yes, no'
-        type: string
-        required: false
-        default: 'yes'
-      build_storybook:
-        description: 'BUILD_STORYBOOK. Valid values: yes, no'
-        type: string
-        required: false
-        default: 'yes'
   workflow_call:
     inputs:
       gh_ref:
@@ -26,29 +16,21 @@ on:
         type: string
         required: true
         default: 'develop'
-      build_wasm:
-        description: 'BUILD_WASM. Valid values: yes, no'
-        type: string
-        required: false
-        default: 'yes'
-      build_storybook:
-        description: 'BUILD_STORYBOOK. Valid values: yes, no'
-        type: string
-        required: false
-        default: 'yes'
 
 concurrency:
   group: ${{ github.workflow }}-${{ inputs.gh_ref }}
   cancel-in-progress: true
 
 jobs:
-  build-bundle:
-    name: Build and Upload Penpot Bundle
+  # ── 1. Decide whether there is anything to build ───────────────────────
+  check:
+    name: Check current bundle
     runs-on: penpot-runner-01
-    env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+    timeout-minutes: 10
+    outputs:
+      gh_ref: ${{ steps.vars.outputs.gh_ref }}
+      bundle_version: ${{ steps.vars.outputs.bundle_version }}
+      exists: ${{ steps.check.outputs.exists }}
 
     steps:
       - name: Checkout repository
@@ -63,10 +45,52 @@ jobs:
           echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
           echo "bundle_version=$(git describe --tags --always)" >> $GITHUB_OUTPUT
 
+      # The uploaded zip carries its version as S3 metadata. If the
+      # existing object was already built from this same commit, the
+      # whole build job is skipped.
+      - name: Check if this bundle is already built
+        id: check
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          EXISTING_VERSION=$(aws s3api head-object \
+            --bucket ${{ secrets.S3_BUCKET }} \
+            --key "penpot-${{ steps.vars.outputs.gh_ref }}.zip" \
+            --query 'Metadata."bundle-version"' \
+            --output text 2>/dev/null || echo "none")
+
+          if [ "$EXISTING_VERSION" = "${{ steps.vars.outputs.bundle_version }}" ]; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            {
+              echo "### ⏭️ Bundle build skipped"
+              echo ""
+              echo "The bundle in S3 was already built from \`${{ steps.vars.outputs.bundle_version }}\`."
+            } >> "$GITHUB_STEP_SUMMARY"
+          else
+            echo "exists=false" >> $GITHUB_OUTPUT
+          fi
+
+  # ── 2. Build and upload, only when needed ──────────────────────────────
+  build:
+    name: Build and Upload Penpot Bundle
+    runs-on: penpot-runner-01
+    timeout-minutes: 90
+    needs: check
+    if: needs.check.outputs.exists == 'false'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.gh_ref }}
+
       - name: Build bundle
         env:
-          BUILD_WASM: ${{ inputs.build_wasm }}
-          BUILD_STORYBOOK: ${{ inputs.build_storybook }}
+          BUILD_WASM: 'yes'
+          BUILD_STORYBOOK: 'yes'
         run: ./manage.sh build-bundle
 
       - name: Prepare directories for zipping
@@ -80,18 +104,32 @@ jobs:
           zip -r zips/penpot.zip penpot
 
       - name: Upload Penpot bundle to S3
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
         run: |
-          aws s3 cp zips/penpot.zip s3://${{ secrets.S3_BUCKET }}/penpot-${{ steps.vars.outputs.gh_ref }}.zip --metadata bundle-version=${{ steps.vars.outputs.bundle_version }}
+          aws s3 cp zips/penpot.zip \
+            s3://${{ secrets.S3_BUCKET }}/penpot-${{ needs.check.outputs.gh_ref }}.zip \
+            --metadata bundle-version=${{ needs.check.outputs.bundle_version }}
 
+  # ── 3. Single failure notification for the whole workflow ─────────────
+  notify:
+    name: Notify failure
+    runs-on: penpot-runner-01
+    timeout-minutes: 5
+    needs: [check, build]
+    if: failure()
+
+    steps:
       - name: Notify Mattermost
-        if: failure()
-        uses: mattermost/action-mattermost-notify@master
+        uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd
           TEXT: |
             ❌ 📦 *[PENPOT] Error building penpot bundles.*
-            📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
-               Bundle version: `${{ steps.vars.outputs.bundle_version }}`
+            📄 Triggered from ref: `${{ needs.check.outputs.gh_ref || inputs.gh_ref }}`
+               Bundle version: `${{ needs.check.outputs.bundle_version || 'n/a' }}`
             🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
             @infra

.github/workflows/build-develop.yml

@@ -11,8 +11,6 @@ jobs:
     secrets: inherit
     with:
       gh_ref: "develop"
-      build_wasm: "yes"
-      build_storybook: "yes"
 
   build-docker:
     needs: build-bundle
@@ -20,3 +18,9 @@ jobs:
     secrets: inherit
     with:
       gh_ref: "develop"
+
+  build-admin-console-docker:
+    uses: ./.github/workflows/build-docker-admin-console.yml
+    secrets: inherit
+    with:
+      gh_ref: "develop"

.github/workflows/build-docker-admin-console.yml

@@ -0,0 +1,91 @@
+name: Admin Console Docker Builder
+
+on:
+  workflow_dispatch:
+    inputs:
+      gh_ref:
+        description: 'Name of the branch or ref to build in penpot-nitrate'
+        type: string
+        required: true
+        default: 'develop'
+      dispatch_ref:
+        description: 'Branch of penpot-nitrate from which the workflow definition is read'
+        type: string
+        required: false
+        default: 'develop'
+  workflow_call:
+    inputs:
+      gh_ref:
+        description: 'Name of the branch or ref to build in penpot-nitrate'
+        type: string
+        required: true
+      dispatch_ref:
+        description: 'Branch of penpot-nitrate from which the workflow definition is read'
+        type: string
+        required: false
+        default: 'develop'
+    secrets:
+      ORG_WORKFLOW_TOKEN:
+        description: 'Token with Actions write access on penpot-nitrate'
+        required: true
+
+jobs:
+  build-nitrate-docker:
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.ORG_WORKFLOW_TOKEN }}
+      REPO: penpot/penpot-nitrate
+      WORKFLOW: build-docker-admin-console.yml
+      GH_REF: ${{ inputs.gh_ref }}
+      DISPATCH_REF: ${{ inputs.dispatch_ref }}
+    steps:
+      - name: Trigger nitrate docker build
+        id: dispatch
+        run: |
+          DISTINCT_ID="${{ github.run_id }}-${{ github.run_attempt }}"
+          CALLER_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+
+          gh workflow run "$WORKFLOW" --repo "$REPO" --ref "$DISPATCH_REF" \
+            -f gh_ref="$GH_REF" \
+            -f caller_run_id="$DISTINCT_ID" \
+            -f caller_run_url="$CALLER_URL"
+
+          # Locate the dispatched run using the correlation id embedded in its run-name
+          RUN_ID=""
+          for i in $(seq 1 24); do
+            sleep 5
+            RUN_ID=$(gh run list --repo "$REPO" --workflow "$WORKFLOW" \
+              --limit 10 --json databaseId,displayTitle \
+              --jq ".[] | select(.displayTitle | contains(\"$DISTINCT_ID\")) | .databaseId" \
+              | head -n1)
+            [ -n "$RUN_ID" ] && break
+          done
+
+          if [ -z "$RUN_ID" ]; then
+            echo "::error::Could not locate the dispatched run in $REPO"
+            exit 1
+          fi
+
+          RUN_URL="https://github.com/$REPO/actions/runs/$RUN_ID"
+          echo "run_id=$RUN_ID" >> "$GITHUB_OUTPUT"
+          echo "run_url=$RUN_URL" >> "$GITHUB_OUTPUT"
+          echo "::notice title=Nitrate docker build::$RUN_URL"
+
+      - name: Wait for nitrate docker build
+        run: |
+          gh run watch "${{ steps.dispatch.outputs.run_id }}" \
+            --repo "$REPO" \
+            --interval 30 \
+            --exit-status
+
+      - name: Report result
+        if: always() && steps.dispatch.outputs.run_id != ''
+        run: |
+          CONCLUSION=$(gh run view "${{ steps.dispatch.outputs.run_id }}" \
+            --repo "$REPO" --json conclusion --jq '.conclusion')
+          {
+            echo "### 🐳 Nitrate docker build"
+            echo ""
+            echo "- Result: \`${CONCLUSION:-in_progress}\`"
+            echo "- Run: ${{ steps.dispatch.outputs.run_url }}"
+          } >> "$GITHUB_STEP_SUMMARY"

.github/workflows/build-docker-devenv.yml

@@ -20,12 +20,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: Login to Docker Registry
+      - name: Login to Docker Registry (push destination)
         uses: docker/login-action@v4
         with:
           username: ${{ secrets.PUB_DOCKER_USERNAME }}
           password: ${{ secrets.PUB_DOCKER_PASSWORD }}
 
+      - name: Login to Docker Hardened Images registry (base image pull)
+        uses: docker/login-action@v4
+        with:
+          registry: dhi.io
+          username: ${{ secrets.PUB_DOCKER_USERNAME }}
+          password: ${{ secrets.PUB_DOCKER_PASSWORD }}
+
       - name: Build and push DevEnv Docker image
         uses: docker/build-push-action@v7
         env:
@@ -35,12 +42,14 @@ jobs:
           file: ./docker/devenv/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
+          provenance: mode=max
+          sbom: true
           tags: ${{ env.DOCKER_IMAGE }}:latest
           cache-from: type=registry,ref=${{ env.DOCKER_IMAGE }}:buildcache
           cache-to: type=registry,ref=${{ env.DOCKER_IMAGE }}:buildcache,mode=max
 
       - name: Notify Mattermost
-        uses: mattermost/action-mattermost-notify@master
+        uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd

.github/workflows/build-docker.yml

@@ -20,55 +20,117 @@ concurrency:
   group: ${{ github.workflow }}-${{ inputs.gh_ref }}
   cancel-in-progress: true
 
+env:
+  ALL_IMAGES: backend frontend exporter storybook mcp
+  # All runner instances live on the same server, so the bundle is
+  # downloaded from S3 once and shared between build jobs through this
+  # host-local directory. Each build job falls back to S3 if the file is
+  # missing (e.g. if runners ever move to separate machines).
+  BUNDLE_CACHE: /var/tmp/penpot-bundle-cache
+
 jobs:
-  build-and-push:
-    name: Build and Push Penpot Docker Images
+  # ── 1. Resolve the build key and check the whole set at once ───────────
+  prepare:
+    name: Prepare
     runs-on: penpot-runner-02
+    timeout-minutes: 15
+    outputs:
+      gh_ref: ${{ steps.vars.outputs.gh_ref }}
+      bundle_version: ${{ steps.vars.outputs.bundle_version }}
+      build_key: ${{ steps.vars.outputs.build_key }}
+      exists: ${{ steps.check.outputs.exists }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.gh_ref }}
+
+      - name: Extract some useful variables
+        id: vars
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          GH_REF="${{ inputs.gh_ref || github.ref_name }}"
+          echo "gh_ref=$GH_REF" >> $GITHUB_OUTPUT
+
+          BUNDLE_VERSION=$(aws s3api head-object \
+            --bucket ${{ secrets.S3_BUCKET }} \
+            --key "penpot-$GH_REF.zip" \
+            --query 'Metadata."bundle-version"' \
+            --output text)
+          echo "bundle_version=$BUNDLE_VERSION" >> $GITHUB_OUTPUT
+
+          # Image content = bundle + docker build context, so the build key
+          # combines both.
+          CTX_HASH=$(git rev-parse "HEAD:docker/images" | cut -c1-12)
+          echo "build_key=${BUNDLE_VERSION}-${CTX_HASH}" >> $GITHUB_OUTPUT
+
+      # The image set is a single block, so a single set-level check is
+      # enough: `promote` drops a marker object in S3 only after every
+      # image was built AND every branch tag was moved. Marker present
+      # means there is nothing at all to do for this build key.
+      - name: Check if this image set is already built
+        id: check
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          if aws s3api head-object \
+               --bucket ${{ secrets.S3_BUCKET }} \
+               --key "markers/images-${{ steps.vars.outputs.build_key }}" \
+               > /dev/null 2>&1; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            {
+              echo "### ⏭️ Image set build skipped"
+              echo ""
+              echo "The whole set was already built and promoted for \`${{ steps.vars.outputs.build_key }}\`."
+            } >> "$GITHUB_STEP_SUMMARY"
+          else
+            echo "exists=false" >> $GITHUB_OUTPUT
+
+            # Stage the bundle in the host-local cache, once, for all the
+            # build jobs. Download to a temp name and mv for atomicity;
+            # prune stale bundles while at it.
+            mkdir -p "$BUNDLE_CACHE"
+            find "$BUNDLE_CACHE" -type f -mtime +1 -delete || true
+            ZIP="$BUNDLE_CACHE/penpot-${{ steps.vars.outputs.build_key }}.zip"
+            if [ ! -f "$ZIP" ]; then
+              aws s3 cp "s3://${{ secrets.S3_BUCKET }}/penpot-${{ steps.vars.outputs.gh_ref }}.zip" "$ZIP.$$.tmp"
+              mv "$ZIP.$$.tmp" "$ZIP"
+            fi
+          fi
+
+  # ── 2. One build per image, in parallel, only when needed ──────────────
+  build:
+    name: Build ${{ matrix.image }}
+    runs-on: penpot-runner-02
+    timeout-minutes: 60
+    needs: prepare
+    if: needs.prepare.outputs.exists == 'false'
+    strategy:
+      fail-fast: true
+      # 4 runner slots are available for build jobs on this server; cap the
+      # matrix at 3 so short jobs (prepare and other workflows' checks)
+      # never queue behind long builds.
+      max-parallel: 3
+      matrix:
+        image: [backend, frontend, exporter, storybook, mcp]
 
     steps:
       - name: Set common environment variables
         run: |
           # Each job execution will use its own docker configuration.
-          echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}" >> $GITHUB_ENV
+          echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}-${{ matrix.image }}" >> $GITHUB_ENV
 
       - name: Checkout code
         uses: actions/checkout@v6
         with:
-          fetch-depth: 0
           ref: ${{ inputs.gh_ref }}
 
-      - name: Extract some useful variables
-        id: vars
-        run: |
-          echo "gh_ref=${{ inputs.gh_ref || github.ref_name }}" >> $GITHUB_OUTPUT
-
-      - name: Download Penpot Bundles
-        id: bundles
-        env:
-          FILE_NAME: penpot-${{ steps.vars.outputs.gh_ref }}.zip
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
-        run: |
-          tmp=$(aws s3api head-object \
-            --bucket ${{ secrets.S3_BUCKET }} \
-            --key "$FILE_NAME" \
-            --query 'Metadata."bundle-version"' \
-            --output text)
-          echo "bundle_version=$tmp" >> $GITHUB_OUTPUT
-          pushd docker/images
-          aws s3 cp s3://${{ secrets.S3_BUCKET }}/$FILE_NAME .
-          unzip $FILE_NAME > /dev/null
-          mv penpot/backend bundle-backend
-          mv penpot/frontend bundle-frontend
-          mv penpot/exporter bundle-exporter
-          mv penpot/storybook bundle-storybook
-          mv penpot/mcp bundle-mcp
-          popd
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-
       - name: Login to Docker Registry
         uses: docker/login-action@v4
         with:
@@ -85,103 +147,140 @@ jobs:
           username: ${{ secrets.PUB_DOCKER_USERNAME }}
           password: ${{ secrets.PUB_DOCKER_PASSWORD }}
 
+      # Images now build FROM Docker Hardened Images (dhi.io). DHI
+      # is free (Apache 2.0, no subscription), but pulling from it
+      # still requires an authenticated login -- a separate `docker
+      # login` against a different registry host, even though it
+      # reuses the same PUB_DOCKER_* credentials as the DockerHub
+      # login above.
+      - name: Login to Docker Hardened Images registry (base image pull)
+        uses: docker/login-action@v4
+        with:
+          registry: dhi.io
+          username: ${{ secrets.PUB_DOCKER_USERNAME }}
+          password: ${{ secrets.PUB_DOCKER_PASSWORD }}
+
+      # Bundle staged once by `prepare` on this host; the S3 fallback only
+      # triggers if the cache is unavailable (runners on another machine,
+      # cache pruned mid-run, ...).
+      - name: Prepare Penpot bundle
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          ZIP="$BUNDLE_CACHE/penpot-${{ needs.prepare.outputs.build_key }}.zip"
+          if [ ! -f "$ZIP" ]; then
+            echo "Bundle not found in host cache; falling back to S3."
+            mkdir -p "$BUNDLE_CACHE"
+            aws s3 cp "s3://${{ secrets.S3_BUCKET }}/penpot-${{ needs.prepare.outputs.gh_ref }}.zip" "$ZIP.$$.tmp"
+            mv "$ZIP.$$.tmp" "$ZIP"
+          fi
+          # Extract only the bundle this job needs.
+          pushd docker/images
+          unzip -q "$ZIP" "penpot/${{ matrix.image }}/*"
+          mv "penpot/${{ matrix.image }}" "bundle-${{ matrix.image }}"
+          popd
+
+      - name: Set up QEMU (stable)
+        uses: docker/setup-qemu-action@v4
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
       - name: Extract metadata (tags, labels)
         id: meta
         uses: docker/metadata-action@v6
         with:
-          images:
-            frontend
-            backend
-            exporter
-            storybook
-            mcp
+          images: ${{ matrix.image }}
           labels: |
-            bundle_version=${{ steps.bundles.outputs.bundle_version }}
+            bundle_version=${{ needs.prepare.outputs.bundle_version }}
 
-      - name: Build and push Backend Docker image
+      - name: Build and push Docker image
         uses: docker/build-push-action@v7
-        env:
-          DOCKER_IMAGE: 'backend'
-          BUNDLE_PATH: './bundle-backend'
         with:
           context: ./docker/images/
-          file: ./docker/images/Dockerfile.backend
+          file: ./docker/images/Dockerfile.${{ matrix.image }}
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
+          provenance: mode=max
+          sbom: true
+          # Immutable tag only; branch tags are moved atomically for the
+          # whole image set by the `promote` job.
+          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ matrix.image }}:build-${{ needs.prepare.outputs.build_key }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
+          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ matrix.image }}:buildcache
+          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ matrix.image }}:buildcache,mode=max
 
-      - name: Build and push Frontend Docker image
-        uses: docker/build-push-action@v7
-        env:
-          DOCKER_IMAGE: 'frontend'
-          BUNDLE_PATH: './bundle-frontend'
+  # ── 3. Move the branch tags of ALL images together ─────────────────────
+  # Runs only when every build succeeded (default `needs` semantics); if
+  # the set was already complete, `build` is skipped and so is this job —
+  # the S3 marker guarantees the branch tags were already moved.
+  promote:
+    name: Promote image set
+    runs-on: penpot-runner-02
+    timeout-minutes: 10
+    needs: [prepare, build]
+
+    steps:
+      - name: Set common environment variables
+        run: |
+          echo "DOCKER_CONFIG=${{ runner.temp }}/.docker-${{ github.run_id }}-${{ github.job }}" >> $GITHUB_ENV
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Login to Docker Registry
+        uses: docker/login-action@v4
         with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.frontend
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
+          registry: ${{ secrets.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and push Exporter Docker image
-        uses: docker/build-push-action@v7
+      - name: Point branch tags to the new build key
+        run: |
+          set -e
+          for image in $ALL_IMAGES; do
+            docker buildx imagetools create \
+              -t "${{ secrets.DOCKER_REGISTRY }}/$image:${{ needs.prepare.outputs.gh_ref }}" \
+              "${{ secrets.DOCKER_REGISTRY }}/$image:build-${{ needs.prepare.outputs.build_key }}"
+          done
+
+      # The marker is written LAST: its presence certifies that all five
+      # images exist and all branch tags point to this build key.
+      - name: Write set-completed marker
         env:
-          DOCKER_IMAGE: 'exporter'
-          BUNDLE_PATH: './bundle-exporter'
-        with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.exporter
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
+        run: |
+          echo "${{ github.run_id }}" | aws s3 cp - \
+            "s3://${{ secrets.S3_BUCKET }}/markers/images-${{ needs.prepare.outputs.build_key }}"
+          {
+            echo "### ✅ Image set promoted"
+            echo ""
+            echo "All \`:${{ needs.prepare.outputs.gh_ref }}\` tags now point to \`build-${{ needs.prepare.outputs.build_key }}\`."
+          } >> "$GITHUB_STEP_SUMMARY"
 
-      - name: Build and push Storybook Docker image
-        uses: docker/build-push-action@v7
-        env:
-          DOCKER_IMAGE: 'storybook'
-          BUNDLE_PATH: './bundle-storybook'
-        with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.storybook
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
-
-      - name: Build and push MCP Docker image
-        uses: docker/build-push-action@v7
-        env:
-          DOCKER_IMAGE: 'mcp'
-          BUNDLE_PATH: './bundle-mcp'
-        with:
-          context: ./docker/images/
-          file: ./docker/images/Dockerfile.mcp
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.vars.outputs.gh_ref }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:buildcache,mode=max
+  # ── 4. Single failure notification for the whole workflow ─────────────
+  notify:
+    name: Notify failure
+    runs-on: penpot-runner-02
+    timeout-minutes: 5
+    needs: [prepare, build, promote]
+    if: failure()
 
+    steps:
       - name: Notify Mattermost
-        if: failure()
-        uses: mattermost/action-mattermost-notify@master
+        uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd
           TEXT: |
-            ❌ 🐳 *[PENPOT] Error building penpot docker images.*
-            📄 Triggered from ref: `${{ steps.vars.outputs.gh_ref }}`
-            📦 Bundle: `${{ steps.bundles.outputs.bundle_version }}`
+            ❌ 🐳 *[PENPOT] Error building/promoting the penpot docker image set.*
+            📄 Triggered from ref: `${{ needs.prepare.outputs.gh_ref || inputs.gh_ref }}`
+            📦 Bundle: `${{ needs.prepare.outputs.bundle_version || 'n/a' }}`
             🔗 Run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
             @infra

.github/workflows/build-staging.yml

@@ -11,8 +11,6 @@ jobs:
     secrets: inherit
     with:
       gh_ref: "staging"
-      build_wasm: "yes"
-      build_storybook: "yes"
 
   build-docker:
     needs: build-bundle
@@ -20,3 +18,9 @@ jobs:
     secrets: inherit
     with:
       gh_ref: "staging"
+
+  build-admin-console-docker:
+    uses: ./.github/workflows/build-docker-admin-console.yml
+    secrets: inherit
+    with:
+      gh_ref: "staging"

.github/workflows/build-tag.yml

@@ -12,8 +12,6 @@ jobs:
     secrets: inherit
     with:
       gh_ref: ${{ github.ref_name }}
-      build_wasm: "yes"
-      build_storybook: "yes"
 
   build-docker:
     needs: build-bundle
@@ -26,10 +24,9 @@ jobs:
     name: Notifications
     runs-on: ubuntu-24.04
     needs: build-docker
-
     steps:
       - name: Notify Mattermost
-        uses: mattermost/action-mattermost-notify@master
+        uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd

.github/workflows/plugins-deploy-api-doc.yml

@@ -131,7 +131,7 @@ jobs:
 
       - name: Notify Mattermost
         if: failure()
-        uses: mattermost/action-mattermost-notify@master
+        uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd

.github/workflows/plugins-deploy-package.yml

@@ -114,7 +114,7 @@ jobs:
 
       - name: Notify Mattermost
         if: failure()
-        uses: mattermost/action-mattermost-notify@master
+        uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd

.github/workflows/plugins-deploy-styles-doc.yml

@@ -129,7 +129,7 @@ jobs:
 
       - name: Notify Mattermost
         if: failure()
-        uses: mattermost/action-mattermost-notify@master
+        uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd

.github/workflows/release.yml

@@ -103,7 +103,7 @@ jobs:
 
       - name: Notify Mattermost
         if: failure()
-        uses: mattermost/action-mattermost-notify@master
+        uses: mattermost/action-mattermost-notify@ae31bb6f9e26a54336e79696f108a2c91cf55b4e # v2.1.0
         with:
           MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK }}
           MATTERMOST_CHANNEL: bot-alerts-cicd

.github/workflows/tests-backend.yml

@@ -62,14 +62,15 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
+      - name: Fmt
+        working-directory: ./backend
+        run: |
+          cljfmt check --parallel=true src/ test/
+
       - name: Lint
         working-directory: ./backend
         run: |
-          corepack enable;
-          corepack install;
-          pnpm install;
-          pnpm run check-fmt
-          pnpm run lint
+          clj-kondo --parallel --lint ../common/src/ src/
 
       - name: Tests
         working-directory: ./backend
@@ -81,4 +82,4 @@ jobs:
 
         run: |
           mkdir -p /tmp/penpot;
-          clojure -M:dev:test --reporter kaocha.report/documentation
+          clojure -M:dev:test

.github/workflows/tests-composable-suite.yml

@@ -0,0 +1,69 @@
+name: "CI: Composable Test Suite"
+
+# Runs the composable component test suite (it exercises component semantics
+# through the real Plugin API against the full frontend, so it needs the
+# frontend bundle + the plugin runtime, but no backend): the driver serves the
+# prebuilt frontend bundle and intercepts every backend RPC with Playwright
+# fixtures. See plugins/apps/composable-test-suite/README.md ("Running in CI").
+
+defaults:
+  run:
+    shell: bash
+
+on:
+  pull_request:
+    paths:
+      - 'plugins/**'
+      - 'frontend/**'
+      - 'common/**'
+    types:
+      - opened
+      - synchronize
+      - ready_for_review
+
+  push:
+    branches:
+      - develop
+      - staging
+    paths:
+      - 'plugins/**'
+      - 'frontend/**'
+      - 'common/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  composable-test-suite:
+    if: ${{ !github.event.pull_request.draft }}
+    name: "Run composable test suite (mocked backend)"
+    runs-on: penpot-runner-02
+    container:
+      image: penpotapp/devenv:latest
+      volumes:
+        - /var/cache/github-runner/m2:/root/.m2
+        - /var/cache/github-runner/gitlib:/root/.gitlibs
+
+    steps:
+      - uses: actions/checkout@v6
+
+      # The driver serves the prebuilt bundle from frontend/resources/public.
+      - name: Build frontend bundle
+        working-directory: ./frontend
+        run: ./scripts/build
+
+      - name: Install deps
+        working-directory: ./plugins
+        run: |
+          corepack enable;
+          corepack install;
+          pnpm install;
+
+      - name: Install Playwright Chromium
+        working-directory: ./plugins
+        run: pnpm --filter composable-test-suite exec playwright install --with-deps chromium
+
+      - name: Run composable test suite (mocked)
+        working-directory: ./plugins
+        run: pnpm --filter composable-test-suite run test:ci

.gitignore

@@ -9,6 +9,7 @@
 .clj-kondo
 .cpcache
 .lsp
+.env
 .nrepl-port
 .nyc_output
 .rebel_readline_history
@@ -73,8 +74,6 @@ opencode.json
 /frontend/target/
 /frontend/test-results/
 /frontend/.shadow-cljs
-/other/
-/scripts/
 /nexus/
 /tmp/
 /vendor/**/target
@@ -89,6 +88,7 @@ opencode.json
 /blob-report/
 /playwright/.cache/
 /render-wasm/target/
+/media-processor/dist/
 /**/node_modules
 /**/.yarn/*
 /.pnpm-store
@@ -102,5 +102,6 @@ opencode.json
 /.opencode/plans
 /.opencode/reports
 /.opencode/prompts
+/.ci-logs
 /.codex/
 /tools/__pycache__

.nvmrc

@@ -1 +1 @@
-v24.18.0
+v24.18.1

.opencode/agents/commiter.md

@@ -1,55 +0,0 @@
----
-name: commiter
-description: Git commit assistant
-mode: subagent
-permission:
-  read: allow
-  glob: allow
-  grep: allow
-  edit: deny
-  webfetch: deny
-  websearch: deny
-  task: deny
-  skill: deny
-  lsp: deny
-  todowrite: deny
-  question: deny
-  external_directory: deny
-  bash: allow
----
-
-## Role
-
-You are the Penpot commit assistant. You produce git commits that follow the
-repository's commit conventions. You do not implement features, review code, or
-push branches — you commit.
-
-## Required Reading
-
-Before drafting any commit, **read `.serena/memories/workflow/creating-commits.md`
-end-to-end**. It is the authoritative source for the commit message format, the
-emoji menu, subject/body limits, and the `AI-assisted-by` trailer. Follow it
-exactly — do not improvise the format and do not restate its contents here.
-
-## Pre-commit Workflow
-
-1. **Stage the files** specified by the calling agent. Do not ask for
-   confirmation — the calling agent knows exactly which files to commit.
-2. Run `git diff --staged` to review the content. If you see secrets (API
-   keys, tokens, passwords, private keys, `.env` values), debug prints, or
-   anything that does not match the stated intent, STOP and tell the user
-   before committing.
-3. Following the format in the doc, draft the message and run
-   `git commit -m "<subject>" -m "<body>"` (or `git commit -F -` if the body has
-   unusual characters). The `AI-assisted-by` trailer value is provided by the
-   calling agent — use it verbatim.
-
-## Constraints
-
-- Do not push. Pushing is a separate workflow handled by the user.
-- Do not run `git reset`, `git checkout`, `git restore`, `git clean`, or `rm` — these are destructive operations.
-- Do not pass `--author`. Author identity comes from the local git config.
-- Do not amend a commit you did not create in this session, unless the user explicitly asks.
-- Do not bypass pre-commit hooks (`--no-verify`) unless the user explicitly asks.
-- Do not add untracked files that were not created in this session.
-- Do not ask questions. The calling agent provides all necessary information. If something is unclear, proceed with what you know and note any assumptions in your response.

.opencode/commands/implement-plan.md

@@ -1,5 +1,5 @@
 ---
-description: Execute a ready plan end-to-end — create a GitHub issue, branch issue-NNNN, implement the plan, then commit via the commiter subagent
+description: Execute a ready plan end-to-end — create a GitHub issue, branch issue-NNNN, implement the plan, then commit via the create-commit skill
 agent: build
 ---
 
@@ -32,12 +32,11 @@ Implement the prepared plan from the session context. Work methodically, keeping
 changes focused on what the issue requires. Do not commit — the commit happens in
 step 4.
 
-## 4. Commit with the commiter subagent
+## 4. Commit with the create-commit skill
 
-After the implementation is complete, delegate the commit to the **`commiter`**
-subagent. Give it a brief summary of what was implemented and why, the issue
-reference (`issue-NNNN`), and the model name you are running as so it sets the
-`AI-assisted-by` trailer correctly. The subagent owns the commit format and
-conventions.
+After the implementation is complete, load the **`create-commit`** skill and
+follow its workflow to commit the changes. Provide a brief summary of what was
+implemented and why, the issue reference (`issue-NNNN`), and the model name you
+are running as so the `AI-assisted-by` trailer is set correctly.
 
 Do not push. Pushing is handled separately by the user.

.opencode/commands/review.md

@@ -1,21 +1,79 @@
----
-description: Review a commit (defaults to the last commit) with the code-review-and-quality skill across all five axes
-agent: plan
-subtask: true
----
+Act as a senior software engineer and perform a thorough code review.
 
-You are performing a code review of a git commit. You MUST conduct it using the **`code-review-and-quality`** skill (the five-axis review: correctness, readability, architecture, security, performance).
+## Instructions
 
-The user may specify a commit or revision range as an argument ($ARGUMENTS). If no argument is given, default to reviewing the **last commit** (`HEAD`, i.e. the changes introduced by `HEAD` vs its parent).
+1. Load the **`code-review-and-quality`** skill — it defines the five axes, core principles (DRY, KISS, YAGNI), severity taxonomy, and output format.
+2. Determine the diff or code to review from the provided context.
+3. **Skip generated files, lockfile-only changes, and unrelated modifications** unless they introduce security risks.
+4. Read the diff and the surrounding context for each changed file.
+5. Review across all five axes: correctness, readability, architecture, security, performance.
+6. Produce the review using this structure:
+   - **Summary**: One-paragraph overview of the change and its impact
+   - **Critical/High Findings**: Blockers that must be fixed (with file:line, severity, description, and proposed fix)
+   - **Other Findings**: Medium/Low issues and suggestions
+   - **Testing Recommendations**: Missing test coverage or test quality issues
+   - **Positive Observations**: What was done well (brief, specific)
+   - **Verdict**: Approve / Request Changes / Needs Discussion
+7. For each finding:
+   - State the severity (Critical / High / Medium / Low / Suggestion)
+   - Identify the file and line
+   - Describe failure circumstances
+   - **For Critical/High**: Provide a concrete fix with a code snippet showing the corrected code
+   - **For Medium/Low**: Describe the fix clearly; code snippet optional
+    - If multiple approaches exist, briefly note trade-offs
+8. **Perform a second review pass if the change is complex:**
+   - **Complex indicators**: Critical/High findings, multiple files (>5), architectural changes, security-sensitive code, >300 lines changed
+   - **Skip for simple changes**: Typo fixes, formatting, small bug fixes (<50 lines), single-file changes with no findings
+   - Second pass checks:
+     - Validate severity assignments: Are Critical/High findings truly blockers?
+     - Catch missed issues: Edge cases, error paths, test gaps overlooked in first pass
+     - Remove false positives: Discard findings that aren't real issues
+     - Verify fixes: Are the proposed solutions actually correct and complete?
 
-Workflow:
+## Strong Rules
 
-1. Determine the target to review:
-   - If the user provided a revision/range in $ARGUMENTS, use it.
-   - Otherwise, default to the last commit: review `HEAD` (the diff of `HEAD` against `HEAD~1`).
-2. Inspect the change with `git show <target>` / `git diff <target>~1 <target>` and `git log -1 --stat <target>` to understand the intent and the files touched.
-3. Invoke the **`code-review-and-quality`** skill and review the commit across all five axes. Categorize every finding as Critical / Required / Optional / Nit / FYI, and lead with correctness and security.
-4. For each finding, state the axis it belongs to, the severity, and a concrete suggested fix (propose the structural remedy, not just the problem).
-5. Conclude with a clear verdict: **Approve** (ready to merge) or **Request changes** (issues that must be addressed), and summarize the highest-leverage items.
+1. Do not invent problems. Every finding must be real and actionable.
+2. Do not modify any code and do not create a commit — this command only reviews.
+3. Be specific and constructive. "This could be better" is not helpful — explain why and how.
+4. Prioritize by impact. One structural issue outweighs ten nits.
+5. If tests are missing for new functionality, flag it as High severity.
 
-Do not modify any code and do not create a commit — this command only reviews.
+## Context
+
+$ARGUMENTS
+
+## Expected Format
+
+```
+## Review Summary
+[1-2 sentences on what the change does and overall assessment]
+
+## Critical/High Findings
+### [Severity] file.ts:123
+**Issue**: [Description of the problem]
+**Impact**: [What could go wrong]
+**Fix**:
+```[language]
+// Current code
+[problematic code]
+
+// Fixed code
+[corrected code]
+```
+[Optional: note trade-offs if multiple approaches exist]
+
+## Other Findings
+### [Severity] file.ts:456
+**Issue**: [Description]
+**Fix**: [Clear description; code snippet optional]
+
+## Testing Recommendations
+[List specific test cases that should be added]
+
+## Positive Observations
+[2-3 specific things done well]
+
+## Verdict
+[Approve / Request Changes / Needs Discussion]
+[If Request Changes: list the must-fix items]
+```

.opencode/plugins/penpot.js

@@ -0,0 +1,299 @@
+import { tool } from "@opencode-ai/plugin"
+import path from "path"
+import { spawn } from "child_process"
+
+const penpotPsqlTool = tool({
+  description:
+    "Execute a SQL command against the Penpot database. Uses the defaults from scripts/psql.",
+
+  args: {
+    sql: tool.schema
+      .string()
+      .describe("SQL command to execute"),
+
+    test: tool.schema
+      .boolean()
+      .describe("Use the penpot_test database")
+      .optional(),
+  },
+
+  async execute(args, context) {
+    const host = process.env.PENPOT_DB_HOST || "postgres"
+    const user = process.env.PENPOT_DB_USER || "penpot"
+    const db = args.test
+      ? "penpot_test"
+      : process.env.PENPOT_DB_NAME || "penpot"
+    const password = process.env.PENPOT_DB_PASSWORD || "penpot"
+
+    const psqlArgs = ["-h", host, "-U", user, "-d", db, "-c", args.sql]
+
+    return new Promise((resolve) => {
+      let stdout = ""
+      let stderr = ""
+
+      const proc = spawn("psql", psqlArgs, {
+        cwd: context.worktree,
+        env: { ...process.env, PGPASSWORD: password },
+      })
+
+      proc.stdout.on("data", (data) => {
+        stdout += data.toString()
+      })
+
+      proc.stderr.on("data", (data) => {
+        stderr += data.toString()
+      })
+
+      proc.on("error", (error) => {
+        resolve(`Error: ${error.message}`)
+      })
+
+      proc.on("close", (exitCode) => {
+        const output =
+          exitCode === 0
+            ? stdout.trim() || "Query executed successfully"
+            : `Error (exit ${exitCode}): ${
+                (stderr || stdout).trim() || "No error output"
+              }`
+        resolve(output)
+      })
+    })
+  },
+})
+
+const parenRepairTool = tool({
+  description:
+    "Fix mismatched parentheses/braces in Clojure files (.clj, .cljs, .cljc) then reformat with cljfmt.",
+
+  args: {
+    // A string is used instead of an array so OpenCode displays it
+    // in the generic tool invocation.
+    files: tool.schema
+      .string()
+      .describe(
+        "Comma-separated file paths to fix, for example: frontend/src/app/config.cljs, backend/src/core.clj",
+      )
+      .optional(),
+
+    code: tool.schema
+      .string()
+      .describe("Code string to fix via stdin")
+      .optional(),
+  },
+
+  async execute(args, context) {
+    const script = path.join(context.worktree, "scripts/paren-repair")
+
+    const files = args.files
+      ? args.files
+          .split(",")
+          .map((file) => file.trim())
+          .filter(Boolean)
+      : []
+
+    const paramInfo =
+      files.length > 0
+        ? `files=[${files.join(", ")}]`
+        : args.code !== undefined
+          ? `code=(${args.code.length} chars)`
+          : "none"
+
+    return new Promise((resolve) => {
+      const childArgs =
+        files.length > 0
+          ? [script, ...files]
+          : [script]
+
+      const proc = spawn("bb", childArgs, {
+        cwd: context.worktree,
+      })
+
+      let stdout = ""
+      let stderr = ""
+
+      proc.stdout.on("data", (data) => {
+        stdout += data.toString()
+      })
+
+      proc.stderr.on("data", (data) => {
+        stderr += data.toString()
+      })
+
+      proc.on("error", (error) => {
+        resolve(`Error: ${error.message}`)
+      })
+
+      proc.on("close", (exitCode) => {
+        const output =
+          exitCode === 0
+            ? stdout.trim() || "No changes needed"
+            : `Error (exit ${exitCode}): ${
+                (stderr || stdout).trim() || "No error output"
+              }`
+
+        resolve(output)
+      })
+
+      // Close stdin in all cases so the process cannot wait indefinitely.
+      if (args.code !== undefined) {
+        proc.stdin.end(args.code)
+      } else {
+        proc.stdin.end()
+      }
+    })
+  },
+})
+
+export default async function plugin() {
+  return {
+    tool: {
+      "paren-repair": parenRepairTool,
+      "penpot-psql": penpotPsqlTool,
+    },
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+// import { tool } from "@opencode-ai/plugin"
+// import path from "path"
+// import { spawn } from "child_process"
+
+// function formatFiles(files) {
+//   if (files.length === 0) return "stdin"
+
+//   // Keep the visible tool title reasonably short.
+//   if (files.length <= 3) return files.join(", ")
+
+//   return `${files.slice(0, 3).join(", ")} (+${files.length - 3} more)`
+// }
+
+// const parenRepairTool = tool({
+//   description:
+//     "Fix mismatched parentheses/braces in Clojure files, then reformat with cljfmt.",
+
+//   args: {
+//     files: tool.schema
+//       .array(tool.schema.string())
+//       .describe("Array of file paths to fix")
+//       .optional(),
+
+//     code: tool.schema
+//       .string()
+//       .describe("Code string to fix via stdin")
+//       .optional(),
+//   },
+
+//   async execute(args, context) {
+//     const script = path.join(context.worktree, "scripts/paren-repair")
+
+//     const files = (args.files ?? []).map((file) => {
+//       const absolute = path.isAbsolute(file)
+//         ? file
+//         : path.resolve(context.worktree, file)
+
+//       return path.relative(context.worktree, absolute)
+//     })
+
+//     const targetSummary =
+//       files.length > 0
+//         ? formatFiles(files)
+//         : args.code !== undefined
+//           ? `stdin (${args.code.length} chars)`
+//           : "no input"
+
+//     // This updates the tool-call title immediately, while it is running.
+//     await context.metadata({
+//       title: `Paren repair: ${targetSummary}`,
+//       metadata: {
+//         files,
+//         codeChars: args.code?.length,
+//       },
+//     })
+
+//     const childArgs =
+//       args.files && args.files.length > 0
+//         ? [script, ...args.files]
+//         : [script]
+
+//     return new Promise((resolve) => {
+//       const proc = spawn("bb", childArgs, {
+//         cwd: context.worktree,
+//       })
+
+//       let stdout = ""
+//       let stderr = ""
+
+//       if (args.code !== undefined) {
+//         proc.stdin.end(args.code)
+//       }
+
+//       proc.stdout.on("data", (data) => {
+//         stdout += data.toString()
+//       })
+
+//       proc.stderr.on("data", (data) => {
+//         stderr += data.toString()
+//       })
+
+//       proc.on("close", (exitCode) => {
+//         const successful = exitCode === 0
+
+//         const commandOutput = successful
+//           ? stdout.trim() || "No changes needed"
+//           : `Error (exit ${exitCode}): ${(stderr || stdout).trim()}`
+
+//         const parameterOutput =
+//           files.length > 0
+//             ? `Files passed:\n${files.map((file) => `- ${file}`).join("\n")}`
+//             : args.code !== undefined
+//               ? `Input passed through stdin: ${args.code.length} characters`
+//               : "No files or stdin input were passed"
+
+//         resolve({
+//           title: `Paren repair: ${targetSummary}`,
+//           output: `${parameterOutput}\n\n${commandOutput}`,
+//           metadata: {
+//             files,
+//             codeChars: args.code?.length,
+//             exitCode,
+//             successful,
+//           },
+//         })
+//       })
+
+//       proc.on("error", (error) => {
+//         resolve({
+//           title: `Paren repair failed: ${targetSummary}`,
+//           output: [
+//             files.length > 0
+//               ? `Files passed:\n${files.map((file) => `- ${file}`).join("\n")}`
+//               : `Input: ${targetSummary}`,
+//             `Failed to start bb: ${error.message}`,
+//           ].join("\n\n"),
+//           metadata: {
+//             files,
+//             codeChars: args.code?.length,
+//             successful: false,
+//           },
+//         })
+//       })
+//     })
+//   },
+// })
+
+// export default async function plugin() {
+//   return {
+//     tool: {
+//       "paren-repair": parenRepairTool,
+//     },
+//   }
+// }

.opencode/skills/backport-commit/SKILL.md

@@ -1,85 +0,0 @@
----
-name: backport-commit
-description: Port changes from a specific Git commit to the current branch by manually applying the diff, avoiding cherry-pick when it would introduce complex conflicts.
----
-
-# Backport Commit
-
-Port changes from a specific Git commit to the current branch by manually
-applying the diff, avoiding `git cherry-pick` when it would introduce
-complex conflicts.
-
-## When to Use
-
-Use this skill whenever the user asks to backport a commit, especially when:
-
-- The commit touches multiple modules or files with significant divergence
-- `git cherry-pick` is explicitly ruled out ("do not use cherry-pick")
-- The target commit is old enough that conflicts are likely
-- The commit introduces both source changes AND new files (tests, etc.)
-- You need full control over how each hunk is applied
-
-## Workflow
-
-### 1. Identify the target commit
-
-```bash
-# Verify the commit exists and understand what it does
-git log --oneline -1 <commit-sha>
-
-# Get the full diff (including new/deleted files)
-git show <commit-sha>
-
-# Capture the original commit message for later reuse
-git log --format='%B' -1 <commit-sha>
-```
-
-### 2. Identify affected modules
-
-From the file paths in the diff, determine which Penpot modules are affected
-(frontend, backend, common, render-wasm, etc.) and read their `AGENTS.md`
-files **before** making any changes. If a module has no `AGENTS.md`, skip
-that step — verify with `ls <module>/AGENTS.md` first.
-
-### 3. Read the current state of each affected file
-
-For every file the diff touches, read the current version on disk to understand
-context and ensure correct placement before editing.
-
-### 4. Apply changes manually (the core of this approach)
-
-Process every hunk in the diff using the appropriate tool:
-
-| Diff action | Tool to use |
-|-------------|-------------|
-| Modify existing file | `edit` — use enough surrounding context in `oldString` to uniquely match the location |
-| Add new file | `write` — include proper license header and namespace conventions matching project style |
-| Delete file | `bash rm <path>` |
-| Rename/move file | `bash mv <old> <new>`, then apply any content changes with `edit` |
-
-> **Tip:** Group nearby hunks from the same file into a single `edit` call.
-> Use separate calls when hunks are far apart to keep `oldString` short and
-> unambiguous.
-
-Repeat until **all** hunks in the diff are ported.
-
-### 5. Validate
-
-Run **lint**, **check-fmt**, and **tests** for every affected module (see each
-module's `AGENTS.md` for the exact commands). If the formatter auto-fixes
-indentation, verify the logic is still semantically correct. All checks must
-pass before moving on.
-
-### 6. Commit
-
-Ask the `commiter` sub-agent to create a commit. Stage all relevant files
-(exclude unrelated untracked files) and provide the original commit message as
-a reference, adapting it as needed for the target branch context.
-
-## Key Principles
-
-- **Context matters** — always read files before editing; never guess
-  indentation or surrounding code
-- **Lint + format + test** — never skip validation before committing
-- **Preserve intent** — keep the original commit message meaning; the
-  `commiter` agent handles formatting

.opencode/skills/code-review-and-quality/SKILL.md

@@ -19,9 +19,18 @@ Multi-dimensional code review with quality gates. Every change gets reviewed bef
 - When refactoring existing code
 - After any bug fix (review both the fix and the regression test)
 
+## Core Principles
+
+These principles underpin every axis. When in doubt, default to them.
+
+- **DRY (Don't Repeat Yourself):** Every piece of knowledge has one authoritative representation. If the same logic appears in two places, extract it into a shared helper, model, or type. Reviewers: flag duplicated logic as a required change — it's not "just similar," it's drift that will diverge.
+- **KISS (Keep It Simple, Stupid):** The simplest solution that works is the best solution. Complexity must earn its place. Reviewers: if you need more than one sentence to explain what a piece of code does, it's too complex — push for simplification before merge.
+- **YAGNI (You Aren't Gonna Need It):** Don't add abstractions, hooks, or generalizations for hypothetical future use cases. Generalize on the third occurrence, not the first. Reviewers: delete speculative generality.
+- **Don't invent problems:** Do not manufacture issues to produce more feedback. Every finding must be a real risk, a real readability barrier, or a real architectural concern — not a hypothetical or a stylistic preference disguised as a problem.
+
 ## The Five-Axis Review
 
-Every review evaluates code across these dimensions:
+Every review evaluates code across these dimensions.
 
 ### 1. Correctness
 
@@ -39,14 +48,13 @@ Can another engineer (or agent) understand this code without the author explaini
 
 - Are names descriptive and consistent with project conventions? (No `temp`, `data`, `result` without context)
 - Is the control flow straightforward (avoid nested ternaries, deep callbacks)?
-- Is the code organized logically (related code grouped, clear module boundaries)?
 - Are there any "clever" tricks that should be simplified?
-- **Could this be done in fewer lines?** (1000 lines where 100 suffice is a failure)
-- **Are abstractions earning their complexity?** (Don't generalize until the third use case)
-- Would comments help clarify non-obvious intent? (But don't comment obvious code.)
-- Are there dead code artifacts: no-op variables (`_unused`), backwards-compat shims, or `// removed` comments?
-- **Is a new conditional bolted onto an unrelated flow?** That's a design smell, not a nit — push the logic into its own helper, state, or policy instead of tangling an existing path.
-- **Do repeated conditionals on the same shape appear?** They signal a missing model or dispatcher. A "temporary" branch is usually permanent debt.
+- **KISS check:** Is this the simplest approach that solves the problem? A 20-line straightforward function beats a 5-line clever one that requires a comment to explain.
+- Could this be done in fewer lines? (1000 lines where 100 suffice is a failure)
+- Are abstractions earning their complexity? (Don't generalize until the third use case)
+- Is a new conditional bolted onto an unrelated flow? Push the logic into its own helper, state, or policy.
+- Do repeated conditionals on the same shape appear? They signal a missing model or dispatcher.
+- Are there dead code artifacts: no-op variables, backwards-compat shims, or `// removed` comments?
 
 ### 3. Architecture
 
@@ -54,16 +62,17 @@ Does the change fit the system's design?
 
 - Does it follow existing patterns or introduce a new one? If new, is it justified?
 - Does it maintain clean module boundaries?
-- Is there code duplication that should be shared?
+- **DRY check:** Is there existing code that does the same thing? Reuse the canonical helper instead of writing a near-duplicate. If two branches do nearly the same thing, collapse them.
 - Are dependencies flowing in the right direction (no circular dependencies)?
 - Is the abstraction level appropriate (not over-engineered, not too coupled)?
-- **Does this refactor reduce complexity or just relocate it?** Count the concepts a reader must hold to follow the change. If a "cleaner" version leaves that count unchanged, it isn't cleaner — prefer the restructuring that makes whole branches, modes, or layers disappear over one that re-centralizes the same logic. Prefer deleting an abstraction to polishing it.
-- **Is feature-specific logic leaking into a shared or general-purpose module?** Keep logic in its owning layer, reuse the existing canonical helper instead of a near-duplicate, and don't normalize architectural drift.
-- **Are type boundaries explicit?** Question gratuitous `any`/`unknown`/optional/casts and silent fallbacks that paper over an unclear invariant — making the boundary explicit often makes the surrounding control flow simpler.
+- Does this refactor reduce complexity or just relocate it? Count the concepts a reader must hold. Prefer the restructuring that makes whole branches disappear over one that re-centralizes the same logic. Prefer deleting an abstraction to polishing it.
+- Is feature-specific logic leaking into a shared or general-purpose module?
+- Are type boundaries explicit? Question gratuitous `any`/`unknown`/optional/casts and silent fallbacks.
+- **Structural remedies:** When you flag a problem, propose the move — not just the problem. Replace conditionals with dispatchers, collapse duplicate branches, separate orchestration from business logic, extract helpers, split large files. Prefer the remedy that removes moving pieces over one that spreads the same complexity around.
 
 ### 4. Security
 
-For detailed security guidance, see `security-and-hardening`. Does the change introduce vulnerabilities?
+For detailed security guidance, see `security-and-hardening`.
 
 - Is user input validated and sanitized?
 - Are secrets kept out of code, logs, and version control?
@@ -72,12 +81,9 @@ For detailed security guidance, see `security-and-hardening`. Does the change in
 - Are outputs encoded to prevent XSS?
 - Are dependencies from trusted sources with no known vulnerabilities?
 - Is data from external sources (APIs, logs, user content, config files) treated as untrusted?
-- Are external data flows validated at system boundaries before use in logic or rendering?
 
 ### 5. Performance
 
-Does the change introduce performance problems?
-
 - Any N+1 query patterns?
 - Any unbounded loops or unconstrained data fetching?
 - Any synchronous operations that should be async?
@@ -85,24 +91,66 @@ Does the change introduce performance problems?
 - Any missing pagination on list endpoints?
 - Any large objects created in hot paths?
 
-## Structural Remedies
+## Review Process
 
-When you flag a structural problem, propose the move — not just the problem. A review that only says "this is complex" leaves the author guessing. Reach for a named restructuring:
+1. **Understand the intent** — What is this change trying to accomplish? What spec or task does it implement?
+2. **Review tests first** — Tests reveal intent and coverage. Do they test behavior, not implementation details? Are edge cases covered?
+3. **Review the implementation** — Walk through each file with the five axes in mind.
+4. **Categorize findings** — Label every comment with its severity:
 
-- **Replace a chain of conditionals** with a typed model or an explicit dispatcher.
-- **Collapse duplicate branches** into a single clearer flow.
-- **Separate orchestration from business logic** so each reads on its own.
-- **Move feature-specific logic** out of a shared module into the package that owns the concept.
-- **Reuse the canonical helper** instead of a bespoke near-duplicate.
-- **Make a type boundary explicit** so downstream branching disappears.
-- **Delete a pass-through wrapper** that adds indirection without clarifying the API.
-- **Extract a helper, or split a large file** into focused modules.
+| Prefix | Meaning | Author Action |
+|--------|---------|---------------|
+| **Critical:** | Blocks merge | Security vulnerability, data loss, broken functionality |
+| **High:** | Required change | Must address before merge |
+| **Medium:** | Should fix | Strongly recommended, not a blocker |
+| **Low:** | Minor, optional | Author may ignore — formatting, style preferences |
+| **Suggestion:** | Worth considering | Not required, but improves the code |
 
-Prefer the remedy that removes moving pieces over one that spreads the same complexity around.
+For each finding, describe the circumstances under which it could fail: specific inputs, load conditions, timing, or user actions that trigger the problem. "This crashes when input is null" is actionable; "this might crash" is not.
+
+Lead with what matters: correctness and security first, then structural issues, then everything else. A few high-conviction comments beat a long list.
+
+5. **Verify the verification** — What tests were run? Did the build pass? Was the change tested manually? Screenshots for UI changes?
+
+## Review Output
+
+Structure every review using this format:
+
+### Summary
+
+Briefly explain what the code does and give an overall assessment.
+
+### Critical and High-Priority Issues
+
+List problems that could cause security incidents, data loss, crashes, incorrect behavior, or major performance degradation. For each: state the severity, identify the file/function/code section, explain why it's a problem, describe failure circumstances, and provide a concrete improvement with corrected code when useful.
+
+### Other Findings
+
+List medium- and low-priority issues, including maintainability and design concerns.
+
+### Suggested Refactoring
+
+Provide focused code changes or revised snippets. Preserve existing behavior unless a behavior change is explicitly justified.
+
+### Testing Recommendations
+
+Identify missing tests and describe specific test cases, including edge cases and failure scenarios.
+
+### Positive Observations
+
+Mention implementation choices that are clear, safe, efficient, or well designed. This is not fluff — it reinforces good patterns and tells the author what to keep doing.
+
+### Final Verdict
+
+Choose one:
+
+- **Approve** — Ready to merge
+- **Approve with minor changes** — Good to merge after addressing low/medium issues
+- **Request changes** — Critical or high issues must be resolved before merge
 
 ## Change Sizing
 
-Small, focused changes are easier to review, faster to merge, and safer to deploy. Target these sizes:
+Small, focused changes are easier to review, faster to merge, and safer to deploy.
 
 ```
 ~100 lines changed   → Good. Reviewable in one sitting.
@@ -110,11 +158,9 @@ Small, focused changes are easier to review, faster to merge, and safer to deplo
 ~1000 lines changed  → Too large. Split it.
 ```
 
-**Watch file size, not just diff size.** A small diff can still push a file past a healthy boundary — around 1000 *total* lines in a single file (distinct from the ~1000 *changed*-lines threshold above) is a common inspection signal, not a hard cap. When a change materially grows an already-large file, ask whether to extract helpers, subcomponents, or modules *first*, before piling more on. Decompose, then add.
+**Watch file size, not just diff size.** Around 1000 *total* lines in a single file is a common inspection signal. When a change materially grows an already-large file, decompose first.
 
-**What counts as "one change":** A single self-contained modification that addresses one thing, includes related tests, and keeps the system functional after submission. One part of a feature — not the whole feature.
-
-**Splitting strategies when a change is too large:**
+**Splitting strategies:**
 
 | Strategy | How | When |
 |----------|-----|------|
@@ -123,164 +169,17 @@ Small, focused changes are easier to review, faster to merge, and safer to deplo
 | **Horizontal** | Create shared code/stubs first, then consumers | Layered architecture |
 | **Vertical** | Break into smaller full-stack slices of the feature | Feature work |
 
-**When large changes are acceptable:** Complete file deletions and automated refactoring where the reviewer only needs to verify intent, not every line.
-
-**Separate refactoring from feature work.** A change that refactors existing code and adds new behavior is two changes — submit them separately. Small cleanups (variable renaming) can be included at reviewer discretion.
+**Separate refactoring from feature work.** A change that refactors and adds new behavior is two changes — submit them separately.
 
 ## Change Descriptions
 
-Every change needs a description that stands alone in version control history.
+- **First line:** Short, imperative, standalone. "Delete the FizzBuzz RPC" not "Deleting the FizzBuzz RPC."
+- **Body:** What is changing and why. Include context and reasoning not visible in the code itself.
+- **Anti-patterns:** "Fix bug," "Fix build," "Add patch," "Phase 1."
 
-**First line:** Short, imperative, standalone. "Delete the FizzBuzz RPC" not "Deleting the FizzBuzz RPC." Must be informative enough that someone searching history can understand the change without reading the diff.
+## Dependencies
 
-**Body:** What is changing and why. Include context, decisions, and reasoning not visible in the code itself. Link to bug numbers, benchmark results, or design docs where relevant. Acknowledge approach shortcomings when they exist.
-
-**Anti-patterns:** "Fix bug," "Fix build," "Add patch," "Moving code from A to B," "Phase 1," "Add convenience functions."
-
-## Review Process
-
-### Step 1: Understand the Context
-
-Before looking at code, understand the intent:
-
-```
-- What is this change trying to accomplish?
-- What spec or task does it implement?
-- What is the expected behavior change?
-```
-
-### Step 2: Review the Tests First
-
-Tests reveal intent and coverage:
-
-```
-- Do tests exist for the change?
-- Do they test behavior (not implementation details)?
-- Are edge cases covered?
-- Do tests have descriptive names?
-- Would the tests catch a regression if the code changed?
-```
-
-### Step 3: Review the Implementation
-
-Walk through the code with the five axes in mind:
-
-```
-For each file changed:
-1. Correctness: Does this code do what the test says it should?
-2. Readability: Can I understand this without help?
-3. Architecture: Does this fit the system?
-4. Security: Any vulnerabilities?
-5. Performance: Any bottlenecks?
-```
-
-### Step 4: Categorize Findings
-
-Label every comment with its severity so the author knows what's required vs optional:
-
-| Prefix | Meaning | Author Action |
-|--------|---------|---------------|
-| *(no prefix)* | Required change | Must address before merge |
-| **Critical:** | Blocks merge | Security vulnerability, data loss, broken functionality |
-| **Nit:** | Minor, optional | Author may ignore — formatting, style preferences |
-| **Optional:** / **Consider:** | Suggestion | Worth considering but not required |
-| **FYI** | Informational only | No action needed — context for future reference |
-
-This prevents authors from treating all feedback as mandatory and wasting time on optional suggestions.
-
-**Lead with what matters.** Order findings by leverage: correctness and security first, then structural regressions and missed simplifications, then everything else. Don't bury a real issue under cosmetic nits — a few high-conviction comments beat a long list. If you have one structural problem and ten nits, the structural problem *is* the review.
-
-### Step 5: Verify the Verification
-
-Check the author's verification story:
-
-```
-- What tests were run?
-- Did the build pass?
-- Was the change tested manually?
-- Are there screenshots for UI changes?
-- Is there a before/after comparison?
-```
-
-## Multi-Model Review Pattern
-
-Use different models for different review perspectives:
-
-```
-Model A writes the code
-    │
-    ▼
-Model B reviews for correctness and architecture
-    │
-    ▼
-Model A addresses the feedback
-    │
-    ▼
-Human makes the final call
-```
-
-This catches issues that a single model might miss — different models have different blind spots.
-
-**Example prompt for a review agent:**
-```
-Review this code change for correctness, security, and adherence to
-our project conventions. The spec says [X]. The change should [Y].
-Flag any issues as Critical, Required, Optional, or Nit.
-```
-
-## Dead Code Hygiene
-
-After any refactoring or implementation change, check for orphaned code:
-
-1. Identify code that is now unreachable or unused
-2. List it explicitly
-3. **Ask before deleting:** "Should I remove these now-unused elements: [list]?"
-
-Don't leave dead code lying around — it confuses future readers and agents. But don't silently delete things you're not sure about. When in doubt, ask.
-
-```
-DEAD CODE IDENTIFIED:
-- formatLegacyDate() in src/utils/date.ts — replaced by formatDate()
-- OldTaskCard component in src/components/ — replaced by TaskCard
-- LEGACY_API_URL constant in src/config.ts — no remaining references
-→ Safe to remove these?
-```
-
-## Review Speed
-
-Slow reviews block entire teams. The cost of context-switching to review is less than the waiting cost imposed on others.
-
-- **Respond within one business day** — this is the maximum, not the target
-- **Ideal cadence:** Respond shortly after a review request arrives, unless deep in focused coding. A typical change should complete multiple review rounds in a single day
-- **Prioritize fast individual responses** over quick final approval. Quick feedback reduces frustration even if multiple rounds are needed
-- **Large changes:** Ask the author to split them rather than reviewing one massive changeset
-
-## Handling Disagreements
-
-When resolving review disputes, apply this hierarchy:
-
-1. **Technical facts and data** override opinions and preferences
-2. **Style guides** are the absolute authority on style matters
-3. **Software design** must be evaluated on engineering principles, not personal preference
-4. **Codebase consistency** is acceptable if it doesn't degrade overall health
-
-**Don't accept "I'll clean it up later."** Experience shows deferred cleanup rarely happens. Require cleanup before submission unless it's a genuine emergency. If surrounding issues can't be addressed in this change, require filing a bug with self-assignment.
-
-## Honesty in Review
-
-When reviewing code — whether written by you, another agent, or a human:
-
-- **Don't rubber-stamp.** "LGTM" without evidence of review helps no one.
-- **Don't soften real issues.** "This might be a minor concern" when it's a bug that will hit production is dishonest.
-- **Quantify problems when possible.** "This N+1 query will add ~50ms per item in the list" is better than "this could be slow."
-- **Push back on approaches with clear problems.** Sycophancy is a failure mode in reviews. If the implementation has issues, say so directly and propose alternatives.
-- **Accept override gracefully.** If the author has full context and disagrees, defer to their judgment. Comment on code, not people — reframe personal critiques to focus on the code itself.
-
-## Dependency Discipline
-
-Part of code review is dependency review:
-
-**Before adding any dependency:**
+Before adding any dependency:
 
 1. Does the existing stack solve this? (Often it does.)
 2. How large is the dependency? (Check bundle impact.)
@@ -290,67 +189,14 @@ Part of code review is dependency review:
 
 **Rule:** Prefer standard library and existing utilities over new dependencies. Every dependency is a liability.
 
-**Upgrading an existing dependency** is a code change like any other, and the riskiest upgrades are the ones merged in bulk with a message like "bump deps." Review them with the same discipline:
+**Upgrading dependencies:**
 
-1. **Read the changelog, not just the version number.** Semver is a promise the maintainer may not have kept — a "patch" can carry a behavioral change. For a major bump, read the migration notes and find what breaks.
-2. **One dependency per change.** Upgrade and merge them individually (or in small related groups). When a bulk bump breaks the build, you've lost which package did it; a single-package change makes the cause obvious and the revert clean.
-3. **Let the tests decide.** The upgrade is verified by a green suite before *and* after, not by "it installed." If coverage around the dependency's behavior is thin, that gap is the real finding — add a test first.
-4. **Mind the transitive graph.** Most installed packages are ones nobody chose directly. Review the lockfile diff, not just `package.json`; a single direct bump can pull in dozens of indirect changes.
-5. **Keep the lockfile honest.** Commit it, review its diff, and never hand-edit it. The lockfile is the thing that actually pins what ships.
+- Read the changelog, not just the version number. Semver is a promise the maintainer may not have kept.
+- One dependency per change. When a bulk bump breaks the build, you've lost which package did it.
+- Let the tests decide — a green suite before *and* after, not just "it installed."
+- Review the lockfile diff, not just `package.json`. Commit it and never hand-edit it.
 
-For triaging `npm audit` findings and supply-chain risk (typosquatting, compromised maintainers), follow the `security-and-hardening` skill — this section covers the upgrade *workflow*, that one covers the security verdict.
-
-## The Review Checklist
-
-```markdown
-## Review: [PR/Change title]
-
-### Context
-- [ ] I understand what this change does and why
-
-### Correctness
-- [ ] Change matches spec/task requirements
-- [ ] Edge cases handled
-- [ ] Error paths handled
-- [ ] Tests cover the change adequately
-
-### Readability
-- [ ] Names are clear and consistent
-- [ ] Logic is straightforward
-- [ ] No unnecessary complexity
-
-### Architecture
-- [ ] Follows existing patterns
-- [ ] No unnecessary coupling or dependencies
-- [ ] Appropriate abstraction level
-- [ ] Refactors reduce complexity rather than relocate it
-- [ ] No feature logic in shared modules; file stays within a healthy size
-
-### Security
-- [ ] No secrets in code
-- [ ] Input validated at boundaries
-- [ ] No injection vulnerabilities
-- [ ] Auth checks in place
-- [ ] External data sources treated as untrusted
-
-### Performance
-- [ ] No N+1 patterns
-- [ ] No unbounded operations
-- [ ] Pagination on list endpoints
-
-### Verification
-- [ ] Tests pass
-- [ ] Build succeeds
-- [ ] Manual verification done (if applicable)
-
-### Verdict
-- [ ] **Approve** — Ready to merge
-- [ ] **Request changes** — Issues must be addressed
-```
-
-## See Also
-
-- For detailed security review guidance, see `security-and-hardening`
+For supply-chain risk triage, follow the `security-and-hardening` skill.
 
 ## Common Rationalizations
 
@@ -358,13 +204,16 @@ For triaging `npm audit` findings and supply-chain risk (typosquatting, compromi
 |---|---|
 | "It works, that's good enough" | Working code that's unreadable, insecure, or architecturally wrong creates debt that compounds. |
 | "I wrote it, so I know it's correct" | Authors are blind to their own assumptions. Every change benefits from another set of eyes. |
-| "We'll clean it up later" | Later never comes. The review is the quality gate — use it. Require cleanup before merge, not after. |
+| "We'll clean it up later" | Later never comes. The review is the quality gate — use it. |
 | "AI-generated code is probably fine" | AI code needs more scrutiny, not less. It's confident and plausible, even when wrong. |
-| "The tests pass, so it's good" | Tests are necessary but not sufficient. They don't catch architecture problems, security issues, or readability concerns. |
-| "The refactor makes it cleaner" | Relocating complexity isn't reducing it. If the reader still holds the same number of concepts, the structure didn't improve — look for the version where branches disappear. |
-| "It's only a small addition to this file" | Small diffs still push files past a healthy size and bolt branches onto unrelated flows. Judge the resulting structure, not the diff size. |
-| "It's just a version bump" | A bump is a behavior change you didn't write. Read the changelog; semver doesn't guarantee no breakage. |
-| "I'll upgrade everything in one PR to save time" | A bulk bump that breaks the build hides which package did it. One dependency per change keeps the cause and the revert clean. |
+| "The tests pass, so it's good" | Tests are necessary but not sufficient. They don't catch architecture, security, or readability problems. |
+| "The refactor makes it cleaner" | Relocating complexity isn't reducing it. If the reader still holds the same number of concepts, the structure didn't improve. |
+| "It's only a small addition to this file" | Small diffs still push files past healthy size and bolt branches onto unrelated flows. |
+| "It's just a version bump" | A bump is a behavior change you didn't write. Read the changelog. |
+| "I'll upgrade everything in one PR" | A bulk bump hides which package broke the build. One per change. |
+| "It's duplicated but it's only two places" | Two becomes three becomes five. Extract now, before the copies diverge. |
+| "The abstraction is future-proof" | YAGNI. Delete speculative generality — generalize on the third occurrence, not the first. |
+| "It's clever but efficient" | Cleverness is a readability tax. If it needs a comment to understand, simplify it. |
 
 ## Red Flags
 
@@ -374,14 +223,11 @@ For triaging `npm audit` findings and supply-chain risk (typosquatting, compromi
 - Security-sensitive changes without security-focused review
 - Large PRs that are "too big to review properly" (split them)
 - No regression tests with bug fix PRs
-- Review comments without severity labels — makes it unclear what's required vs optional
 - Accepting "I'll fix it later" — it never happens
 - A refactor that moves code around without reducing the number of concepts a reader must hold
-- A change that grows an already-large file instead of decomposing it
 - New conditionals scattered into unrelated code paths (a missing abstraction)
-- A bespoke helper that duplicates an existing canonical one, or feature logic placed in a shared module
-- A bulk "bump dependencies" PR with no changelog review and no per-package isolation
-- A lockfile change that's hand-edited, uncommitted, or merged without reviewing its diff
+- A bespoke helper that duplicates an existing canonical one
+- A bulk "bump dependencies" PR with no changelog review
 
 ## Verification
 
@@ -392,6 +238,18 @@ After review is complete:
 - [ ] Tests pass
 - [ ] Build succeeds
 - [ ] The verification story is documented (what changed, how it was verified)
-- [ ] Dependency upgrades were reviewed against their changelog, isolated per package, and verified by a green suite with the lockfile diff reviewed
+- [ ] Dependency upgrades reviewed against changelog, isolated per package, verified by green suite
 
-**Presumptive blockers:** surface and propose the simpler design for each of these; escalate to Required only when the change actively makes structure worse: a refactor that relocates complexity instead of reducing it; a change that pushes a file past the size boundary with no decomposition; feature logic added to a shared module; a near-duplicate of an existing canonical helper; a silent fallback that hides an unclear invariant.
+## Multi-Model Review Pattern
+
+Use different models for different review perspectives:
+
+```
+Model A writes the code → Model B reviews → Model A addresses feedback → Human makes the final call
+```
+
+Different models have different blind spots.
+
+## See Also
+
+- For detailed security review guidance, see `security-and-hardening`

.opencode/skills/create-commit/SKILL.md

@@ -0,0 +1,47 @@
+---
+name: create-commit
+description: Stage, review, and commit files following Penpot commit conventions.
+---
+
+# Skill: create-commit
+
+Produce a git commit that follows Penpot's commit message conventions. This
+skill owns the commit format, staging review, and safety checks — it does not
+implement features or push.
+
+## When to Use
+
+- After code changes are complete and files need to be committed
+- When delegated by a workflow step (e.g. implement-plan) to handle the commit
+
+## Required Reading
+
+Before drafting any commit, read `mem:workflow/creating-commits` end-to-end. It
+is the authoritative source for the commit message format, the emoji menu,
+subject/body limits, and the `AI-assisted-by` trailer. Follow it exactly.
+
+## Workflow
+
+1. **Stage the files** specified by the calling context. Do not ask for
+   confirmation.
+2. Run `git diff --staged` to review the content. If you see secrets (API keys,
+   tokens, passwords, private keys, `.env` values), debug prints, or anything
+   that does not match the stated intent, **STOP** and tell the user before
+   committing.
+3. Draft the message following the format in the memory doc, wrapping the body
+   at 72 characters per line, and run:
+   ```bash
+   git commit -m "<subject>" -m "<body>"
+   ```
+   (or `git commit -F -` if the body has unusual characters).
+4. The `AI-assisted-by` trailer value is provided by the calling context — use
+   it verbatim.
+
+## Constraints
+
+- Do not push. Pushing is a separate workflow handled by the user.
+- Do not run `git reset`, `git checkout`, `git restore`, `git clean`, or `rm`.
+- Do not pass `--author`. Author identity comes from the local git config.
+- Do not amend a commit you did not create in this session, unless explicitly asked.
+- Do not bypass pre-commit hooks (`--no-verify`) unless explicitly asked.
+- Do not add untracked files that were not created in this session.

.opencode/skills/nrepl-eval/SKILL.md

@@ -1,19 +1,19 @@
 ---
 name: nrepl-eval
-description: Evaluate Clojure code via nREPL using the standalone tools/nrepl-eval.mjs CLI tool.
+description: Evaluate Clojure code via nREPL using the standalone scripts/nrepl-eval.mjs CLI tool.
 ---
 
 # nREPL Eval
 
 Evaluate Clojure (or ClojureScript) code via a running nREPL server using
-`tools/nrepl-eval.mjs`.
+`scripts/nrepl-eval.mjs`.
 
-Full documentation: `mem:tools/nrepl-eval` (file: `.serena/memories/tools/nrepl-eval.md`)
+Full documentation: `mem:scripts/nrepl-eval` (file: `.serena/memories/scripts/nrepl-eval.md`)
 
 ## Quick Reference
 
 ```bash
-./tools/nrepl-eval.mjs [options] [<code>]
+./scripts/nrepl-eval.mjs [options] [<code>]
 ```
 
 | Flag | Description | Default |
@@ -30,8 +30,8 @@ Full documentation: `mem:tools/nrepl-eval` (file: `.serena/memories/tools/nrepl-
 ## Examples
 
 ```bash
-./tools/nrepl-eval.mjs '(+ 1 2 3)'
-./tools/nrepl-eval.mjs --backend '(+ 1 2 3)'
-./tools/nrepl-eval.mjs --frontend '(js/alert "hi")'
-./tools/nrepl-eval.mjs -e
+./scripts/nrepl-eval.mjs '(+ 1 2 3)'
+./scripts/nrepl-eval.mjs --backend '(+ 1 2 3)'
+./scripts/nrepl-eval.mjs --frontend '(js/alert "hi")'
+./scripts/nrepl-eval.mjs -e
 ```

.opencode/skills/taiga/SKILL.md

@@ -13,7 +13,7 @@ Fetch information from Taiga public API for the **Penpot** project
 
 ## Prerequisites
 
-- `python3` — the `tools/taiga.py` CLI script is self-contained (stdlib only)
+- `python3` — the `scripts/taiga.py` CLI script is self-contained (stdlib only)
 
 ## Quick Start
 
@@ -21,17 +21,17 @@ The easiest way is to use the bundled Python script:
 
 ```bash
 # Pass a Taiga URL directly
-python3 tools/taiga.py https://tree.taiga.io/project/penpot/issue/13714
+python3 scripts/taiga.py https://tree.taiga.io/project/penpot/issue/13714
 
 # Or use "<type> <ref>" syntax
-python3 tools/taiga.py us 14128
-python3 tools/taiga.py task 13648
+python3 scripts/taiga.py us 14128
+python3 scripts/taiga.py task 13648
 
 # Add --json for raw output
-python3 tools/taiga.py --json issue 13714
+python3 scripts/taiga.py --json issue 13714
 
 # See full usage
-python3 tools/taiga.py --help
+python3 scripts/taiga.py --help
 ```
 
 ## URL Pattern Reference
@@ -51,30 +51,30 @@ To extract the **type** and **ref** from a URL:
 
 ## Python Script Reference
 
-The `tools/taiga.py` script wraps the Taiga API into a single convenient CLI
+The `scripts/taiga.py` script wraps the Taiga API into a single convenient CLI
 with sensible defaults.
 
 ### Usage
 
 ```
-python3 tools/taiga.py <taiga-url>
-python3 tools/taiga.py <type> <ref>
-python3 tools/taiga.py [--json] <taiga-url>
-python3 tools/taiga.py [--json] <type> <ref>
+python3 scripts/taiga.py <taiga-url>
+python3 scripts/taiga.py <type> <ref>
+python3 scripts/taiga.py [--json] <taiga-url>
+python3 scripts/taiga.py [--json] <type> <ref>
 ```
 
 ### Examples
 
 ```bash
 # By URL (recommended — no need to think about type/ref)
-python3 tools/taiga.py https://tree.taiga.io/project/penpot/issue/13714
+python3 scripts/taiga.py https://tree.taiga.io/project/penpot/issue/13714
 
 # By type and ref
-python3 tools/taiga.py us 14128
-python3 tools/taiga.py task 13648
+python3 scripts/taiga.py us 14128
+python3 scripts/taiga.py task 13648
 
 # Raw JSON output
-python3 tools/taiga.py --json issue 13714
+python3 scripts/taiga.py --json issue 13714
 ```
 
 ### Output

.opencode/skills/testing/SKILL.md

@@ -0,0 +1,57 @@
+---
+name: testing
+description: Enforce TDD workflow and testing best practices for Penpot. Use when implementing features, fixing bugs, or modifying behavior. Reads testing memory for full guidance.
+---
+
+# Testing Skill
+
+Enforces test-driven development and Penpot testing conventions.
+
+## When to Use
+
+- Implementing new logic or behavior
+- Fixing any bug (reproduction test required)
+- Modifying existing functionality
+- Adding edge case handling
+
+**Skip:** Pure configuration changes, documentation updates, or static content with no behavioral impact.
+
+## Workflow
+
+Follow TDD (Red → Green → Refactor) whenever practical:
+
+1. **RED** — Write a failing test first
+2. **GREEN** — Write minimal code to pass
+3. **REFACTOR** — Clean up while tests stay green
+
+For bug fixes, use the Prove-It Pattern: write a test that reproduces the bug, confirm it fails, implement the fix, confirm it passes.
+
+## Required Reading
+
+Before writing any test, read:
+
+1. `.serena/memories/testing.md` — cross-cutting testing principles, TDD workflow, anti-patterns, execution discipline
+2. Module-specific testing memory for the affected module:
+   - `mem:common/testing` — CLJC unit tests
+   - `mem:frontend/testing` — CLJS unit tests, Playwright E2E
+   - `mem:backend/core` — JVM clojure.test conventions
+
+## Key Rules
+
+- Every behavior change needs a test
+- Test state, not interactions
+- DAMP over DRY — tests are specifications; duplication is OK if each test is self-contained and readable
+- Prefer Real > Fake > Stub > Mock
+- Arrange-Act-Assert structure
+- One assertion per concept
+- Never pipe test output to filters — redirect to file first
+- Register new test files in the module's runner/entrypoint
+
+## Verification
+
+After completing implementation:
+
+- [ ] Every new behavior has a test
+- [ ] All tests pass for touched modules
+- [ ] Bug fixes include a reproduction test
+- [ ] Lint/formatter passes

.opencode/skills/update-changelog/SKILL.md

@@ -20,7 +20,7 @@ primary link, with the fix PR inline on the same line.
 
 - `gh` CLI authenticated (`gh auth status`)
 - Python 3.8+
-- `tools/gh.py` helper script available
+- `scripts/gh.py` helper script available
 
 ## Workflow
 
@@ -36,13 +36,13 @@ Use the helper script. It uses GraphQL for efficient single-pass fetching
 
 ```bash
 # All closed issues (default)
-python3 tools/gh.py issues "2.16.0"
+python3 scripts/gh.py issues "2.16.0"
 
 # Include open issues too
-python3 tools/gh.py issues "2.16.0" --state all
+python3 scripts/gh.py issues "2.16.0" --state all
 
 # Exclude entries that should not go in the changelog
-python3 tools/gh.py issues "2.16.0" --exclude "release blocker,no changelog"
+python3 scripts/gh.py issues "2.16.0" --exclude "release blocker,no changelog"
 ```
 
 **Exclusion rules (issue-level):**
@@ -68,7 +68,7 @@ If updating from an existing `CHANGES.md`, find issues in the milestone that
 are NOT yet referenced in the changelog:
 
 ```bash
-python3 tools/gh.py issues "2.16.0" --exclude "release blocker,no changelog" --compare CHANGES.md
+python3 scripts/gh.py issues "2.16.0" --exclude "release blocker,no changelog" --compare CHANGES.md
 ```
 
 This returns a filtered JSON array with only the missing issues.
@@ -85,23 +85,23 @@ community contribution attribution, or to read the PR body for
 
 ```bash
 # One or more PR numbers
-python3 tools/gh.py prs 9179 9204 9311
+python3 scripts/gh.py prs 9179 9204 9311
 
 # From a file
-python3 tools/gh.py prs --file prs.txt
+python3 scripts/gh.py prs --file prs.txt
 
 # From stdin
-cat prs.txt | python3 tools/gh.py prs --stdin
+cat prs.txt | python3 scripts/gh.py prs --stdin
 ```
 
 The `prs` command also supports listing all PRs in a milestone in one call:
 
 ```bash
 # All merged PRs in a milestone (default)
-python3 tools/gh.py prs --milestone "2.16.0"
+python3 scripts/gh.py prs --milestone "2.16.0"
 
 # All states (merged, open, closed)
-python3 tools/gh.py prs --milestone "2.16.0" --state all
+python3 scripts/gh.py prs --milestone "2.16.0" --state all
 ```
 
 The `prs` command returns JSON with `number`, `title`, `body`, `state`,
@@ -113,13 +113,13 @@ You can also list all PRs in a milestone in a single call:
 
 ```bash
 # All merged PRs in a milestone (default)
-python3 tools/gh.py prs --milestone "2.16.0"
+python3 scripts/gh.py prs --milestone "2.16.0"
 
 # All states (merged, open, closed)
-python3 tools/gh.py prs --milestone "2.16.0" --state all
+python3 scripts/gh.py prs --milestone "2.16.0" --state all
 
 # Open PRs only
-python3 tools/gh.py prs --milestone "2.16.0" --state open
+python3 scripts/gh.py prs --milestone "2.16.0" --state open
 ```
 
 The milestone path uses paginated GraphQL on the milestone's `pullRequests`
@@ -147,6 +147,12 @@ belongs to.
 The `gh.py` issues command already includes `issue_type` in every entry's
 output. **No separate GraphQL query is needed.**
 
+**Preserve highlighted entries:** If an entry is already featured in
+`### :rocket: Epics and highlights`, keep it in that section when refreshing a
+changelog version. Do not remove a highlighted entry just because issue type
+categorization would otherwise place it under `### :sparkles: New features &
+Enhancements`.
+
 **Community contribution attribution:** If the issue or its fix PR has the
 `community contribution` label, add an attribution `(by @<github_username>)`
 on the changelog entry line, **before** the GitHub issue/PR references.
@@ -155,7 +161,7 @@ The attribution should reference the **PR author**, not the issue author.
 The `prs` subcommand includes the `author` field — use that:
 
 ```bash
-python3 tools/gh.py prs <PR_NUMBER> | python3 -c "import sys,json; print(json.load(sys.stdin)[0]['author'])"
+python3 scripts/gh.py prs <PR_NUMBER> | python3 -c "import sys,json; print(json.load(sys.stdin)[0]['author'])"
 ```
 
 Placement in the entry line:
@@ -190,7 +196,7 @@ only reference **merged** PRs. Verify before writing:
 
 ```bash
 # Collect all PR numbers from the candidate entries and check them
-python3 tools/gh.py prs <ALL_PR_NUMBERS> | python3 -c "
+python3 scripts/gh.py prs <ALL_PR_NUMBERS> | python3 -c "
 import json, sys
 for pr in json.load(sys.stdin):
     if pr['state'] != 'MERGED':
@@ -265,7 +271,7 @@ section) or in the candidate set for the current milestone, check:
    current milestone since the changelog was last updated (e.g., a fix
    arrived late and the issue was reassigned to a future milestone)?
    - Verify the issue is still in the current milestone via
-     `python3 tools/gh.py issues <MILESTONE> --state all`. If it's no
+     `python3 scripts/gh.py issues <MILESTONE> --state all`. If it's no
      longer there, remove the entry from the current section. (If the
      target section doesn't exist yet, the entry is simply dropped.)
 
@@ -337,7 +343,7 @@ cross-reference to catch gaps:
 
 ```bash
 # List all merged PRs in the milestone
-python3 tools/gh.py prs --milestone "<MILESTONE>" --state merged > /tmp/milestone-prs.json
+python3 scripts/gh.py prs --milestone "<MILESTONE>" --state merged > /tmp/milestone-prs.json
 
 # Extract PR numbers from the changelog section
 python3 -c "
@@ -378,7 +384,7 @@ changelog or is legitimately excluded (check its labels).
 Also verify that no closed-unmerged PRs remain in the changelog:
 
 ```bash
-python3 tools/gh.py prs --milestone "<MILESTONE>" --state all | python3 -c "
+python3 scripts/gh.py prs --milestone "<MILESTONE>" --state all | python3 -c "
 import json, sys
 data = json.load(sys.stdin)
 closed = [p for p in data if p['state'] == 'CLOSED']
@@ -483,13 +489,13 @@ def fmt_issue_list(nums):
 
 # --- Fetch milestone data ---
 result = subprocess.run(
-    ["python3", "tools/gh.py", "issues", MILESTONE, "--state", "all"],
+    ["python3", "scripts/gh.py", "issues", MILESTONE, "--state", "all"],
     capture_output=True, text=True)
 all_issues = json.loads(result.stdout)
 issue_by_num = {i['number']: i for i in all_issues}
 
 result = subprocess.run(
-    ["python3", "tools/gh.py", "prs", "--milestone", MILESTONE, "--state", "all"],
+    ["python3", "scripts/gh.py", "prs", "--milestone", MILESTONE, "--state", "all"],
     capture_output=True, text=True)
 all_prs = json.loads(result.stdout)
 pr_by_num = {p['number']: p for p in all_prs}
@@ -728,7 +734,7 @@ self-contained and clickable in any Markdown viewer.
   reference if applicable.
 - **Re-fetch before editing.** Milestones can change — always re-fetch issues
   before making edits, don't rely on cached data.
-- **Use `tools/gh.py`.** Prefer the helper script over raw `gh api` calls for
+- **Use `scripts/gh.py`.** Prefer the helper script over raw `gh api` calls for
   milestone issue listing and PR detail fetching. It handles GraphQL
   pagination, batching, and label filtering automatically.
 - **Verify PR merge status.** Not all closing PRs are merged — community PRs
@@ -739,7 +745,7 @@ self-contained and clickable in any Markdown viewer.
   labels. Check both.
 - **Cross-reference milestone PRs, not just issues.** The `--compare` flag on
   the `issues` command only compares issue numbers. Merged PRs not linked to
-  any milestone issue can be missed. Use `python3 tools/gh.py prs --milestone`
+  any milestone issue can be missed. Use `python3 scripts/gh.py prs --milestone`
   for a full PR cross-reference.
 - **False-positive PR-to-issue associations.** A PR may claim to close an
   issue from a different project or context. If the PR title and issue title

.serena/memories/backend/core.md

@@ -39,8 +39,8 @@ Backend RPC command areas without focused memories include access tokens, binfil
 
 Database migrations live in `backend/src/app/migrations/`; pure SQL migrations are under `backend/src/app/migrations/sql/`. SQL filenames conventionally start with a sequence and verb/table description, e.g. `0026-mod-profile-table-add-is-active-field`. Applied migrations are tracked in the `migrations` table.
 
-For interactive PostgreSQL access with correct dev defaults, use `tools/psql`; to dump
-the current DDL schema, use `tools/db-schema` (see `mem:tools/psql`).
+For interactive PostgreSQL access with correct dev defaults, use `scripts/psql`; to dump
+the current DDL schema, use `scripts/db-schema` (see `mem:scripts/psql`).
 
 For deeper details on transaction semantics, advisory locks, Transit vs JSON helpers, and dev/test DB URLs: `mem:backend/rpc-db-worker-subtleties`.
 
@@ -56,14 +56,14 @@ In devenv, backend nREPL is exposed on port 6064.
 
 ### Non-interactive eval (preferred for agents)
 
-`./tools/nrepl-eval.mjs` connects to an already-running nREPL server and evaluates code. Session state (defs, `in-ns`) persists across invocations via a stored session ID in `/tmp/penpot-nrepl-session-<host>-<port>`.
+`./scripts/nrepl-eval.mjs` connects to an already-running nREPL server and evaluates code. Session state (defs, `in-ns`) persists across invocations via a stored session ID in `/tmp/penpot-nrepl-session-<host>-<port>`.
 
 ```bash
-./tools/nrepl-eval.mjs '(+ 1 2)'                            # single expression
-./tools/nrepl-eval.mjs "(require '[my.ns :as ns] :reload)"  # reload after edits
-./tools/nrepl-eval.mjs -e                                   # inspect last exception (*e)
-./tools/nrepl-eval.mjs --reset-session '(def x 0)'          # discard session, start fresh
-./tools/nrepl-eval.mjs <<'EOF'                              # multi-expression heredoc
+./scripts/nrepl-eval.mjs '(+ 1 2)'                            # single expression
+./scripts/nrepl-eval.mjs "(require '[my.ns :as ns] :reload)"  # reload after edits
+./scripts/nrepl-eval.mjs -e                                   # inspect last exception (*e)
+./scripts/nrepl-eval.mjs --reset-session '(def x 0)'          # discard session, start fresh
+./scripts/nrepl-eval.mjs <<'EOF'                              # multi-expression heredoc
 (def x 10)
 (+ x 20)
 EOF
@@ -92,12 +92,12 @@ Fixtures can populate local data for manual testing/perf work. From the backend
 
 IMPORTANT: all CLI commands must be executed from the `backend/` subdirectory.
 
-* **Linting:** `pnpm run lint` from the repository root.
-* **Formatting:** `pnpm run check-fmt`. Use `pnpm run fmt` to fix. Avoid unrelated whitespace diffs.
+* **Linting:** `pnpm run lint:clj`.
+* **Formatting:** `pnpm run check-fmt:clj` to check, `pnpm run fmt:clj` to fix. After running `fmt:clj`, `check-fmt:clj` is redundant. Avoid unrelated whitespace diffs.
 
 **Before linting:** if delimiter errors are suspected (after LLM edits), run
-`tools/paren-repair.bb` on the affected files first. Delimiter errors produce
-misleading linter/compiler output. See `mem:tools/paren-repair`.
+`scripts/paren-repair` on the affected files first. Delimiter errors produce
+misleading linter/compiler output. See `mem:scripts/paren-repair`.
 
 ## Testing
 

.serena/memories/common/component-data-model.md

@@ -24,6 +24,12 @@ Variant masters are main instances and component roots. Their descendants may th
 
 Masters are not normally touched through `set-shape-attr`, but touched flags can appear on master shapes through cloning/duplication paths. `add-touched-from-ref-chain` in `app.common.logic.variants` unions touched flags from ancestors into the copy being processed, so upstream/master touched state can affect downstream switch behavior.
 
+## Swap slots and positional matching
+
+- A swap slot (stored via `ctk/set-swap-slot`, a `:touched` group `swap-slot-<uuid>`) marks a copy sub-head that was SWAPPED to another component; `compare-children` then pairs it to the main child by slot instead of by `shape-ref`.
+- Copy sub-heads without a slot are paired to main children by `shape-ref` (seek, not index). `find-near-match` (positional) is only a validator/repair heuristic; validity requires membership of the ref among the near-main parent's children, not index equality (`mem:common/file-change-validation-migration-subtleties`).
+- Copy child ORDER converges to the main's via the async sync (`moved` branch of `compare-children`); local code must never reorder copy children directly (guards in `:mov-objects`/`:reorder-children`).
+
 ## Cloning paths
 
 `make-component-instance` in `app.common.types.container` produces a clean component copy through `update-new-shape`, dissociating attrs such as `:touched`, `:variant-id`, and `:variant-name` on cloned shapes.

.serena/memories/common/core.md

@@ -5,7 +5,7 @@
 ## Stable namespace map
 
 - `app.common.data` and `app.common.data.macros`: generic data helpers and performance macros that do not depend on Penpot domain entities.
-- `app.common.types.*`: shared shape/file/page/component/token data types, schemas, predicates, and entity-local operations. `app.common.types.nitrate-permissions` contains shared fail-closed Nitrate organization/team permission rules.
+- `app.common.types.*`: shared shape/file/page/component/token data types, schemas, predicates, and entity-local operations. `app.common.types.organization` contains organization schemas, `apply-organization`, and fail-closed organization/team permission rules (`allowed?`, `can-send-invitations?`).
 - `app.common.files.*`: file-level operations, shape tree helpers, change application, migrations, validation, and undo/redo-related logic.
 - `app.common.logic.*`: higher-level workflows/algorithms over files, shapes, components, variants, libraries, tokens, etc.
 - `app.common.geom.*`: geometry helpers and transformations.

.serena/memories/common/file-change-validation-migration-subtleties.md

@@ -7,6 +7,8 @@
 - `set-shape-attr` treats `:position-data` as derived and never touched. Geometry/content-path changes use approximate equality; geometry differences under about 1px can be ignored for touched purposes.
 - Width/height are excluded from the `is-geometry?` branch in `set-shape-attr`; do not assume all geometry-group attrs follow identical ignore-geometry behavior.
 - `process-touched-change` marks the owning component modified when a touched shape belongs to a main instance; component-data changes can come from shape ops through this second pass.
+- Copy structure is guarded at change application: `:mov-objects` (`is-valid-move?`) and `:reorder-children` both refuse to alter children of shapes inside component copies unless the change carries `allow-altering-copies` (sync/swap flows set it). New structural change types must follow the same rule.
+- `cls/generate-delete-shapes` propagates deletions from INSIDE a component main to the copy shapes referencing them (transitively, all pages of the file) so no dangling `shape-ref`s remain; skipped when the main root itself is deleted (copies then resolve into the deleted component) and for `allow-altering-copies` flows (swap replaces the shape; sync reconciles).
 
 ## Shape tree edits
 
@@ -19,6 +21,7 @@
 - Full referential/semantic validation currently runs only when file features contain `"components/v2"`.
 - Validation starts at root plus orphan shapes, then validates component records. `validate-file!` raises `:validation :referential-integrity` with collected details.
 - `repair-file` does not mutate data directly; it reduces validation errors into redo changes using `changes-builder`. Callers must apply or persist those changes.
+- `:missing-slot` fires only for a REAL swap: a copy sub-head whose `shape-ref` is no longer a child of the near main parent. A pure positional mismatch (ref still a sibling elsewhere) is a reorder — valid, realigned by the async component sync; do not "repair" it by assigning swap slots (a slot freezes the child out of normal sync). `fix-missing-swap-slots` (migration 0019) follows the same membership rule.
 
 ## Migrations
 

.serena/memories/common/layout-grid-subtleties.md

@@ -8,6 +8,9 @@
 ## Grid assignment
 
 - Grid `assign-cells` ensures at least one column and row, skips absolute-position children, creates non-tracked rows/cols when children exceed tracked cells, and asserts that assigned cells do not overlap.
+- `position-absolute?` counts HIDDEN shapes as absolute: hiding a grid child frees its cell on the next `assign-cells`.
+- `reorder-grid-children` rewrites the parent's `:shapes` to the REVERSE of the sorted cell order, but children with no cell (hidden/absolute) keep their original index — do not "fix" this into moving them to an end; that broke copy/main positional slot alignment (referential-integrity crash).
+- The `:reorder-children` change it emits is refused on parents inside component copies unless `allow-altering-copies` (same rule as `:mov-objects`); `pcb/reorder-grid-children` also skips copy grids producer-side. Copy child order is owned by the component sync engine.
 - Grid deassignment removes cells for shapes that are no longer direct children or have become absolute-positioned.
 - Auto-positioning is not just sorting: some auto cells are converted to manual when empty/manual/span state would break the auto sequence, then auto single-span items can be compacted.
 - `fix-overlaps` is marked dev-only and removes one overlapping cell, preferring empty cells first. Avoid depending on it as normal production repair.

.serena/memories/critical-info.md

@@ -22,23 +22,24 @@ You are working on the GitHub project `penpot/penpot`, a monorepo.
 - Align `let` binding values: when a `let` form has multiple bindings spanning
   several lines, align the value forms to the same column with spaces.
 - If you introduce delimiter errors (mismatched parens/brackets) in Clojure/CLJS files,
-  fix them with `tools/paren-repair.bb` BEFORE running lint/format checks.
-  See `mem:tools/paren-repair` for usage.
+  fix them with `scripts/paren-repair` BEFORE running lint/format checks.
+  See `mem:scripts/paren-repair` for usage.
 - Never run anything that destroys data without explicit permission, including `drop-devenv`, `docker compose down -v`, `docker volume rm ...`. The user's real work lives in the volumes of the shared infra.
 
 # Project modules
 
 This is a monorepo. Principles that apply to one module do *not* generally apply to others. Do not make assumptions.
 
-- `frontend/`: ClojureScript + SCSS SPA/design editor.
-- `backend/`: JVM Clojure HTTP/RPC server with PostgreSQL, Redis, storage, mail, and workers.Runtime services and the task-queue vs Pub/Sub topology that constrains horizontal scaling: `mem:prod-infra/core`.
-- `common/`: shared CLJC data types, geometry, schemas, file/change logic, and utilities.
-- `render-wasm/`: Rust -> WebAssembly Skia renderer consumed by frontend.
-- `exporter/`: ClojureScript/Node headless Playwright SVG/PDF export.
-- `mcp/`: TypeScript Model Context Protocol integration.
-- `plugins/`: TypeScript plugin runtime/examples and Plugin API types.
-- `library/`: design library workflows.
-- `docs/`: documentation site.
+- `frontend/`: ClojureScript + SCSS SPA/design editor; core conventions: `mem:frontend/core`.
+- `backend/`: JVM Clojure HTTP/RPC server with PostgreSQL, Redis, storage, mail, and workers; core conventions: `mem:backend/core`. Runtime services and the task-queue vs Pub/Sub topology that constrains horizontal scaling: `mem:prod-infra/core`.
+- `common/`: shared CLJC data types, geometry, schemas, file/change logic, and utilities; core conventions: `mem:common/core`.
+- `render-wasm/`: Rust -> WebAssembly Skia renderer consumed by frontend; core conventions: `mem:render-wasm/core`.
+- `exporter/`: ClojureScript/Node headless Playwright SVG/PDF export; core conventions: `mem:exporter/core`.
+- `mcp/`: TypeScript Model Context Protocol integration; core conventions: `mem:mcp/core`.
+- `plugins/`: TypeScript plugin runtime/examples and Plugin API types; core conventions: `mem:plugins/core`.
+- `library/`: design library workflows; core conventions: `mem:library/core`.
+- `docs/`: documentation site; core workflow and conventions: `mem:docs/core`.
+- `media-processor/`: TypeScript/Node.js HTTP service for image (sharp) and font (FontForge) processing; core conventions: `mem:media-processor/core`.
 
 The memory is structured in a way that you can get the critical information about the
 module. You can read it from `mem:<MODULE>/core`
@@ -52,20 +53,23 @@ module. You can read it from `mem:<MODULE>/core`
 - `experiments/` contains standalone experimental HTML/JS/scripts; treat it as non-core unless the user explicitly asks about it.
 - `sample_media/` contains sample image/icon media and config used as fixtures/demo material; do not infer app behavior from it.
 
-# Dev tools
+# Dev Scripts (scripts/)
 
-- `tools/nrepl-eval.mjs` — Evaluate Clojure/ClojureScript code via nREPL.
+- `scripts/nrepl-eval.mjs` — Evaluate Clojure/ClojureScript code via nREPL.
   Supports `--backend` (port 6064) and `--frontend` (port 3447) aliases.
-  See `mem:tools/nrepl-eval`.
-- `tools/paren-repair.bb` — Fix mismatched delimiters in Clojure/CLJS files
+  See `mem:scripts/nrepl-eval`.
+- `scripts/paren-repair` — Fix mismatched delimiters in Clojure/CLJS files
   and reformat with cljfmt. Run before lint checks when LLM edits break parens.
-  See `mem:tools/paren-repair`.
-- `tools/psql` — PostgreSQL client wrapper with devenv defaults.
-  Companion: `tools/db-schema` for DDL dumps. See `mem:tools/psql`.
-- `tools/taiga.py` — Fetch public issues, user stories, and tasks from the
-  Penpot Taiga project without authentication. See `mem:tools/taiga`.
-- `tools/gh.py` — GitHub operations helper: list milestone issues, fetch PR
-  details, compare against CHANGES.md. Requires `gh` CLI. See `mem:tools/gh`.
+  See `mem:scripts/paren-repair`.
+- `scripts/psql` — PostgreSQL client wrapper with devenv defaults.
+  Companion: `scripts/db-schema` for DDL dumps. See `mem:scripts/psql`.
+- `scripts/taiga.py` — Fetch public issues, user stories, and tasks from the
+  Penpot Taiga project without authentication. See `mem:scripts/taiga`.
+- `scripts/gh.py` — GitHub operations helper: list milestone issues, fetch PR
+  details, compare against CHANGES.md. Requires `gh` CLI. See `mem:scripts/gh`.
+- `scripts/error-reports.mjs` — Query error reports via RPC API with token
+  authentication. Supports list/get operations with filtering and pagination.
+  See `mem:scripts/error-reports`.
 
 # Dependency graph
 

.serena/memories/devenv/core.md

@@ -25,7 +25,9 @@ Compose-based dev environment under `docker/devenv/`, driven by `manage.sh`. Par
 
 ## Worker policy
 
-Backend workers run only on ws0. `_env` gates `enable-backend-worker` on `PENPOT_BACKEND_WORKER`; ws1+ inject it as false. ws0 must be running whenever any ws1+ is running, and is the last instance to stop — `run-devenv --agentic --ws N` (N≥1) auto-starts ws0 first; `stop-devenv` refuses to stop ws0 while any ws1+ is up. Workers are pure fire-and-forget: `wrk/submit!` inserts a row into the shared Postgres `task` table and returns; RPC handlers never wait on completion and workers never publish to msgbus. The reason for "ws0 only" is avoiding multi-instance worker races (cron dedup is best-effort across instances, `wrk/submit!` `dedupe` is racy across submitters); details in `mem:prod-infra/core`.
+Backend workers run only on ws0. `_env` gates `enable-backend-worker` on `PENPOT_BACKEND_WORKER`; ws1+ inject it as false. Workers are pure fire-and-forget: `wrk/submit!` inserts a row into the shared Postgres `task` table and returns; RPC handlers never wait on completion and workers never publish to msgbus. The reason for "ws0 only" is avoiding multi-instance worker races (cron dedup is best-effort across instances, `wrk/submit!` `dedupe` is racy across submitters); details in `mem:prod-infra/core`.
+
+Each workspace is independent and can be started/stopped in any order. Shared infra (postgres, minio, etc.) is shut down only when no instances remain running.
 
 ## Port layout
 
@@ -63,8 +65,8 @@ No `--delete` on the working-tree pass: gitignored caches in the workspace survi
 
 ## CLI surface
 
-- `run-devenv --agentic [--ws main|0|wsN|N] [--sync] [--serena-context CTX]`: bring one instance up. Agentic only — MCP and Serena windows are always created. Default target main. Errors out if the target is already running. `--sync` is rejected on main; on ws1+ it's optional (forced only when the workspace dir does not exist yet). Auto-starts ws0 first when the target is ws1+ and ws0 is not yet up.
-- `stop-devenv [--ws main|0|wsN|N] [--all]`: stop instances. Flags mutually exclusive. `--ws N` (N≥1) stops just that workspace. `--ws 0` or no flag stops ws0 + shared infra, refused while any ws1+ is running. `--all` stops every ws highest-first then ws0, then infra.
+- `run-devenv --agentic [--ws main|0|wsN|N] [--sync] [--serena-context CTX]`: bring one instance up. Agentic only — MCP and Serena windows are always created. Default target main. Errors out if the target is already running. `--sync` is rejected on main; on ws1+ it's optional (forced only when the workspace dir does not exist yet).
+- `stop-devenv [--ws main|0|wsN|N] [--all]`: stop instances. Flags mutually exclusive. `--ws N` stops just that workspace. `--ws 0` or no flag stops ws0; shared infra shuts down only if no other instances remain. `--all` stops every ws highest-first then ws0, then infra.
 - `run-devenv`: legacy alias, ws0 non-agentic attached.
 - `attach-devenv [--ws main|0|wsN|N]`: pure attach. Fails fast if instance/session missing.
 - `run-devenv-shell [--instance 0|wsN|N] [cmd...]`: bash in target instance. (`--instance` flag not yet renamed to `--ws`.)

.serena/memories/docs/core.md

@@ -1,4 +1,4 @@
-# Docs Workflow
+# Docs
 
 `docs/`: Penpot documentation site; Eleventy.
 
@@ -16,4 +16,4 @@ From `docs/`:
 - Build: `pnpm run build`.
 - Watch: `pnpm run watch`.
 
-Documentation changes should follow the existing page structure and rendered Help Center conventions rather than inventing a new style locally.
+Documentation changes should follow the existing page structure and rendered Help Center conventions rather than inventing a new style locally.

.serena/memories/frontend/composable-component-tests.md

@@ -0,0 +1,152 @@
+# Composable component tests
+
+A framework concept for systematically testing Penpot's component subsystem
+(synchronisation/propagation, swaps, variant switches, nesting, overrides), implemented in TWO test
+suites that share the principles below:
+
+1. **ClojureScript suite** — in the frontend test tree (`frontend/test/frontend_tests/
+   composable_tests/`), driving a minimally-assembled real app headlessly. The original.
+2. **TypeScript suite** — a Penpot plugin (`plugins/apps/composable-test-suite/`), driving the FULL
+   production app end-to-end through the Plugin API, with a slightly more elaborate set of
+   abstractions. Runs interactively (panel), remotely (Playwright), and headlessly in CI. Its
+   README is the authoritative operational reference.
+
+## Shared core idea
+A test is a **composition of operations** over a starting configuration, plus assertions. You
+describe a test as data (a setup + a sequence of operations) rather than writing bespoke imperative
+code, and coverage grows by COMPOSITION: a new variation is one combinator wrapped around existing
+pieces, not a copied test. Choice points (one-of alternatives, optional steps) EXPAND the
+composition into a full sweep of variants — one written case stands for a whole matrix of concrete
+tests.
+
+## Shared principles
+- **Every producing object is the accessor interface to what it produces downstream.** An
+  operation — and related objects such as content-creation strategies — is not merely an action:
+  the SAME object instance the case holds is the typed interface through which everything it
+  created or changed is later retrieved, checked, and asserted, parameterized by the situation. A
+  foundation operation exposes accessors for the participants it built; an edit operation exposes
+  its dual check (`assertHasChangedProperty` / `has-property-of`); a choice is recovered by asking
+  the one-of object (`getChoice`/`get-choice`); "did this step run" is asked of the step
+  (`wasApplied`/`applied?`). NEVER reach into a situation (or the document) for something an
+  upstream object produced — ask the producer. This is what keeps sweeps sound (object identity
+  ties the question to the exact node that ran) and what keeps retrieval logic in exactly one
+  place. Particularly explicit in the TS OOP implementation, where these accessors are methods on
+  the operation/strategy classes; repeatedly violating it (reading the document directly,
+  duplicating retrieval) was the most common review correction while building the suites.
+- **Operations are data with identity.** Each operation node has a unique id at construction and
+  records what it did under that id; interrogation is by identity. Bind an operation to a value
+  ONCE and reuse it in the composition and in every query about it.
+- **Drive the real production pipeline.** Operations route through genuine Penpot logic — real
+  change functions / real workspace events / the real Plugin API, never raw field writes — so the
+  production watcher's AUTOMATIC propagation is what's under test.
+- **Roles, not internals.** A starting configuration names its participants (roles). Role→id
+  capture happens when the configuration is built; operation TARGETS resolve at apply-time and may
+  be re-bound, so an operation targeting a role follows it as state-building ops re-point it —
+  which lets a single operation be swept across depth.
+- **Enumeration is authored, not exhaustive.** Compose only VALID cases, so outcomes are just
+  pass / fail / error — no not-applicable cells.
+- **Naming discipline.** Penpot domain nouns ("component", "variant") must not name framework
+  abstractions; an operation may name the domain ACTION it performs.
+- **Operator algebra** (same in both suites): sequence (cartesian product of the steps' variants),
+  one-of (union, choice recorded), optional(X) = one-of([X, skip]), inline assertion ops, trailing
+  asserters.
+- **Case authoring:** a case carries a CamelCase identifier and a plain-terms description in three
+  parts — situation setup, actions/variations, asserted requirement.
+
+---
+
+# ClojureScript suite (frontend test tree)
+
+Test-only `.cljs` code in the frontend test tree (nothing "common" about it). A **situation** =
+the in-memory file value + named roles + `:vars` + an ordered applied-log. Operations are records
+implementing `IOperation`/`apply-to` (`apply` collides with core). Assertions = inline `Test` ops
+and/or a trailing asserter; the runner makes no judgment. Failures carry `describe-applied` (the
+transcript), which is what makes a failing variant in a sweep identifiable.
+
+Layout: `core.cljs` (the domain-agnostic engine: situation, identity/transcript, roles/targets,
+operators, runners), `comp/setups.cljs` (setups + role accessors), `comp/nodes.cljs` (the component
+operations and their check duals), `interpreter.cljs` (runs cases against the real frontend),
+`comp/sync_test.cljs` (the cases; registered in `frontend_tests/runner.cljs`). Case letters B..N;
+the sweeps (K: depth × edit-precedence; L: swaps; M: variant switches; N: rotated-instance
+geometry, on the #10109 fix branch until merged) are the flagship pattern — read them before
+writing a new sweep.
+
+**Scenario lineage model** (behind the sweeps): scenario ops track named component lineages as
+objects under `:vars`, each holding the FIXED deepest origin (`:remote-*`), the ADVANCING outer
+main (`:main-*`), and per-nesting-level data whose `:nested-head` (the deepest instance at that
+level, found by descending the `:shape-ref` chain — matching chain MEMBERSHIP, not terminus) is
+the swap/switch target, anchored by its swap-stable parent. Nesting seeks the FIXED origin, not
+the advancing main — that is what makes each level's `:nested-head` land on the deepest instance.
+A variant nesting re-points the lineage's remote to the chosen member. Construction lesson:
+cross-level propagation requires progressively NESTED levels (one variant + plain wraps); sibling
+nestings do not propagate between each other.
+
+**Interpreter:** installs the situation's files into the global `st/state` (aux files tagged
+`:library-of`), starts the real `watch-component-changes` (+ harness `watch-undo-stack`), maps
+event-ops to REAL workspace events (`dwsh/update-shapes`, `dwl/component-swap`,
+`dwv/variants-switch`, `dwt/increase-rotation` — which runs the `check-delta` placement
+classification — `dwt/update-dimensions`, `dwu/undo`, `dwl/sync-file`, …) and runs sync-ops'
+`apply-to` against the live store file; awaits settlement (idle-gap heuristic + per-op grace) and
+re-reads `:file` each step so the shared accessors keep working.
+STORE-SWAP IMMUNITY: other test namespaces `set!` `st/state`/`st/stream` and never restore, while
+the `app.main.refs` lenses stay bound to the ORIGINAL atoms — propagation then dies silently. The
+interpreter captures the atoms at namespace-load time and re-`set!`s them per variant.
+
+Running: `cd frontend && pnpm run build:test`, then
+`node target/tests/test.js --focus frontend-tests.composable-tests.comp.sync-test`
+(var-level focus for one case).
+
+**Fidelity warning:** the harness drives a MINIMALLY-ASSEMBLED app — only some
+`initialize-workspace` subscriptions are wired. Risk = SILENT UNDER-WIRING (e.g. undo needs the
+harness `watch-undo-stack`). When a case needs app behaviour beyond a raw edit, check for an
+unwired subscription and verify by PROBING store state, not by trusting a green assertion.
+
+**Caveats:** inline `Test` exceptions are UNCAUGHT on the frontend (crash the runner — assert in
+the trailing asserter). `(optional (in-sequence …))` is not flattened for the interpreter — use
+independent optionals. The Serena/clj-kondo cache for `nodes.cljs` goes stale (phantom symbols) —
+trust the build. Cross-namespace global-state leaks land in this suite first; suspect them before
+the framework on inexplicable full-run-only failures. Case H's `sync-file` schedules a delayed RPC
+that fails headless (benign; absorbed by per-op grace).
+
+---
+
+# TypeScript suite (the plugin) — full e2e
+
+`plugins/apps/composable-test-suite/` — same principles against the FULL production app through the
+Plugin API (real frontend, real propagation). Continuation of the CLJS suite per issue #10584.
+Operational details (build/run, connect URL, remote control, reading logs, auto-reload, CI): the
+plugin README.
+
+Distinguishing abstractions (the OOP articulation of the shared principles):
+- `TestCase {identifier, description, operation}` with the three-part description mandated in the
+  constructor docstring.
+- The accessor-interface principle is class-level: foundation operations (e.g.
+  `OpCreateSimpleComponentWithCopy`) expose the roles they build; **content-creation strategies**
+  (pluggable: what content a foundation builds around) expose accessors for the content they
+  created; edit operations expose their checks (`OpChangeProperty.assertHasChangedProperty`);
+  `OpOneOf`/`OpOptional` are queried for what ran. Tests never grope the document for something a
+  producer can be asked for.
+- `ShapeProp` model: property duals with numeric tolerance; rotation is a writable attr, height
+  goes via resize (readonly in the Plugin API).
+- `TestSuite` enumerates cases into a `TestTree` with stable per-test ids;
+  `run(ids, TestRunObserver)` is the ONLY output channel — the framework is UI-free by
+  construction. `plugin.ts` (panel adapter), `main.ts` (panel UI) and `src/ci/headless.ts`
+  (CI adapter) are three thin consumers.
+- Cases live in `src/composable-tests/cases/` as `case<Identifier>.ts` (e.g. `MainEditSyncs` — the
+  sweep that found #10109).
+- Panel checkboxes carry stable DOM ids (case identifier / `Identifier-N` composites) for remote
+  control via Playwright; recipe in the README.
+
+## CI
+Headless per-PR gate: `.github/workflows/tests-composable-suite.yml` runs
+`pnpm --filter composable-test-suite run test:ci` — mocked backend (frontend e2e static server +
+Playwright RPC fixtures, no backend/login), the in-sandbox bundle injected via `ɵloadPlugin`,
+results streamed via console markers, `TEST_FILTER` by identifier substring. The mocked backend is
+NOT a limitation for this suite (everything asserted is frontend store logic; empirically
+confirmed against the interactive runs). Architecture mirrors `plugin-api-test-suite`'s CI driver;
+the mock harness exists in THREE places that must stay in sync (provenance note in `ci/run-ci.ts`).
+Details: README, "Running in CI".
+
+## Substrate
+`mem:common/test-setup`, `mem:common/component-data-model`, `mem:common/component-swap-pipeline`,
+`mem:frontend/testing`.

.serena/memories/frontend/core.md

@@ -23,13 +23,13 @@ From `frontend/`:
 - JS lint currently no-ops via `pnpm run lint:js`.
 - SCSS lint: `pnpm run lint:scss`.
 - Format checks: `pnpm run check-fmt:clj`, `pnpm run check-fmt:js`, `pnpm run check-fmt:scss`.
-- Format fix: `pnpm run fmt`, or targeted `fmt:clj` / `fmt:js` / `fmt:scss`.
+- Format fix: `pnpm run fmt`, or targeted `fmt:clj` / `fmt:js` / `fmt:scss`. After running `fmt:*`, `check-fmt:*` is redundant.
 - Translation formatting after i18n edits: `pnpm run translations`.
 
 **Before linting:** if delimiter errors are suspected (after LLM edits, or
-lint/compiler reports syntax errors), run `tools/paren-repair.bb` on the
+lint/compiler reports syntax errors), run `scripts/paren-repair` on the
 affected files first. Delimiter errors produce misleading linter output.
-See `mem:tools/paren-repair`.
+See `mem:scripts/paren-repair`.
 
 ## Focused memory routing
 

.serena/memories/frontend/handling-errors-and-debugging.md

@@ -11,10 +11,10 @@ The latter is needed because syntax errors in parentheses give an uninformative
 tool can often find the exact location of such errors.
 
 When delimiter errors are detected (typically from lint or compiler output),
-fix the affected files with `tools/paren-repair.bb`. The `clj_check_parentheses`
+fix the affected files with `scripts/paren-repair`. The `clj_check_parentheses`
 MCP tool can also pinpoint the error location when available, but it is not
 required — standard build errors are usually enough.
-See `mem:tools/paren-repair`.
+See `mem:scripts/paren-repair`.
 
 ## Runtime patching with `set!`
 

.serena/memories/media-processor/core.md

@@ -0,0 +1,100 @@
+# Media Processor
+
+Stateless HTTP service for Penpot image and font processing. Handles image info extraction, thumbnail generation (sharp), and font conversion (FontForge, woff-tools).
+
+## Tech Stack
+
+- Language: TypeScript
+- Runtime: Node.js
+- Framework: Express
+- Image processing: sharp (libvips)
+- Font processing: FontForge (TTF/OTF), sfnt2woff, woff2_decompress
+- Upload handling: multer (hybrid storage: memory for small, disk for large)
+- Logging: pino (with optional Loki transport)
+- Config validation: Zod
+- Testing: Vitest
+- Package Manager: pnpm
+
+## Project Structure
+
+```
+media-processor/
+├── src/
+│   ├── index.ts              # Express app setup, routes, middleware
+│   ├── config.ts             # Zod-validated env config, HKDF key derivation
+│   ├── types.ts              # TypeScript type definitions
+│   ├── upload.ts             # Multer configuration, getFileBuffer helper
+│   ├── upload-storage.ts     # Hybrid storage engine (memory < threshold, disk >= threshold)
+│   ├── logger.ts             # Pino logger setup
+│   ├── middleware/
+│   │   ├── auth.ts           # Timing-safe shared key authentication
+│   │   ├── error-handler.ts  # ProcessingError class, centralized error handling
+│   │   └── timeout.ts        # Request timeout middleware
+│   ├── routes/
+│   │   ├── health.ts         # GET /api/health
+│   │   ├── image.ts          # POST /api/image/info, /api/image/thumbnail
+│   │   └── font.ts           # POST /api/font/convert
+│   └── services/
+│       ├── image.ts          # sharp-based image info/thumbnail generation
+│       ├── font.ts           # FontForge/woff-tools font conversion
+│       └── errors.ts         # throwValidation, throwRestriction, throwProcessing
+├── test/                     # Vitest test files
+├── vitest.config.ts          # Test configuration
+├── tsconfig.json             # TypeScript configuration
+├── esbuild.config.mjs        # Build configuration
+└── package.json              # Dependencies and scripts
+```
+
+## Key Conventions
+
+### Auth
+- Requests authenticated via `x-shared-key` header using timing-safe comparison
+- When no key configured, all requests rejected with 403
+- Key derived from `PENPOT_SECRET_KEY` via HKDF (blake2b512) or set directly via `PENPOT_MEDIA_PROCESSOR_SHARED_KEY`
+
+### Resource Limits
+- Image: max pixels, max width/height enforced before processing
+- Font: prlimit wraps FontForge processes with memory (AS) and CPU time limits
+- Concurrency: p-queue limits concurrent requests (default 10)
+- Upload: hybrid storage — memory for files < 10MB, disk for larger; configurable via `PENPOT_MEDIA_PROCESSOR_MEMORY_THRESHOLD`
+- Max file size: configurable (default 350MB)
+
+### Error Handling
+- `throwValidation(code, hint)` — 400 errors for invalid input
+- `throwRestriction(code, hint)` — 413 errors for resource limits exceeded
+- `throwProcessing(code, hint)` — 503 errors for processing failures (e.g., resource limit kills)
+
+### Image Processing
+- EXIF orientation applied before dimension validation and thumbnail generation
+- sharp caching disabled to prevent unbounded memory growth
+- `withoutEnlargement: true` prevents upscaling small images
+
+### Font Conversion
+- Supported formats: TTF, OTF, WOFF, WOFF2
+- SFNT type detected via magic bytes (0x4f54544f = OTF, 0x00010000 = TTF)
+- Temp files cleaned up in finally blocks (best-effort)
+
+## Commands
+
+All commands run from `media-processor/` directory:
+
+- `pnpm run test` — Run Vitest test suite
+- `pnpm run types:check` — TypeScript type checking (tsc --noEmit)
+- `pnpm run fmt` — Format code with Prettier
+- `pnpm run fmt:check` — Check formatting without modifying
+- `pnpm run build` — Build for production (esbuild)
+- `pnpm run start:dev` — Start development server (tsx)
+
+## Docker
+
+- Exposed port: 6065 (configurable via `PENPOT_MEDIA_PROCESSOR_PORT`)
+- Must be deployed on internal Docker network only (not public-facing)
+- Backend communicates via `PENPOT_MEDIA_PROCESSING_SERVICE_URI`
+
+## Testing Principles
+
+Cross-cutting testing principles and anti-patterns: `mem:testing`.
+
+- Run `pnpm run test` after changes
+- Run `pnpm run types:check` after TypeScript changes
+- Run `pnpm run fmt:check` before commits

.serena/memories/scripts/error-reports.md

@@ -0,0 +1,289 @@
+# Error Reports CLI Tool
+
+`scripts/error-reports.mjs` is a Node.js CLI tool for querying Penpot error reports via the RPC API. Provides access to error logs with filtering, pagination, and multiple output formats.
+
+## When to use
+
+- Querying error reports from the database for debugging or analysis
+- Filtering errors by source, kind, tenant, or backend version
+- Exporting error data in JSON, NDJSON, or table format
+- Computing error statistics (top signatures, version, source, audit-log kind, hourly distribution, bursts, heatmap)
+- Investigating specific error reports by ID
+
+## Prerequisites
+
+- Node.js with `commander` and `dotenv` packages installed (in root `package.json`)
+- Running Penpot backend with error-reports RPC endpoints
+- Access token with `error-reports:read` permission
+
+## Configuration
+
+Create a `.env` file in the project root:
+
+```bash
+PENPOT_API_URI=http://localhost:3450
+PENPOT_ACCESS_TOKEN=<your-token>
+```
+
+Grant the required permission to your access token:
+
+```sql
+UPDATE access_token
+SET perms = ARRAY['error-reports:read']::text[],
+    updated_at = now()
+WHERE id = '<token-uuid>';
+```
+
+## Usage
+
+```bash
+./scripts/error-reports.mjs <command> [options]
+```
+
+### Commands
+
+#### `list` - List error reports with pagination and filters
+
+```bash
+./scripts/error-reports.mjs list [options]
+```
+
+**Options:**
+
+| Flag | Description | Default |
+|------|-------------|---------|
+| `-l, --limit <n>` | Max items per page (max: 200) | `50` |
+| `--from <date>` | ISO timestamp — oldest boundary (items after this) | — |
+| `--to <date>` | ISO timestamp — newest boundary (items before this) | — |
+| `--since <date>` | ISO timestamp — explicit cursor for manual pagination | — |
+| `--since-id <uuid>` | Fetch errors after this ID (cursor pagination) | — |
+| `-s, --source <name>` | Filter by source (see source names below) | — |
+| `-p, --profile-id <uuid>` | Filter by profile ID | — |
+| `-k, --kind <kind>` | Filter by kind (string) | — |
+| `-t, --tenant <tenant>` | Filter by tenant (string) | — |
+| `--version <version>` | Filter by version | — |
+| `--hint <text>` | Filter by hint (ILIKE match) | — |
+| `-a, --all` | Fetch all pages automatically (streams output) | `false` |
+| `-f, --format <type>` | Output format: `json`, `table`, or `ndjson` | `table` |
+| `--normalize-hints` | Normalize hints by stripping dynamic values | `false` |
+| `-o, --output <file>` | Write output to file instead of stdout | — |
+| `--env <path>` | Custom .env file path | `.env` |
+| `-h, --help` | Show help message | — |
+
+**Streaming behavior:** With `--all`, output must be `ndjson` or `table`; `--all --format json` is rejected because `--all` streams output. `--all --format table` prints rows immediately. `--format ndjson` always streams one JSON object per line.
+
+#### `get` - Get a single error report by ID
+
+```bash
+./scripts/error-reports.mjs get [options]
+```
+
+**Options:**
+
+| Flag | Description | Required |
+|------|-------------|----------|
+| `--id <uuid>` | Error report ID | Yes (or --error-id) |
+| `--error-id <id>` | Error report error-id | Yes (or --id) |
+| `-f, --format <type>` | Output format: `json` or `table` | No (default: `table`) |
+| `--env <path>` | Custom .env file path | No (default: `.env`) |
+| `-h, --help` | Show help message | No |
+
+#### `stats` - Compute error report statistics
+
+```bash
+./scripts/error-reports.mjs stats [options]
+```
+
+Reads from `--input <file>`, stdin (piped), or fetches from API. Computes aggregations by signature, version, source, audit-log kind, hour, optional 5-minute bursts, and optional day-of-week × hour heatmap.
+
+**Options:**
+
+| Flag | Description | Default |
+|------|-------------|---------|
+| `--from <date>` | Start of interval (ISO timestamp) | — |
+| `--to <date>` | End of interval (ISO timestamp) | — |
+| `--limit <n>` | Items per page when fetching from API | `200` |
+| `--input <file>` | Read from local JSON/NDJSON file instead of API | — |
+| `--burst` | Detect 5-minute windows above 3× the average rate | `false` |
+| `--heatmap` | Show day-of-week × hour-of-day heatmap | `false` |
+| `-f, --format <type>` | Output format: `json` or `table` | `table` |
+| `--env <path>` | Custom .env file path | `.env` |
+
+## Source Names
+
+The `--source` filter accepts these values:
+
+- `logging`
+- `audit-log`
+- `rlimit`
+
+## Hint Normalization
+
+With `--normalize-hints` (or always in `stats`), hints are normalized by stripping dynamic values:
+
+1. File IDs in file-id context → `<file-id>`
+2. UUIDs (8-4-4-4-12 hex) → `<uuid>`
+3. Numeric IDs in parentheses `(12345)` → `(<id>)`
+4. Elapsed times (`7.5s`, `2m3.027s`) → `<elapsed>`
+5. URIs (`https://...`) → `<uri>`
+6. Unicode quotes and whitespace normalized
+
+## Examples
+
+### List recent errors
+```bash
+./scripts/error-reports.mjs list --limit 10
+```
+
+### Time-range query (today)
+```bash
+./scripts/error-reports.mjs list --from 2026-07-23T00:00:00Z --to 2026-07-23T23:59:59Z --all
+```
+
+### Stream all errors as NDJSON
+```bash
+./scripts/error-reports.mjs list --all --format ndjson > errors.ndjson
+```
+
+### Save to file with --output
+```bash
+./scripts/error-reports.mjs list --all --format ndjson -o errors.ndjson
+./scripts/error-reports.mjs list --format json -o errors.json
+```
+
+### Filter by source
+```bash
+./scripts/error-reports.mjs list --source audit-log --limit 20
+```
+
+### Filter by kind
+```bash
+./scripts/error-reports.mjs list --kind exception-page
+```
+
+### Filter by tenant
+```bash
+./scripts/error-reports.mjs list --tenant production
+```
+
+### Filter by version
+```bash
+./scripts/error-reports.mjs list --version 2.1.0
+```
+
+### Search by hint (partial match)
+```bash
+./scripts/error-reports.mjs list --hint "NullPointerException"
+```
+
+### Fetch all errors with pagination
+```bash
+./scripts/error-reports.mjs list --all
+```
+
+### Get specific error by ID
+```bash
+./scripts/error-reports.mjs get --id 550e8400-e29b-41d4-a716-446655440000
+```
+
+### Output as JSON
+```bash
+./scripts/error-reports.mjs list --limit 5 --format json
+```
+
+### Combine filters
+```bash
+./scripts/error-reports.mjs list --source audit-log --kind exception-page --tenant production --limit 50
+```
+
+### Stats with burst and heatmap analysis
+```bash
+./scripts/error-reports.mjs stats --from 2026-07-23T00:00:00Z --to 2026-07-23T23:59:59Z --burst --heatmap
+```
+
+### Stats from file
+```bash
+./scripts/error-reports.mjs stats --input errors.json
+```
+
+### Stats from pipe
+```bash
+./scripts/error-reports.mjs list --all --format json | ./scripts/error-reports.mjs stats
+```
+
+## Output Formats
+
+### Table (default)
+Human-readable table format for terminal display. With `--all`, rows stream as they arrive.
+
+### JSON
+Single page: `{items: [...], nextSince, nextId}`. `--all` cannot be combined with `--format json`; use `--format ndjson` for streaming.
+
+### NDJSON
+One JSON object per line, always streaming. Pipe-friendly: `| jq -c '.hint'`, `| wc -l`.
+
+## Pagination
+
+The server returns items in **ascending** order (oldest first). Cursor pagination uses `--since` / `--since-id` to fetch the next page of newer items.
+
+### Manual pagination
+Use `--since` and `--since-id` with values from `nextSince` and `nextId` in the response:
+
+```bash
+./scripts/error-reports.mjs list --limit 50
+# Use nextSince and nextId from response
+./scripts/error-reports.mjs list --limit 50 --since "2026-01-20T10:29:00Z" --since-id "next-uuid"
+```
+
+### Automatic pagination
+Use `--all` to fetch all pages automatically (streams output):
+
+```bash
+./scripts/error-reports.mjs list --all
+```
+
+### Time-range queries
+Use `--from` and `--to` to bound the query. These map to the server's `--since` and `--until` parameters:
+
+```bash
+./scripts/error-reports.mjs list --from 2026-07-20T00:00:00Z --to 2026-07-23T23:59:59Z --all
+```
+
+## Key principles
+
+- **Authentication required** - Uses access token with `error-reports:read` permission
+- **API endpoint configurable** - Set via `PENPOT_API_URI` in `.env` file
+- **Table is default format** - Use `--format json` for structured JSON, `--format ndjson` for streaming
+- **Streaming with --all** - Items print as they arrive, no buffering. Use `--format ndjson` or `--format table`; `--all --format json` is rejected.
+- **Filters are combinable** - All filter options can be used together
+- **Both flag formats supported** - `--option=value` and `--option value` both work
+- **Ascending order** - Server returns oldest items first (changed from DESC)
+
+## Error handling
+
+The tool provides helpful error messages for common issues:
+
+- **Missing configuration**: Shows setup instructions for `.env` file
+- **Authentication errors (401)**: Indicates invalid or expired token
+- **Authorization errors (403)**: Indicates missing `error-reports:read` permission
+- **RPC errors**: Displays error code and message from the API
+
+## Integration with other scripts
+
+- **jq**: Pipe NDJSON output to `jq` for further processing
+  ```bash
+  ./scripts/error-reports.mjs list --all --format ndjson | jq -c '{id, hint}'
+  ```
+- **stats from pipe**: Fetch data once, compute stats
+  ```bash
+  ./scripts/error-reports.mjs list --all --format ndjson | ./scripts/error-reports.mjs stats
+  ```
+- **stats from NDJSON pipe**: Works with NDJSON format too
+  ```bash
+  ./scripts/error-reports.mjs list --all --format ndjson | ./scripts/error-reports.mjs stats
+  ```
+- **grep/search**: Filter output by specific patterns
+- **--output**: Save to file without shell redirection
+  ```bash
+  ./scripts/error-reports.mjs list --all --format ndjson -o errors.ndjson
+  ```

.serena/memories/scripts/gh.md

@@ -1,6 +1,6 @@
 # GitHub operations helper
 
-`tools/gh.py` is a multi-purpose CLI for querying the penpot/penpot GitHub
+`scripts/gh.py` is a multi-purpose CLI for querying the penpot/penpot GitHub
 repository via GraphQL and REST APIs through the authenticated `gh` CLI.
 
 ## When to use
@@ -23,24 +23,24 @@ List issues in a milestone, with filtering by state, labels, and project status.
 
 ```bash
 # Closed issues in a milestone (default)
-python3 tools/gh.py issues "2.16.0"
+python3 scripts/gh.py issues "2.16.0"
 
 # All issues in a milestone
-python3 tools/gh.py issues "2.16.0" --state all
+python3 scripts/gh.py issues "2.16.0" --state all
 
 # Issues with no milestone
-python3 tools/gh.py issues none
-python3 tools/gh.py issues none --state open
+python3 scripts/gh.py issues none
+python3 scripts/gh.py issues none --state open
 
 # Filter by label (include only)
-python3 tools/gh.py issues "2.16.0" --label "bug"
-python3 tools/gh.py issues "2.16.0" --label "bug,regression"
+python3 scripts/gh.py issues "2.16.0" --label "bug"
+python3 scripts/gh.py issues "2.16.0" --label "bug,regression"
 
 # Exclude by label
-python3 tools/gh.py issues "2.16.0" --exclude "release blocker,no changelog"
+python3 scripts/gh.py issues "2.16.0" --exclude "release blocker,no changelog"
 
 # Show only issues NOT yet in CHANGES.md
-python3 tools/gh.py issues "2.16.0" --compare CHANGES.md
+python3 scripts/gh.py issues "2.16.0" --compare CHANGES.md
 ```
 
 **Default filters** (override with flags):
@@ -55,19 +55,19 @@ Fetch PR details by number or by milestone.
 
 ```bash
 # Fetch specific PRs
-python3 tools/gh.py prs 9179 9204 9311
+python3 scripts/gh.py prs 9179 9204 9311
 
 # Read PR numbers from file
-python3 tools/gh.py prs --file prs.txt
+python3 scripts/gh.py prs --file prs.txt
 
 # Read PR numbers from stdin
-cat prs.txt | python3 tools/gh.py prs --stdin
+cat prs.txt | python3 scripts/gh.py prs --stdin
 
 # All PRs in a milestone (default: merged only)
-python3 tools/gh.py prs --milestone "2.16.0"
+python3 scripts/gh.py prs --milestone "2.16.0"
 
 # All PRs in a milestone (all states)
-python3 tools/gh.py prs --milestone "2.16.0" --state all
+python3 scripts/gh.py prs --milestone "2.16.0" --state all
 ```
 
 **Output**: JSON array to stdout; progress to stderr.

.serena/memories/scripts/nrepl-eval.md

@@ -1,7 +1,7 @@
 # nREPL Eval
 
 Evaluate Clojure (or ClojureScript) code via a running nREPL server using
-`tools/nrepl-eval.mjs` — a standalone CLI application.
+`scripts/nrepl-eval.mjs` — a standalone CLI application.
 
 Session state (defs, in-ns, etc.) persists across invocations via a stored
 session ID, so you can build up state incrementally.
@@ -9,9 +9,9 @@ session ID, so you can build up state incrementally.
 ## Usage
 
 ```bash
-node tools/nrepl-eval.mjs [options] [<code>]
+node scripts/nrepl-eval.mjs [options] [<code>]
 # or
-./tools/nrepl-eval.mjs [options] [<code>]
+./scripts/nrepl-eval.mjs [options] [<code>]
 ```
 
 ## Options
@@ -47,37 +47,37 @@ Sessions are persisted to `/tmp/penpot-nrepl-session-<host>-<port>`. State
 carries across calls automatically:
 
 ```bash
-./tools/nrepl-eval.mjs '(def x 42)'
-./tools/nrepl-eval.mjs 'x'
+./scripts/nrepl-eval.mjs '(def x 42)'
+./scripts/nrepl-eval.mjs 'x'
 # => 42
 ```
 
 Reset the session to start fresh:
 
 ```bash
-./tools/nrepl-eval.mjs --reset-session '(def x 0)'
+./scripts/nrepl-eval.mjs --reset-session '(def x 0)'
 ```
 
 ### Evaluate code
 
 **Single expression (inline) — uses default port 6064:**
 ```bash
-./tools/nrepl-eval.mjs '(+ 1 2 3)'
+./scripts/nrepl-eval.mjs '(+ 1 2 3)'
 ```
 
 **Backend nREPL (explicit):**
 ```bash
-./tools/nrepl-eval.mjs --backend '(+ 1 2 3)'
+./scripts/nrepl-eval.mjs --backend '(+ 1 2 3)'
 ```
 
 **Frontend nREPL:**
 ```bash
-./tools/nrepl-eval.mjs --frontend '(js/alert "hi")'
+./scripts/nrepl-eval.mjs --frontend '(js/alert "hi")'
 ```
 
 **Multiple expressions via heredoc (recommended — avoids escaping issues):**
 ```bash
-./tools/nrepl-eval.mjs <<'EOF'
+./scripts/nrepl-eval.mjs <<'EOF'
 (def x 10)
 (+ x 20)
 EOF
@@ -85,7 +85,7 @@ EOF
 
 **Override with a different port:**
 ```bash
-./tools/nrepl-eval.mjs -p 7888 '(+ 1 2 3)'
+./scripts/nrepl-eval.mjs -p 7888 '(+ 1 2 3)'
 ```
 
 ### Inspect last exception
@@ -93,26 +93,48 @@ EOF
 After code throws an error, retrieve the full exception details:
 
 ```bash
-./tools/nrepl-eval.mjs -e
+./scripts/nrepl-eval.mjs -e
 ```
 
 ## Common Patterns
 
 **Require a namespace with reload:**
 ```bash
-./tools/nrepl-eval.mjs "(require '[my.namespace :as ns] :reload)"
+./scripts/nrepl-eval.mjs "(require '[my.namespace :as ns] :reload)"
 ```
 
 **Test a function:**
 ```bash
-./tools/nrepl-eval.mjs "(ns/my-function arg1 arg2)"
+./scripts/nrepl-eval.mjs "(ns/my-function arg1 arg2)"
 ```
 
 **Long-running operation with custom timeout:**
 ```bash
-./tools/nrepl-eval.mjs -t 300000 "(long-running-fn)"
+./scripts/nrepl-eval.mjs -t 300000 "(long-running-fn)"
 ```
 
+### Accessing Private Functions
+
+Private functions (declared with `^:private` or `defn-`) cannot be called 
+directly from outside their namespace. Use the var quote syntax `#'` to 
+access the underlying var:
+
+**This fails:**
+```bash
+./scripts/nrepl-eval.mjs "(app.rpc.commands.error-reports/build-list-query {})"
+# => Syntax error: app.rpc.commands.error-reports/build-list-query is not public
+```
+
+**This works:**
+```bash
+./scripts/nrepl-eval.mjs "(#'app.rpc.commands.error-reports/build-list-query {})"
+# => Returns the result
+```
+
+The `#'` reader macro resolves to `(var ...)`, giving you direct access to 
+the var regardless of its visibility modifier. The syntax is `#'` followed 
+by the fully qualified symbol.
+
 ## Key Principles
 
 - **Default port is 6064** — just pass code directly, no `-p` needed when

.serena/memories/scripts/paren-repair.md

@@ -0,0 +1,43 @@
+# Paren-Repair
+
+`scripts/paren-repair` fixes mismatched parentheses, brackets, and braces in
+Clojure/ClojureScript files, then reformats them with cljfmt.
+
+## When to use
+
+- After LLM edits introduce broken delimiters — proactively run it on files
+  you just touched.
+- When lint (clj-kondo), the Clojure compiler, or shadow-cljs report syntax
+  errors mentioning mismatched/unclosed delimiters, reader errors, or
+  unexpected EOF.
+- Before running lint/format checks — delimiter errors make linter output
+  misleading. Fix them first, then lint.
+
+## How to use (CLI)
+
+```bash
+# File mode (in-place fix + format)
+bb scripts/paren-repair path/to/file.clj
+
+# Pipe mode (stdin → fixed code to stdout)
+echo '(def x 1' | bb scripts/paren-repair
+
+# Help
+bb scripts/paren-repair --help
+```
+`bb` must be invoked from the repo root so the path `scripts/paren-repair` resolves.
+
+## Native Tool Available (opencode)
+
+A native opencode tool `paren-repair` is available at `.opencode/scripts/paren-repair.ts`.
+The LLM can call it directly with:
+- `files`: Array of file paths to fix
+- `code`: Code string to fix via stdin
+
+Example usage by the LLM:
+```
+paren-repair(files="src/foo.clj, src/bar.cljs")
+paren-repair(code="(defn foo [x")
+```
+
+

.serena/memories/scripts/psql.md

@@ -0,0 +1,39 @@
+# Psql
+
+`scripts/psql` is a wrapper around `psql` that connects to the Penpot PostgreSQL
+database using environment variables (`PENPOT_DB_HOST`, `PENPOT_DB_USER`,
+`PENPOT_DB_PASSWORD`, `PENPOT_DB_NAME`) with sensible defaults for local
+development.
+
+## When to use
+
+- Running ad-hoc SQL queries against the Penpot database.
+- Inspecting schema, migrations, or data during development or debugging.
+
+## How to use (CLI)
+
+```bash
+# Default connection (penpot db, localhost)
+scripts/psql -c "SELECT version();"
+
+# Test database
+scripts/psql --test -c "SELECT * FROM migrations;"
+
+# Custom host/user/database
+scripts/psql --host myhost --user myuser --db mydb
+```
+
+`scripts/psql` must be invoked from the repo root so the path resolves.
+
+## Native Tool Available (opencode)
+
+A native opencode tool `penpot-psql` is available. The LLM can call it directly
+with:
+- `sql`: SQL command string to execute
+- `test`: Boolean flag to use the `penpot_test` database
+
+Example usage by the LLM:
+```
+penpot-psql(sql="SELECT version();")
+penpot-psql(sql="SELECT * FROM migrations;", test=true)
+```

.serena/memories/scripts/taiga.md

@@ -1,6 +1,6 @@
 # Taiga API client
 
-`tools/taiga.py` fetches public issues, user stories, and tasks from the
+`scripts/taiga.py` fetches public issues, user stories, and tasks from the
 Penpot Taiga project (id 345963) without authentication.
 
 ## When to use
@@ -13,16 +13,16 @@ Penpot Taiga project (id 345963) without authentication.
 
 ```bash
 # Fetch by full Taiga URL
-python3 tools/taiga.py https://tree.taiga.io/project/penpot/issue/13714
+python3 scripts/taiga.py https://tree.taiga.io/project/penpot/issue/13714
 
 # Fetch by type and ref number
-python3 tools/taiga.py issue 13714
-python3 tools/taiga.py us 14128
-python3 tools/taiga.py task 13648
+python3 scripts/taiga.py issue 13714
+python3 scripts/taiga.py us 14128
+python3 scripts/taiga.py task 13648
 
 # Output raw JSON instead of formatted summary
-python3 tools/taiga.py --json issue 13714
-python3 tools/taiga.py --json https://tree.taiga.io/project/penpot/us/14128
+python3 scripts/taiga.py --json issue 13714
+python3 scripts/taiga.py --json https://tree.taiga.io/project/penpot/us/14128
 ```
 
 ## Supported types

.serena/memories/testing.md

@@ -137,17 +137,32 @@ E2E tests should not be added unless explicitly requested.
 
 ## Execution discipline
 
-When running CLJS/JS tests (frontend, common):
+**CRITICAL: Test output handling rules**
 
+When running ANY test command (CLJS/JS or JVM):
+
+1. **NEVER pipe test output directly to `| head`, `| tail`, `| grep`, or similar filters** — this can hide failures and cause you to miss critical errors.
+2. **ALWAYS pipe to a file first, then read the file:**
+   ```bash
+   # CORRECT:
+   pnpm run test 2>&1 > /tmp/test-output.txt
+   grep -A 5 "failures" /tmp/test-output.txt
+   
+   # WRONG:
+   pnpm run test 2>&1 | tail -20
+   pnpm run test 2>&1 | grep "failures"
+   ```
+3. **Use `--focus` to narrow test scope** instead of filtering output.
+4. **Read the full output file** to understand test results completely.
+
+When running CLJS/JS tests (frontend, common):
 - **Always use `pnpm run test:quiet`** — it silently builds the test bundle then runs the test runner, giving you clean test output.
-- **Never pipe test output through `tail`, `head`, or similar filters** — doing so can silently hide test failures. Use `--focus` to narrow scope instead.
-- **If you need to filter output, tee to a temp file first:** `pnpm run test:quiet 2>&1 | tee /tmp/penpot-test-output.txt`. The full output is preserved on disk so you can `grep`/`tail`/`head` the file without re-running.
 - Use `pnpm run test` when you want to see build output alongside test results (always builds, then runs).
 - After `build:test` has been run once, you can invoke the runner directly: `node target/tests/test.js [--focus ...] [--log-level ...]`.
 
 When running JVM tests (backend, common):
 - Use `clojure -M:dev:test` directly (no pnpm wrapper).
-- The same no-piping rule applies: use `--focus` to narrow scope.
+- Same file-piping rule applies.
 
 ## Verification Checklist
 

.serena/memories/tools/paren-repair.md

@@ -1,29 +0,0 @@
-# Paren-Repair
-
-`tools/paren-repair.bb` fixes mismatched parentheses, brackets, and braces in
-Clojure/ClojureScript files, then reformats them with cljfmt.
-
-## When to use
-
-- After LLM edits introduce broken delimiters — proactively run it on files
-  you just touched.
-- When lint (clj-kondo), the Clojure compiler, or shadow-cljs report syntax
-  errors mentioning mismatched/unclosed delimiters, reader errors, or
-  unexpected EOF.
-- Before running lint/format checks — delimiter errors make linter output
-  misleading. Fix them first, then lint.
-
-## How to use
-
-```bash
-# File mode (in-place fix + format)
-bb tools/paren-repair.bb path/to/file.clj
-
-# Pipe mode (stdin → fixed code to stdout)
-echo '(def x 1' | bb tools/paren-repair.bb
-
-# Help
-bb tools/paren-repair.bb --help
-```
-
-`bb` must be invoked from the repo root so the path `tools/paren-repair.bb` resolves.

.serena/memories/tools/psql.md

@@ -1,51 +0,0 @@
-# PostgreSQL client wrapper
-
-`tools/psql` is a wrapper around the `psql` command with defaults preconfigured
-for the Penpot development environment.
-
-## When to use
-
-- Running SQL queries against the dev database (`penpot`) or test database
-  (`penpot_test`).
-- Inspecting table structures, running migrations manually, or debugging
-  database state.
-- Any time you need PostgreSQL access and want the correct host/user/password
-  without typing them each time.
-
-## How to use
-
-```bash
-# Interactive session (penpot database)
-tools/psql
-
-# Interactive session (penpot_test database)
-tools/psql --test
-
-# Inline query (penpot)
-tools/psql -c "SELECT 1"
-
-# Inline query (penpot_test)
-tools/psql --test -c "SELECT 1"
-
-# Override defaults
-tools/psql -h other-host -U other-user -d other-db
-
-# Pipe SQL from a file
-tools/psql -f some-query.sql
-```
-
-All standard `psql` flags are passed through after the wrapper's own flags.
-
-## Defaults
-
-| Setting  | Default    | Env override       |
-|----------|-----------|---------------------|
-| Host     | `postgres` | `PENPOT_DB_HOST`  |
-| User     | `penpot`   | `PENPOT_DB_USER`  |
-| Password | `penpot`   | `PENPOT_DB_PASSWORD` |
-| Database | `penpot`   | `PENPOT_DB_NAME`  |
-
-## See also
-
-`tools/db-schema` — a companion script that dumps the current DDL schema
-using `pg_dump --schema-only`, with the same defaults and `--test` flag.

.serena/memories/workflow/creating-commits.md

@@ -14,6 +14,8 @@ automatically pull the identity from the local git config `user.name` and `user.
 :emoji: Subject line (imperative, capitalized, no period, <=70 chars)
 
 Body explaining what changed and why.
+Wrap lines at 72 characters — git log and tooling
+render long lines poorly. Keep each line concise.
 
 AI-assisted-by: model-name
 ```
@@ -25,3 +27,7 @@ AI-assisted-by: model-name
 ## Commit Type Emojis
 
 `:bug:` bug fix · `:sparkles:` enhancement · `:tada:` new feature · `:recycle:` refactor · `:lipstick:` cosmetic · `:ambulance:` critical fix · `:books:` docs · `:construction:` WIP · `:boom:` breaking · `:wrench:` config · `:zap:` perf · `:whale:` docker · `:paperclip:` other · `:arrow_up:` dep upgrade · `:arrow_down:` dep downgrade · `:fire:` removal · `:globe_with_meridians:` translations · `:rocket:` epic/highlight
+
+## Referencing Issues
+
+Use `Closes #NNNN` (not `Fixes #NNNN`) to link a commit to a GitHub issue.

.serena/memories/workflow/creating-prs.md

@@ -4,10 +4,10 @@ PR only on explicit request. Branch: issue/feature-specific; fallback `<type>/<s
 
 ## Target Branch
 
-Auto-detect the base branch with `tools/detect-target-branch`:
+Auto-detect the base branch with `scripts/detect-target-branch`:
 
 ```bash
-TARGET=$(tools/detect-target-branch)
+TARGET=$(scripts/detect-target-branch)
 ```
 
 This outputs `staging` or `develop` by walking the local commit graph (pure local, no remote/network). Do not ask the user for the target branch unless the tool fails.
@@ -30,7 +30,7 @@ See `mem:workflow/creating-commits` for emoji codes. Squash merge uses the PR ti
 
 Include concise sections covering:
 - what changed and why;
-- related GitHub issues or Taiga stories (`Fixes #NNNN`, `Relates to #NNNN`, `Taiga #NNNN`);
+- related GitHub issues or Taiga stories (`Closes #NNNN`, `Relates to #NNNN`, `Taiga #NNNN`);
 - screenshots or recordings for UI-visible changes;
 - testing performed and residual risk;
 - breaking changes or migration notes, if any.
@@ -42,15 +42,15 @@ PR descriptions follow this structure:
 
 ## What
 
-<one paragraph: the problem or feature, user-facing impact>
+<the problem or feature and its user-facing impact — short bullet items where there is more than one point>
 
 ## Why
 
-<root cause or motivation, why this change was necessary>
+<root cause or motivation — a short paragraph or bullets>
 
 ## How
 
-<high-level approach, key technical decisions>
+<high-level approach and key decisions — bullet items, grouped by area (bold lead-ins) for larger PRs>
 ```
 
 The "Note:" line is required at the top. Adjust if this is a manual (non-AI) PR.
@@ -59,6 +59,8 @@ The "Note:" line is required at the top. Adjust if this is a manual (non-AI) PR.
 
 - **Write for humans.** The diff shows what changed. The description explains why.
 - **Be concise.** Focus on reasoning: What was the problem? Why did it happen? How did you solve it?
+- **Prefer bullets over paragraphs.** Short bullet items, grouped by area with bold lead-ins where helpful, are far easier to digest than prose; keep any remaining paragraph to a few sentences.
+- **No manual line wraps.** Markdown renders adapting to the viewport; hard-wrapped lines degrade rendering. One line per paragraph or bullet, however long.
 - **Skip the obvious.** Don't explain what `git diff` already shows.
 
 ### What NOT to Include
@@ -83,7 +85,7 @@ cat > /tmp/pr-body.md << 'PR_BODY'
 <body content here>
 PR_BODY
 
-TARGET=$(tools/detect-target-branch)
+TARGET=$(scripts/detect-target-branch)
 
 gh pr create \
   --repo penpot/penpot \

.serena/project.yml

@@ -1,26 +1,31 @@
-# the name by which the project can be referenced within Serena
+# the name by which the project can be referenced within Serena/when chatting with the LLM.
 project_name: "penpot"
 
-
-# list of languages for which language servers are started; choose from:
-#   al                  ansible             bash                clojure             cpp
-#   cpp_ccls            crystal             csharp              csharp_omnisharp    dart
-#   elixir              elm                 erlang              fortran             fsharp
+# list of languages for which language servers are started (LSP backend only); choose from:
+#   ada                 al                  angular             ansible             bash
+#   bsl                 clojure             cpp                 cpp_ccls            crystal
+#   csharp              csharp_omnisharp    cue                 dart                elixir
+#   elm                 erlang              fortran             fsharp              gdscript
 #   go                  groovy              haskell             haxe                hlsl
-#   java                json                julia               kotlin              lean4
-#   lua                 luau                markdown            matlab              msl
-#   nix                 ocaml               pascal              perl                php
-#   php_phpactor        powershell          python              python_jedi         python_ty
-#   r                   rego                ruby                ruby_solargraph     rust
-#   scala               solidity            swift               systemverilog       terraform
-#   toml                typescript          typescript_vts      vue                 yaml
-#   zig
-#   (This list may be outdated. For the current list, see values of Language enum here:
-#   https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
-#   For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
+#   html                java                json                julia               kotlin
+#   latex               lean4               lua                 luau                markdown
+#   matlab              msl                 nix                 ocaml               pascal
+#   perl                php                 php_phpactor        php_phpantom        powershell
+#   python              python_jedi         python_pyrefly      python_ty           r
+#   rego                ruby                ruby_solargraph     rust                scala
+#   scss                solidity            svelte              swift               systemverilog
+#   terraform           toml                typescript          typescript_vts      vue
+#   yaml                zig
+#   (This list may be outdated; generated with scripts/print_language_list.py;
+#   For the current list, see values of Language enum here:
+#   https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py)
+# For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
 # Note:
 #   - For C, use cpp
 #   - For JavaScript, use typescript
+#   - For Angular projects, use angular (subsumes typescript+html; requires `npm install` in the project root)
+#   - For Svelte projects, use svelte (subsumes typescript/javascript for .svelte projects; requires npm)
+#   - For SCSS / Sass / plain CSS, use scss (some-sass-language-server handles all three)
 #   - For Free Pascal/Lazarus, use pascal
 # Special requirements:
 #   Some languages require additional setup/installations.
@@ -54,12 +59,19 @@ ignore_all_files_in_gitignore: true
 
 # advanced configuration option allowing to configure language server-specific options.
 # Maps the language key to the options.
-# Have a look at the docstring of the constructors of the LS implementations within solidlsp (e.g., for C# or PHP) to see which options are available.
-# No documentation on options means no options are available.
+# The settings are considered only if the project is trusted (see global configuration to define trusted projects).
+# See https://oraios.github.io/serena/02-usage/050_configuration.html#language-server-specific-settings
 ls_specific_settings: {}
 
 # list of additional paths to ignore in this project.
 # Same syntax as gitignore, so you can use * and **.
+# Important: quote patterns that start with `*`, otherwise YAML treats them as aliases.
+# Example:
+#   ignored_paths:
+#     - "examples/**"
+#     - ".worktrees/**"
+#     - "**/bin/**"
+#     - "**/obj/**"
 # Note: global ignored_paths from serena_config.yml are also applied additively.
 ignored_paths: []
 
@@ -130,13 +142,38 @@ ignored_memory_patterns: []
 # See https://oraios.github.io/serena/02-usage/050_configuration.html#modes
 added_modes:
 
-# list of additional workspace folder paths for cross-package reference support (e.g. in monorepos).
+# list of additional workspace folder paths for cross-package reference support.
 # Paths can be absolute or relative to the project root.
 # Each folder is registered as an LSP workspace folder, enabling language servers to discover
-# symbols and references across package boundaries.
-# Currently supported for: TypeScript.
+# symbols and references across package boundaries, but these folders are not indexed by Serena,
+# i.e. the respective symbols will not be found using Serena's symbol search tools.
 # Example:
 #   additional_workspace_folders:
 #     - ../sibling-package
 #     - ../shared-lib
-additional_workspace_folders: []
+ls_additional_workspace_folders: []
+
+# list of workspace folder paths (LSP backend only).
+# These folders will be used to build up Serena's symbol index.
+# Paths must be within the project root and should thus be relative to the project root.
+# Furthermore, the paths should not be filtered by ignore settings.
+# Default setting: The entire project root folder (".") is considered.
+# In (large) monorepos, this can be used to index only subfolders of the project root, e.g.
+#   ls_workspace_folders:
+#     - "./subproject1"
+#     - "./subproject2"
+ls_workspace_folders:
+- .
+
+# optional shell command to run before the language backend (LSP or JetBrains) is initialised.
+# the command runs in the project root directory and is only executed if the project is trusted
+# (see trusted_project_path_patterns in the global configuration).
+# serena waits for the command to exit: a non-zero exit code is logged as an error but does not
+# abort activation. a per-project timeout (activation_command_timeout, default 180s) is the safety
+# backstop for non-terminating commands; on expiry the process is killed and activation continues.
+# example: activation_command: "npx nx run-many -t build"
+activation_command:
+
+# maximum time in seconds to wait for activation_command to complete before killing it (default 180s).
+# must be a positive number.
+activation_command_timeout: 180.0

AGENTS.md

@@ -1,6 +1,6 @@
 # AI AGENT GUIDE
 
-## Hard rules (always apply — no exceptions)
+## HARD RULES (always apply — no exceptions)
 
 - **Never `git push`, force-push, or modify `git origin`** (or any other remote).
   The user pushes from their own shell. If a push is required to surface the
@@ -8,6 +8,9 @@
   wait for the user to push. Do not change the remote URL, do not switch SSH↔HTTPS.
 - **Never amend a commit that has been pushed** unless the user explicitly asks.
   If the user pushes, treat that commit as final from the agent's side.
+- **Never pipe test output directly to filters** (`| head`, `| tail`, `| grep`, etc.).
+  Always redirect to a file first: `command > /tmp/output.txt 2>&1`, then read/grep the file.
+  This prevents hiding test failures. See `mem:testing` for details.
 - **Read the workflow memory BEFORE the corresponding action**:
   - Before `git commit` → `mem:workflow/creating-commits` (commit format, AI-assisted-by trailer)
   - Before `gh issue create` → `mem:workflow/creating-issues` (title derivation, body template, Issue Type)
@@ -92,3 +95,22 @@ precision while maintaining a strong focus on maintainability and performance.
    down into atomic steps.
 2. Be concise and autonomous.
 3. Do **not** touch unrelated modules unless the task explicitly requires it.
+
+---
+
+# Available Scripts & Tools
+
+## Native opencode Tools (callable directly by the LLM)
+
+- `paren-repair` — Fix mismatched delimiters + reformat Clojure files. Example: `paren-repair(files="src/foo.clj, src/bar.cljs")`
+- `penpot-psql` — Execute SQL against the Penpot database. Example: `penpot-psql(sql="SELECT version();")`
+
+## Scripts (from repo root via `scripts/<name>`)
+
+- `scripts/paren-repair` — Fix mismatched delimiters in Clojure/CLJS files + reformat with cljfmt. See `mem:scripts/paren-repair`.
+- `scripts/psql` — Connect to the Penpot PostgreSQL database (wraps `psql` with env-var defaults). See `mem:scripts/psql`.
+- `scripts/nrepl-eval.mjs` — Evaluate Clojure code via nREPL (backend + frontend).
+- `scripts/check-commit` — Validate commit messages against Penpot's commit guidelines.
+- `scripts/check-fmt-clj` — Check Clojure formatting without modifying files.
+- `scripts/ci` — CI orchestration script for running lint, tests, and format checks across modules. See `scripts/ci --help`.
+

CHANGES.md

@@ -1,5 +1,40 @@
 # CHANGELOG
 
+## 2.18.0 (Unreleased)
+
+### :bug: Bugs fixed
+
+- Fix MCP integration hanging when the Penpot tab is backgrounded or frozen by the browser [#10323](https://github.com/penpot/penpot/issues/10323) (PR: [#10392](https://github.com/penpot/penpot/pull/10392))
+- Fix synced component copy not reflowing children after spacing token update [#9892](https://github.com/penpot/penpot/issues/9892)
+- Fix spacebar activating pan mode while typing a comment (by @Krishcode264) [#10285](https://github.com/penpot/penpot/issues/10285) (PR: [#10287](https://github.com/penpot/penpot/pull/10287))
+- Fix plugin API rejecting negative letterSpacing values (by @filipsajdak) [#9780](https://github.com/penpot/penpot/issues/9780) (PR: [#10257](https://github.com/penpot/penpot/pull/10257))
+- Fix plugin API addTheme calls failing with the signature shown in the high-level overview [#10074](https://github.com/penpot/penpot/issues/10074) (PR: [#10359](https://github.com/penpot/penpot/pull/10359))
+- Fix empty text shape not being deleted on editor exit [#10540](https://github.com/penpot/penpot/issues/10540) (PR: [#10541](https://github.com/penpot/penpot/pull/10541))
+- Fix broken token pills showing wrong default state when not selected [#10524](https://github.com/penpot/penpot/issues/10524) (PR: [#10535](https://github.com/penpot/penpot/pull/10535))
+- Replace hyphens with bullets in subscription benefits list [#10547](https://github.com/penpot/penpot/issues/10547) (PR: [#10523](https://github.com/penpot/penpot/pull/10523))
+- Fix Chinese (zh-CN) translation showing wrong label for Intersection in board path menu (by @sawirricardo) [#10346](https://github.com/penpot/penpot/issues/10346) (PR: [#10381](https://github.com/penpot/penpot/pull/10381))
+
+### :sparkles: New features & Enhancements
+
+- Group toolbar drawing tools into shape and free-draw flyouts [#9316](https://github.com/penpot/penpot/issues/9316) (PR: [#9480](https://github.com/penpot/penpot/pull/9480), [#10354](https://github.com/penpot/penpot/pull/10354))
+- Add outline stroke to Paths [#9961](https://github.com/penpot/penpot/issues/9961) (PR: [#8677](https://github.com/penpot/penpot/pull/8677))
+- Make throwValidationErrors default to true for v2 manifest plugins [#10401](https://github.com/penpot/penpot/issues/10401) (PR: [#10433](https://github.com/penpot/penpot/pull/10433))
+- Add dedicated Line and Arrow drawing tools (by @davidv399) [#9145](https://github.com/penpot/penpot/issues/9145) (PR: [#9146](https://github.com/penpot/penpot/pull/9146))
+- Refactor wasm rulers and UI state [#10116](https://github.com/penpot/penpot/issues/10116) (PR: [#10461](https://github.com/penpot/penpot/pull/10461))
+- Improve team invitations modal in the dashboard [#10484](https://github.com/penpot/penpot/issues/10484) (PR: [#10459](https://github.com/penpot/penpot/pull/10459))
+
+
+## 2.17.1 (Unreleased)
+
+### :bug: Bugs fixed
+
+- Fix malformed get-font-variants request when team-id is missing from dashboard URL [#10644](https://github.com/penpot/penpot/issues/10644) (PR: [#10645](https://github.com/penpot/penpot/pull/10645))
+- Fix malformed get-profiles-for-file-comments request when file-id is missing from workspace URL [#10652](https://github.com/penpot/penpot/issues/10652) (PR: [#10655](https://github.com/penpot/penpot/pull/10655))
+- Fix workspace crash when holding an arrow key on a selection due to excessive re-renders [#10726](https://github.com/penpot/penpot/issues/10726) (PR: [#10736](https://github.com/penpot/penpot/pull/10736))
+- Fix asset download failing with S3 auth conflict when using access token [#10776](https://github.com/penpot/penpot/issues/10776) (PR: [#10777](https://github.com/penpot/penpot/pull/10777))
+- Fix internal error when dragging inner layout with Boolean operations [#10647](https://github.com/penpot/penpot/issues/10647) (PR: [#10778](https://github.com/penpot/penpot/pull/10778))
+- Fix viewer crash with WASM panic when opening URL with page-id [#10800](https://github.com/penpot/penpot/issues/10800) (PR: [#10805](https://github.com/penpot/penpot/pull/10805))
+
 ## 2.17.0
 
 ### :rocket: Epics and highlights
@@ -36,49 +71,28 @@
 - Render guides in WebGL [#10068](https://github.com/penpot/penpot/issues/10068) (PR: [#10014](https://github.com/penpot/penpot/pull/10014))
 - Add configurable resource limits to ImageMagick image processing [#10223](https://github.com/penpot/penpot/issues/10223) (PR: [#10240](https://github.com/penpot/penpot/pull/10240))
 - Add resource limits to font processing child processes [#10234](https://github.com/penpot/penpot/issues/10234) (PR: [#10274](https://github.com/penpot/penpot/pull/10274))
-- Add color variants and positioning to selection size badge (by @bittoby) [#10258](https://github.com/penpot/penpot/issues/10258) (PR: [#9210](https://github.com/penpot/penpot/pull/9210))
+- Add color variants and positioning to selection size badge [#10258](https://github.com/penpot/penpot/issues/10258) (PR: [#9210](https://github.com/penpot/penpot/pull/9210))
 - Use hard reload for render engine switching in the workspace menu [#10441](https://github.com/penpot/penpot/issues/10441) (PR: [#10444](https://github.com/penpot/penpot/pull/10444))
 - Rotate size badge when shape is rotated [#10386](https://github.com/penpot/penpot/issues/10386) (PR: [#10393](https://github.com/penpot/penpot/pull/10393))
 - Add separate internal URI for exporter to handle Docker deployments where internal and public URIs differ [#10627](https://github.com/penpot/penpot/issues/10627) (PR: [#10630](https://github.com/penpot/penpot/pull/10630))
 
 ### :bug: Bugs fixed
 
-- Fix LDAP provider params schema typo (`bind-passwor` → `bind-password`) introduced during the `clojure.spec` → `malli` migration; the schema slot now matches the runtime key actually read by `prepare-params` (`:password (:bind-password cfg)`) and `try-connectivity` (`(:bind-password cfg)`), so a wrong type for the password no longer slips through unvalidated
-- Fix `login-with-ldap` silently dropping its error message on the `ldap-not-initialized` restriction (typo `:hide` → `:hint`); the message `"ldap auth provider is not initialized"` now actually surfaces in logs and error responses instead of being discarded into an unread key
-- Fix `get-view-only-bundle` crashing when a share-link viewer encounters a team member whose email lacks `@` (NullPointerException in `obfuscate-email`) or whose domain has no `.` (previously produced a dangling-dot `****@****.`); now the viewer-side obfuscation is nil-safe and omits the trailing dot when the domain has no TLD
-- Fix Copy as SVG: emit a single valid SVG document when multiple shapes are selected, and publish `image/svg+xml` to the clipboard so the paste target works in Inkscape and other SVG-native tools [Github #838](https://github.com/penpot/penpot/issues/838)
-- Add export panel to inspect styles tab [Taiga #13582](https://tree.taiga.io/project/penpot/issue/13582)
-- Fix styles between grid layout inputs [Taiga #13526](https://tree.taiga.io/project/penpot/issue/13526)
-- Fix id prop on switch component [Taiga #13534](https://tree.taiga.io/project/penpot/issue/13534)
-- Update copy on penpot update message [Taiga #12924](https://tree.taiga.io/project/penpot/issue/12924)
-- Fix scroll on library modal [Taiga #13639](https://tree.taiga.io/project/penpot/issue/13639)
-- Fix dates to avoid show them in english when browser is in auto [Taiga #13786](https://tree.taiga.io/project/penpot/issue/13786)
-- Fix focus radio button [Taiga #13841](https://tree.taiga.io/project/penpot/issue/13841)
-- Token tree should be expanded by default [Taiga #13631](https://tree.taiga.io/project/penpot/issue/13631)
-- Fix opacity incorrectly disabled for visible shapes [Taiga #13906](https://tree.taiga.io/project/penpot/issue/13906)
-- Update onboarding image [Taiga #13864](https://tree.taiga.io/project/penpot/issue/13864)
-- Fix plugin modal drag interactions over iframe and close-button behavior (by @marekhrabe) [Github #8871](https://github.com/penpot/penpot/pull/8871)
-- Fix hot update on color-row on texts [Taiga #13923](https://tree.taiga.io/project/penpot/issue/13923)
-- Fix selected color tokens [Taiga #13930](https://tree.taiga.io/project/penpot/issue/13930)
-- Display resolved values of inactive tokens [Taiga #13628](https://tree.taiga.io/project/penpot/issue/13628)
-- Fix app crash when selecting shapes with one hidden [Taiga #13959](https://tree.taiga.io/project/penpot/issue/13959)
-- Fix opacity mixed value [Taiga #13960](https://tree.taiga.io/project/penpot/issue/13960)
-- Fix gap input throwing an error [Github #8984](https://github.com/penpot/penpot/pull/8984)
-- Fix copy to be more specific [Taiga #13990](https://tree.taiga.io/project/penpot/issue/13990)
-- Fix colorpicker layout so the eyedropper button is visible again [Taiga #14057](https://tree.taiga.io/project/penpot/issue/14057)
+- Fix Plugin API variant creation failing due to undocumented multi-step workflow [#10075](https://github.com/penpot/penpot/issues/10075) (PR: [#10149](https://github.com/penpot/penpot/pull/10149))
+- Fix workspace crash when editing text shapes with degenerate selrect [#10617](https://github.com/penpot/penpot/issues/10617) (PR: [#10618](https://github.com/penpot/penpot/pull/10618))
 - Fix SVG stroke line join not applied when pasting strokes [#4836](https://github.com/penpot/penpot/issues/4836) (PR: [#9982](https://github.com/penpot/penpot/pull/9982), [#10019](https://github.com/penpot/penpot/pull/10019))
-- Fix blend-mode hover preview on canvas not reverted when dismissing dropdown (by @jack-stormentswe) [#9235](https://github.com/penpot/penpot/issues/9235) (PR: [#9237](https://github.com/penpot/penpot/pull/9237))
+- Fix blend-mode hover preview on canvas not reverted when dismissing dropdown (by @davidv399) [#9235](https://github.com/penpot/penpot/issues/9235) (PR: [#9237](https://github.com/penpot/penpot/pull/9237))
 - Fix View Mode mouse-leave and click in combination not working [#4855](https://github.com/penpot/penpot/issues/4855) (PR: [#9991](https://github.com/penpot/penpot/pull/9991))
 - Fix Storybook UI missing scrollbar (by @MilosM348) [#6049](https://github.com/penpot/penpot/issues/6049) (PR: [#9319](https://github.com/penpot/penpot/pull/9319))
 - Fix font selector missing intermediate font weights for Source Sans Pro and similar fonts (by @dhgoal) [#7378](https://github.com/penpot/penpot/issues/7378) (PR: [#9247](https://github.com/penpot/penpot/pull/9247))
-- Fix plugin API `typography.remove()` passing wrong parameter format (by @leonaIee) [#8223](https://github.com/penpot/penpot/issues/8223) (PR: [#9279](https://github.com/penpot/penpot/pull/9279))
+- Fix plugin API `typography.remove()` passing wrong parameter format (by @peter-rango) [#8223](https://github.com/penpot/penpot/issues/8223) (PR: [#9279](https://github.com/penpot/penpot/pull/9279))
 - Fix plugin API fills and strokes array elements being read-only (by @RenzoMXD) [#8357](https://github.com/penpot/penpot/issues/8357) (PR: [#9161](https://github.com/penpot/penpot/pull/9161))
 - Fix "Show Guides" shortcut not working on German keyboards (by @RenzoMXD) [#8423](https://github.com/penpot/penpot/issues/8423) (PR: [#9209](https://github.com/penpot/penpot/pull/9209))
 - Fix token validation failing when a malformed token exists in the Component category [#9010](https://github.com/penpot/penpot/issues/9010) (PR: [#9025](https://github.com/penpot/penpot/pull/9025), [#9825](https://github.com/penpot/penpot/pull/9825))
 - Fix Docker frontend image missing CSS reference (by @NativeTeachingAidsB) [#9135](https://github.com/penpot/penpot/issues/9135) (PR: [#9840](https://github.com/penpot/penpot/pull/9840))
 - Fix MCP media upload error and SVG data URI image parsing (by @claytonlin1110) [#9164](https://github.com/penpot/penpot/issues/9164) (PR: [#9201](https://github.com/penpot/penpot/pull/9201))
-- Fix lost-update race on team features during concurrent file creation (by @JPette1783) [#9197](https://github.com/penpot/penpot/issues/9197) (PR: [#9198](https://github.com/penpot/penpot/pull/9198))
-- Fix get-profile RPC method silently masking DB errors as "Anonymous User" (by @jack-stormentswe) [#9253](https://github.com/penpot/penpot/issues/9253) (PR: [#9254](https://github.com/penpot/penpot/pull/9254))
+- Fix lost-update race on team features during concurrent file creation (by @Lobster-0429) [#9197](https://github.com/penpot/penpot/issues/9197) (PR: [#9198](https://github.com/penpot/penpot/pull/9198))
+- Fix get-profile RPC method silently masking DB errors as "Anonymous User" (by @davidv399) [#9253](https://github.com/penpot/penpot/issues/9253) (PR: [#9254](https://github.com/penpot/penpot/pull/9254))
 - Fix crash when creating or editing tokens named "white" or "black" [#9256](https://github.com/penpot/penpot/issues/9256) (PR: [#9034](https://github.com/penpot/penpot/pull/9034))
 - Fix conditional use-ctx hook violation in shape-wrapper (by @Dexterity104) [#9280](https://github.com/penpot/penpot/issues/9280) (PR: [#9281](https://github.com/penpot/penpot/pull/9281))
 - Make ShapeImageIds byte conversion fallible to prevent panics (by @Dexterity104) [#9282](https://github.com/penpot/penpot/issues/9282) (PR: [#9283](https://github.com/penpot/penpot/pull/9283))
@@ -165,6 +179,9 @@
 - Fix Plugin API validation error when listing shared plugin data keys [#10628](https://github.com/penpot/penpot/issues/10628) (PR: [#10632](https://github.com/penpot/penpot/pull/10632))
 - Fix Plugin API silently dropping plugin data written to shared library [#10629](https://github.com/penpot/penpot/issues/10629) (PR: [#10632](https://github.com/penpot/penpot/pull/10632))
 - Fix workspace crash when event target is a DOM text node [#10640](https://github.com/penpot/penpot/issues/10640) (PR: [#10641](https://github.com/penpot/penpot/pull/10641))
+- Fix text shape position-data to include required fills in WASM and DOM calculation paths [#10646](https://github.com/penpot/penpot/issues/10646) (PR: [#10650](https://github.com/penpot/penpot/pull/10650))
+- Log expired OIDC tokens as auth failures instead of server errors [#10635](https://github.com/penpot/penpot/issues/10635) (PR: [#10636](https://github.com/penpot/penpot/pull/10636))
+- Return 400 instead of 500 when ImageMagick rejects invalid uploaded images [#10642](https://github.com/penpot/penpot/issues/10642) (PR: [#10643](https://github.com/penpot/penpot/pull/10643))
 
 ## 2.16.2
 

CONTRIBUTING.md

@@ -14,9 +14,9 @@ Center](https://help.penpot.app/).
 - [Reporting Bugs](#reporting-bugs)
 - [Pull Requests](#pull-requests)
   - [Workflow](#workflow)
-  - [Title format](#title-format)
-  - [Description](#description)
-  - [Branch naming](#branch-naming)
+  - [Format](#format)
+    - [Title format](#title-format)
+    - [Description](#description)
   - [Review process](#review-process)
   - [What we won't accept](#what-we-wont-accept)
   - [Good first issues](#good-first-issues)
@@ -73,35 +73,23 @@ Advisories](https://github.com/penpot/penpot/security/advisories)
 4. **Format and lint** — run the checks described in
    [Formatting and Linting](#formatting-and-linting) before submitting.
 
-### Title format
+### Format
+
+#### Title
+
+> **IMPORTANT:** When a PR is squash-merged, the PR title becomes the
+> commit message on the main branch. Getting the title right matters.
 
 Pull request titles **must** follow the same convention as commit subjects:
 
 ```
-:emoji: <subject>
+:emoji: Subject line (imperative, capitalized, no period, <=70 chars)
 ```
 
-- Use the **imperative mood** (e.g. "Fix", not "Fixed").
-- Capitalize the first letter of the subject.
-- Do not end the subject with a period.
-- Keep the subject to **70 characters** or fewer.
-- Use one of the [commit type emojis](#commit-types) listed below.
+Read [Creating Commits](./.serena/memories/workflow/creating-commits.md)
+for more concrete information.
 
-When a PR contains multiple unrelated commits, choose the emoji that
-best represents the dominant change.
-
-**Examples:**
-
-```
-:bug: Fix unexpected error on launching modal
-:sparkles: Enable new modal for profile
-:zap: Improve performance of dashboard navigation
-```
-
-> **Note:** When a PR is squash-merged, the PR title becomes the
-> commit message on the main branch. Getting the title right matters.
-
-### Description
+#### Description
 
 Every pull request should include a description that helps reviewers
 understand the change quickly:
@@ -114,24 +102,8 @@ understand the change quickly:
 5. **Breaking changes** — call out anything that affects existing users
    or requires migration steps.
 
-### Branch naming
-
-Use a descriptive branch name that reflects the type and scope of the
-change:
-
-```
-<type>/<short-description>
-```
-
-Types: `fix`, `feat`, `refactor`, `docs`, `chore`, `perf`.
-
-Optionally include the issue number:
-
-```
-fix/9122-email-blacklisting
-feat/export-webp
-refactor/layout-sizing
-```
+Read [Creating PRs](./.serena/memories/workflow/creating-prs.md)
+for more concrete information.
 
 ### Review process
 
@@ -151,10 +123,10 @@ refactor/layout-sizing
 To save time on both sides, please avoid submitting PRs that:
 
 - Introduce new dependencies without prior discussion.
-- Change the build system or CI configuration without maintainer
-  approval.
-- Mix unrelated changes in a single PR — keep PRs focused on one
-  concern.
+- Change the build system or CI configuration without maintainer approval.
+- Mix unrelated changes in a single PR — keep PRs focused on one concern.
+- Submit AI-generated code without human review.
+- Skip local syntax and formatting checks before submitting.
 - Skip the [discussion step](#workflow) for non-bug-fix changes.
 
 ### Good first issues
@@ -217,36 +189,8 @@ Commit messages must follow this format:
 
 ## Formatting and Linting
 
-We use [cljfmt](https://github.com/weavejester/cljfmt) for formatting and
-[clj-kondo](https://github.com/clj-kondo/clj-kondo) for linting.
-
-```bash
-# Check formatting (does not modify files)
-./scripts/check-fmt
-
-# Fix formatting (modifies files in place)
-./scripts/fmt
-
-# Lint
-./scripts/lint
-```
-
-For frontend SCSS, we use `stylelint` for linting and
-`Prettier` for formatting:
-
-```bash
-cd frontend
-
-# Lint SCSS
-pnpm run lint:scss (does not modify files)
-
-# Fix SCSS formatting (modifies files in place)
-pnpm run fmt:scss
-```
-
-Ideally, run these as git pre-commit hooks.
-[Husky](https://typicode.github.io/husky/#/) is a convenient option for
-setting this up.
+Each module has its own linting and formatting commands — see the relevant one on the
+[Serena Memories](./.serena/memories/)
 
 ## Changelog
 

backend/deps.edn

@@ -6,7 +6,7 @@
   org.clojure/clojure {:mvn/version "1.12.5"}
   org.clojure/tools.namespace {:mvn/version "1.5.1"}
 
-  com.github.luben/zstd-jni {:mvn/version "1.5.7-11"}
+  com.github.luben/zstd-jni {:mvn/version "1.5.7-12"}
 
   io.prometheus/simpleclient {:mvn/version "0.16.0"}
   io.prometheus/simpleclient_hotspot {:mvn/version "0.16.0"}
@@ -34,27 +34,28 @@
    :exclusions [org.slf4j/slf4j-api]}
 
   com.github.seancorfield/next.jdbc
-  {:mvn/version "1.3.1108"}
+  {:mvn/version "1.3.1118"}
 
   metosin/reitit-core {:mvn/version "0.10.1"}
   nrepl/nrepl {:mvn/version "1.7.0"}
 
-  org.postgresql/postgresql {:mvn/version "42.7.12"}
-  org.xerial/sqlite-jdbc {:mvn/version "3.53.2.0"}
+  org.postgresql/postgresql {:mvn/version "42.7.13"}
+  org.xerial/sqlite-jdbc {:mvn/version "3.53.2.1"}
 
-  com.zaxxer/HikariCP {:mvn/version "7.0.2"}
+  com.zaxxer/HikariCP {:mvn/version "7.1.0"}
 
   io.whitfin/siphash {:mvn/version "2.0.0"}
 
   buddy/buddy-hashers {:mvn/version "2.0.167"}
   buddy/buddy-sign {:mvn/version "3.6.1-359"}
+  org.passay/passay {:mvn/version "1.6.6"}
 
   com.github.ben-manes.caffeine/caffeine {:mvn/version "3.2.4"}
 
-  org.jsoup/jsoup {:mvn/version "1.22.2"}
+  org.jsoup/jsoup {:mvn/version "1.23.1"}
 
   at.yawk.lz4/lz4-java
-  {:mvn/version "1.11.0"}
+  {:mvn/version "1.11.1"}
 
   org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"}
 
@@ -63,8 +64,8 @@
 
   ;; Pretty Print specs
   pretty-spec/pretty-spec {:mvn/version "0.1.4"}
-  software.amazon.awssdk/s3 {:mvn/version "2.46.18"}
-  software.amazon.awssdk/sts {:mvn/version "2.46.18"}}
+  software.amazon.awssdk/s3 {:mvn/version "2.50.1"}
+  software.amazon.awssdk/sts {:mvn/version "2.50.1"}}
 
  :paths ["src" "resources" "target/classes"]
  :aliases

backend/dev/user.clj

@@ -104,24 +104,20 @@
   []
   (try
     (main/start)
-    :started
     (catch Throwable cause
       (ex/print-throwable cause))))
 
 (defn- stop
   []
-  (main/stop)
-  :stopped)
+  (main/stop))
 
 (defn restart
   []
-  (stop)
-  (repl/refresh :after 'user/start))
+  (main/restart))
 
 (defn restart-all
   []
-  (stop)
-  (repl/refresh-all :after 'user/start))
+  (main/restart-all))
 
 ;; (defn compression-bench
 ;;   [data]

backend/package.json

@@ -4,23 +4,25 @@
   "license": "MPL-2.0",
   "author": "Kaleidos INC Sucursal en España SL",
   "private": true,
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b",
+  "packageManager": "pnpm@11.20.0+sha512.9a6f330a95b66446ea088faf1521405a8a01f07fde7124cc9958dfed52d4bb436737e65b08f85f37b46fcba375092558ac51262b816844b22f63406ed166bfee",
   "repository": {
     "type": "git",
     "url": "https://github.com/penpot/penpot"
   },
   "dependencies": {
-    "luxon": "^3.4.4",
-    "sax": "^1.6.0"
+    "eventsource-parser": "^3.0.6",
+    "luxon": "^3.7.2",
+    "sax": "^1.6.1"
   },
   "devDependencies": {
     "nodemon": "^3.1.14",
     "source-map-support": "^0.5.21",
-    "ws": "^8.21.0"
+    "ws": "^8.21.1"
   },
   "scripts": {
-    "lint": "clj-kondo --parallel --lint ../common/src src/",
-    "check-fmt": "cljfmt check --parallel=true src/ test/",
-    "fmt": "cljfmt fix --parallel=true src/ test/"
+    "lint:clj": "clj-kondo --config-dir ../.clj-kondo --lint ../common/src src/",
+    "check-fmt:clj": "cljfmt check --parallel=true src/ test/",
+    "fmt:clj": "cljfmt fix --parallel=true src/ test/",
+    "test:e2e": "node --test --test-concurrency=1 test/e2e/*.test.mjs"
   }
 }

backend/pnpm-lock.yaml

@@ -8,12 +8,15 @@ importers:
 
   .:
     dependencies:
+      eventsource-parser:
+        specifier: ^3.0.6
+        version: 3.1.0
       luxon:
-        specifier: ^3.4.4
+        specifier: ^3.7.2
         version: 3.7.2
       sax:
-        specifier: ^1.6.0
-        version: 1.6.0
+        specifier: ^1.6.1
+        version: 1.6.1
     devDependencies:
       nodemon:
         specifier: ^3.1.14
@@ -22,8 +25,8 @@ importers:
         specifier: ^0.5.21
         version: 0.5.21
       ws:
-        specifier: ^8.21.0
-        version: 8.21.0
+        specifier: ^8.21.1
+        version: 8.21.1
 
 packages:
 
@@ -39,9 +42,9 @@ packages:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
-  brace-expansion@5.0.7:
-    resolution: {integrity: sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==}
-    engines: {node: 18 || 20 || >=22}
+  brace-expansion@5.0.9:
+    resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}
+    engines: {node: 20 || >=22}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -63,6 +66,10 @@ packages:
       supports-color:
         optional: true
 
+  eventsource-parser@3.1.0:
+    resolution: {integrity: sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg==}
+    engines: {node: '>=18.0.0'}
+
   fill-range@7.1.1:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
@@ -130,8 +137,8 @@ packages:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
 
-  sax@1.6.0:
-    resolution: {integrity: sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==}
+  sax@1.6.1:
+    resolution: {integrity: sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==}
     engines: {node: '>=11.0.0'}
 
   semver@7.8.5:
@@ -165,8 +172,8 @@ packages:
   undefsafe@2.0.5:
     resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
 
-  ws@8.21.0:
-    resolution: {integrity: sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==}
+  ws@8.21.1:
+    resolution: {integrity: sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
       bufferutil: ^4.0.1
@@ -188,7 +195,7 @@ snapshots:
 
   binary-extensions@2.3.0: {}
 
-  brace-expansion@5.0.7:
+  brace-expansion@5.0.9:
     dependencies:
       balanced-match: 4.0.4
 
@@ -216,6 +223,8 @@ snapshots:
     optionalDependencies:
       supports-color: 5.5.0
 
+  eventsource-parser@3.1.0: {}
+
   fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
@@ -247,7 +256,7 @@ snapshots:
 
   minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.7
+      brace-expansion: 5.0.9
 
   ms@2.1.3: {}
 
@@ -274,7 +283,7 @@ snapshots:
     dependencies:
       picomatch: 2.3.2
 
-  sax@1.6.0: {}
+  sax@1.6.1: {}
 
   semver@7.8.5: {}
 
@@ -301,4 +310,4 @@ snapshots:
 
   undefsafe@2.0.5: {}
 
-  ws@8.21.0: {}
+  ws@8.21.1: {}

backend/pnpm-workspace.yaml

@@ -0,0 +1,2 @@
+minimumReleaseAgeExclude:
+  - brace-expansion@5.0.8 || 5.0.9

backend/resources/app/email/invite-to-org/en.txt

@@ -1,10 +0,0 @@
-Hello!
-
-{{invited-by|abbreviate:25}} has invited you to join the organization “{{ organization.name|abbreviate:25 }}”.
-
-Accept invitation using this link:
-
-{{ public-uri }}/#/auth/verify-token?token={{token}}
-
-Enjoy!
-The Penpot team.

backend/resources/app/email/invite-to-organization/en.html

@@ -195,21 +195,45 @@
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                       <div
                         style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="20" height="20" style="display:inline-block;vertical-align:middle;">
+                        <table role="presentation" cellpadding="0" cellspacing="0" border="0" width="20" height="20"
+                          style="display:inline-block;vertical-align:middle;">
                           <tr>
                             <td width="20" height="20" align="center" valign="middle"
-                                background="{% if organization.logo %}{{organization.logo}}{% else %}{{organization.avatar-bg-url}}{% endif %}"
-                                style="width:20px;height:20px;text-align:center;font-weight:bold;font-size:9px;line-height:20px;color:#ffffff;background-size:cover;background-position:center;background-repeat:no-repeat;border-radius: 50%;color:black">
+                              background="{% if organization.logo %}{{organization.logo}}{% else %}{{organization.avatar-bg-url}}{% endif %}"
+                              style="width:20px;height:20px;text-align:center;font-weight:bold;font-size:9px;line-height:20px;color:#ffffff;background-size:cover;background-position:center;background-repeat:no-repeat;border-radius: 50%;color:black">
                               {% if organization.initials %}{{organization.initials}}{% endif %}
                             </td>
                           </tr>
                         </table>
-                        <span style="display:inline-block; vertical-align: middle;padding-left:5px;height:20px;line-height: 20px;">
-                        {{ organization.name|abbreviate:50 }}
+                        <span
+                          style="display:inline-block; vertical-align: middle;padding-left:5px;height:20px;line-height: 20px;">
+                          {{ organization.name|abbreviate:50 }}
                         </span>
                       </div>
                     </td>
                   </tr>
+
+                  {% if organization.sso-active %}
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        "{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its
+                        teams and files now goes through your organization's identity provider.
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        If you can't get in, your account probably isn't in the directory yet.
+                        To get access, contact the organization owner.
+                      </div>
+                    </td>
+                  </tr>
+                  {% endif %}
+
                   <tr>
                     <td align="center" vertical-align="middle"
                       style="font-size:0px;padding:10px 25px;word-break:break-word;">

backend/resources/app/email/invite-to-organization/en.txt

@@ -0,0 +1,17 @@
+Hello!
+
+{{invited-by|abbreviate:25}} has invited you to join the organization “{{ organization.name|abbreviate:50 }}”.
+
+{% if organization.sso-active %}
+"{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files now goes
+through your organization's identity provider.
+
+If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
+{% endif %}
+
+Accept invitation using this link:
+
+{{ public-uri }}/#/auth/verify-token?token={{token}}
+
+Enjoy!
+The Penpot team.

backend/resources/app/email/invite-to-team/en.html

@@ -186,10 +186,31 @@
                     <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
                       <div
                         style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
-                        {{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”{% if organization %}
-                         part of the organization “{{ organization|abbreviate:25 }}”{% endif %}.</div>
+                        {{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:50 }}”{% if
+                        organization %}
+                        part of the organization “{{ organization.name|abbreviate:50 }}”{% endif %}.</div>
                     </td>
                   </tr>
+                  {% if organization.sso-active %}
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        "{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to
+                        its teams and files now goes through your organization's identity provider.
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        If you can't get in, your account probably isn't in the directory yet.
+                        To get access, contact the organization owner.
+                      </div>
+                    </td>
+                  </tr>
+                  {% endif %}
                   <tr>
                     <td align="center" vertical-align="middle"
                       style="font-size:0px;padding:10px 25px;word-break:break-word;">

backend/resources/app/email/invite-to-team/en.txt

@@ -1,6 +1,13 @@
 Hello!
 
-{{invited-by|abbreviate:25}} has invited you to join the team "{{ team|abbreviate:25 }}"{% if organization %}, part of the organization "{{ organization|abbreviate:25 }}"{% endif %}.
+{{invited-by|abbreviate:25}} has invited you to join the team "{{ team|abbreviate:50 }}"{% if organization %}, part of the organization "{{ organization.name|abbreviate:50 }}"{% endif %}.
+
+{% if organization.sso-active %}
+"{{ organization.name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files now goes
+through your organization's identity provider.
+
+If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
+{% endif %}
 
 Accept invitation using this link:
 

backend/resources/app/email/organization-setup-sso/en.html

@@ -0,0 +1,231 @@
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml"
+  xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<head>
+  <title>
+  </title>
+  <!--[if !mso]><!-- -->
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <!--<![endif]-->
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <style type="text/css">
+    #outlook a {
+      padding: 0;
+    }
+
+    body {
+      margin: 0;
+      padding: 0;
+      -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+    }
+
+    table,
+    td {
+      border-collapse: collapse;
+      mso-table-lspace: 0pt;
+      mso-table-rspace: 0pt;
+    }
+
+    img {
+      border: 0;
+      height: auto;
+      line-height: 100%;
+      outline: none;
+      text-decoration: none;
+      -ms-interpolation-mode: bicubic;
+    }
+
+    p {
+      display: block;
+      margin: 13px 0;
+    }
+  </style>
+  <!--[if mso]>
+        <xml>
+        <o:OfficeDocumentSettings>
+          <o:AllowPNG/>
+          <o:PixelsPerInch>96</o:PixelsPerInch>
+        </o:OfficeDocumentSettings>
+        </xml>
+        <![endif]-->
+  <!--[if lte mso 11]>
+        <style type="text/css">
+          .mj-outlook-group-fix { width:100% !important; }
+        </style>
+        <![endif]-->
+  <!--[if !mso]><!-->
+  <link href="https://fonts.googleapis.com/css?family=Source%20Sans%20Pro" rel="stylesheet" type="text/css">
+  <style type="text/css">
+    @import url(https://fonts.googleapis.com/css?family=Source%20Sans%20Pro);
+  </style>
+  <!--<![endif]-->
+  <style type="text/css">
+    @media only screen and (min-width:480px) {
+      .mj-column-per-100 {
+        width: 100% !important;
+        max-width: 100%;
+      }
+
+      .mj-column-px-425 {
+        width: 425px !important;
+        max-width: 425px;
+      }
+    }
+  </style>
+  <style type="text/css">
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile {
+        width: 100% !important;
+      }
+
+      td.mj-full-width-mobile {
+        width: auto !important;
+      }
+    }
+  </style>
+</head>
+
+<body style="background-color:#E5E5E5;">
+  <div style="background-color:#E5E5E5;">
+    <!--[if mso | IE]>
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix"
+                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
+                  width="100%">
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:16px;word-break:break-word;">
+                      <table border="0" cellpadding="0" cellspacing="0" role="presentation"
+                        style="border-collapse:collapse;border-spacing:0px;">
+                        <tbody>
+                          <tr>
+                            <td style="width:97px;">
+                              <img height="32" src="{{ public-uri }}/images/email/logo-penpot.svg"
+                                style="border:0;display:block;outline:none;text-decoration:none;height:32px;width:100%;font-size:13px;"
+                                width="97" />
+                            </td>
+                          </tr>
+                        </tbody>
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <!--[if mso | IE]>
+          </td>
+        </tr>
+      </table>
+
+      <table
+         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
+      >
+        <tr>
+          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
+      <![endif]-->
+    <div style="background:#FFFFFF;background-color:#FFFFFF;margin:0px auto;max-width:600px;">
+      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation"
+        style="background:#FFFFFF;background-color:#FFFFFF;width:100%;">
+        <tbody>
+          <tr>
+            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
+              <!--[if mso | IE]>
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+
+        <tr>
+
+            <td
+               class="" style="vertical-align:top;width:600px;"
+            >
+          <![endif]-->
+              <div class="mj-column-per-100 mj-outlook-group-fix"
+                style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
+                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;"
+                  width="100%">
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        Hi,
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        "{{ organization-name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its
+                        teams and files now goes through your organization's identity provider.
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        If you can't get in, your account probably isn't in the directory yet. To get access, contact the
+                        organization owner.
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                      <div
+                        style="font-family:Source Sans Pro, sans-serif;font-size:16px;line-height:150%;text-align:left;color:#000000;">
+                        The Penpot team.</div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+              <!--[if mso | IE]>
+            </td>
+
+        </tr>
+
+                  </table>
+                <![endif]-->
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+
+    {% include "app/email/includes/footer.html" %}
+
+  </div>
+</body>
+
+</html>

backend/resources/app/email/organization-setup-sso/en.subj

@@ -0,0 +1 @@
+“{{ organization-name|abbreviate:25 }}” uses single sign-on

backend/resources/app/email/organization-setup-sso/en.txt

@@ -0,0 +1,8 @@
+Hi,
+
+"{{ organization-name|abbreviate:50 }}" has set up single sign-on (SSO) in Penpot. Access to its teams and files now goes
+through your organization's identity provider.
+
+If you can't get in, your account probably isn't in the directory yet. To get access, contact the organization owner.
+
+The Penpot team.

backend/resources/app/templates/error-list.tmpl

@@ -10,9 +10,10 @@ penpot - error list
       <a href="/dbg"> [BACK]</a>
       <h1>Error reports (last 300)</h1>
 
-      <a class="{% if version = 3 %}strong{% endif %}" href="?version=3">[BACKEND ERRORS]</a>
-      <a class="{% if version = 4 %}strong{% endif %}" href="?version=4">[FRONTEND ERRORS]</a>
-      <a class="{% if version = 5 %}strong{% endif %}" href="?version=5">[RLIMIT REPORTS]</a>
+      <a class="{% if source = 0 %}strong{% endif %}" href="?source=0">[ALL ERRORS]</a>
+      <a class="{% if source = 3 %}strong{% endif %}" href="?source=3">[BACKEND ERRORS]</a>
+      <a class="{% if source = 4 %}strong{% endif %}" href="?source=4">[FRONTEND ERRORS]</a>
+      <a class="{% if source = 5 %}strong{% endif %}" href="?source=5">[RLIMIT REPORTS]</a>
     </div>
   </nav>
   <main class="horizontal-list">

backend/resources/app/templates/error-report.v3.tmpl

@@ -6,7 +6,7 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v3)
 
 {% block content %}
 <nav>
-  <div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
+  <div>[<a href="/dbg/error?source={{source}}">⮜</a>]</div>
   <div>[<a href="#head">head</a>]</div>
   <div>[<a href="#props">props</a>]</div>
   <div>[<a href="#context">context</a>]</div>

backend/resources/app/templates/error-report.v4.tmpl

@@ -6,11 +6,11 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v4)
 
 {% block content %}
 <nav>
-  <div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
+  <div>[<a href="/dbg/error?source={{source}}">⮜</a>]</div>
   <div>[<a href="#head">head</a>]</div>
   <div>[<a href="#context">context</a>]</div>
-  {% if report %}
-  <div>[<a href="#report">report</a>]</div>
+  {% if trace %}
+  <div>[<a href="#trace">trace</a>]</div>
   {% endif %}
 </nav>
 <main>
@@ -20,7 +20,7 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v4)
       <div class="table-val">
         <h1><span class="not-important">Hint:</span> <br/> {{hint}}</h1>
         <h2><span class="not-important">Reported at:</span> <br/> {{created-at}}</h2>
-        <h2><span class="not-important">Origin:</span> <br/> {{origin}}</h2>
+        <h2><span class="not-important">Kind:</span> <br/> {{kind}}</h2>
         <h2><span class="not-important">HREF:</span> <br/> {{href}}</h2>
       </div>
     </div>
@@ -33,11 +33,11 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v4)
       </div>
     </div>
 
-    {% if report %}
+    {% if trace %}
     <div class="table-row multiline">
-      <div id="report" class="table-key">REPORT:</div>
+      <div id="trace" class="table-key">TRACE:</div>
       <div class="table-val">
-        <pre>{{report}}</pre>
+        <pre>{{trace}}</pre>
       </div>
     </div>
     {% endif %}

backend/resources/app/templates/error-report.v5.tmpl

@@ -6,10 +6,10 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Rate Limit Report
 
 {% block content %}
 <nav>
-  <div>[<a href="/dbg/error?version={{version}}">⮜</a>]</div>
+  <div>[<a href="/dbg/error?source={{source}}">⮜</a>]</div>
   <div>[<a href="#head">head</a>]</div>
   <div>[<a href="#context">context</a>]</div>
-  <div>[<a href="#result">result</a>]</div>
+  <div>[<a href="#value">value</a>]</div>
 </nav>
 <main>
   <div class="table">
@@ -30,9 +30,9 @@ Report: {{hint|abbreviate:150}} - {{id}} - Penpot Rate Limit Report
     </div>
 
     <div class="table-row multiline">
-      <div id="result" class="table-key">RESULT: </div>
+      <div id="value" class="table-key">VALUE: </div>
       <div class="table-val">
-        <pre>{{result}}</pre>
+        <pre>{{value}}</pre>
       </div>
     </div>
   </div>

backend/resources/climit.edn

@@ -39,4 +39,10 @@
  {:permits 3}
 
  :create-file-snapshot/by-profile
- {:permits 1 :queue 2 :timeout 60000}}
+ {:permits 1 :queue 2 :timeout 60000}
+
+ :send-user-feedback/global
+ {:permits 4}
+
+ :send-user-feedback/by-profile
+ {:permits 1 :queue 3}}

backend/scripts/_env

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-export PENPOT_NITRATE_SHARED_KEY=super-secret-nitrate-api-key
+export PENPOT_ADMIN_CONSOLE_SHARED_KEY=super-secret-nitrate-api-key
 export PENPOT_EXPORTER_SHARED_KEY=super-secret-exporter-api-key
 export PENPOT_NEXUS_SHARED_KEY=super-secret-nexus-api-key
 export PENPOT_SECRET_KEY=super-secret-devenv-key
+export PENPOT_MEDIA_PROCESSOR_SHARED_KEY=super-secret-media-processor-key
 
 # DEPRECATED: only used for subscriptions
 export PENPOT_MANAGEMENT_API_KEY=super-secret-management-api-key
@@ -21,6 +22,8 @@ if [[ "${PENPOT_BACKEND_WORKER:-true}" == "true" ]]; then
     __worker_flag="enable-backend-worker"
 fi
 
+export PENPOT_MEDIA_PROCESSING_SERVICE_URI=http://localhost:6065
+
 export PENPOT_FLAGS="\
        $PENPOT_FLAGS \
        enable-login-with-password \
@@ -36,12 +39,14 @@ export PENPOT_FLAGS="\
        enable-feature-fdata-objects-map \
        enable-audit-log \
        enable-transit-readable-response \
+       disable-remote-media-processing \
        enable-demo-users \
        enable-user-feedback \
        disable-secure-session-cookies \
        enable-smtp \
        enable-prepl-server \
        enable-urepl-server \
+       enable-nrepl-server \
        enable-rpc-climit \
        enable-rpc-rlimit \
        enable-quotes \
@@ -70,7 +75,7 @@ export PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE=314572800
 
 export PENPOT_USER_FEEDBACK_DESTINATION="support@example.com"
 
-export PENPOT_NITRATE_BACKEND_URI=http://localhost:3000/admin-console
+export PENPOT_ADMIN_CONSOLE_URI=http://localhost:3000/admin-console
 
 export JAVA_OPTS="\
        -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \

backend/src/app/auth/oidc.clj

@@ -459,9 +459,10 @@
     (let [{:keys [status body]} (http/req cfg req {:skip-ssrf-check? (:skip-ssrf-check? provider)})]
       (if (= status 200)
         (let [data (json/decode body)
-              data {:token/access (get data :access_token)
-                    :token/id     (get data :id_token)
-                    :token/type   (get data :token_type)}]
+              data {:token/access     (get data :access_token)
+                    :token/id         (get data :id_token)
+                    :token/type       (get data :token_type)
+                    :token/expires-in (get data :expires_in)}]
           (l/trc :hint "access token fetched"
                  :token-id (:token/id data)
                  :token-type (:token/type data)
@@ -619,6 +620,9 @@
       (some? (:external-session-id state))
       (assoc :external-session-id (:external-session-id state))
 
+      (some? (:token/expires-in tdata))
+      (assoc :sso-token-exp (ct/in-future {:seconds (:token/expires-in tdata)}))
+
       ;; If state token comes with props, merge them. The state token
       ;; props can contain pm_ and utm_ prefixed query params.
       (map? (:props state))
@@ -761,20 +765,110 @@
 ;; ORG SSO HELPERS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn prepare-org-sso-provider
-  "Build an OIDC provider map dynamically from the Nitrate org SSO config.
-  Uses OIDC discovery via :base-url (or :issuer as fallback) when
-  token/auth/user URIs are absent."
-  [cfg {:keys [client-id client-secret base-url issuer scopes]}]
+(defn- non-blank-uri
+  [value]
+  (when-not (str/blank? value) value))
+
+(defn organization-sso-discovery-uri
+  "Return the OIDC discovery URI from an organization SSO config."
+  [sso]
+  (non-blank-uri (:issuer sso)))
+
+(defn prepare-organization-sso-provider
+  "Build an OIDC provider map dynamically from the Nitrate organization SSO config.
+   Uses OIDC discovery via :issuer when token/auth/user URIs are absent."
+  [cfg {:keys [client-id client-secret issuer]}]
   (prepare-oidc-provider cfg
                          {:type             "oidc"
                           :client-id        client-id
                           :client-secret    client-secret
-                          :base-uri         (some-> (or base-url issuer)
+                          :base-uri         (some-> (non-blank-uri issuer)
                                                     (str/rtrim "/")
                                                     (str "/"))
-                          :scopes           (into default-oidc-scopes (or scopes #{}))
-                          :skip-ssrf-check? true}))
+                          :scopes           default-oidc-scopes}))
+
+(defn build-organization-sso-auth-redirect-uri
+  "Build the OIDC authorization redirect URI for an organization SSO config.
+  Raises if the config is incomplete or OIDC discovery fails."
+  [cfg sso & {:keys [dest-url organization-id provider]}]
+  (let [organization-id (or organization-id (:organization-id sso))
+        issuer          (organization-sso-discovery-uri sso)
+        dest-url        (or dest-url (str (cf/get :public-uri)))]
+    (when-not issuer
+      (ex/raise :type :validation
+                :code :invalid-sso-config
+                :hint "missing issuer"))
+    (let [oidc-provider (or provider (prepare-organization-sso-provider cfg sso))
+          state-token   (tokens/generate cfg {:iss             "oidc"
+                                              :dest-url        dest-url
+                                              :organization-id organization-id
+                                              :issuer          issuer
+                                              :exp             (ct/in-future "4h")})]
+      (build-auth-redirect-uri oidc-provider state-token))))
+
+(def ^:private probe-auth-code "penpot-sso-config-probe")
+
+(defn- decode-token-error-response
+  [body]
+  (when (and (string? body) (pos? (count body)))
+    (try
+      (json/decode body)
+      (catch Throwable _ nil))))
+
+(defn- token-endpoint-error
+  [response]
+  (some-> response :body decode-token-error-response :error d/name))
+
+(defn- token-endpoint-error-description
+  [response]
+  (some-> response :body decode-token-error-response :error-description))
+
+(defn- token-endpoint-valid-client-error?
+  "Token endpoint rejected the dummy auth code but accepted the client credentials."
+  [response]
+  (= "invalid_grant" (token-endpoint-error response)))
+
+(defn- token-endpoint-invalid-client-error?
+  "Token endpoint rejected the client credentials."
+  [{:keys [status] :as response}]
+  (let [error (token-endpoint-error response)
+        description (str/lower (or (token-endpoint-error-description response) ""))]
+    (or (= status 401)
+        (#{"invalid_client" "unauthorized_client"} error)
+        (and (= error "access_denied")
+             (str/includes? description "unauthorized")))))
+
+(defn- probe-organization-sso-client-credentials
+  "Probe the token endpoint with a dummy authorization code.
+  Valid client credentials are expected to answer with `invalid_grant`."
+  [cfg provider]
+  (let [params {:client_id     (:client-id provider)
+                :client_secret (:client-secret provider)
+                :code          probe-auth-code
+                :grant_type    "authorization_code"
+                :redirect_uri  (build-redirect-uri)}
+        req    {:method  :post
+                :headers {"content-type" "application/x-www-form-urlencoded"
+                          "accept"       "application/json"}
+                :uri     (:token-uri provider)
+                :body    (u/map->query-string params)}
+        response (http/req cfg req {:skip-ssrf-check? (:skip-ssrf-check? provider)})]
+    (cond
+      (token-endpoint-valid-client-error? response) true
+      (token-endpoint-invalid-client-error? response) false
+      :else false)))
+
+(defn is-organization-sso-config-valid?
+  "Return true when the SSO config can be discovered, can build a login URL,
+  and the client credentials are accepted by the token endpoint."
+  [cfg sso]
+  (try
+    (if (organization-sso-discovery-uri sso)
+      (let [provider (prepare-organization-sso-provider cfg sso)]
+        (and (build-organization-sso-auth-redirect-uri cfg sso :provider provider)
+             (probe-organization-sso-client-credentials cfg provider)))
+      false)
+    (catch Throwable _ false)))
 
 (defn- auth-handler
   [cfg {:keys [params] :as request}]
@@ -802,17 +896,15 @@
             state    (get params :state)
             state    (tokens/verify cfg {:token state :iss "oidc"})]
 
-        ;; Org SSO flow: state carries :dest-url — exchange the authorization
+        ;; Organization SSO flow: state carries :dest-url — exchange the authorization
         ;; code with the OIDC provider to verify authentication actually occurred.
         (if-let [dest-url (:dest-url state)]
-          (let [team-id         (:team-id state)
-                organization-id (:organization-id state)
-                sso             (nitrate/call cfg :get-org-sso-by-team {:team-id team-id})
-                provider        (prepare-org-sso-provider cfg sso)
-                ;; verify token or throw error
-                _info           (get-info cfg provider state code)
+          (let [organization-id (:organization-id state)
+                sso             (nitrate/call cfg :get-organization-sso {:organization-id organization-id})
+                provider        (prepare-organization-sso-provider cfg sso)
+                info            (get-info cfg provider state code)
                 session         (session/get-session request)
-                exp             (ct/in-future {:hours 48})]
+                exp             (or (:sso-token-exp info) (ct/in-future {:hours 48}))]
             (when (and session organization-id)
               (let [props (-> (or (:props session) {})
                               (update :sso assoc organization-id exp))]

backend/src/app/auth/passwords.clj

@@ -0,0 +1,53 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.auth.passwords
+  "Password strength validation using Passay library."
+  (:require
+   [app.common.exceptions :as ex])
+  (:import
+   [org.passay CharacterCharacteristicsRule CharacterRule EnglishCharacterData PasswordData]))
+
+(defonce ^:private passay-code->translation-key
+  {"INSUFFICIENT_LOWERCASE"   "errors.weak-password.insufficient-lowercase"
+   "INSUFFICIENT_UPPERCASE"   "errors.weak-password.insufficient-uppercase"
+   "INSUFFICIENT_DIGIT"       "errors.weak-password.insufficient-digits"
+   "INSUFFICIENT_SPECIAL"     "errors.weak-password.insufficient-special"})
+
+(defonce ^:private character-characteristics-rule
+  (doto (CharacterCharacteristicsRule.)
+    (.setRules [(CharacterRule. EnglishCharacterData/LowerCase 1)
+                (CharacterRule. EnglishCharacterData/UpperCase 1)
+                (CharacterRule. EnglishCharacterData/Digit 1)
+                (CharacterRule. EnglishCharacterData/Special 1)])
+    (.setNumberOfCharacteristics 4)))
+
+(defn validate-password
+  "Validates password strength.
+   Returns nil if valid, or raises exception if invalid.
+   Checks:
+   - Minimum length of 8 characters
+   - At least 1 lowercase letter
+   - At least 1 uppercase letter
+   - At least 1 digit
+   - At least 1 special character"
+  [password]
+  (when (< (count password) 8)
+    (ex/raise :type :validation
+              :code :weak-password
+              :hint "password must be at least 8 characters"
+              :details ["errors.weak-password.too-short"]))
+
+  (let [password-data (PasswordData. password)
+        char-result   (.validate character-characteristics-rule password-data)]
+    (when-not (.isValid char-result)
+      (ex/raise :type :validation
+                :code :weak-password
+                :hint "password must contain at least 1 lowercase letter, 1 uppercase letter, 1 digit, and 1 special character"
+                :details (->> (.getDetails char-result)
+                              (mapv #(.getErrorCode %))
+                              (mapv passay-code->translation-key)
+                              (filterv some?))))))

backend/src/app/binfile/common.clj

@@ -748,9 +748,17 @@
     (fmigr/upsert-migrations! conn file))
 
   (let [file (encode-file cfg file)]
-    (db/insert! conn :file
-                (file->params file)
-                (assoc opts ::db/return-keys false))
+    (try
+      (db/insert! conn :file
+                  (file->params file)
+                  (assoc opts ::db/return-keys false))
+      (catch org.postgresql.util.PSQLException cause
+        (if (db/duplicate-key-error? cause)
+          (ex/raise :type :not-found
+                    :code :object-not-found
+                    :hint "file already exists"
+                    :cause cause)
+          (throw cause))))
 
     (->> (file->file-data-params file)
          (fdata/upsert! cfg))

backend/src/app/binfile/v1.clj

@@ -174,6 +174,10 @@
     (assert-mark m :obj)
     (let [size (read-long! input)]
       (assert (pos? size) "incorrect header size found on reading header")
+      (when (> size bfc/max-object-size)
+        (ex/raise :type :validation
+                  :code :max-file-size-reached
+                  :hint (dm/str "unable to import object with size " size " bytes")))
       (let [buff (byte-array size)]
         (read-bytes! input buff)
         (fres/decode buff)))))

backend/src/app/config.clj

@@ -119,8 +119,9 @@
     [:allowed-origins {:optional true} [::sm/set :string]]
 
     [:exporter-shared-key {:optional true} :string]
-    [:nitrate-shared-key {:optional true} :string]
+    [:admin-console-shared-key {:optional true} :string]
     [:nexus-shared-key {:optional true} :string]
+    [:media-processor-shared-key {:optional true} :string]
     [:management-api-key {:optional true} :string]
 
     [:telemetry-uri {:optional true} :string]
@@ -147,6 +148,9 @@
     [:imagemagick-width-limit {:optional true} :string]
     [:imagemagick-height-limit {:optional true} :string]
 
+    [:media-processing-service-uri {:optional true} ::sm/uri]
+    [:media-processing-service-timeout {:optional true} ::sm/int]
+
     [:deletion-delay {:optional true} ::ct/duration]
     [:file-clean-delay {:optional true} ::ct/duration]
     [:telemetry-enabled {:optional true} ::sm/boolean]
@@ -253,6 +257,8 @@
     [:urepl-port {:optional true} ::sm/int]
     [:prepl-host {:optional true} :string]
     [:prepl-port {:optional true} ::sm/int]
+    [:nrepl-host {:optional true} :string]
+    [:nrepl-port {:optional true} ::sm/int]
 
     [:file-data-backend {:optional true} [:enum "db" "legacy-db" "storage"]]
 
@@ -262,7 +268,7 @@
 
     [:netty-io-threads {:optional true} ::sm/int]
 
-    [:nitrate-backend-uri {:optional true} ::sm/uri]
+    [:admin-console-uri {:optional true} ::sm/uri]
 
     ;; DEPRECATED
     [:assets-storage-backend {:optional true} :keyword]

backend/src/app/email.clj

@@ -419,10 +419,19 @@
    :id ::change-email
    :schema schema:change-email))
 
+(def ^:private schema:organization-data
+  [:map
+   [:name ::sm/text]
+   [:initials {:optional true} [:maybe :string]]
+   [:logo {:optional true} [:maybe ::sm/uri]]
+   [:avatar-bg-url {:optional true} [:maybe ::sm/uri]]
+   [:sso-active {:optional true} [:maybe ::sm/boolean]]])
+
 (def ^:private schema:invite-to-team
   [:map
    [:invited-by ::sm/text]
    [:team ::sm/text]
+   [:organization {:optional true} [:maybe schema:organization-data]]
    [:token ::sm/text]])
 
 (def invite-to-team
@@ -431,27 +440,28 @@
    :id ::invite-to-team
    :schema schema:invite-to-team))
 
-(def ^:private schema:organization-data
-  [:map
-   [:name ::sm/text]
-   [:initials [:maybe :string]]
-   [:logo [:maybe ::sm/uri]]
-   [:avatar-bg-url [:maybe ::sm/uri]]])
-
-(def ^:private schema:invite-to-org
+(def ^:private schema:invite-to-organization
   [:map
    [:invited-by ::sm/text]
    [:user-name [:maybe ::sm/text]]
    [:token ::sm/text]
    [:organization schema:organization-data]])
 
-(def invite-to-org
-  "Org member invitation email."
+(def invite-to-organization
+  "Organization member invitation email."
   (template-factory
-   :id ::invite-to-org
-   :schema schema:invite-to-org))
+   :id ::invite-to-organization
+   :schema schema:invite-to-organization))
 
+(def ^:private schema:organization-setup-sso
+  [:map
+   [:organization-name ::sm/text]])
 
+(def organization-setup-sso
+  "Email when an organization set up SSO"
+  (template-factory
+   :id ::organization-setup-sso
+   :schema schema:organization-setup-sso))
 
 (def ^:private schema:renewal-notice
   [:map

backend/src/app/http/access_token.clj

@@ -24,7 +24,7 @@
              :cause cause))))
 
 (def sql:get-token-data
-  "SELECT perms, profile_id, expires_at
+  "SELECT perms, profile_id, expires_at, type
      FROM access_token
     WHERE id = ?
       AND (expires_at IS NULL
@@ -42,15 +42,19 @@
   (fn [request]
     (let [{:keys [type claims]} (get request ::http/auth-data)]
       (if (= :token type)
-        (let [{:keys [perms profile-id expires-at]} (some->> claims (get-token-data pool))]
-          ;; FIXME: revisit this, this data looks unused
+        (let [{:keys [perms profile-id expires-at type]} (some->> claims (get-token-data pool))
+              token-id (get claims :tid)]
           (handler (cond-> request
                      (some? perms)
                      (assoc ::perms perms)
                      (some? profile-id)
                      (assoc ::profile-id profile-id)
                      (some? expires-at)
-                     (assoc ::expires-at expires-at))))
+                     (assoc ::expires-at expires-at)
+                     (some? token-id)
+                     (assoc ::id token-id)
+                     (some? type)
+                     (assoc ::type type))))
 
         (handler request)))))
 

backend/src/app/http/assets.clj

@@ -7,6 +7,7 @@
 (ns app.http.assets
   "Assets related handlers."
   (:require
+   [app.binfile.common :as bfc]
    [app.common.data :as d]
    [app.common.exceptions :as ex]
    [app.common.time :as ct]
@@ -31,7 +32,8 @@
   #{"file-media-object"
     "file-object-thumbnail"
     "team-font-variant"
-    "file-data-fragment"})
+    "file-data-fragment"
+    "organization"})
 
 (defn get-id
   [{:keys [path-params]}]
@@ -41,7 +43,7 @@
 
 (defn- get-file-media-object
   [pool id]
-  (db/get pool :file-media-object {:id id} {::db/remove-deleted false}))
+  (db/get* pool :file-media-object {:id id} {::db/remove-deleted false}))
 
 (defn- serve-object-from-s3
   [{:keys [::sto/storage ::signature-max-age ::cache-max-age] :as cfg} obj]
@@ -108,13 +110,21 @@
 (defn- generic-handler
   "A generic handler helper/common code for file-media based handlers."
   [{:keys [::sto/storage] :as cfg} request kf]
-  (let [pool (::db/pool storage)
-        id   (get-id request)
-        mobj (get-file-media-object pool id)
-        sobj (sto/get-object storage (kf mobj))]
-    (if sobj
-      (serve-object cfg sobj)
-      {::yres/status 404})))
+  (let [pool       (::db/pool storage)
+        id         (get-id request)
+        mobj       (get-file-media-object pool id)]
+    (if (nil? mobj)
+      {::yres/status 404}
+      (let [file-id    (:file-id mobj)
+            profile-id (or (::session/profile-id request)
+                           (::actoken/profile-id request))
+            perms      (bfc/get-file-permissions pool profile-id file-id)]
+        (if-not (:can-read perms)
+          {::yres/status 404}
+          (let [sobj (sto/get-object storage (kf mobj))]
+            (if sobj
+              (serve-object cfg sobj)
+              {::yres/status 404})))))))
 
 (defn file-objects-handler
   "Handler that serves storage objects by file media id."

backend/src/app/http/debug.clj

@@ -230,25 +230,28 @@
             (-> (io/resource "app/templates/error-report.v3.tmpl")
                 (tmpl/render (-> content
                                  (assoc :id id)
-                                 (assoc :version 3)
+                                 (assoc :source 3)
                                  (assoc :created-at (ct/format-inst created-at :rfc1123))))))
 
           (render-template-v4 [{:keys [content id created-at]}]
             (-> (io/resource "app/templates/error-report.v4.tmpl")
                 (tmpl/render (-> content
                                  (assoc :id id)
-                                 (assoc :version 4)
+                                 (assoc :source 4)
+                                 (assoc :kind (or (:kind content) (:origin content)))
+                                 (assoc :trace (or (:trace content) (:report content)))
                                  (assoc :created-at (ct/format-inst created-at :rfc1123))))))
 
           (render-template-v5 [{:keys [content id created-at]}]
             (-> (io/resource "app/templates/error-report.v5.tmpl")
                 (tmpl/render (-> content
                                  (assoc :id id)
-                                 (assoc :version 5)
+                                 (assoc :source 5)
+                                 (assoc :value (or (:value content) (:result content)))
                                  (assoc :created-at (ct/format-inst created-at :rfc1123))))))]
 
     (if-let [report (get-report request)]
-      (let [result (case (:version report)
+      (let [result (case (:source report)
                      1 (render-template-v1 report)
                      2 (render-template-v2 report)
                      3 (render-template-v3 report)
@@ -265,18 +268,19 @@
   "SELECT id, created_at,
           content->>'~:hint' AS hint
      FROM server_error_report
-    WHERE version = ?
-    ORDER BY created_at DESC
-    LIMIT 300")
+     WHERE (version = ? OR source = ? OR ? = 0)
+     ORDER BY created_at DESC
+     LIMIT 300")
 
 (defn- error-list-handler
   [{:keys [::db/pool]} {:keys [params]}]
-  (let [version (or (some-> (get params :version) parse-long) 3)
-        items   (->> (db/exec! pool [sql:error-reports version])
-                     (map #(update % :created-at ct/format-inst :rfc1123)))]
+  (let [source (or (some-> (get params :source) parse-long) 3)
+        items  (->> (db/exec! pool [sql:error-reports source source source])
+                    (map #(update % :created-at ct/format-inst :rfc1123)))]
+
     {::yres/status 200
      ::yres/body (-> (io/resource "app/templates/error-list.tmpl")
-                     (tmpl/render {:items items :version version}))
+                     (tmpl/render {:items items :source source}))
      ::yres/headers {"content-type" "text/html; charset=utf-8"
                      "x-robots-tag" "noindex"}}))
 

backend/src/app/http/errors.clj

@@ -31,7 +31,7 @@
         (assoc :request/user-agent (yreq/get-header request "user-agent"))
         (assoc :request/ip-addr (inet/parse-request request))
         (assoc :request/profile-id (get claims :uid))
-        (assoc :request/auth-data auth)
+        (assoc :request/auth-data (dissoc auth :token))
         (assoc :frontend/version (or (yreq/get-header request "x-frontend-version") "unknown")))))
 
 (defmulti handle-error

backend/src/app/http/middleware.clj

@@ -65,12 +65,25 @@
                 :else
                 request)))
 
+          ;; The specific-exception branches below (IAE,
+          ;; RequestTooBigException, EOFException) raise with
+          ;; `ex/raise` rather than calling `errors/handle` directly.
+          ;; This is intentional: the throw is caught by the
+          ;; top-level error handler in `app.http/router-handler`
+          ;; (`backend/src/app/http.clj`), which routes every
+          ;; uncaught exception through `errors/handle`. The
+          ;; per-route `wrap-errors` middleware in the route list
+          ;; is a defensive layer; correctness does not depend on
+          ;; it. Raising here keeps the cond uniform with the
+          ;; existing RequestTooBigException / EOFException
+          ;; branches.
           (handle-error [cause request]
             (cond
-              (instance? RuntimeException cause)
-              (if-let [cause (ex-cause cause)]
-                (handle-error cause request)
-                (errors/handle cause request))
+              (instance? IllegalArgumentException cause)
+              (ex/raise :type :validation
+                        :code :malformed-json
+                        :hint (ex-message cause)
+                        :cause cause)
 
               (instance? RequestTooBigException cause)
               (ex/raise :type :validation
@@ -83,6 +96,11 @@
                         :hint (ex-message cause)
                         :cause cause)
 
+              (instance? RuntimeException cause)
+              (if-let [cause (ex-cause cause)]
+                (handle-error cause request)
+                (errors/handle cause request))
+
               :else
               (errors/handle cause request)))]
 

backend/src/app/http/session.clj

@@ -226,19 +226,19 @@
     (-> (db/exec-one! cfg [sql (:profile-id session) (:id session)])
         (db/get-update-count))))
 
-(def ^:private sql:clear-org-sso-sessions
+(def ^:private sql:clear-organization-sso-sessions
   (str "UPDATE http_session_v2 "
        "SET props = props #- ARRAY['~:sso', ?]::text[] "
        "WHERE props IS NOT NULL "
        "AND jsonb_exists(props -> '~:sso', ?)"))
 
-(defn clear-org-sso-sessions!
+(defn clear-organization-sso-sessions!
   "Remove the SSO entry for organization-id from the props of every
   session that currently holds it. The key is transit-encoded as the
   string '~u<uuid>' under the '~:sso' path."
   [pool organization-id]
-  (let [org-key (str "~u" organization-id)]
-    (db/exec! pool [sql:clear-org-sso-sessions org-key org-key])))
+  (let [organization-key (str "~u" organization-id)]
+    (db/exec! pool [sql:clear-organization-sso-sessions organization-key organization-key])))
 
 (defn- renew-session?
   [{:keys [id modified-at] :as session}]

backend/src/app/loggers/audit.clj

@@ -88,7 +88,8 @@
   #{:session-id
     :password
     :old-password
-    :token})
+    :token
+    :client-secret})
 
 (defn extract-utm-params
   "Extracts additional data from params and namespace them under
@@ -153,7 +154,7 @@
 ;; COLLECTOR API
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(declare ^:private prepare-context-from-request)
+(declare prepare-context-from-request)
 
 ;; Defines a service that collects the audit/activity log using
 ;; internal database. Later this audit log can be transferred to
@@ -182,7 +183,7 @@
 (def valid-event?
   (sm/validator schema:event))
 
-(defn- prepare-context-from-request
+(defn prepare-context-from-request
   "Prepare backend event context from request"
   [request]
   (let [client-event-origin (get-client-event-origin request)
@@ -336,7 +337,9 @@
   (let [resultm      (meta result)
         request      (-> params meta ::http/request)
         profile-id   (or (::profile-id resultm)
-                         (:profile-id result)
+                         (some-> (:profile-id result)
+                                 (cond-> (string? (:profile-id result))
+                                   uuid/parse*))
                          (::rpc/profile-id params)
                          uuid/zero)
 
@@ -411,7 +414,7 @@
                   (update :ip-addr d/nilv "0.0.0.0")
                   (update :props d/nilv {})
                   (update :context d/nilv {})
-                  (assoc :source "backend")
+                  (update :source d/nilv "backend")
                   (d/without-nils))]
     (submit* cfg event)))
 
@@ -428,7 +431,7 @@
                     (update :profile-id d/nilv uuid/zero)
                     (update :props d/nilv {})
                     (update :context d/nilv {})
-                    (assoc :source "backend")
+                    (update :source d/nilv "backend")
                     (select-keys event-keys)
                     (check-event))]
       (db/run! cfg append-audit-entry event))))

backend/src/app/loggers/database.clj

@@ -12,6 +12,7 @@
    [app.common.logging :as l]
    [app.common.pprint :as pp]
    [app.common.schema :as sm]
+   [app.common.uri :as u]
    [app.config :as cf]
    [app.db :as db]
    [app.loggers.audit :as audit]
@@ -30,11 +31,12 @@
 (defonce enabled (atom true))
 
 (defn- persist-on-database!
-  [pool id version report]
+  [pool id source report]
   (when-not (db/read-only? pool)
     (db/insert! pool :server-error-report
                 {:id id
-                 :version version
+                 :source source
+                 :version source ;; backward compatibility with old code that reads version column
                  :content (db/tjson report)})))
 
 (defn- concurrent-exception?
@@ -56,19 +58,27 @@
                  (assoc :backend/version (:full cf/version))
                  (assoc :logger/name logger)
                  (assoc :logger/level level)
-                 (dissoc :request/params :value :params :data))]
+                 (dissoc :request/params :value :params :data))
+
+        href (if-let [path (:request/path context)]
+               (str (u/join (cf/get :public-uri) path))
+               (str (cf/get :public-uri)))]
 
     (merge
-     {:context (-> (into (sorted-map) ctx)
-                   (pp/pprint-str :length 50))
-      :props   (pp/pprint-str props :length 50)
-      :hint    (or (when-let [message (ex-message cause)]
-                     (if-let [props-hint (:hint props)]
-                       (str props-hint ": " message)
-                       message))
-                   @message)
-      :trace   (or (::trace record)
-                   (some-> cause (ex/format-throwable :data? true :explain? false :header? false :summary? false)))}
+     {:context          (-> (into (sorted-map) ctx)
+                            (pp/pprint-str :length 50))
+      :props            (pp/pprint-str props :length 50)
+      :hint             (or (when-let [message (ex-message cause)]
+                              (if-let [props-hint (:hint props)]
+                                (str props-hint ": " message)
+                                message))
+                            @message)
+      :trace            (or (::trace record)
+                            (some-> cause (ex/format-throwable :data? true :explain? false :header? false :summary? false)))
+      :tenant           (cf/get :tenant)
+      :version          (:full cf/version)
+      :profile-id       (some-> (:request/profile-id context) str)
+      :href             href}
 
      (when-let [params (or (:request/params context) (:params context))]
        {:params (pp/pprint-str params :length 20 :level 20)})
@@ -97,7 +107,7 @@
       (l/warn :hint "unexpected exception on database error logger" :cause cause))))
 
 (defn- audit-event->report
-  [{:keys [context props ip-addr] :as record}]
+  [{:keys [context props ip-addr profile-id] :as record}]
   (let [context
         (reduce-kv (fn [context k v]
                      (let [k' (keyword "frontend" (name k))]
@@ -115,12 +125,15 @@
             (assoc :backend/version (:full cf/version))
             (assoc :frontend/ip-addr ip-addr))]
 
-    {:context (-> (into (sorted-map) context)
-                  (pp/pprint-str :length 50))
-     :origin  (:name record)
-     :href    (get props :href)
-     :hint    (get props :hint)
-     :report  (get props :report)}))
+    {:context          (-> (into (sorted-map) context)
+                           (pp/pprint-str :length 50))
+     :kind             (:name record)
+     :profile-id       (some-> profile-id str)
+     :href             (get props :href)
+     :hint             (get props :hint)
+     :trace            (get props :report)
+     :tenant           (cf/get :tenant)
+     :version          (:full cf/version)}))
 
 (defn- handle-audit-event
   "Convert the log record into a report object and persist it on the database"
@@ -153,10 +166,13 @@
                      (-> (into (sorted-map) result)
                          (dissoc ::rlimit/method)))))]
 
-    {:hint    (str "Rate Limit Rejection: " (::rlimit/method event) " for " (::rlimit/uid event))
-     :context (-> (into (sorted-map) context)
-                  (pp/pprint-str :length 50))
-     :result  (pp/pprint-str result :length 50)}))
+    {:hint             (str "Rate Limit Rejection: " (::rlimit/method event) " for " (::rlimit/uid event))
+     :context          (-> (into (sorted-map) context)
+                           (pp/pprint-str :length 50))
+     :value            (pp/pprint-str result :length 50)
+     :tenant           (cf/get :tenant)
+     :version          (:full cf/version)
+     :href             (str (cf/get :public-uri))}))
 
 (defn- handle-rlimit-event
   "Convert the log record into a report object and persist it on the database"

backend/src/app/main.clj

@@ -38,6 +38,7 @@
    [app.storage.gc-deleted :as-alias sto.gc-deleted]
    [app.storage.gc-touched :as-alias sto.gc-touched]
    [app.storage.s3 :as-alias sto.s3]
+   [app.system :as sys]
    [app.util.cron]
    [app.worker :as-alias wrk]
    [app.worker.executor]
@@ -45,7 +46,6 @@
    [clojure.tools.namespace.repl :as repl]
    [cuerdas.core :as str]
    [integrant.core :as ig]
-   [nrepl.server :as nrepl]
    [promesa.exec :as px])
   (:gen-class))
 
@@ -335,6 +335,7 @@
     ::rpc/rlimit         (ig/ref ::rpc/rlimit)
     ::setup/templates    (ig/ref ::setup/templates)
     ::setup/props        (ig/ref ::setup/props)
+    ::setup/shared-keys  (ig/ref ::setup/shared-keys)
 
     ::email/blacklist    (ig/ref ::email/blacklist)
     ::email/whitelist    (ig/ref ::email/whitelist)
@@ -444,13 +445,17 @@
     ::http.client/client (ig/ref ::http.client/client)
     ::setup/props        (ig/ref ::setup/props)}
 
-   [::srepl/urepl ::srepl/server]
-   {::srepl/port (cf/get :urepl-port 6062)
-    ::srepl/host (cf/get :urepl-host "localhost")}
+   ::srepl/urepl
+   {:port (cf/get :urepl-port 6062)
+    :host (cf/get :urepl-host "localhost")}
 
-   [::srepl/prepl ::srepl/server]
-   {::srepl/port (cf/get :prepl-port 6063)
-    ::srepl/host (cf/get :prepl-host "localhost")}
+   ::srepl/prepl
+   {:port (cf/get :prepl-port 6063)
+    :host (cf/get :prepl-host "localhost")}
+
+   ::srepl/nrepl
+   {:port (cf/get :nrepl-port 6064)
+    :host (cf/get :nrepl-host "localhost")}
 
    ::setup/templates {}
 
@@ -463,10 +468,11 @@
     ::migrations (ig/ref :app.migrations/migrations)}
 
    ::setup/shared-keys
-   {::setup/props (ig/ref ::setup/props)
-    :nexus        (cf/get :nexus-shared-key)
-    :nitrate      (cf/get :nitrate-shared-key)
-    :exporter     (cf/get :exporter-shared-key)}
+   {::setup/props    (ig/ref ::setup/props)
+    :nexus           (cf/get :nexus-shared-key)
+    :admin-console   (cf/get :admin-console-shared-key)
+    :exporter        (cf/get :exporter-shared-key)
+    :media-processor (cf/get :media-processor-shared-key)}
 
    ::setup/clock
    {}
@@ -584,42 +590,70 @@
     ::db/pool         (ig/ref ::db/pool)}})
 
 
-(def system nil)
-
 (defn start
   []
   (cf/validate!)
   (ig/load-namespaces (merge system-config worker-config))
-  (alter-var-root #'system (fn [sys]
-                             (when sys (ig/halt! sys))
-                             (-> system-config
-                                 (cond-> (contains? cf/flags :backend-worker)
-                                   (merge worker-config))
-                                 (ig/expand)
-                                 (ig/init))))
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (some-> sys not-empty ig/halt!)
+                    (-> system-config
+                        (cond-> (contains? cf/flags :backend-worker)
+                          (merge worker-config))
+                        (ig/expand)
+                        (ig/init))))
+
   (l/inf :hint "welcome to penpot"
          :flags (str/join "," (map name cf/flags))
          :worker? (contains? cf/flags :backend-worker)
-         :version (:full cf/version)))
+         :version (:full cf/version))
+  :start)
+
+(defn resume
+  []
+  (cf/validate!)
+  (ig/load-namespaces (merge system-config worker-config))
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (let [config (-> system-config
+                                     (cond-> (contains? cf/flags :backend-worker)
+                                       (merge worker-config))
+                                     (ig/expand))]
+                      (if-let [sys (not-empty sys)]
+                        (ig/resume config sys)
+                        (ig/init config)))))
+  :resume)
 
 (defn start-custom
   [config]
   (ig/load-namespaces config)
-  (alter-var-root #'system (fn [sys]
-                             (when sys (ig/halt! sys))
-                             (-> config
-                                 (ig/expand)
-                                 (ig/init)))))
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (some-> sys not-empty ig/halt!)
+                    (-> config
+                        (ig/expand)
+                        (ig/init)))))
 
 (defn stop
   []
-  (alter-var-root #'system (fn [sys]
-                             (when sys (ig/halt! sys))
-                             nil)))
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (some-> sys not-empty ig/halt!)
+                    {}))
+  :stop)
+
+(defn suspend
+  []
+  (alter-var-root #'app.system/system
+                  (fn [sys]
+                    (some-> sys not-empty ig/suspend!)
+                    sys))
+  :suspend)
+
 (defn restart
   []
-  (stop)
-  (repl/refresh :after 'app.main/start))
+  (suspend)
+  (repl/refresh :after 'app.main/resume))
 
 (defn restart-all
   []
@@ -646,15 +680,15 @@
            (test/test-vars [(resolve o)]))
        (test/test-ns o)))))
 
-(repl/disable-reload! (find-ns 'integrant.core))
-
 (defn -main
   [& _args]
   (try
-    (let [p (promise)]
-      (l/inf :hint "start nrepl server" :port 6064)
-      (nrepl/start-server :bind "0.0.0.0" :port 6064)
+    (ex/ignoring
+     (repl/disable-reload! (find-ns 'integrant.core))
+     (repl/disable-reload! (find-ns 'app.system))
+     (repl/disable-reload! (find-ns 'app.common.debug)))
 
+    (let [p (promise)]
       (start)
       (deref p))
     (catch Throwable cause

backend/src/app/media.clj

@@ -5,316 +5,37 @@
 ;; Copyright (c) KALEIDOS INC Sucursal en España SL
 
 (ns app.media
-  "Media & Font postprocessing."
+  "Media & Font postprocessing.
+
+  This namespace is the dispatch layer only. Processing implementations
+  live in two separate namespaces, each owning their own defmulti:
+
+    app.media.local  — shell/ImageMagick/FontForge implementations
+    app.media.remote — HTTP delegation to media-processor service
+
+  Validation and schemas live in app.media.validation (leaf namespace,
+  no circular dep). When adding a new :cmd type, add defmethods in
+  BOTH local and remote."
   (:require
    [app.common.data :as d]
-   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [app.common.media :as cm]
-   [app.common.schema :as sm]
-   [app.common.schema.openapi :as-alias oapi]
-   [app.common.time :as ct]
    [app.config :as cf]
    [app.db :as-alias db]
    [app.http.client :as http]
+   [app.media.local :as media.local]
+   [app.media.remote :as media.remote]
    [app.media.sanitize :as sanitize]
+   [app.media.validation :as validation]
    [app.storage :as-alias sto]
    [app.storage.tmp :as tmp]
-   [app.util.shell :as shell]
-   [buddy.core.bytes :as bb]
-   [buddy.core.codecs :as bc]
-   [clojure.string]
-   [clojure.xml :as xml]
    [cuerdas.core :as str]
-   [datoteka.fs :as fs]
-   [datoteka.io :as io])
-  (:import
-   clojure.lang.XMLHandler
-   java.io.InputStream
-   javax.xml.parsers.SAXParserFactory
-   javax.xml.XMLConstants
-   org.apache.commons.io.IOUtils))
-
-(def schema:upload
-  [:map {:title "Upload"}
-   [:filename :string]
-   [:size ::sm/int]
-   [:path ::fs/path]
-   [:mtype {:optional true} :string]
-   [:headers {:optional true}
-    [:map-of :string :string]]])
-
-(def ^:private schema:input
-  [:map {:title "Input"}
-   [:path ::fs/path]
-   [:mtype {:optional true} ::sm/text]])
-
-(def check-input
-  (sm/check-fn schema:input))
-
-(defn validate-media-type!
-  ([upload] (validate-media-type! upload cm/image-types))
-  ([upload allowed]
-   (when-not (contains? allowed (:mtype upload))
-     (ex/raise :type :validation
-               :code :media-type-not-allowed
-               :hint "Seems like you are uploading an invalid media object"))
-
-   upload))
-
-(defn validate-media-size!
-  [upload]
-  (let [max-size (cf/get :media-max-file-size)]
-    (when (> (:size upload) max-size)
-      (ex/raise :type :restriction
-                :code :media-max-file-size-reached
-                :hint (str/ffmt "the uploaded file size % is greater than the maximum %"
-                                (:size upload)
-                                max-size)))
-    upload))
-
-(defn validate-font-size!
-  "Validates that the font file `upload` does not exceed the configured
-  `:font-max-file-size` limit.  Accepts the same map shape as
-  `validate-media-size!` — requires a `:size` key in bytes."
-  [upload]
-  (let [max-size (cf/get :font-max-file-size)]
-    (when (> (:size upload) max-size)
-      (ex/raise :type :restriction
-                :code :font-max-file-size-reached
-                :hint (str/ffmt "the uploaded font size % is greater than the maximum %"
-                                (:size upload)
-                                max-size)))
-    upload))
-
-(defmulti process (fn [_system params] (:cmd params)))
-
-(defmethod process :default
-  [_system {:keys [cmd] :as params}]
-  (ex/raise :type :internal
-            :code :not-implemented
-            :hint (str/fmt "No impl found for process cmd: %s" cmd)))
+   [datoteka.io :as io]))
 
 (defn run
   [system params]
-  (process system params))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; SVG PARSING
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- secure-parser-factory
-  [^InputStream input ^XMLHandler handler]
-  (.. (doto (SAXParserFactory/newInstance)
-        (.setFeature XMLConstants/FEATURE_SECURE_PROCESSING true)
-        (.setFeature "http://apache.org/xml/features/disallow-doctype-decl" true))
-      (newSAXParser)
-      (parse input handler)))
-
-(defn- strip-doctype
-  [data]
-  (cond-> data
-    (str/includes? data "<!DOCTYPE")
-    (str/replace #"<\!DOCTYPE[^>]*>" "")))
-
-(defn- parse-svg
-  [text]
-  (let [text (strip-doctype text)]
-    (dm/with-open [istream (IOUtils/toInputStream ^String text "UTF-8")]
-      (xml/parse istream secure-parser-factory))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; IMAGE THUMBNAILS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def ^:private schema:thumbnail-params
-  [:map {:title "ThumbnailParams"}
-   [:input schema:input]
-   [:format [:enum :jpeg :webp :png]]
-   [:quality [:int {:min 1 :max 100}]]
-   [:width :int]
-   [:height :int]])
-
-(def ^:private check-thumbnail-params
-  (sm/check-fn schema:thumbnail-params))
-
-;; Related info on how thumbnails generation
-;;  http://www.imagemagick.org/Usage/thumbnails/
-
-(def ^:private imagemagick-default-env
-  "Default environment variables for ImageMagick resource limits.
-   These are the soft ceiling — policy.xml is the hard ceiling."
-  {"MAGICK_THREAD_LIMIT" "2"
-   "MAGICK_MEMORY_LIMIT" "256MiB"
-   "MAGICK_MAP_LIMIT" "512MiB"
-   "MAGICK_AREA_LIMIT" "128MP"
-   "MAGICK_DISK_LIMIT" "1GiB"
-   "MAGICK_TIME_LIMIT" "30"})
-
-(defn- get-imagemagick-env
-  "Returns environment variables for ImageMagick commands.
-   Reads individual PENPOT_IMAGEMAGICK_* config values, falling back to defaults."
-  []
-  (let [thread (cf/get :imagemagick-thread-limit)
-        memory (cf/get :imagemagick-memory-limit)
-        map-l  (cf/get :imagemagick-map-limit)
-        area   (cf/get :imagemagick-area-limit)
-        disk   (cf/get :imagemagick-disk-limit)
-        time   (cf/get :imagemagick-time-limit)
-        width  (cf/get :imagemagick-width-limit)
-        height (cf/get :imagemagick-height-limit)]
-    (cond-> imagemagick-default-env
-      thread (assoc "MAGICK_THREAD_LIMIT" thread)
-      memory (assoc "MAGICK_MEMORY_LIMIT" memory)
-      map-l  (assoc "MAGICK_MAP_LIMIT" map-l)
-      area   (assoc "MAGICK_AREA_LIMIT" area)
-      disk   (assoc "MAGICK_DISK_LIMIT" disk)
-      time   (assoc "MAGICK_TIME_LIMIT" time)
-      width  (assoc "MAGICK_WIDTH_LIMIT" width)
-      height (assoc "MAGICK_HEIGHT_LIMIT" height))))
-
-(defn- exec-magick!
-  "Execute an ImageMagick command with resource limits.
-   `args` is a vector of string arguments to pass to `magick`."
-  [system args]
-  (let [cmd    (into ["magick"] args)
-        result (shell/exec! system
-                            :cmd cmd
-                            :env (get-imagemagick-env)
-                            :timeout 60)]
-    (when (not= 0 (:exit result))
-      (ex/raise :type :validation
-                :code :invalid-image
-                :hint (str "ImageMagick command failed: " (:err result))
-                :cmd cmd
-                :exit (:exit result)))
-    result))
-
-(defn- generic-process
-  [system {:keys [input format convert-args] :as params}]
-  (let [{:keys [path mtype]} input
-        format (or format (cm/mtype->format mtype))
-        ext    (cm/format->extension format)
-        tmp    (tmp/tempfile :prefix "penpot.media." :suffix ext)
-        args   (into [(str path)] (conj (vec convert-args) (str tmp)))]
-    (exec-magick! system args)
-    (assoc params
-           :format format
-           :mtype  (cm/format->mtype format)
-           :size   (fs/size tmp)
-           :data   tmp)))
-
-(defmethod process :generic-thumbnail
-  [system params]
-  (let [{:keys [quality width height] :as params}
-        (check-thumbnail-params params)]
-    (generic-process system
-                     (assoc params
-                            :convert-args ["-auto-orient" "-strip"
-                                           "-thumbnail" (str width "x" height ">")
-                                           "-quality" (str quality)]))))
-
-(defmethod process :profile-thumbnail
-  [system params]
-  (let [{:keys [quality width height] :as params}
-        (check-thumbnail-params params)]
-    (generic-process system
-                     (assoc params
-                            :convert-args ["-auto-orient" "-strip"
-                                           "-thumbnail" (str width "x" height "^")
-                                           "-gravity" "center"
-                                           "-extent" (str width "x" height)
-                                           "-quality" (str quality)]))))
-
-(defn get-basic-info-from-svg
-  [{:keys [tag attrs] :as data}]
-  (when (not= tag :svg)
-    (ex/raise :type :validation
-              :code :unable-to-parse-svg
-              :hint "uploaded svg has invalid content"))
-  (reduce (fn [default f]
-            (if-let [res (f attrs)]
-              (reduced res)
-              default))
-          {:width 100 :height 100}
-          [(fn parse-width-and-height
-             [{:keys [width height]}]
-             (when (and (string? width)
-                        (string? height))
-               (let [width  (d/parse-double width)
-                     height (d/parse-double height)]
-                 (when (and width height)
-                   {:width (int width)
-                    :height (int height)}))))
-           (fn parse-viewbox
-             [{:keys [viewBox]}]
-             (let [[x y width height] (->> (str/split viewBox #"\s+" 4)
-                                           (map d/parse-double))]
-               (when (and x y width height)
-                 {:width (int width)
-                  :height (int height)})))]))
-
-(defn- get-dimensions-with-orientation [system ^String path]
-  ;; Image magick doesn't give info about exif rotation so we use the identify command
-  ;; If we are processing an animated gif we use the first frame with -scene 0
-  (let [dim-result    (exec-magick! system ["identify" "-format" "%w %h\n" path])
-        orient-result (exec-magick! system ["identify" "-format" "%[EXIF:Orientation]\n" path])]
-    (when (= 0 (:exit dim-result))
-      (let [[w h] (-> (:out dim-result)
-                      str/trim
-                      (clojure.string/split #"\s+")
-                      (->> (mapv #(Integer/parseInt %))))
-            orientation-exit (:exit orient-result)
-            orientation      (-> orient-result :out str/trim)]
-        (if (= 0 orientation-exit)
-          (case orientation
-            ("6" "8") {:width h :height w} ; Rotated 90 or 270 degrees
-            {:width w :height h})          ; Normal or unknown orientation
-          {:width w :height h})))))        ; If orientation can't be read, use dimensions as-is
-
-(defmethod process :info
-  [system {:keys [input] :as params}]
-  (let [{:keys [path mtype] :as input} (check-input input)]
-    (if (= mtype "image/svg+xml")
-      (let [info (some-> path slurp parse-svg get-basic-info-from-svg)]
-        (when-not info
-          (ex/raise :type :validation
-                    :code :invalid-svg-file
-                    :hint "uploaded svg does not provides dimensions"))
-        (merge input info {:ts (ct/now) :size (fs/size path)}))
-
-      (let [path-str      (str path)
-            identify-res  (exec-magick! system ["identify" "-format" "image/%[magick]\n" path-str])
-            ;; identify prints one line per frame (animated GIFs, etc.); we take the first one
-            mtype'        (if (zero? (:exit identify-res))
-                            (-> identify-res
-                                :out
-                                str/trim
-                                (str/split #"\s+" 2)
-                                first
-                                str/lower)
-                            (ex/raise :type :validation
-                                      :code :invalid-image
-                                      :hint "invalid image"))
-            {:keys [width height]}
-            (or (get-dimensions-with-orientation system path-str)
-                (do
-                  (l/warn "Failed to read image dimensions with orientation" {:path path})
-                  (ex/raise :type :validation
-                            :code :invalid-image
-                            :hint "invalid image")))]
-        (when (and (string? mtype)
-                   (not= (str/lower mtype) mtype'))
-          (ex/raise :type :validation
-                    :code :media-type-mismatch
-                    :hint (str "Seems like you are uploading a file whose content does not match the extension."
-                               "Expected: " mtype ". Got: " mtype')))
-        (assoc input
-               :width  width
-               :height height
-               :size (fs/size path)
-               :ts (ct/now))))))
+  (if (contains? cf/flags :remote-media-processing)
+    (media.remote/process system params)
+    (media.local/process system params)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; IMAGE HELPERS
@@ -338,8 +59,8 @@
                           :hint "seems like the url points to resource with unknown size"))
 
               (-> {:size size :mtype mtype}
-                  (validate-media-type!)
-                  (validate-media-size!))))]
+                  (validation/validate-media-type!)
+                  (validation/validate-media-size!))))]
 
     (let [{:keys [body] :as response}
           (try
@@ -367,188 +88,24 @@
               (ex/raise :type :validation
                         :code :unable-to-download-image
                         :hint (str/ffmt "unable to download image from '%': I/O error" uri)
-                        :cause cause)))
+                        :cause cause)))]
 
-          {:keys [size mtype]} (parse-and-validate response)
-          path    (tmp/tempfile :prefix "penpot.media.download.")
-          written (io/write* path body :size size)]
+      (if body
+        (with-open [body body]
+          (let [{:keys [size mtype]} (parse-and-validate response)
+                path    (tmp/tempfile :prefix "penpot.media.download.")
+                written (io/write* path body :size size)]
 
-      (when (not= written size)
-        (ex/raise :type :internal
-                  :code :mismatch-write-size
-                  :hint "unexpected state: unable to write to file"))
+            (when (not= written size)
+              (ex/raise :type :internal
+                        :code :mismatch-write-size
+                        :hint "unexpected state: unable to write to file"))
 
-      ;; Sanitize: strip trailing data after image EOF markers
-      (let [new-size (sanitize/truncate-after-eof path mtype)]
-        {:path  path
-         :mtype mtype
-         :size  new-size}))))
+            ;; Sanitize: strip trailing data after image EOF markers
+            (let [new-size (sanitize/truncate-after-eof path mtype)]
+              {:path  path
+               :mtype mtype
+               :size  new-size})))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; FONTS
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- get-font-prlimit
-  "Returns resource limits for font processing tools, read from config."
-  []
-  {:mem (cf/get :font-process-mem)
-   :cpu (cf/get :font-process-cpu)})
-
-(defn- get-font-timeout
-  "Returns the wall-clock timeout for font processing, read from config."
-  []
-  (cf/get :font-process-timeout))
-
-(defn- exec-font!
-  "Execute a font processing command with resource limits.
-   `args` is a vector of string arguments."
-  [system args]
-  (shell/exec! system
-               :cmd args
-               :prlimit (get-font-prlimit)
-               :timeout (get-font-timeout)))
-
-(defmethod process :generate-fonts
-  [system {:keys [input] :as params}]
-  (letfn [(ttf->otf [data]
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".otf"))]
-              (try
-                (io/write* finput data)
-                (let [res (exec-font! system ["fontforge" "-lang=ff" "-c"
-                                              (str/fmt "Open('%s'); Generate('%s')"
-                                                       (str finput)
-                                                       (str foutput))])]
-                  (when (zero? (:exit res))
-                    foutput))
-                (finally
-                  (fs/delete finput)))))
-
-          (otf->ttf [data]
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".ttf"))]
-              (try
-                (io/write* finput data)
-                (let [res (exec-font! system ["fontforge" "-lang=ff" "-c"
-                                              (str/fmt "Open('%s'); Generate('%s')"
-                                                       (str finput)
-                                                       (str foutput))])]
-                  (when (zero? (:exit res))
-                    foutput))
-                (finally
-                  (fs/delete finput)))))
-
-          (ttf-or-otf->woff [data]
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
-                  foutput (fs/path (str finput ".woff"))]
-              (try
-                (io/write* finput data)
-                (let [res (exec-font! system ["sfnt2woff" (str finput)])]
-                  (when (zero? (:exit res))
-                    foutput))
-                (finally
-                  (fs/delete finput)))))
-
-          (woff->sfnt [data]
-            (let [finput (tmp/tempfile :prefix "penpot" :suffix "")]
-              (try
-                (io/write* finput data)
-                (let [res (shell/exec! system
-                                       :cmd ["woff2sfnt" (str finput)]
-                                       :out-enc :bytes
-                                       :prlimit (get-font-prlimit)
-                                       :timeout (get-font-timeout))]
-                  (when (zero? (:exit res))
-                    (:out res)))
-                (finally
-                  (fs/delete finput)))))
-
-          (woff2->sfnt [data]
-            ;; woff2_decompress outputs to same directory with .ttf extension
-            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix ".woff2")
-                  foutput (fs/path (str/replace (str finput) #"\.woff2$" ".ttf"))]
-              (try
-                (io/write* finput data)
-                (let [res (exec-font! system ["woff2_decompress" (str finput)])]
-                  (if (zero? (:exit res))
-                    foutput
-                    (do
-                      (when (fs/exists? foutput)
-                        (fs/delete foutput))
-                      nil)))
-                (finally
-                  (fs/delete finput)))))
-
-          ;; Documented here:
-          ;; https://docs.microsoft.com/en-us/typography/opentype/spec/otff#table-directory
-          (get-sfnt-type [data]
-            (let [buff (bb/slice data 0 4)
-                  type (bc/bytes->hex buff)]
-              (case type
-                "4f54544f" :otf
-                "00010000" :ttf
-                (ex/raise :type :internal
-                          :code :unexpected-data
-                          :hint "unexpected font data"))))
-
-          (gen-if-nil [val factory]
-            (if (nil? val)
-              (factory)
-              val))]
-
-    (let [current (into #{} (keys input))]
-      (cond
-        (contains? current "font/ttf")
-        (let [data (get input "font/ttf")]
-          (-> input
-              (update "font/otf" gen-if-nil #(ttf->otf data))
-              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))))
-
-        (contains? current "font/otf")
-        (let [data (get input "font/otf")]
-          (-> input
-              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))
-              (assoc "font/ttf" (otf->ttf data))))
-
-        (contains? current "font/woff")
-        (let [data (get input "font/woff")
-              sfnt (woff->sfnt data)]
-          (when-not sfnt
-            (ex/raise :type :validation
-                      :code :invalid-woff-file
-                      :hint "invalid woff file"))
-          (let [stype (get-sfnt-type sfnt)]
-            (cond-> input
-              true
-              (-> (assoc "font/woff" data))
-
-              (= stype :otf)
-              (-> (assoc "font/otf" sfnt)
-                  (assoc "font/ttf" (otf->ttf sfnt)))
-
-              (= stype :ttf)
-              (-> (assoc "font/otf" (ttf->otf sfnt))
-                  (assoc "font/ttf" sfnt)))))
-
-        (contains? current "font/woff2")
-        (let [data    (get input "font/woff2")
-              foutput (woff2->sfnt data)]
-          (when-not foutput
-            (ex/raise :type :validation
-                      :code :invalid-woff2-file
-                      :hint "invalid woff2 file"))
-          (try
-            (let [sfnt  (io/read* foutput)
-                  type (get-sfnt-type sfnt)]
-              (cond-> input
-                (= type :otf)
-                (-> (assoc "font/otf" sfnt)
-                    (assoc "font/ttf" (otf->ttf sfnt))
-                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))
-
-                (= type :ttf)
-                (-> (assoc "font/ttf" sfnt)
-                    (assoc "font/otf" (ttf->otf sfnt))
-                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))))
-            (finally
-              (fs/delete foutput))))))))
+        ;; No body - validation will raise appropriate error
+        (parse-and-validate response)))))

backend/src/app/media/local.clj

@@ -0,0 +1,366 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.media.local
+  "Local media processing via ImageMagick and FontForge shell commands."
+  (:require
+   [app.common.exceptions :as ex]
+   [app.common.logging :as l]
+   [app.common.media :as cm]
+   [app.common.schema :as sm]
+   [app.common.time :as ct]
+   [app.config :as cf]
+   [app.media.svg :as svg]
+   [app.media.validation :as validation]
+   [app.storage.tmp :as tmp]
+   [app.util.shell :as shell]
+   [buddy.core.bytes :as bb]
+   [buddy.core.codecs :as bc]
+   [clojure.string]
+   [cuerdas.core :as str]
+   [datoteka.fs :as fs]
+   [datoteka.io :as io]))
+
+(defmulti process (fn [_system params] (:cmd params)))
+
+(defmethod process :default
+  [_system {:keys [cmd] :as params}]
+  (ex/raise :type :internal
+            :code :not-implemented
+            :hint (str/fmt "No impl found for local process cmd: %s" cmd)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; IMAGE THUMBNAILS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def ^:private schema:thumbnail-params
+  [:map {:title "ThumbnailParams"}
+   [:input validation/schema:input]
+   [:format [:enum :jpeg :webp :png]]
+   [:quality [:int {:min 1 :max 100}]]
+   [:width :int]
+   [:height :int]])
+
+(def ^:private check-thumbnail-params
+  (sm/check-fn schema:thumbnail-params))
+
+;; Related info on how thumbnails generation
+;;  http://www.imagemagick.org/Usage/thumbnails/
+
+(def ^:private imagemagick-default-env
+  "Default environment variables for ImageMagick resource limits.
+   These are the soft ceiling — policy.xml is the hard ceiling."
+  {"MAGICK_THREAD_LIMIT" "2"
+   "MAGICK_MEMORY_LIMIT" "256MiB"
+   "MAGICK_MAP_LIMIT" "512MiB"
+   "MAGICK_AREA_LIMIT" "128MP"
+   "MAGICK_DISK_LIMIT" "1GiB"
+   "MAGICK_TIME_LIMIT" "30"})
+
+(defn- get-imagemagick-env
+  "Returns environment variables for ImageMagick commands.
+   Reads individual PENPOT_IMAGEMAGICK_* config values, falling back to defaults."
+  []
+  (let [thread (cf/get :imagemagick-thread-limit)
+        memory (cf/get :imagemagick-memory-limit)
+        map-l  (cf/get :imagemagick-map-limit)
+        area   (cf/get :imagemagick-area-limit)
+        disk   (cf/get :imagemagick-disk-limit)
+        time   (cf/get :imagemagick-time-limit)
+        width  (cf/get :imagemagick-width-limit)
+        height (cf/get :imagemagick-height-limit)]
+    (cond-> imagemagick-default-env
+      thread (assoc "MAGICK_THREAD_LIMIT" thread)
+      memory (assoc "MAGICK_MEMORY_LIMIT" memory)
+      map-l  (assoc "MAGICK_MAP_LIMIT" map-l)
+      area   (assoc "MAGICK_AREA_LIMIT" area)
+      disk   (assoc "MAGICK_DISK_LIMIT" disk)
+      time   (assoc "MAGICK_TIME_LIMIT" time)
+      width  (assoc "MAGICK_WIDTH_LIMIT" width)
+      height (assoc "MAGICK_HEIGHT_LIMIT" height))))
+
+(defn- exec-magick!
+  "Execute an ImageMagick command with resource limits.
+   `args` is a vector of string arguments to pass to `magick`."
+  [system args]
+  (let [cmd    (into ["magick"] args)
+        result (shell/exec! system
+                            :cmd cmd
+                            :env (get-imagemagick-env)
+                            :timeout 60)]
+    (when (not= 0 (:exit result))
+      (ex/raise :type :validation
+                :code :invalid-image
+                :hint (str "ImageMagick command failed: " (:err result))
+                :cmd cmd
+                :exit (:exit result)))
+    result))
+
+(defn- generic-process
+  [system {:keys [input format convert-args] :as params}]
+  (let [{:keys [path mtype]} input
+        format (or format (cm/mtype->format mtype))
+        ext    (cm/format->extension format)
+        tmp    (tmp/tempfile :prefix "penpot.media." :suffix ext)
+        args   (into [(str path)] (conj (vec convert-args) (str tmp)))]
+    (exec-magick! system args)
+    (assoc params
+           :format format
+           :mtype  (cm/format->mtype format)
+           :size   (fs/size tmp)
+           :data   tmp)))
+
+(defmethod process :generic-thumbnail
+  [system params]
+  (let [{:keys [quality width height] :as params}
+        (check-thumbnail-params params)]
+    (generic-process system
+                     (assoc params
+                            :convert-args ["-auto-orient" "-strip"
+                                           "-thumbnail" (str width "x" height ">")
+                                           "-quality" (str quality)]))))
+
+(defmethod process :profile-thumbnail
+  [system params]
+  (let [{:keys [quality width height] :as params}
+        (check-thumbnail-params params)]
+    (generic-process system
+                     (assoc params
+                            :convert-args ["-auto-orient" "-strip"
+                                           "-thumbnail" (str width "x" height "^")
+                                           "-gravity" "center"
+                                           "-extent" (str width "x" height)
+                                           "-quality" (str quality)]))))
+
+(defn- get-dimensions-with-orientation [system ^String path]
+  ;; Image magick doesn't give info about exif rotation so we use the identify command
+  ;; If we are processing an animated gif we use the first frame with -scene 0
+  (let [dim-result    (exec-magick! system ["identify" "-format" "%w %h\n" path])
+        orient-result (exec-magick! system ["identify" "-format" "%[EXIF:Orientation]\n" path])]
+    (when (= 0 (:exit dim-result))
+      (let [[w h] (-> (:out dim-result)
+                      str/trim
+                      (clojure.string/split #"\s+")
+                      (->> (mapv #(Integer/parseInt %))))
+            orientation-exit (:exit orient-result)
+            orientation      (-> orient-result :out str/trim)]
+        (if (= 0 orientation-exit)
+          (case orientation
+            ("6" "8") {:width h :height w} ; Rotated 90 or 270 degrees
+            {:width w :height h})          ; Normal or unknown orientation
+          {:width w :height h})))))        ; If orientation can't be read, use dimensions as-is
+
+(defmethod process :info
+  [system {:keys [input] :as params}]
+  (let [{:keys [path mtype] :as input} (validation/check-input input)]
+    (if (= mtype "image/svg+xml")
+      (let [info (some-> path slurp svg/parse-svg svg/get-basic-info-from-svg)]
+        (when-not info
+          (ex/raise :type :validation
+                    :code :invalid-svg-file
+                    :hint "uploaded svg does not provides dimensions"))
+        (merge input info {:ts (ct/now) :size (fs/size path)}))
+
+      (let [path-str      (str path)
+            identify-res  (exec-magick! system ["identify" "-format" "image/%[magick]\n" path-str])
+            ;; identify prints one line per frame (animated GIFs, etc.); we take the first one
+            mtype'        (if (zero? (:exit identify-res))
+                            (-> identify-res
+                                :out
+                                str/trim
+                                (str/split #"\s+" 2)
+                                first
+                                str/lower)
+                            (ex/raise :type :validation
+                                      :code :invalid-image
+                                      :hint "invalid image"))
+            {:keys [width height]}
+            (or (get-dimensions-with-orientation system path-str)
+                (do
+                  (l/warn "Failed to read image dimensions with orientation" {:path path})
+                  (ex/raise :type :validation
+                            :code :invalid-image
+                            :hint "invalid image")))]
+        (when (and (string? mtype)
+                   (not= (str/lower mtype) mtype'))
+          (ex/raise :type :validation
+                    :code :media-type-mismatch
+                    :hint (str "Seems like you are uploading a file whose content does not match the extension."
+                               "Expected: " mtype ". Got: " mtype')))
+        (assoc input
+               :width  width
+               :height height
+               :size (fs/size path)
+               :ts (ct/now))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; FONTS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn- get-font-prlimit
+  "Returns resource limits for font processing tools, read from config."
+  []
+  {:mem (cf/get :font-process-mem)
+   :cpu (cf/get :font-process-cpu)})
+
+(defn- get-font-timeout
+  "Returns the wall-clock timeout for font processing, read from config."
+  []
+  (cf/get :font-process-timeout))
+
+(defn- exec-font!
+  "Execute a font processing command with resource limits.
+   `args` is a vector of string arguments."
+  [system args]
+  (shell/exec! system
+               :cmd args
+               :prlimit (get-font-prlimit)
+               :timeout (get-font-timeout)))
+
+(defmethod process :generate-fonts
+  [system {:keys [input] :as params}]
+  (letfn [(ttf->otf [data]
+            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
+                  foutput (fs/path (str finput ".otf"))]
+              (try
+                (io/write* finput data)
+                (let [res (exec-font! system ["fontforge" "-lang=ff" "-c"
+                                              (str/fmt "Open('%s'); Generate('%s')"
+                                                       (str finput)
+                                                       (str foutput))])]
+                  (when (zero? (:exit res))
+                    foutput))
+                (finally
+                  (fs/delete finput)))))
+
+          (otf->ttf [data]
+            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
+                  foutput (fs/path (str finput ".ttf"))]
+              (try
+                (io/write* finput data)
+                (let [res (exec-font! system ["fontforge" "-lang=ff" "-c"
+                                              (str/fmt "Open('%s'); Generate('%s')"
+                                                       (str finput)
+                                                       (str foutput))])]
+                  (when (zero? (:exit res))
+                    foutput))
+                (finally
+                  (fs/delete finput)))))
+
+          (ttf-or-otf->woff [data]
+            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix "")
+                  foutput (fs/path (str finput ".woff"))]
+              (try
+                (io/write* finput data)
+                (let [res (exec-font! system ["sfnt2woff" (str finput)])]
+                  (when (zero? (:exit res))
+                    foutput))
+                (finally
+                  (fs/delete finput)))))
+
+          (woff->sfnt [data]
+            (let [finput (tmp/tempfile :prefix "penpot" :suffix "")]
+              (try
+                (io/write* finput data)
+                (let [res (shell/exec! system
+                                       :cmd ["woff2sfnt" (str finput)]
+                                       :out-enc :bytes
+                                       :prlimit (get-font-prlimit)
+                                       :timeout (get-font-timeout))]
+                  (when (zero? (:exit res))
+                    (:out res)))
+                (finally
+                  (fs/delete finput)))))
+
+          (woff2->sfnt [data]
+            ;; woff2_decompress outputs to same directory with .ttf extension
+            (let [finput  (tmp/tempfile :prefix "penpot.font." :suffix ".woff2")
+                  foutput (fs/path (str/replace (str finput) #"\.woff2$" ".ttf"))]
+              (try
+                (io/write* finput data)
+                (let [res (exec-font! system ["woff2_decompress" (str finput)])]
+                  (if (zero? (:exit res))
+                    foutput
+                    (do
+                      (when (fs/exists? foutput)
+                        (fs/delete foutput))
+                      nil)))
+                (finally
+                  (fs/delete finput)))))
+
+          ;; Documented here:
+          ;; https://docs.microsoft.com/en-us/typography/opentype/spec/otff#table-directory
+          (get-sfnt-type [data]
+            (let [buff (bb/slice data 0 4)
+                  type (bc/bytes->hex buff)]
+              (case type
+                "4f54544f" :otf
+                "00010000" :ttf
+                (ex/raise :type :internal
+                          :code :unexpected-data
+                          :hint "unexpected font data"))))
+
+          (gen-if-nil [val factory]
+            (if (nil? val)
+              (factory)
+              val))]
+
+    (let [current (into #{} (keys input))]
+      (cond
+        (contains? current "font/ttf")
+        (let [data (get input "font/ttf")]
+          (-> input
+              (update "font/otf" gen-if-nil #(ttf->otf data))
+              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))))
+
+        (contains? current "font/otf")
+        (let [data (get input "font/otf")]
+          (-> input
+              (update "font/woff" gen-if-nil #(ttf-or-otf->woff data))
+              (assoc "font/ttf" (otf->ttf data))))
+
+        (contains? current "font/woff")
+        (let [data (get input "font/woff")
+              sfnt (woff->sfnt data)]
+          (when-not sfnt
+            (ex/raise :type :validation
+                      :code :invalid-woff-file
+                      :hint "invalid woff file"))
+          (let [stype (get-sfnt-type sfnt)]
+            (cond-> input
+              true
+              (-> (assoc "font/woff" data))
+
+              (= stype :otf)
+              (-> (assoc "font/otf" sfnt)
+                  (assoc "font/ttf" (otf->ttf sfnt)))
+
+              (= stype :ttf)
+              (-> (assoc "font/otf" (ttf->otf sfnt))
+                  (assoc "font/ttf" sfnt)))))
+
+        (contains? current "font/woff2")
+        (let [data    (get input "font/woff2")
+              foutput (woff2->sfnt data)]
+          (when-not foutput
+            (ex/raise :type :validation
+                      :code :invalid-woff2-file
+                      :hint "invalid woff2 file"))
+          (try
+            (let [sfnt  (io/read* foutput)
+                  type (get-sfnt-type sfnt)]
+              (cond-> input
+                (= type :otf)
+                (-> (assoc "font/otf" sfnt)
+                    (assoc "font/ttf" (otf->ttf sfnt))
+                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))
+
+                (= type :ttf)
+                (-> (assoc "font/ttf" sfnt)
+                    (assoc "font/otf" (ttf->otf sfnt))
+                    (update "font/woff" gen-if-nil #(ttf-or-otf->woff sfnt)))))
+            (finally
+              (fs/delete foutput))))))))

backend/src/app/media/remote.clj

@@ -0,0 +1,264 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.media.remote
+  "Remote media processing via the media-processor HTTP service."
+  (:require
+   [app.common.exceptions :as ex]
+   [app.common.media :as cm]
+   [app.common.time :as ct]
+   [app.common.uri :as uri]
+   [app.config :as cf]
+   [app.http.client :as http]
+   [app.media.svg :as svg]
+   [app.media.validation :as validation]
+   [app.setup :as-alias setup]
+   [app.storage.tmp :as tmp]
+   [app.util.json :as json]
+   [cuerdas.core :as str]
+   [datoteka.fs :as fs]
+   [datoteka.io :as io])
+  (:import
+   java.io.ByteArrayInputStream
+   java.io.InputStream
+   java.io.SequenceInputStream
+   java.net.ConnectException
+   java.net.http.HttpTimeoutException
+   java.util.Collections))
+
+(defn- service-base-url
+  "Returns the base URL of the media-processor service."
+  []
+  (or (cf/get :media-processing-service-uri)
+      (ex/raise :type :internal
+                :code :media-processor-not-configured
+                :hint "PENPOT_MEDIA_PROCESSING_SERVICE_URI is not configured")))
+
+(defn- service-timeout
+  "Returns the HTTP timeout (ms) for media-processor requests."
+  []
+  (or (cf/get :media-processing-service-timeout)
+      120000))
+
+(defn- get-shared-key
+  "Returns the shared key for authenticating with the media-processor."
+  [system]
+  (-> system ::setup/shared-keys :media-processor))
+
+(defn- parse-json-response
+  "Parse a JSON response body."
+  [body]
+  (json/read! body))
+
+(defn- translate-error
+  "Translate a media-processor error response into a Penpot exception."
+  [status body]
+  (let [code (or (:code body) "media-processor-error")
+        hint (or (:hint body) "media-processor request failed")]
+    (case status
+      400 {:type :validation    :code (keyword code) :hint hint}
+      403 {:type :authorization :code :forbidden      :hint hint}
+      413 {:type :restriction   :code (keyword code) :hint hint}
+      504 {:type :internal      :code :media-processor-timeout :hint hint}
+      {:type :internal :code (keyword code) :hint hint})))
+
+(defn service-request
+  "Make an HTTP request to the media-processor service."
+  [system {:keys [method uri body headers timeout]}]
+  (let [client  (::http/client system)
+        timeout (or timeout (service-timeout))]
+    (try
+      (let [resp (http/req client
+                           {:method method
+                            :uri uri
+                            :body body
+                            :headers headers}
+                           {:response-type :input-stream
+                            :skip-ssrf-check? true
+                            :timeout timeout})
+            status (:status resp)]
+        (when (not (<= 200 status 299))
+          (let [body (:body resp)]
+            (try
+              (let [parsed (try (parse-json-response body) (catch Exception _ nil))
+                    err    (translate-error status parsed)]
+                (ex/raise :type (:type err) :code (:code err) :hint (:hint err)))
+              (finally
+                (.close body)))))
+        resp)
+      (catch ConnectException _cause
+        (ex/raise :type :internal
+                  :code :media-processor-unavailable
+                  :hint "Cannot connect to media-processor service"))
+      (catch HttpTimeoutException _cause
+        (ex/raise :type :internal
+                  :code :media-processor-timeout
+                  :hint "media-processor service request timed out")))))
+
+(defn- multipart-boundary
+  []
+  (str "----PenpotBoundary" (System/currentTimeMillis)))
+
+(defn- build-multipart-stream
+  "Build a streaming multipart/form-data body with a single file field.
+   Returns an InputStream that lazily reads from the file on demand."
+  [^String boundary mtype ^InputStream file-stream]
+  (let [header (.getBytes (str "--" boundary "\r\n"
+                               "Content-Disposition: form-data; name=\"file\"; filename=\"file\"\r\n"
+                               "Content-Type: " mtype "\r\n"
+                               "\r\n")
+                          "UTF-8")
+        footer (.getBytes (str "\r\n--" boundary "--\r\n")
+                          "UTF-8")
+        parts  (Collections/enumeration
+                [(ByteArrayInputStream. header)
+                 file-stream
+                 (ByteArrayInputStream. footer)])]
+    (SequenceInputStream. parts)))
+
+(defn- service-multipart-request
+  "Send a multipart request to the media-processor service.
+   Accepts a file from disk via :path. The file stream is closed
+   after the HTTP request completes (success or failure)."
+  [system {:keys [endpoint path mtype query timeout]}]
+  (let [shared-key  (get-shared-key system)
+        boundary    (multipart-boundary)
+        ctype       (or mtype "application/octet-stream")
+        base-url    (service-base-url)
+        request-uri (cond-> (uri/join base-url endpoint)
+                      (seq query)
+                      (str "?" (uri/map->query-string query)))]
+    (with-open [file-stream (io/input-stream path)]
+      (let [body (build-multipart-stream boundary ctype file-stream)]
+        (service-request system
+                         {:method  :post
+                          :uri     request-uri
+                          :body    body
+                          :headers {"Content-Type" (str "multipart/form-data; boundary=" boundary)
+                                    "x-shared-key" shared-key}
+                          :timeout timeout})))))
+
+(def ^:private known-font-types
+  "Priority-ordered list of font mime-types the system knows how to convert.
+   Order matters: when a font upload contains multiple variants, the first
+   match becomes the conversion source (ttf preferred for best coverage)."
+  ["font/ttf" "font/otf" "font/woff" "font/woff2"])
+
+(defn- font-convert
+  "Convert a font to the given target mime-type via the media-processor service.
+   Accepts source font data as a filesystem Path. Returns a tempfile Path."
+  [system source-mtype target-mtype data]
+  (let [resp (service-multipart-request system {:endpoint "api/font/convert"
+                                                :path     data
+                                                :mtype    source-mtype
+                                                :query    {:target-type target-mtype}
+                                                :timeout  180000})
+        ext  (cm/mtype->extension target-mtype)
+        tmp  (tmp/tempfile :prefix "penpot.font." :suffix ext)
+        body (:body resp)]
+    (try
+      (io/write* tmp body)
+      (finally
+        (.close body)))
+    tmp))
+
+(defn- font-missing-variants
+  "Return the set of target mime-types that should be generated for the given
+   source mime-type (excluding font/woff2, which is never generated)."
+  [source-mtype]
+  (case source-mtype
+    "font/ttf"   #{"font/otf" "font/woff"}
+    "font/otf"   #{"font/ttf" "font/woff"}
+    "font/woff"  #{"font/ttf" "font/otf"}
+    "font/woff2" #{"font/ttf" "font/otf" "font/woff"}))
+
+(defmulti process (fn [_system params] (:cmd params)))
+
+(defmethod process :info
+  [system {:keys [input]}]
+  (let [{:keys [path mtype]} (validation/check-input input)]
+    (if (= mtype "image/svg+xml")
+      ;; SVG: parse locally (Sharp doesn't support SVG)
+      (let [info (some-> path slurp svg/parse-svg svg/get-basic-info-from-svg)]
+        (when-not info
+          (ex/raise :type :validation
+                    :code :invalid-svg-file
+                    :hint "uploaded svg does not provide dimensions"))
+        (merge input info {:ts (ct/now) :size (fs/size path)}))
+      ;; Raster: delegate to media-processor
+      (let [resp (service-multipart-request system {:endpoint "api/image/info"
+                                                    :path     path
+                                                    :mtype    mtype})
+            body (:body resp)]
+        (try
+          (let [info (parse-json-response body)
+                detected-mtype (:mtype info)]
+            (when (and (string? mtype)
+                       (string? detected-mtype)
+                       (not= (str/lower mtype) (str/lower detected-mtype)))
+              (ex/raise :type :validation
+                        :code :media-type-mismatch
+                        :hint (str "File content does not match the declared type. "
+                                   "Expected: " mtype ". Got: " detected-mtype)))
+            (assoc input
+                   :width  (:width info)
+                   :height (:height info)
+                   :size   (fs/size path)
+                   :ts     (ct/now)))
+          (finally
+            (.close body)))))))
+
+(defn- thumbnail-request
+  "Shared implementation for generic-thumbnail and profile-thumbnail."
+  [system params mode]
+  (let [{:keys [input format quality width height]} params
+        {:keys [path mtype]} (validation/check-input input)
+        fmt        (name (or format (cm/mtype->format mtype) :jpeg))
+        resp       (service-multipart-request system {:endpoint "api/image/thumbnail"
+                                                      :path     path
+                                                      :mtype    mtype
+                                                      :query    {:width   width
+                                                                 :height  height
+                                                                 :quality quality
+                                                                 :format  fmt
+                                                                 :mode    mode}})
+        out-format (or format (cm/mtype->format mtype) :jpeg)
+        ext        (cm/format->extension out-format)
+        tmp        (tmp/tempfile :prefix "penpot.media." :suffix ext)
+        body       (:body resp)]
+    (try
+      (io/write* tmp body)
+      (finally
+        (.close body)))
+    (assoc params
+           :format out-format
+           :mtype  (cm/format->mtype out-format)
+           :size   (fs/size tmp)
+           :data   tmp)))
+
+(defmethod process :generic-thumbnail
+  [system params]
+  (thumbnail-request system params "fit"))
+
+(defmethod process :profile-thumbnail
+  [system params]
+  (thumbnail-request system params "crop"))
+
+(defmethod process :generate-fonts
+  [system {:keys [input]}]
+  (let [source-mtype (or (some #(when (contains? input %) %) known-font-types)
+                         (ex/raise :type :validation
+                                   :code :invalid-font
+                                   :hint "No recognized font variant in input"))
+        data         (get input source-mtype)
+        present      (set (keys input))
+        targets      (remove present (font-missing-variants source-mtype))]
+    (reduce (fn [acc target-mtype]
+              (assoc acc target-mtype
+                     (font-convert system source-mtype target-mtype data)))
+            input
+            targets)))
+

backend/src/app/media/svg.clj

@@ -0,0 +1,130 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.media.svg
+  "SVG parsing, sanitization, and info extraction.
+   Centralizes all SVG-related security concerns."
+  (:require
+   [app.common.data :as d]
+   [app.common.data.macros :as dm]
+   [app.common.exceptions :as ex]
+   [app.common.logging :as l]
+   [clojure.xml :as xml]
+   [cuerdas.core :as str])
+  (:import
+   clojure.lang.XMLHandler
+   java.io.InputStream
+   javax.xml.parsers.SAXParserFactory
+   javax.xml.XMLConstants
+   org.apache.commons.io.IOUtils))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; SVG PARSING
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn- secure-parser-factory
+  [^InputStream input ^XMLHandler handler]
+  (.. (doto (SAXParserFactory/newInstance)
+        (.setFeature XMLConstants/FEATURE_SECURE_PROCESSING true)
+        (.setFeature "http://apache.org/xml/features/disallow-doctype-decl" true))
+      (newSAXParser)
+      (parse input handler)))
+
+(defn- strip-doctype
+  [data]
+  (cond-> data
+    (str/includes? data "<!DOCTYPE")
+    (str/replace #"<\!DOCTYPE[^>]*>" "")))
+
+(defn parse-svg
+  [text]
+  (let [text (strip-doctype text)]
+    (dm/with-open [istream (IOUtils/toInputStream ^String text "UTF-8")]
+      (xml/parse istream secure-parser-factory))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; SVG SANITIZATION
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def ^:private dangerous-attrs-pattern #"(?i)^on\w+$")
+(def ^:private javascript-href-pattern #"(?i)^javascript:")
+
+(defn- sanitize-svg-element
+  "Recursively sanitize an SVG element by removing dangerous tags and attributes."
+  [{:keys [tag attrs content] :as element}]
+  (when (and (map? element) tag)
+    (let [dangerous-tags #{:script :foreignObject :set :animate :animateTransform :animateColor :animateMotion}]
+      (when-not (contains? dangerous-tags tag)
+        (let [clean-attrs (->> attrs
+                               (remove (fn [[k v]]
+                                         (or (re-matches dangerous-attrs-pattern (name k))
+                                             (and (#{:href :xlink:href} k)
+                                                  (string? v)
+                                                  (re-find javascript-href-pattern (str/trim v))))))
+                               (into {}))
+              clean-content (when content
+                              (->> content
+                                   (filter #(or (string? %) (map? %)))
+                                   (map (fn [child]
+                                          (if (map? child)
+                                            (sanitize-svg-element child)
+                                            child)))
+                                   (filter some?)
+                                   vec))]
+          (cond-> {:tag tag :attrs clean-attrs}
+            (seq clean-content) (assoc :content clean-content)))))))
+
+(defn sanitize-svg
+  "Sanitize SVG content by removing dangerous elements and attributes.
+   Removes <script> tags, <foreignObject> elements, event handlers (on*),
+   and javascript: URLs from href attributes."
+  [svg-text]
+  (try
+    (let [parsed (parse-svg svg-text)
+          sanitized (sanitize-svg-element parsed)]
+      (if sanitized
+        (with-out-str (xml/emit sanitized))
+        (ex/raise :type :validation
+                  :code :invalid-svg-file
+                  :hint "SVG sanitization produced no output")))
+    (catch Exception e
+      (l/warn :hint "SVG sanitization failed, rejecting upload" :cause e)
+      (ex/raise :type :validation
+                :code :invalid-svg-file
+                :hint "SVG parsing failed during sanitization"
+                :cause e))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; SVG INFO EXTRACTION
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn get-basic-info-from-svg
+  [{:keys [tag attrs] :as data}]
+  (when (not= tag :svg)
+    (ex/raise :type :validation
+              :code :unable-to-parse-svg
+              :hint "uploaded svg has invalid content"))
+  (reduce (fn [default f]
+            (if-let [res (f attrs)]
+              (reduced res)
+              default))
+          {:width 100 :height 100}
+          [(fn parse-width-and-height
+             [{:keys [width height]}]
+             (when (and (string? width)
+                        (string? height))
+               (let [width  (d/parse-double width)
+                     height (d/parse-double height)]
+                 (when (and width height)
+                   {:width (int width)
+                    :height (int height)}))))
+           (fn parse-viewbox
+             [{:keys [viewBox]}]
+             (let [[x y width height] (->> (str/split viewBox #"\s+" 4)
+                                           (map d/parse-double))]
+               (when (and x y width height)
+                 {:width (int width)
+                  :height (int height)})))]))

backend/src/app/media/validation.clj

@@ -0,0 +1,68 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns app.media.validation
+  "Schemas and validation functions for media uploads.
+   Leaf namespace — depends on app.common.* and app.config only."
+  (:require
+   [app.common.exceptions :as ex]
+   [app.common.media :as cm]
+   [app.common.schema :as sm]
+   [app.config :as cf]
+   [cuerdas.core :as str]
+   [datoteka.fs :as fs]))
+
+(def schema:upload
+  [:map {:title "Upload"}
+   [:filename :string]
+   [:size ::sm/int]
+   [:path ::fs/path]
+   [:mtype {:optional true} :string]
+   [:headers {:optional true}
+    [:map-of :string :string]]])
+
+(def schema:input
+  [:map {:title "Input"}
+   [:path ::fs/path]
+   [:mtype {:optional true} ::sm/text]])
+
+(def check-input
+  (sm/check-fn schema:input))
+
+(defn validate-media-type!
+  ([upload] (validate-media-type! upload cm/image-types))
+  ([upload allowed]
+   (when-not (contains? allowed (:mtype upload))
+     (ex/raise :type :validation
+               :code :media-type-not-allowed
+               :hint "Seems like you are uploading an invalid media object"))
+
+   upload))
+
+(defn validate-media-size!
+  [upload]
+  (let [max-size (cf/get :media-max-file-size)]
+    (when (> (:size upload) max-size)
+      (ex/raise :type :restriction
+                :code :media-max-file-size-reached
+                :hint (str/ffmt "the uploaded file size % is greater than the maximum %"
+                                (:size upload)
+                                max-size)))
+    upload))
+
+(defn validate-font-size!
+  "Validates that the font file `upload` does not exceed the configured
+  `:font-max-file-size` limit.  Accepts the same map shape as
+  `validate-media-size!` — requires a `:size` key in bytes."
+  [upload]
+  (let [max-size (cf/get :font-max-file-size)]
+    (when (> (:size upload) max-size)
+      (ex/raise :type :restriction
+                :code :font-max-file-size-reached
+                :hint (str/ffmt "the uploaded font size % is greater than the maximum %"
+                                (:size upload)
+                                max-size)))
+    upload))

backend/src/app/migrations.clj

@@ -493,7 +493,13 @@
     :fn (mg/resource "app/migrations/sql/0150-mod-storage-object-table.sql")}
 
    {:name "0151-mod-file-tagged-object-thumbnail-table"
-    :fn (mg/resource "app/migrations/sql/0151-mod-file-tagged-object-thumbnail-table.sql")}])
+    :fn (mg/resource "app/migrations/sql/0151-mod-file-tagged-object-thumbnail-table.sql")}
+
+   {:name "0152-improve-uuid-defaults-and-drop-extension"
+    :fn (mg/resource "app/migrations/sql/0152-improve-uuid-defaults-and-drop-extension.sql")}
+
+   {:name "0152-rename-version-and-add-indexes-to-server-error-report"
+    :fn (mg/resource "app/migrations/sql/0152-rename-version-and-add-indexes-to-server-error-report.sql")}])
 
 (defn apply-migrations!
   [pool name migrations]

backend/src/app/migrations/sql/0152-improve-uuid-defaults-and-drop-extension.sql

@@ -0,0 +1,29 @@
+-- Migration: Replace uuid_generate_v4() defaults with gen_random_uuid()
+-- and remove uuid-ossp extension.
+--
+-- gen_random_uuid() is built into PostgreSQL >= 13 and requires no extension.
+-- The application already generates IDs explicitly via uuid/next in all
+-- code paths; this migration adds gen_random_uuid() as a safety-net default
+-- instead of the extension-dependent uuid_generate_v4().
+
+ALTER TABLE access_token             ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE audit_log                ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE comment                  ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE comment_thread           ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE file                     ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE file_change              ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE file_media_object        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE profile                  ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE project                  ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE project_profile_rel      ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE scheduled_task_history   ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE share_link               ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE storage_object           ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE task                     ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE team                     ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE team_access_request      ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE team_font_variant        ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE team_invitation          ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE team_profile_rel         ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE team_project_profile_rel ALTER COLUMN id SET DEFAULT gen_random_uuid();
+ALTER TABLE usage_quote              ALTER COLUMN id SET DEFAULT gen_random_uuid();

backend/src/app/migrations/sql/0152-rename-version-and-add-indexes-to-server-error-report.sql

@@ -0,0 +1,44 @@
+-- Add source column (keep version column as-is for backward compatibility)
+ALTER TABLE server_error_report
+  ADD COLUMN source integer;
+
+-- Trigger function to sync version -> source (backward compatibility with old code)
+CREATE OR REPLACE FUNCTION server_error_report__sync_version_to_source()
+RETURNS TRIGGER AS $$
+BEGIN
+  IF NEW.version IS NOT NULL AND NEW.source IS NULL THEN
+    NEW.source := NEW.version;
+  END IF;
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Trigger fires on INSERT or UPDATE OF version column
+CREATE TRIGGER server_error_report__sync_version_to_source__tgr
+  BEFORE INSERT OR UPDATE OF version ON server_error_report
+  FOR EACH ROW
+  EXECUTE FUNCTION server_error_report__sync_version_to_source();
+
+-- Backfill existing rows
+UPDATE server_error_report SET source = version WHERE source IS NULL;
+
+-- Drop old version index
+DROP INDEX IF EXISTS server_error_report__version__idx;
+
+-- Create new source index
+CREATE INDEX server_error_report__source__idx
+  ON server_error_report (source);
+
+-- Content-based indexes
+CREATE INDEX server_error_report__content_kind__idx
+  ON server_error_report (COALESCE(content->>'~:kind', content->>'~:origin'));
+
+CREATE INDEX server_error_report__content_tenant__idx
+  ON server_error_report ((content->>'~:tenant'));
+
+CREATE INDEX server_error_report__content_version__idx
+  ON server_error_report ((content->>'~:version'));
+
+-- Index for pagination
+CREATE INDEX server_error_report__created_at_id__idx
+  ON server_error_report (created_at DESC, id DESC);

backend/src/app/nitrate.clj

@@ -14,19 +14,49 @@
    [app.common.schema :as sm]
    [app.common.schema.generators :as sg]
    [app.common.time :as ct]
-   [app.common.types.organization :as cto]
+   [app.common.types.organization :as cto
+    :refer [schema:nitrate-sso]]
+   [app.common.uri :as u]
    [app.config :as cf]
    [app.http.client :as http]
    [app.http.session :as session]
    [app.rpc :as-alias rpc]
    [app.setup :as-alias setup]
+   [app.util.cache :as cache]
    [clojure.core :as c]
+   [clojure.string :as str]
    [integrant.core :as ig]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; HELPERS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(defn- join-path-segments
+  "Build a single relative path from Nitrate URI segments, normalizing slashes."
+  [segments]
+  (let [path (->> segments (map str) (str/join "/"))]
+    (->> (str/split path #"/")
+         (remove str/blank?)
+         (str/join "/"))))
+
+(defn- join-base-uri
+  "Join path segments to a base URI."
+  [base-uri & segments]
+  (u/join (u/ensure-path-slash base-uri)
+          (join-path-segments segments)))
+
+(defn- generate-nitrate-uri
+  "Joins relative path segments to the Nitrate backend URI.
+   Segments must not start with `/`"
+  [& segments]
+  (apply join-base-uri (cf/get :admin-console-uri) segments))
+
+(defn- generate-public-uri
+  "Joins relative path segments to the public backend URI.
+   Segments must not start with `/`"
+  [& segments]
+  (apply join-base-uri (cf/get :public-uri) segments))
+
 (defn- request-builder
   [cfg method uri shared-key profile-id request-params]
   (fn []
@@ -113,7 +143,7 @@
 
 (defn- request-to-nitrate
   [cfg method uri schema {:keys [::rpc/profile-id request-params throw-on-error?] :as params}]
-  (let [shared-key     (-> cfg ::setup/shared-keys :nitrate)
+  (let [shared-key     (-> cfg ::setup/shared-keys :admin-console)
         full-http-call (-> (request-builder cfg method uri shared-key profile-id request-params)
                            (with-retries 3)
                            (with-validate uri schema :throw-on-error? throw-on-error?))]
@@ -125,14 +155,14 @@
 
 (defn call
   [cfg method params]
-  (when (contains? cf/flags :nitrate)
+  (when (contains? cf/flags :admin-console)
     (let [client (get cfg ::client)
           method (get client method)]
       (method params))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(def ^:private schema:org-summary
+(def ^:private schema:organization-summary
   [:map
    [:id ::sm/uuid]
    [:name ::sm/text]
@@ -143,13 +173,6 @@
       [:id ::sm/uuid]
       [:is-your-penpot :boolean]]]]])
 
-(def ^:private schema:profile-org
-  [:map
-   [:is-member :boolean]
-   [:organization-id {:optional true} [:maybe ::sm/uuid]]
-   [:default-team-id {:optional true} [:maybe ::sm/uuid]]])
-
-
 ;; TODO Unify with schemas on backend/src/app/http/management.clj
 (def ^:private schema:timestamp
   (sm/type-schema
@@ -166,6 +189,13 @@
      :decode/json ct/inst
      :encode/json inst-ms}}))
 
+(def ^:private schema:profile-organization
+  [:map
+   [:is-member :boolean]
+   [:organization-id {:optional true} [:maybe ::sm/uuid]]
+   [:default-team-id {:optional true} [:maybe ::sm/uuid]]
+   [:created-at {:optional true} [:maybe schema:timestamp]]])
+
 (def ^:private schema:subscription
   [:map {:title "Subscription"}
    [:id ::sm/text]
@@ -223,60 +253,52 @@
   [:map
    [:licenses ::sm/boolean]])
 
-(defn- get-team-org-api
+(defn- get-team-organization-api
   [cfg {:keys [team-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/teams/"
-                             team-id)
-                        cto/schema:team-with-organization params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri "api/teams/" team-id)
+                      cto/schema:team-with-organization params))
 
-(defn- get-org-membership-api
+(defn- get-organization-membership-api
   [cfg {:keys [profile-id organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/members/"
-                             profile-id)
-                        schema:profile-org params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri
+                       "api/organizations/"
+                       organization-id
+                       "members/"
+                       profile-id)
+                      schema:profile-organization params))
 
-(defn- get-org-membership-by-team-api
+(defn- get-organization-membership-by-team-api
   [cfg {:keys [profile-id team-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/teams/"
-                             team-id
-                             "/users/"
-                             profile-id)
-                        schema:profile-org params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri
+                       "api/teams/"
+                       team-id
+                       "users/"
+                       profile-id)
+                      schema:profile-organization params))
 
-
-(defn- get-org-summary-api
+(defn- get-organization-summary-api
   [cfg {:keys [organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/summary")
-                        schema:org-summary params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri
+                       "api/organizations/"
+                       organization-id
+                       "summary")
+                      schema:organization-summary params))
 
-(defn- get-owned-orgs-api
+(defn- get-owned-organizations-api
   [cfg {:keys [profile-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/users/"
-                             profile-id
-                             "/owned-organizations")
-                        [:vector schema:org-summary]
-                        params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri
+                       "api/users/"
+                       profile-id
+                       "owned-organizations")
+                      [:vector schema:organization-summary]
+                      params))
 
-(def ^:private schema:org-summary-counts
+(def ^:private schema:organization-summary-counts
   [:map
    [:id ::sm/uuid]
    [:name ::sm/text]
@@ -286,101 +308,94 @@
    [:avatar-bg-url {:optional true} [:maybe ::sm/uri]]
    [:logo-id {:optional true} [:maybe ::sm/uuid]]])
 
-(defn- get-owned-orgs-summary-api
+(defn- get-owned-organizations-summary-api
   [cfg {:keys [profile-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        orgs    (request-to-nitrate cfg :get
-                                    (str baseuri
-                                         "/api/users/"
-                                         profile-id
-                                         "/owned-organizations-summary")
-                                    [:vector schema:org-summary-counts]
-                                    params)]
-    (mapv (fn [org]
-            (if-let [logo-id (:logo-id org)]
-              (assoc org :custom-photo (str (cf/get :public-uri) "/assets/by-id/" logo-id))
-              org))
-          orgs)))
+  (let [organizations (request-to-nitrate cfg :get
+                                          (generate-nitrate-uri
+                                           "api/users/"
+                                           profile-id
+                                           "owned-organizations-summary")
+                                          [:vector schema:organization-summary-counts]
+                                          params)]
+    (mapv (fn [organization]
+            (if-let [logo-id (:logo-id organization)]
+              (assoc organization :custom-photo (generate-public-uri "assets/by-id/" logo-id))
+              organization))
+          organizations)))
 
 (defn- cleanup-deleted-penpot-user-api
   [cfg {:keys [profile-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :post
-                        (str baseuri
-                             "/api/users/"
-                             profile-id
-                             "/cleanup-after-deletion")
-                        nil params)))
+  (request-to-nitrate cfg :post
+                      (generate-nitrate-uri
+                       "api/users/"
+                       profile-id
+                       "cleanup-after-deletion")
+                      nil params))
 
-(defn- set-team-org-api
+(defn- set-team-organization-api
   [cfg {:keys [organization-id team-id is-default] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        params (assoc params :request-params {:team-id team-id
+  (let [params (assoc params :request-params {:team-id team-id
                                               :is-your-penpot (true? is-default)})
         team (request-to-nitrate cfg :post
-                                 (str baseuri
-                                      "/api/organizations/"
-                                      organization-id
-                                      "/add-team")
+                                 (generate-nitrate-uri
+                                  "api/organizations/"
+                                  organization-id
+                                  "add-team")
                                  cto/schema:team-with-organization params)
         custom-photo (when-let [logo-id (dm/get-in team [:organization :logo-id])]
-                       (str (cf/get :public-uri) "/assets/by-id/" logo-id))]
+                       (generate-public-uri "assets/by-id/" logo-id))]
     (cond-> team
       custom-photo
       (assoc-in [:organization :custom-photo] custom-photo))))
 
-(defn- add-profile-to-org-api
+(defn- add-profile-to-organization-api
   [cfg {:keys [profile-id organization-id team-id email] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        request-params (cond-> {:user-id profile-id :team-id team-id}
+  (let [request-params (cond-> {:user-id profile-id :team-id team-id}
                          (some? email) (assoc :email email))
         params (assoc params :request-params request-params)]
     (request-to-nitrate cfg :post
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/add-user")
-                        schema:profile-org params)))
+                        (generate-nitrate-uri
+                         "api/organizations/"
+                         organization-id
+                         "add-user")
+                        schema:profile-organization params)))
 
-(defn- remove-profile-from-org-api
-  [cfg {:keys [profile-id organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        params (assoc params :request-params {:user-id profile-id})]
+(defn- remove-profile-from-organization-api
+  [cfg {:keys [profile-id organization-id user-who-delete-member deleted-by-role] :as params}]
+  (let [request-params (cond-> {:user-id profile-id}
+                         (some? user-who-delete-member)
+                         (assoc :user-who-delete-member user-who-delete-member)
+                         (some? deleted-by-role)
+                         (assoc :deleted-by-role deleted-by-role))
+        params (assoc params :request-params request-params)]
     (request-to-nitrate cfg :post
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/remove-user")
+                        (generate-nitrate-uri
+                         "api/organizations/"
+                         organization-id
+                         "remove-user")
                         nil params)))
 
-(defn- remove-team-from-org-api
+(defn- remove-team-from-organization-api
   [cfg {:keys [team-id organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)
-        params (assoc params :request-params {:team-id team-id})]
+  (let [params (assoc params :request-params {:team-id team-id})]
     (request-to-nitrate cfg :post
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/remove-team")
+                        (generate-nitrate-uri
+                         "api/organizations/"
+                         organization-id
+                         "remove-team")
                         nil params)))
 
 (defn- delete-team-api
   [cfg {:keys [team-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :delete
-                        (str baseuri
-                             "/api/teams/"
-                             team-id)
-                        nil params)))
+  (request-to-nitrate cfg :delete
+                      (generate-nitrate-uri "api/teams/" team-id)
+                      nil params))
 
 (defn- get-subscription-api
   [cfg {:keys [profile-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/subscriptions/"
-                             profile-id)
-                        schema:subscription params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri "api/subscriptions/" profile-id)
+                      schema:subscription params))
 
 (def ^:private schema:subscription-warning
   [:maybe
@@ -392,80 +407,79 @@
 
 (defn- get-subscription-warning-api
   [cfg {:keys [penpot-id profile-id] :as params}]
-  (let [baseuri   (cf/get :nitrate-backend-uri)
-        penpot-id (or penpot-id profile-id)]
+  (let [penpot-id (or penpot-id profile-id)]
     (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/subscription-warning/"
-                             penpot-id)
+                        (generate-nitrate-uri "api/subscription-warning/" penpot-id)
                         schema:subscription-warning params)))
 
 (defn- get-connectivity-api
   [cfg params]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/connectivity")
-                        schema:connectivity params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri "api/connectivity")
+                      schema:connectivity params))
+
+(def ^:private schema:identity
+  [:map
+   [:nitrate-id ::sm/text]
+   [:public-key ::sm/text]])
+
+(defn- get-identity-api
+  [cfg params]
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri "api/identity")
+                      schema:identity params))
 
 (def ^:private schema:redeem-result
   [:map
    [:cancel-at [:maybe schema:timestamp]]])
 
-(defn- get-org-permissions-api
+(defn- get-organization-permissions-api
   [cfg {:keys [organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/permissions")
-                        [:map
-                         [:organization-id ::sm/uuid]
-                         [:owner-id ::sm/uuid]
-                         [:permissions [:map-of :keyword :string]]]
-                        params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri
+                       "api/organizations/"
+                       organization-id
+                       "permissions")
+                      [:map
+                       [:organization-id ::sm/uuid]
+                       [:owner-id ::sm/uuid]
+                       [:permissions [:map-of :keyword :string]]]
+                      params))
 
-(def ^:private schema:nitrate-sso
-  [:map
-   [:organization-id ::sm/uuid]
-   [:active [:maybe :boolean]]
-   [:provider [:maybe :string]]
-   [:client-id [:maybe :string]]
-   [:base-url [:maybe :string]]
-   [:client-secret [:maybe :string]]
-   [:issuer [:maybe :string]]
-   [:scopes [:maybe [::sm/set ::sm/text]]]])
+(defn- get-organization-sso-api
+  "Fetches the SSO configuration for an organization from Nitrate."
+  [cfg {:keys [organization-id] :as params}]
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri
+                       "api/organizations/"
+                       organization-id
+                       "sso")
+                      schema:nitrate-sso
+                      params))
 
-(defn- get-org-sso-by-team-api
+(defn- get-organization-sso-by-team-api
   [cfg {:keys [team-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/teams/"
-                             team-id
-                             "/sso")
-                        schema:nitrate-sso
-                        params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri "api/teams/" team-id "sso")
+                      schema:nitrate-sso
+                      params))
 
-(defn- get-org-members-api
+(defn- get-organization-members-api
   [cfg {:keys [organization-id] :as params}]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :get
-                        (str baseuri
-                             "/api/organizations/"
-                             organization-id
-                             "/members-list")
-                        [:vector ::sm/uuid]
-                        params)))
+  (request-to-nitrate cfg :get
+                      (generate-nitrate-uri
+                       "api/organizations/"
+                       organization-id
+                       "members-list")
+                      [:vector ::sm/uuid]
+                      params))
 
 (defn- redeem-activation-code-api
   [cfg params]
-  (let [baseuri (cf/get :nitrate-backend-uri)]
-    (request-to-nitrate cfg :post
-                        (str baseuri "/api/activation-codes/redeem")
-                        schema:redeem-result
-                        (assoc params :throw-on-error? true))))
+  (request-to-nitrate cfg :post
+                      (generate-nitrate-uri "api/activation-codes/redeem")
+                      schema:redeem-result
+                      (assoc params :throw-on-error? true)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; INITIALIZATION
@@ -473,40 +487,86 @@
 
 (defmethod ig/init-key ::client
   [_ cfg]
-  (when (contains? cf/flags :nitrate)
-    {:get-team-org                 (partial get-team-org-api cfg)
-     :set-team-org                 (partial set-team-org-api cfg)
-     :get-org-membership           (partial get-org-membership-api cfg)
-     :get-org-membership-by-team   (partial get-org-membership-by-team-api cfg)
-     :get-org-summary              (partial get-org-summary-api cfg)
-     :get-owned-orgs               (partial get-owned-orgs-api cfg)
-     :get-owned-orgs-summary       (partial get-owned-orgs-summary-api cfg)
-     :get-org-members              (partial get-org-members-api cfg)
+  (when (contains? cf/flags :admin-console)
+    {:get-team-organization                 (partial get-team-organization-api cfg)
+     :set-team-organization                 (partial set-team-organization-api cfg)
+     :get-organization-membership           (partial get-organization-membership-api cfg)
+     :get-organization-membership-by-team   (partial get-organization-membership-by-team-api cfg)
+     :get-organization-summary              (partial get-organization-summary-api cfg)
+     :get-owned-organizations               (partial get-owned-organizations-api cfg)
+     :get-owned-organizations-summary       (partial get-owned-organizations-summary-api cfg)
+     :get-organization-members              (partial get-organization-members-api cfg)
      :cleanup-deleted-penpot-user  (partial cleanup-deleted-penpot-user-api cfg)
-     :add-profile-to-org           (partial add-profile-to-org-api cfg)
-     :remove-profile-from-org      (partial remove-profile-from-org-api cfg)
-     :get-org-permissions          (partial get-org-permissions-api cfg)
-     :get-org-sso-by-team          (partial get-org-sso-by-team-api cfg)
+     :add-profile-to-organization           (partial add-profile-to-organization-api cfg)
+     :remove-profile-from-organization      (partial remove-profile-from-organization-api cfg)
+     :get-organization-permissions          (partial get-organization-permissions-api cfg)
+     :get-organization-sso-by-team          (partial get-organization-sso-by-team-api cfg)
+     :get-organization-sso                  (partial get-organization-sso-api cfg)
      :delete-team                  (partial delete-team-api cfg)
-     :remove-team-from-org         (partial remove-team-from-org-api cfg)
+     :remove-team-from-organization         (partial remove-team-from-organization-api cfg)
      :get-subscription             (partial get-subscription-api cfg)
      :get-subscription-warning     (partial get-subscription-warning-api cfg)
      :connectivity                 (partial get-connectivity-api cfg)
+     :get-identity                 (partial get-identity-api cfg)
      :redeem-activation-code       (partial redeem-activation-code-api cfg)}))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; UTILS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(defonce ^:private team-organization-owner-cache
+  ;; Short TTL: permission checks run on the read path, so we avoid an
+  ;; HTTP call to nitrate per check. The organization owner of a team rarely
+  ;; changes, and stale entries only grant read access for a few seconds.
+  (cache/create :expire "30s" :max-size 2048))
+
+(defn- nitrate-client?
+  "True when `cfg` is a config map carrying the nitrate client (i.e. not
+  a raw db connection/pool passed by an internal caller)."
+  [cfg]
+  (and (map? cfg) (some? (get cfg ::client))))
+
+(def ^:private cache-miss ::no-organization-owner)
+
+(defn- get-team-organization-owner-id
+  "Returns the organization owner-id for `team-id`, or nil. Cached
+  briefly, including negative results (teams with no organization) so
+  repeated unauthorized probes don't each hit nitrate."
+  [cfg team-id]
+  (let [owner-id (cache/get team-organization-owner-cache team-id
+                            (fn [team-id]
+                              (let [team-with-organization (call cfg :get-team-organization {:team-id team-id})]
+                                (or (get-in team-with-organization [:organization :owner-id])
+                                    cache-miss))))]
+    (when-not (= owner-id cache-miss)
+      owner-id)))
+
+(defn organization-owner-of-team?
+  "True if `profile-id` is the owner of the organization that owns
+  `team-id`. Used to grant non-member organization owners read-only access to the
+  teams of their organizations. `cfg` must be a config map with the
+  nitrate client; raw db connections/pools yield false so internal
+  callers are unaffected. Returns false when the :nitrate flag is off."
+  [cfg profile-id team-id]
+  (boolean
+   (when (and (contains? cf/flags :admin-console)
+              (nitrate-client? cfg)
+              (some? team-id)
+              (some? profile-id))
+     (= profile-id (get-team-organization-owner-id cfg team-id)))))
+
 (defn sso-session-authorized?
-  "Fetches the org-SSO config for the given team and checks whether
-  the HTTP request has a valid session entry for it. Returns a map
+  "Fetches the organization-SSO config for the given organization or team and checks
+  whether the HTTP request has a valid session entry for it. Returns a map
   with :authorized and :sso keys."
-  [cfg team-id request]
-  (let [session (session/get-session request) sso (call cfg :get-org-sso-by-team {:team-id team-id})]
+  [cfg organization-id team-id request]
+  (let [session (session/get-session request)
+        sso     (if organization-id
+                  (call cfg :get-organization-sso {:organization-id organization-id})
+                  (call cfg :get-organization-sso-by-team {:team-id team-id}))]
     (if-not (:active sso)
       {:authorized true :sso sso}
-      (if (or (:issuer sso) (:base-url sso))
+      (if-not (str/blank? (:issuer sso))
         (let [props           (:props session)
               sso-map         (get props :sso {})
               organization-id (:organization-id sso)
@@ -536,21 +596,21 @@
                    :cause cause)
           profile)))))
 
-(defn add-org-info-to-team
+(defn add-organization-info-to-team
   "Enriches a team map with organization information from Nitrate.
   Adds organization-id, organization-name, organization-slug, organization-owner-id, and your-penpot fields.
-  Returns the original team unchanged if the request fails or org data is nil.
+  Returns the original team unchanged if the request fails or organization data is nil.
   Propagates `:nitrate-unavailable` so the request is rejected when Nitrate is unreachable."
   [cfg team params]
   (try
     (let [params        (assoc (or params {}) :team-id (:id team))
-          team-with-org (call cfg :get-team-org params)
-          org           (:organization team-with-org)]
-      (if (some? org)
-        (-> (cto/apply-organization team (assoc org :custom-photo
-                                                (when-let [logo-id (:logo-id org)]
-                                                  (str (cf/get :public-uri) "/assets/by-id/" logo-id))))
-            (assoc :is-default (or (:is-default team) (true? (:is-your-penpot team-with-org)))))
+          team-with-organization (call cfg :get-team-organization params)
+          organization           (:organization team-with-organization)]
+      (if (some? organization)
+        (-> (cto/apply-organization team (assoc organization :custom-photo
+                                                (when-let [logo-id (:logo-id organization)]
+                                                  (generate-public-uri "assets/by-id/" logo-id))))
+            (assoc :is-default (or (:is-default team) (true? (:is-your-penpot team-with-organization)))))
         team))
     (catch Throwable cause
       (if (= :nitrate-unavailable (-> cause ex-data :type))
@@ -570,10 +630,10 @@
                       :team-id (:id team)
                       :organization-id (:organization-id params)
                       :is-default (:is-default params))
-        result (call cfg :set-team-org params)]
+        result (call cfg :set-team-organization params)]
     (when (nil? result)
       (ex/raise :type :internal
-                :code :failed-to-set-team-org
+                :code :failed-to-set-team-organization
                 :context {:team-id (:id team)
                           :organization-id (:organization-id params)}))
     team))