Merge remote-tracking branch 'origin/master' into beta

Add 'test' key with 'Beta tests' label to workerRoute response data.
2026-05-27 11:47:40 +02:00 · 2026-05-21 11:39:40 +02:00
667 changed files with 13700 additions and 220563 deletions
@@ -1,7 +1 @@
 /docker-compose.yml
-
-# Runtime-generated replication bootstrap snapshots may contain infrastructure
-# metadata and encrypted/plaintext credential material. They must be
-# supplied at runtime via mounted storage, not baked into deployment images.
-/services/nginx/app/storage/replication-bootstrap.json
-/services/nginx/app/storage/replication-bootstrap-*.json
@@ -53,8 +53,8 @@ ECONOMIC_API_APP_SECRET_TOKEN=
 # Edge broker defaults for shell relay and gateway dispatch.
 EDGE_BROKER_URL=http://edge-broker:4300
 EDGE_PUBLIC_BROKER_URL=http://localhost/api/edge-broker
-EDGE_AUTH_MODE=strict
-EDGE_BROKER_SHARED_SECRET=
+EDGE_AUTH_MODE=manager
+EDGE_BROKER_SHARED_SECRET=truckwash-edge-dev

 # Redis credentials
 REDIS_CONFIG_HOST=redis
@@ -0,0 +1,42 @@
+USE_ENV=true
+# Target of the database connection. Can be either 'live' or 'debug'.
+CONFIG_DB_TARGET=live
+CONFIG_DB_DATABASE=nnks_db
+#CONFIG_DB_HOST=94.130.142.41
+CONFIG_DB_HOST=23.88.23.183
+CONFIG_DB_PASSWORD=562X0Lrr7Cz6zpXZ11I
+CONFIG_DB_USER=root
+CONFIG_DB_PORT=5432
+CONFIG_DB_DEBUG_DATABASE=nnks_db
+CONFIG_DB_DEBUG_HOST=23.88.23.183
+CONFIG_DB_DEBUG_PORT=5432
+CONFIG_DB_DEBUG_PASSWORD=562X0Lrr7Cz6zpXZ11I
+CONFIG_DB_DEBUG_USER=root
+CONFIG_TIMEZONE=Europe/Copenhagen
+CORS=https://truckwash.io,https://www.truckwash.io,https://api.truckwash.io,https://api.truckwash.io:4433,https://web.truckwash.dk,https://api.truckwash.dk,https://truckwash.dk,https://www.truckwash.dk,https://staging.truckwash.io,http://localhost,https://localhost,http://localhost:4433,https://localhost:4433,https://twdev.jeppeb.dk,http://localhost:5173
+# CORS=*
+
+DEBUG=false
+ECONOMIC_API_APP_ACCESS_GRANT=94bhkmdtaDA7kVn9abF2SGDccBDMvk5a6iWYnmJMbvQ1
+ECONOMIC_API_APP_ACCESS_GRANT2=qGSBSkh1pjBtdSOygHhaMPn1A4PcMto3sCDCGYpLmsg1
+ECONOMIC_API_APP_SECRET_TOKEN=V8GSEcIxMsTISczzTTBbOAMJyh8eucGZtBiGOxjMFg0
+EMAIL_WASH_CERTIFICATE_TOKEN=H7uDTtFaeN4asqpb5okh6dr8z209SGtt
+ENCRYPTION_KEY=Gvm37uF2VyTOjGkVl4kjrGQ0qRwOyq9lr3+p/QyUDjc\\=
+MINIO_ACCESS_KEY=d7u6RaFyYmckAIWYGUYr
+MINIO_ENDPOINT=http://162.55.225.220:9000
+MINIO_SECRET_KEY=a2wJUQfkOPNO3UJfXYIdpNq4r1RrthcjiUfW1gVS
+REDIS_CONFIG_DATABASE=0
+REDIS_CONFIG_HOST=23.88.23.183
+REDIS_CONFIG_PASSWORD=BlVg5o1NwkkR1IjKxQm
+REDIS_CONFIG_PORT=5433
+REDIS_CONFIG_USER=default
+REDIS_CONFIG_DEBUG_PORT=5433
+REDIS_CONFIG_DEBUG_USER=default
+SLACK_DEFAULT_WEBHOOK=https://hooks.slaCk.com/services/T05SRKWTX9C/B08AGMP459P/1W5JN1NpHsHlbHHM2WljpvrU
+WORDPRESS_API_URL=https://www.truckwash.dk/wp-admin/admin-ajax.php
+WORDPRESS_STATIC_TOKEN=earm8BX4MFTgS6JCNQdqW5EzHUutv2Vx
+ELASTIC_APM_SERVER_URL=http://elastic-agent:8200
+ELASTIC_APM_SECRET_TOKEN=apm_dev_token
+ELASTIC_APM_SERVICE_NAME=api-truckwash
+ELASTIC_APM_ENVIRONMENT=dev
+AUTO_COMPOSER_INSTALL=false
@@ -1,56 +0,0 @@
-# Default branch protection
-
-`master` is changed through pull requests. Do not push or publish directly to
-the default branch, including through automation or the Git Data API.
-
-## Normal publishing flow
-
-1. Create a scoped `agent/*` or feature branch from the current `origin/master`.
-2. Commit and push only the intended changes.
-3. Open a pull request targeting `master`.
-4. Wait for the `Required CI` check. If `master` moves, update the branch and
-   wait for the strict check to rerun.
-5. Resolve every review conversation and squash-merge the pull request.
-6. Confirm the post-merge `Release Manager gate` completes on `master`.
-
-The aggregate check covers the PHP unit, integration, API, and legacy matrix,
-plus Edge Agent, Edge Broker, and Edge Gateway Backend. Qodana is advisory and
-the Release Manager gate is intentionally post-merge.
-
-## Desired ruleset
-
-[`rulesets/protect-default-branch.json`](rulesets/protect-default-branch.json)
-is the importable final desired-state repository-ruleset request body. For the
-initial POST, copy the file and override `enforcement` to `disabled`. Inspect
-the normalized ruleset and verify a green preparation PR and post-merge run,
-then PUT the exact committed file to activate it.
-
-The desired rule targets `~DEFAULT_BRANCH`, requires pull requests with zero
-approvals, conversation resolution, strict `Required CI` from GitHub Actions
-integration `15368`, squash-only linear history, and blocks deletion and force
-pushes. Repository administrators receive pull-request-only bypass; they do not
-receive a standing direct-push bypass.
-
-When the ruleset is activated, align repository settings at the same time:
-retain squash merging, disable merge commits and rebase merging, enable
-auto-merge and branch-update suggestions, delete merged branches automatically,
-keep the Actions token read-only, and prevent Actions from approving reviews.
-
-## Activation record
-
-Repository ruleset `19041620` was activated on 2026-07-16 after preparation
-PR #311 passed `Required CI` and the merged `master` commit passed both
-`Required CI` and the `Release Manager gate`. This documentation update is
-the after-activation canary for the normal protected pull-request path.
-
-## Break glass
-
-When an incident cannot wait for the normal gate:
-
-1. Open a pull request and describe the incident, risk, and reason for bypass.
-2. Have a repository administrator use the pull-request-only bypass.
-3. Monitor `Required CI` and the post-merge Release Manager workflow.
-4. Open a follow-up pull request for any deferred validation or remediation.
-
-Never bypass by updating `refs/heads/master` directly. Ruleset changes and
-emergency bypasses must remain visible in GitHub's audit trail.
@@ -11,8 +11,6 @@ services:

  edge-broker:
    container_name: "${COMPOSE_PROJECT_NAME:-api}-edge-broker"
-    ports:
-      - "127.0.0.1:${EDGE_BROKER_CI_PORT:-14300}:4300"
    labels:
      - "traefik.http.routers.edge-broker-local-ci.rule=PathPrefix(`/api/edge-broker`)"
      - "traefik.http.routers.edge-broker-local-ci.entrypoints=web"
@@ -82,9 +80,3 @@ services:

 volumes:
  ci_php_app:
-
-networks:
-  default:
-    ipam:
-      config:
-        - subnet: "${CI_DOCKER_SUBNET:-10.240.0.0/24}"
@@ -1,57 +0,0 @@
-{
-  "name": "Protect default branch",
-  "target": "branch",
-  "enforcement": "active",
-  "bypass_actors": [
-    {
-      "actor_id": 5,
-      "actor_type": "RepositoryRole",
-      "bypass_mode": "pull_request"
-    }
-  ],
-  "conditions": {
-    "ref_name": {
-      "exclude": [],
-      "include": [
-        "~DEFAULT_BRANCH"
-      ]
-    }
-  },
-  "rules": [
-    {
-      "type": "deletion"
-    },
-    {
-      "type": "non_fast_forward"
-    },
-    {
-      "type": "required_linear_history"
-    },
-    {
-      "type": "pull_request",
-      "parameters": {
-        "allowed_merge_methods": [
-          "squash"
-        ],
-        "dismiss_stale_reviews_on_push": false,
-        "require_code_owner_review": false,
-        "require_last_push_approval": false,
-        "required_approving_review_count": 0,
-        "required_review_thread_resolution": true
-      }
-    },
-    {
-      "type": "required_status_checks",
-      "parameters": {
-        "do_not_enforce_on_create": false,
-        "required_status_checks": [
-          {
-            "context": "Required CI",
-            "integration_id": 15368
-          }
-        ],
-        "strict_required_status_checks_policy": true
-      }
-    }
-  ]
-}
@@ -1,74 +1,33 @@
 name: Qodana
-
 on:
  workflow_dispatch:
  pull_request:
-    branches:
-      - master
-      - beta
-      - canary
-      - internal
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
  push:
-    branches:
-      - master
-      - beta
-      - canary
-      - internal
-
-concurrency:
-  group: qodana-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+    branches: # Specify your branches here
+      - main # The 'main' branch
+      - 'releases/*' # The release branches

 jobs:
  qodana:
-    name: Qodana
-    if: >-
-      github.event_name != 'pull_request' ||
-      (
-        github.event.pull_request.draft == false &&
-        github.event.pull_request.head.repo.full_name == github.repository &&
-        github.event.pull_request.user.login != 'dependabot[bot]'
-      )
-    runs-on: ubuntu-24.04
-    timeout-minutes: 60
+    # Run on our self-hosted runner to avoid GitHub-hosted Actions budget limits.
+    runs-on: [self-hosted, Linux, X64, default]
    permissions:
-      contents: read
-      checks: write
+      contents: write
      pull-requests: write
+      checks: write
    steps:
-      - name: Require Qodana Cloud token
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-        shell: bash
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}  # Use PR head when available, otherwise the pushed SHA.
+          fetch-depth: 0  # a full history is required for pull request analysis
+      - name: Prepare Qodana cache directories
        run: |
-          set -euo pipefail
-          if [[ -z "${QODANA_TOKEN}" ]]; then
-            echo "::error::QODANA_TOKEN is not configured for this repository."
-            exit 1
-          fi
-
-      - name: Check out the analyzed commit
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+          mkdir -p "${RUNNER_TEMP}/qodana/caches"
+          mkdir -p "${RUNNER_TEMP}/qodana/results"
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2025.3
        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Run Qodana
-        uses: JetBrains/qodana-action@4861e015da555e86a72b862892aba6c2b93e6891 # v2026.1.3
-        with:
-          pr-mode: ${{ github.event_name == 'pull_request' }}
-          use-caches: true
-          cache-default-branch-only: true
-          use-annotations: true
-          post-pr-comment: true
-          github-token: ${{ github.token }}
-          push-fixes: none
-          upload-result: false
+          pr-mode: false
        env:
          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'
@@ -1,167 +0,0 @@
-name: Deploy to Hetzner (staging)
-
-on:
-  push:
-    branches: [master]
-  workflow_dispatch:
-    inputs:
-      reason:
-        description: 'Reason for manual deploy'
-        required: false
-        default: 'manual'
-
-concurrency:
-  group: deploy-${{ github.repository }}
-  cancel-in-progress: false
-
-env:
-  DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
-  DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
-
-jobs:
-  test-and-deploy:
-    name: CI + Deploy
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Show commit info
-        run: |
-          echo "Repo: ${{ github.repository }}"
-          echo "Branch: ${{ github.ref }}"
-          echo "Commit: ${{ github.sha }}"
-          echo "Actor: ${{ github.actor }}"
-
-      # === CI (phpunit / vitest) runs here via repo's existing CI config ===
-      # (Most of our repos already have a "Required CI" check; this section
-      # would invoke that. If your repo doesn't have a CI workflow, the
-      # required-check on the branch will block this workflow's deploy step.)
-
-      - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
-
-      - name: Add host key
-        run: |
-          mkdir -p ~/.ssh
-          ssh-keyscan -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts 2>/dev/null
-
-      - name: Pre-deploy snapshot
-        id: pre
-        run: |
-          ssh "$DEPLOY_USER@$DEPLOY_HOST" '
-            set -e
-            cd /opt/${{ github.event.repository.name }}
-            git rev-parse HEAD > /tmp/last_deploy_sha
-            echo "PRE_SHA=$(cat /tmp/last_deploy_sha)"
-            echo "pre_sha=$(cat /tmp/last_deploy_sha)" >> $GITHUB_OUTPUT
-          '
-
-      - name: Deploy
-        id: deploy
-        run: |
-          ssh "$DEPLOY_USER@$DEPLOY_HOST" '
-            set -e
-            cd /opt/${{ github.event.repository.name }}
-            git fetch origin master
-            git reset --hard origin/master
-            # PHP repos: composer install + clear cache
-            if [ -f composer.json ]; then
-              composer install --no-dev --optimize-autoloader --no-interaction
-              php artisan cache:clear || true
-              php artisan config:cache || true
-              # Restart php-fpm if used
-              sudo systemctl reload php8.2-fpm || true
-            fi
-            # Node repos: npm ci + build
-            if [ -f package.json ]; then
-              npm ci --ignore-scripts
-              npm run build
-              # Restart node service
-              sudo systemctl reload pleno-vue || sudo systemctl reload nginx || true
-            fi
-            # Restart generic services
-            sudo systemctl reload nginx || true
-            echo "Deploy complete: $(git rev-parse --short HEAD)"
-          '
-
-      - name: Pre-deploy schema check (run all *_schema_bootstrap)
-        id: pre_schema
-        run: |
-          echo "Running schema bootstraps against the live database…"
-          # Idempotent — adds missing columns, never drops anything.
-          # Catches the "Unknown column 'invoice_email' in 'SELECT'"
-          # production failure mode (TRU-77) where migrations were
-          # merged to master but never applied to the live DB.
-          php scripts/run-schema-bootstraps.php
-          echo "Schema bootstraps complete."
-
-      - name: Alert Slack if schema-check fails (pre-deploy)
-        if: failure()
-        run: |
-          php scripts/schema-health-check.php > /tmp/schema.json 2>&1 || true
-          msg=$(jq -r '"Schema health FAILED on '$SMOKE_BASE_URL'\nMissing: " + (.missing | join(", "))' /tmp/schema.json 2>/dev/null || echo "Schema check produced no JSON")
-          curl -sS -X POST -H "Authorization: Bearer $SLACK_BOT_TOKEN" \
-            -H "Content-Type: application/json; charset=utf-8" \
-            https://slack.com/api/chat.postMessage \
-            -d "{\"channel\":\"$AI_DAILY_CHANNEL\",\"text\":\":rotating_light: *${{ github.event.repository.name }} — schema health FAIL\n${msg}\"}"
-
-      - name: Smoke test
-        id: smoke
-        continue-on-error: true
-        run: |
-          chmod +x scripts/smoke-test.sh
-          ./scripts/smoke-test.sh
-          # Also hit the new admin schema-check endpoint to verify
-          # no required columns are missing.
-          echo "::group::Schema health check"
-          php scripts/schema-health-check.php | tee /tmp/schema-report.json
-          if [ "$(jq -r .ok /tmp/schema-report.json)" != "true" ]; then
-            echo "::error::Schema health check FAILED — missing columns:"
-            jq -r '.missing[]' /tmp/schema-report.json | sed 's/^/  • /'
-            exit 1
-          fi
-          echo "Schema health check OK."
-
-      - name: Auto-rollback on smoke failure
-        if: steps.smoke.outcome == 'failure'
-        run: |
-          echo "::error::Smoke test failed — rolling back to ${{ steps.pre.outputs.pre_sha }}"
-          ssh "$DEPLOY_USER@$DEPLOY_HOST" '
-            set -e
-            cd /opt/${{ github.event.repository.name }}
-            git reset --hard ${{ steps.pre.outputs.pre_sha }}
-            if [ -f composer.json ]; then
-              composer install --no-dev --optimize-autoloader --no-interaction
-              sudo systemctl reload php8.2-fpm || true
-            fi
-            if [ -f package.json ]; then
-              npm ci --ignore-scripts
-              npm run build
-              sudo systemctl reload nginx || true
-            fi
-          '
-
-      - name: Post Slack status
-        if: always()
-        uses: slackapi/slack-github-action@v1.27.0
-        with:
-          channel-id: ${{ secrets.AI_DAILY_CHANNEL }}
-          payload: |
-            {
-              "text": "${{ job.status == 'success' && '✅' || '❌' }} Deploy *${{ github.repository }}@${{ github.sha[0:7] }}* — ${{ job.status }}\n${{ steps.smoke.outcome == 'failure' && '⚠️ Auto-rolled back' || '✓ Smoke test passed' }}"
-            }
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-
-      - name: Update Linear issue
-        if: success() && steps.deploy.outcome == 'success'
-        run: |
-          # Find Linear issues in this commit's history and post a comment
-          # (uses GitHub's auto-link: if PR body contains "TRU-123" it auto-links)
-          # We skip this here; the OpenClaw cron `f26dfd83` handles Linear updates.
-          echo "Deploy notification will be picked up by OpenClaw cron."
@@ -3,49 +3,25 @@ name: Tests
 on:
  pull_request:
  push:
-    branches:
-      - master
-      - beta
-      - canary
-      - internal
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}

 jobs:
  php:
    name: PHP ${{ matrix.suite }} (required)
-    # Docker jobs use disposable workspaces so root-owned container artifacts cannot poison later checkouts.
-    runs-on: ubuntu-24.04
+    runs-on: [self-hosted, Linux, X64, default]
    strategy:
      fail-fast: false
      matrix:
        suite: [unit, integration, api, legacy]
    env:
-      DOCKER_HOST: unix:///var/run/docker.sock
      COMPOSE_PROJECT_NAME: php-${{ github.run_id }}-${{ github.job }}-${{ matrix.suite }}-${{ github.run_attempt }}

    steps:
      - name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
-
-      - name: Ensure Docker access
-        run: |
-          set -euo pipefail
-          docker ps >/dev/null 2>&1 || {
-            echo "Docker is unavailable to the runner identity. Fix the isolated runner configuration; the workflow will not weaken /var/run/docker.sock permissions." >&2
-            exit 1
-          }
+        uses: actions/checkout@v4

      - name: Setup Node.js
        if: ${{ matrix.suite == 'unit' }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
        with:
          node-version: 22

@@ -59,7 +35,7 @@ jobs:
      - name: Upload PHP suite logs
        if: ${{ failure() }}
        continue-on-error: true
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        uses: actions/upload-artifact@v4
        with:
          name: php-${{ matrix.suite }}-logs
          path: .tmp/ci-logs/${{ matrix.suite }}
@@ -68,18 +44,18 @@ jobs:

  edge-agent:
    name: Edge Agent (required)
-    runs-on: ubuntu-24.04
+    runs-on: [self-hosted, Linux, X64, default]

    steps:
      - name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v4

      - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
        with:
          node-version: 22
+          cache: npm
+          cache-dependency-path: services/edge-agent/package-lock.json

      - name: Install native build tools
        run: |
@@ -115,23 +91,11 @@ jobs:

  edge-broker:
    name: Edge Broker (required)
-    runs-on: ubuntu-24.04
-    env:
-      DOCKER_HOST: unix:///var/run/docker.sock
+    runs-on: [self-hosted, Linux, X64, default]

    steps:
      - name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
-
-      - name: Ensure Docker access
-        run: |
-          set -euo pipefail
-          docker ps >/dev/null 2>&1 || {
-            echo "Docker is unavailable to the runner identity. Fix the isolated runner configuration; the workflow will not weaken /var/run/docker.sock permissions." >&2
-            exit 1
-          }
+        uses: actions/checkout@v4

      - name: Materialize CI compose env files
        run: |
@@ -145,9 +109,11 @@ jobs:
          docker compose -f docker-compose.example.yml config > /dev/null

      - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
        with:
          node-version: 22
+          cache: npm
+          cache-dependency-path: services/edge-broker/package-lock.json

      - name: Install dependencies
        working-directory: services/edge-broker
@@ -159,88 +125,33 @@ jobs:

  edge-gateway-backend:
    name: Edge Gateway Backend (required)
-    runs-on: ubuntu-24.04
+    runs-on: [self-hosted, Linux, X64, default]
    env:
-      DOCKER_HOST: unix:///var/run/docker.sock
      COMPOSE_FILE: docker-compose.yml:.github/docker-compose.ci.yml
      COMPOSE_PROJECT_NAME: edge-gateway-backend-${{ github.run_id }}-${{ github.run_attempt }}
-      COMPOSE_PROFILES: dev
      TRAEFIK_WEB_PORT: "18080"
      TRAEFIK_WEBSECURE_PORT: "18443"
      TRAEFIK_WEBSECURE_STAGING_PORT: "18433"
      TRAEFIK_METRICS_PORT: "19100"
-      EDGE_BROKER_CI_PORT: "14300"
      EDGE_GATEWAY_E2E_BASE_URL: "http://localhost:18080/api"

    steps:
      - name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
-
-      - name: Ensure Docker access
-        run: |
-          set -euo pipefail
-          docker ps >/dev/null 2>&1 || {
-            echo "Docker is unavailable to the runner identity. Fix the isolated runner configuration; the workflow will not weaken /var/run/docker.sock permissions." >&2
-            exit 1
-          }
-
-      - name: Allocate CI ports
-        run: |
-          set -euo pipefail
-          find_free_port() {
-            start="$1"
-            end="$2"
-            port="$start"
-            while [ "$port" -le "$end" ]; do
-              if ! ss -H -ltn "sport = :$port" 2>/dev/null | grep -q .; then
-                echo "$port"
-                return 0
-              fi
-              port=$((port + 1))
-            done
-
-            echo "No free port in range ${start}-${end}." >&2
-            exit 1
-          }
-
-          base=$((20000 + (GITHUB_RUN_ID % 20000)))
-          web_port="$(find_free_port "$base" "$((base + 2000))")"
-          websecure_port="$(find_free_port "$((web_port + 1))" "$((web_port + 2000))")"
-          staging_port="$(find_free_port "$((websecure_port + 1))" "$((websecure_port + 2000))")"
-          metrics_port="$(find_free_port "$((staging_port + 1))" "$((staging_port + 2000))")"
-          broker_port="$(find_free_port "$((metrics_port + 1))" "$((metrics_port + 2000))")"
-          checksum="$(printf '%s' "$COMPOSE_PROJECT_NAME" | cksum | awk '{print $1}')"
-          subnet_second=$((64 + ((checksum / 256) % 64)))
-          subnet_third=$((checksum % 256))
-          ci_docker_subnet="10.${subnet_second}.${subnet_third}.0/24"
-
-          {
-            echo "TRAEFIK_WEB_PORT=${web_port}"
-            echo "TRAEFIK_WEBSECURE_PORT=${websecure_port}"
-            echo "TRAEFIK_WEBSECURE_STAGING_PORT=${staging_port}"
-            echo "TRAEFIK_METRICS_PORT=${metrics_port}"
-            echo "EDGE_BROKER_CI_PORT=${broker_port}"
-            echo "CI_DOCKER_SUBNET=${ci_docker_subnet}"
-            echo "EDGE_GATEWAY_E2E_BASE_URL=http://localhost:${web_port}/api"
-            echo "EDGE_GATEWAY_E2E_COMPOSE_PROJECT=${COMPOSE_PROJECT_NAME}"
-          } >> "$GITHUB_ENV"
+        uses: actions/checkout@v4

      - name: Materialize CI compose env files
        run: |
          set -euo pipefail
          cp .github/ci.env .env
          cp .github/ci.env.staging .env.staging
-          printf '\nEDGE_PUBLIC_BROKER_URL=http://edge-broker:4300/edge-broker\n' >> .env

      - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
        with:
          node-version: 22

      - name: Boot local stack
-        run: sh scripts/ci-docker-compose-up.sh traefik redis mysql-debug edge-broker php1 php2 php3 php4 php5 caddy
+        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml up -d traefik redis mysql-debug edge-broker php1 caddy

      - name: Sync PHP app checkout
        run: >
@@ -249,33 +160,10 @@ jobs:
          --exclude='./.phpunit.cache'
          --exclude='./build/logs'
          -C services/nginx/app -cf - .
-          | docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 tar --no-same-owner -C /var/www/html -xf -
+          | docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 tar -C /var/www/html -xf -

      - name: Resolve dependencies
-        run: |
-          set -euo pipefail
-          composer_install() {
-            install_mode="$1"
-            max_attempts="$2"
-            attempt=1
-            while :; do
-              if docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && composer install --no-interaction ${install_mode} --no-progress"; then
-                return 0
-              fi
-              if [ "$attempt" -ge "$max_attempts" ]; then
-                return 1
-              fi
-              sleep_seconds=$((attempt * 5))
-              echo "composer install ${install_mode} failed; retrying in ${sleep_seconds}s (attempt $((attempt + 1))/${max_attempts})" >&2
-              sleep "$sleep_seconds"
-              attempt=$((attempt + 1))
-            done
-          }
-
-          composer_install --prefer-dist 3 || {
-            echo "Composer dist install failed; retrying with --prefer-source." >&2
-            composer_install --prefer-source 2
-          }
+        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml exec -T php1 sh -lc "cd /var/www/html && composer install --no-interaction --prefer-dist --no-progress"

      - name: Verify edge gateway test files
        run: >
@@ -334,85 +222,34 @@ jobs:
          vendor/bin/pest tests/Integration/EdgeGateway --colors=always"

      - name: Run edge gateway E2E smoke
-        env:
-          EDGE_GATEWAY_E2E_COPY_CONFIG: "true"
-          EDGE_GATEWAY_E2E_SKIP_COMPOSE_UP: "true"
-        run: node scripts/edge-gateway-e2e.mjs
+        run: |
+          set -euo pipefail
+          compose_project="${COMPOSE_PROJECT_NAME:-$(basename "$PWD")}"
+          runner="edge-e2e-runner-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+          docker rm -f "$runner" >/dev/null 2>&1 || true
+          trap 'docker rm -f "$runner" >/dev/null 2>&1 || true' EXIT
+          docker create \
+            --name "$runner" \
+            --network "${compose_project}_default" \
+            -e COMPOSE_FILE="$COMPOSE_FILE" \
+            -e COMPOSE_PROJECT_NAME="$compose_project" \
+            -e TRAEFIK_WEB_PORT="${TRAEFIK_WEB_PORT:-18080}" \
+            -e TRAEFIK_WEBSECURE_PORT="${TRAEFIK_WEBSECURE_PORT:-18443}" \
+            -e TRAEFIK_WEBSECURE_STAGING_PORT="${TRAEFIK_WEBSECURE_STAGING_PORT:-18433}" \
+            -e TRAEFIK_METRICS_PORT="${TRAEFIK_METRICS_PORT:-19100}" \
+            -e EDGE_GATEWAY_E2E_BASE_URL="http://caddy" \
+            -e EDGE_GATEWAY_E2E_COMPOSE_PROJECT="$compose_project" \
+            -e EDGE_GATEWAY_E2E_COPY_CONFIG="true" \
+            -v /var/run/docker.sock:/var/run/docker.sock \
+            -w /workspace \
+            node:22-alpine \
+            sh -lc "apk add --no-cache docker-cli docker-cli-compose >/dev/null && node scripts/edge-gateway-e2e.mjs"
+          docker cp . "$runner:/workspace"
+          docker start "$runner" >/dev/null
+          docker logs -f "$runner"
+          exit_code="$(docker wait "$runner")"
+          exit "$exit_code"

      - name: Tear down local stack
        if: always()
        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml down -v
-
-  required-ci:
-    name: Required CI
-    runs-on: ubuntu-latest
-    needs: [php, edge-agent, edge-broker, edge-gateway-backend]
-    if: ${{ always() }}
-
-    steps:
-      - name: Verify required jobs succeeded
-        env:
-          PHP_RESULT: ${{ needs.php.result }}
-          EDGE_AGENT_RESULT: ${{ needs.edge-agent.result }}
-          EDGE_BROKER_RESULT: ${{ needs.edge-broker.result }}
-          EDGE_GATEWAY_BACKEND_RESULT: ${{ needs.edge-gateway-backend.result }}
-        run: |
-          set -euo pipefail
-          failed=0
-          for dependency in \
-            "php=${PHP_RESULT}" \
-            "edge-agent=${EDGE_AGENT_RESULT}" \
-            "edge-broker=${EDGE_BROKER_RESULT}" \
-            "edge-gateway-backend=${EDGE_GATEWAY_BACKEND_RESULT}"
-          do
-            name="${dependency%%=*}"
-            result="${dependency#*=}"
-            if [ "$result" != "success" ]; then
-              echo "Required dependency ${name} completed with result: ${result:-missing}" >&2
-              failed=1
-            fi
-          done
-          test "$failed" -eq 0
-
-  release-manager-gate:
-    name: Release Manager gate
-    runs-on: ubuntu-24.04
-    needs: [required-ci]
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && needs.required-ci.result == 'success' }}
-
-    steps:
-      - name: Record Release Manager API gate
-        run: |
-          set -euo pipefail
-          test -n "$RELEASE_MANAGER_GATE_TOKEN" || (echo "RELEASE_MANAGER_GATE_TOKEN is required" >&2; exit 1)
-          response_file="$(mktemp)"
-          http_code="$(curl --show-error --silent \
-            --connect-timeout 10 \
-            --retry 5 \
-            --retry-all-errors \
-            --retry-delay 15 \
-            --retry-max-time 300 \
-            -o "$response_file" \
-            -w '%{http_code}' \
-            -X POST "$RELEASE_MANAGER_GATE_URL" \
-            -H "Authorization: Bearer $RELEASE_MANAGER_GATE_TOKEN" \
-            -H "Content-Type: application/json" \
-            --data "{\"channel_slug\":\"stable\",\"app\":\"api\",\"repository\":\"$RELEASE_REPOSITORY\",\"branch\":\"$RELEASE_BRANCH\",\"expected_commit\":\"$RELEASE_EXPECTED_COMMIT\",\"workflow_url\":\"$RELEASE_WORKFLOW_URL\",\"auto_sync\":true,\"wait_timeout_seconds\":300,\"poll_interval_seconds\":10,\"required_checks\":[\"api_gateway\"]}")"
-          response_body="$(cat "$response_file")"
-          rm -f "$response_file"
-
-          if [[ "$http_code" =~ ^2[0-9][0-9]$ ]]; then
-            printf '%s\n' "$response_body"
-            exit 0
-          fi
-
-          printf '%s\n' "$response_body"
-          echo "Release Manager gate failed with HTTP $http_code." >&2
-          exit 1
-        env:
-          RELEASE_MANAGER_GATE_URL: ${{ secrets.RELEASE_MANAGER_GATE_URL || 'https://api.truckwash.io/release/gate/test-runs' }}
-          RELEASE_MANAGER_GATE_TOKEN: ${{ secrets.RELEASE_MANAGER_GATE_TOKEN }}
-          RELEASE_REPOSITORY: ${{ github.repository }}
-          RELEASE_BRANCH: ${{ github.ref_name }}
-          RELEASE_EXPECTED_COMMIT: ${{ github.sha }}
-          RELEASE_WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
@@ -2,7 +2,6 @@
 /docker-compose.yml
 /services/nginx/app/vendor/
 /services/nginx/app/modules/washcertificates/vendor/
-/services/nginx/app/.phpunit.cache/
 /services/nginx/letsencrypt/
 *.pem
 *.log.gz
@@ -11,10 +10,5 @@
 /.idea/
 .env
 /services/caddy/logs*
-.env.old
 /.tmp/
 /.env.staging
-/services/nginx/app/storage/replication-bootstrap.json
-/.env_old_2
-/.openclaw/
-/services/nginx/app/build/phpstan/
@@ -40,7 +40,6 @@ COPY . /var/www/html

 # Copy Nginx configuration file
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY services/php/php-fpm-pool.conf /usr/local/etc/php-fpm.d/zz-pleno-workers.conf

 # Install Composer
 COPY --from=composer:2.6 /usr/bin/composer /usr/bin/composer
@@ -24,7 +24,6 @@ RUN set -eux; \
        libzip-dev \
        mariadb-client \
        nginx \
-        openssl \
        pkg-config \
        redis-tools \
        unzip \
@@ -47,15 +46,11 @@ RUN set -eux; \
    rm -rf /var/lib/apt/lists/*

 COPY services/nginx/app/ /var/www/html/
-COPY scripts/bird-control-plane-activate.php /var/www/html/scripts/bird-control-plane-activate.php
-COPY scripts/bird-control-plane-auto-activate.php /var/www/html/scripts/bird-control-plane-auto-activate.php
 COPY services/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-COPY services/php/php-fpm-pool.conf /usr/local/etc/php-fpm.d/zz-pleno-workers.conf
 COPY services/coolify/api/nginx.conf /etc/nginx/nginx.conf
 COPY services/coolify/api/start.sh /usr/local/bin/coolify-api-start

 RUN set -eux; \
-    rm -f /var/www/html/storage/replication-bootstrap.json /var/www/html/storage/replication-bootstrap-*.json; \
    sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh /usr/local/bin/coolify-api-start; \
    chmod +x /usr/local/bin/docker-entrypoint.sh /usr/local/bin/coolify-api-start; \
    COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev --prefer-dist --optimize-autoloader --no-interaction -d /var/www/html; \
@@ -64,8 +59,6 @@ RUN set -eux; \
    fi; \
    COMPOSER_ALLOW_SUPERUSER=1 composer dump-autoload --no-dev --optimize --no-interaction -d /var/www/html; \
    php -d display_errors=1 -r 'require "/var/www/html/vendor/autoload.php"; exit(interface_exists("Psr\\Http\\Message\\UriInterface") && interface_exists("Psr\\Http\\Message\\StreamInterface") ? 0 : 1);'; \
-    php -r 'exit(function_exists("proc_open") && extension_loaded("openssl") ? 0 : 1);'; \
-    test "$(openssl pkey -pubin -in /var/www/html/modules/bird/resources/control-plane-bootstrap-public.pem -outform DER | sha256sum | cut -d " " -f 1)" = "6dc63c6ffe33b8de0b1396d7f529f56aea0a685ef98168016161cf721ddc8c21"; \
    chown -R www-data:www-data /var/www/html; \
    chmod -R 755 /var/www/html

@@ -2,11 +2,6 @@

 Backend API for Copenhagen Truck Wash services.

-Changes are published from a scoped feature branch through a pull request to
-`master`; direct default-branch pushes are not part of the release workflow.
-See [default branch protection](.github/BRANCH_PROTECTION.md) for the CI gate
-and emergency procedure.
-
 ## Architecture & Stack
 - **Edge Proxy:** [Traefik 2.11](https://doc.traefik.io/traefik/) (Handles TLS termination, routing, and rate limiting).
 - **Web Server:** [Caddy 2.7](https://caddyserver.com/) (Serves the PHP application via FastCGI).
@@ -31,7 +31,7 @@ $MINIO = [
    'access_key' => '', // Minio access
    'secret_key' => '' // Minio secret key
 ];
-$SLACK_DEFAULT_WEBHOOK = ''; // Set through SLACK_DEFAULT_WEBHOOK; never commit a production webhook URL.
+$SLACK_DEFAULT_WEBHOOK = ''; // Default Slack webhook URL e.g. https://hooks.slack.com/services/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX
 $REDIS_CONFIG = [
    'host' => '', // Redis host (IP address)
    'user' => '', // Redis user
@@ -52,9 +52,9 @@ services:
      dockerfile: services/edge-broker/Dockerfile
    container_name: edge-broker
    environment:
-      EDGE_AUTH_MODE: ${EDGE_AUTH_MODE:-strict}
+      EDGE_AUTH_MODE: ${EDGE_AUTH_MODE:-manager}
      EDGE_MANAGER_URL: ${EDGE_MANAGER_URL:-http://caddy}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    labels:
      - "traefik.enable=true"
      - "traefik.http.routers.edge-broker-api.rule=Host(`api.example.com`) && PathPrefix(`/edge-broker`)"
@@ -71,7 +71,6 @@ services:
      - "traefik.http.middlewares.edge-broker-strip-local.stripPrefix.prefixes=/api/edge-broker"
      - "traefik.http.services.edge-broker.loadbalancer.server.port=4300"

-
  caddy:
    image: caddy:2.7.6-alpine
    container_name: caddy
@@ -114,7 +113,7 @@ services:
    environment:
      AUTO_COMPOSER_INSTALL: "true"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/app:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -129,13 +128,13 @@ services:
      - redis
      - mysql
      - edge-broker
-    command: ["php", "index.php", "run", "cron-worker"]
+    command: ["sh", "-c", "while true; do php index.php run cron; sleep 60; done"]
    env_file:
      - .env.example
    environment:
      AUTO_COMPOSER_INSTALL: "false"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/app:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -367,7 +367,7 @@ services:
    depends_on:
      - redis
      - edge-broker
-    command: ["php", "index.php", "run", "cron-worker"]
+    command: ["sh", "-c", "while true; do php index.php run cron; sleep 60; done"]
    env_file:
      - .env
    environment:
@@ -3,8 +3,6 @@ services:
  traefik:
    image: traefik:2.11
    container_name: traefik
-    group_add:
-      - "${DOCKER_SOCKET_GID:-65534}"
    ports:
      - "${TRAEFIK_WEB_PORT:-80}:80"
      - "${TRAEFIK_WEBSECURE_PORT:-443}:443"
@@ -103,10 +101,8 @@ services:
  mysql-debug:
    image: mysql:8.4
    container_name: mysql-debug
-    profiles: [dev]
-    command: ["mysqld", "--innodb-use-native-aio=0"]
    environment:
-      MYSQL_ROOT_PASSWORD: ${CONFIG_DB_DEBUG_PASSWORD:?CONFIG_DB_DEBUG_PASSWORD is required for mysql-debug}
+      MYSQL_ROOT_PASSWORD: ${CONFIG_DB_DEBUG_PASSWORD:-debug_root_password}
      MYSQL_DATABASE: ${CONFIG_DB_DEBUG_DATABASE:-nnks_db_debug}
    ports:
      - "3307:3306"
@@ -125,9 +121,9 @@ services:
      dockerfile: services/edge-broker/Dockerfile
    container_name: edge-broker
    environment:
-      EDGE_AUTH_MODE: ${EDGE_AUTH_MODE:-strict}
+      EDGE_AUTH_MODE: ${EDGE_AUTH_MODE:-manager}
      EDGE_MANAGER_URL: ${EDGE_MANAGER_URL:-http://caddy}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    labels:
      - "traefik.enable=true"
      - "traefik.http.routers.edge-broker-api.rule=Host(`api.truckwash.dk`) && PathPrefix(`/edge-broker`)"
@@ -311,7 +307,7 @@ services:
    environment:
      AUTO_COMPOSER_INSTALL: "true"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/app:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -331,7 +327,7 @@ services:
    environment:
      AUTO_COMPOSER_INSTALL: "false"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/app:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -351,7 +347,7 @@ services:
    environment:
      AUTO_COMPOSER_INSTALL: "false"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/app:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -371,7 +367,7 @@ services:
    environment:
      AUTO_COMPOSER_INSTALL: "false"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/app:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -391,7 +387,7 @@ services:
    environment:
      AUTO_COMPOSER_INSTALL: "false"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/app:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -411,7 +407,7 @@ services:
    environment:
      AUTO_COMPOSER_INSTALL: "false"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/staging:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -425,13 +421,13 @@ services:
    depends_on:
      - redis
      - edge-broker
-    command: ["php", "index.php", "run", "cron-worker"]
+    command: ["sh", "-c", "while true; do php index.php run cron; sleep 60; done"]
    env_file:
      - .env
    environment:
      AUTO_COMPOSER_INSTALL: "false"
      EDGE_BROKER_URL: ${EDGE_BROKER_URL:-http://edge-broker:4300}
-      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:?set EDGE_BROKER_SHARED_SECRET in .env}
+      EDGE_BROKER_SHARED_SECRET: ${EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev}
    volumes:
      - ./services/nginx/app:/var/www/html
      - ./services/php/php.ini:/usr/local/etc/php/conf.d/zz-custom.ini:ro
@@ -1,4 +0,0 @@
-# AGENT MCP SMOKE
-
-Generated 20260813-091957 by hermes agent to verify GitHub MCP wiring.
-Safe to close.
@@ -3357,9 +3357,6 @@
                  },
                  "email_notifications_enabled": {
                    "type": "boolean"
-                  },
-                  "superuser_new_customer_email_notifications_enabled": {
-                    "type": "boolean"
                  }
                }
              }
@@ -9856,7 +9853,6 @@
          "Orders"
        ],
        "summary": "Create Stripe payment intent",
-        "description": "Creates a Stripe Terminal card payment intent with fixed 25% moms.",
        "operationId": "createStripePaymentIntent",
        "requestBody": {
          "required": true,
@@ -9874,6 +9870,9 @@
                  },
                  "reader": {
                    "type": "string"
+                  },
+                  "tax_percentage": {
+                    "type": "integer"
                  }
                }
              }
@@ -12956,54 +12955,6 @@
        }
      }
    },
-    "/slack/config": {
-      "get": {
-        "tags": [
-          "Config"
-        ],
-        "summary": "Get Slack config",
-        "operationId": "getSlackConfig",
-        "responses": {
-          "200": {
-            "description": "Slack configuration retrieved successfully",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/SlackConfigListResponse"
-                }
-              }
-            }
-          }
-        }
-      },
-      "post": {
-        "tags": [
-          "Config"
-        ],
-        "summary": "Update Slack config",
-        "operationId": "updateSlackConfig",
-        "requestBody": {
-          "required": false,
-          "content": {
-            "application/json": {
-              "schema": {}
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Slack configuration updated successfully",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ModuleConfigUpdateResponse"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
    "/backups/config": {
      "get": {
        "tags": [
@@ -15545,39 +15496,6 @@
          "value"
        ]
      },
-      "SlackConfigEntry": {
-        "type": "object",
-        "properties": {
-          "module": {
-            "type": "string",
-            "enum": [
-              "Slack"
-            ]
-          },
-          "variable": {
-            "type": "string",
-            "enum": [
-              "customer_registration_webhook_url"
-            ]
-          },
-          "type": {
-            "type": "string",
-            "enum": [
-              "string"
-            ]
-          },
-          "value": {
-            "type": "string",
-            "example": "https://hooks.slack.com/services/..."
-          }
-        },
-        "required": [
-          "module",
-          "variable",
-          "type",
-          "value"
-        ]
-      },
      "BackupsConfigEntry": {
        "type": "object",
        "properties": {
@@ -16322,27 +16240,6 @@
          }
        ]
      },
-      "SlackConfigListResponse": {
-        "allOf": [
-          {
-            "$ref": "#/components/schemas/ModuleConfigEnvelopeBase"
-          },
-          {
-            "type": "object",
-            "properties": {
-              "data": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/SlackConfigEntry"
-                }
-              }
-            },
-            "required": [
-              "data"
-            ]
-          }
-        ]
-      },
      "BackupsConfigListResponse": {
        "allOf": [
          {
@@ -7,5 +7,4 @@

    <!-- AUTO-GENERATED, DO NOT EDIT -->
    <p>Comprehensive API reference generated from the repository root <code>openapi.yaml</code>.</p>
-    <p>The edge broker's <code>/api/health</code> response additionally exposes a <code>lastActivityAt</code> field (ISO 8601 timestamp). It reports the most recent successful HTTP request handled by the broker container and defaults to the container's start time when no request has been processed yet.</p>
 </topic>
@@ -12,7 +12,7 @@
    </chapter>
    <chapter title="Operation" id="operation">
        <p>Operation ID: <code>createStripePaymentIntent</code></p>
-        <p>Creates a Stripe Terminal card payment intent with fixed 25% moms.</p>
+        <p>Create Stripe payment intent</p>
    </chapter>
    <chapter title="Authentication" id="authentication">
        <p>Security requirements:</p>
@@ -32,6 +32,9 @@
    },
    &quot;reader&quot;: {
      &quot;type&quot;: &quot;string&quot;
+    },
+    &quot;tax_percentage&quot;: {
+      &quot;type&quot;: &quot;integer&quot;
    }
  },
  &quot;required&quot;: [
@@ -1,95 +0,0 @@
-# XL Vask Selvvask surface — inventory & simplification plan
-
-## Scope
-
-The XLVask surface that powers the **Superuser → Fakturaer → Periode → Selvvask**
-view. Goal: remove the AI / MiniMax / autopilot pipeline, leaving only the
-operator-facing review and order-creation flow.
-
-Out of scope: any other XLVask, plate scanner, customer, or vehicle surface.
-
-## Files removed
-
-| Path | Reason |
-| --- | --- |
-| `services/nginx/app/classes/xlvask_autopilot_service.php` | AI autopilot pipeline |
-| `services/nginx/app/classes/xlvask_automation_service.php` | AI automation pipeline |
-| `services/nginx/app/classes/xlvask_automation_policy_service.php` | AI policy service |
-| `services/nginx/app/classes/minimax.php` | MiniMax integration |
-| `services/nginx/app/modules/miniMax/` | MiniMax module (config + class) |
-| `services/nginx/app/modules/xlvask/AUTOMATION_RUNBOOK.md` | Runbook for removed pipeline |
-| `services/nginx/app/modules/xlvask/cron/tasks.php` | Module-owned cron registry (replaced by empty `cron_task_registry` discovery) |
-| `services/nginx/app/modules/xlvask/migrations/20260804_xlvask_ai_auto_policy_v2.php` | Migration for removed AI schema |
-| `services/nginx/app/modules/xlvask/config/xlvask_automatic_order_attachment_enabled_c.php` | Legacy autopilot gate |
-| `services/nginx/app/modules/xlvask/config/xlvask_automatic_order_creation_enabled_c.php` | Legacy autopilot gate |
-| `services/nginx/app/modules/xlvask/config/xlvask_minimax_integration_enabled_c.php` | MiniMax gate |
-| `services/nginx/app/modules/xlvask/config/xlvask_openai_integration_enabled_c.php` | OpenAI gate |
-| `services/nginx/app/cron/EnsureXLVaskAutomationSchema.php` | Migration helper |
-| `scripts/xlvask-automation-migrate.php` | CLI wrapper for migration |
-| `services/nginx/app/tests/Unit/XLVask/XLVaskAutomationMigrateScriptTest.php` | Removed migration test |
-| `services/nginx/app/tests/Unit/XLVask/XLVaskAutomationServiceTest.php` | Removed automation test |
-| `services/nginx/app/tests/Api/XLVaskReviewApiTest.php` | Replaced by Selvvask route contract test |
-
-## Code changes (kept & simplified)
-
-| Path | Change |
-| --- | --- |
-| `services/nginx/app/cron/Cron.php` | Drop `ProcessXLVaskAutopilotQueueCron` registration + function |
-| `services/nginx/app/cli.php` | Drop `xlvask-automation-migrate` case |
-| `services/nginx/app/routes/moduleConfigRoute.php` | Drop `/minimax/config` GET/POST endpoints |
-| `services/nginx/app/routes/moduleXLVaskRoute.php` | Drop `/modules/xlvask/tasks/import-usage` 410 stub and `/tasks/debug` route |
-| `services/nginx/app/routes/xlvaskUsageLogsRoute.php` | Slim to operator-only: list, summary, ignore/unignore, accept, reject, fast-link |
-| `services/nginx/app/modules/xlvask/helpers/xlvask_tasks.php` | Drop `runScheduledAutomationIfReady`, `processAutopilotQueue`, autopilot cleanup, legacy auto-creation branch |
-| `services/nginx/app/modules/xlvask/xlvask_c.php` | Drop `minimax_integration_enabled`, `automatic_order_attachment_enabled`, `automatic_order_creation_enabled`, `openai_integration_enabled` |
-| `services/nginx/app/objects/xlvask_usage_logs_o.php` | Add `summarizeUsageOrdersReadOnly` (replaces autopilot summary) |
-| `services/nginx/app/openapi.yaml` | Replace autopilot/automation openapi block with operator-flow endpoints |
-| `services/nginx/app/tests/Unit/Cron/CronTaskRegistryTest.php` | Update count: 24 → 22, drop `xlvask.autopilot_queue` assertion |
-| `services/nginx/app/tests/Unit/XLVask/XLVaskUsageRouteContractTest.php` | Replaced with end-to-end contract assertions for the new operator surface |
-
-## New operator-facing endpoints
-
-All under `routes/xlvaskUsageLogsRoute.php` and scoped to the operator's
-`allowedHallIds` (all-scope users see every configured scanner hall; own-scope
-users see only their group's halls).
-
-| Method | Path | Permission | Purpose |
-| --- | --- | --- | --- |
-| `GET` | `/modules/xlvask/services/usage/orders` | `list_xlvask_usage_orders_own/all` | List usage logs with direct linked order id, amount summary, ignored metadata |
-| `GET` | `/modules/xlvask/services/usage/orders/summary` | `list_xlvask_usage_orders_own/all` | Read-only per-period summary (counts + net amount) |
-| `PATCH` | `/modules/xlvask/services/usage/orders/{id}/ignore` | `review_xlvask_usage_order` | Mark ignored with reason |
-| `POST` | `/modules/xlvask/services/usage/orders/{id}/unignore` | `review_xlvask_usage_order` | Clear ignored metadata |
-| `POST` | `/modules/xlvask/services/usage/orders/{id}/accept` | `review_xlvask_usage_order` | Convert to order via `createOrderFromWash` |
-| `POST` | `/modules/xlvask/services/usage/orders/{id}/reject` | `review_xlvask_usage_order` | Mark ignored with reject reason |
-| `GET` | `/modules/xlvask/services/usage/orders/fast-link` | `list_xlvask_usage_orders_own` | Cached fast-link redeem (existing) |
-
-## Permissions
-
-The Selvvask surface uses these permissions only:
-
- `list_xlvask_usage_orders_own`
- `list_xlvask_usage_orders_all`
- `review_xlvask_usage_order`
-
-`manage_xlvask_usage_automation`, `ignore_xlvask_usage_order`,
-`superuser_xlvask_automation_activate` are not referenced anywhere in the
-slimmed surface.
-
-## Persistence model
-
-`xlvask_usage_logs_o` already exposes `ignored_at`, `ignored_by`, `ignored_reason`
-columns — no migration required for the simplified flow.
-
-`orders_o::selectByWashId(int|string $WashId)` and
-`orders_o::addXLVaskOrder(users_o $user, xlvask_usage_log $xlvask_usage_log)` are
-the only integration points with the order pipeline.
-
-## Tests
-
- `vendor/bin/pest --testsuite=Unit --colors=never` passes 1266 tests.
- One pre-existing failure (`BirdControlPlaneActivationTest`) requires
-  `PLENO_REPO_ROOT_FOR_TESTS` (coolify repo) and is unrelated to this change.
-
-## Repo scope
-
-This inventory covers `api`. The `pleno-vue` side has not yet been updated in
-this session and will be handled in a follow-up PR.
@@ -1,55 +1,46 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+
+#################################################################################
+#              WARNING: Do not store sensitive information in this file,        #
+#               as its contents will be included in the Qodana report.          #
+#################################################################################
 version: "1.0"

-linter: jetbrains/qodana-php:2026.1
-
+#Specify inspection profile for code analysis
 profile:
-  name: qodana.recommended
+  name: qodana.starter

-php:
-  version: "8.2"
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>

-bootstrap: |+
-  set -eu
-  composer --working-dir=services/nginx/app install --no-interaction --prefer-dist --no-progress --ignore-platform-reqs
-  composer --working-dir=services/nginx/app/modules/washcertificates install --no-interaction --prefer-dist --no-progress --ignore-platform-reqs
-  npm --prefix services/edge-agent ci --ignore-scripts
-  npm --prefix services/edge-broker ci --ignore-scripts
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>

-exclude:
-  # This application is intentionally Composer-classmapped and keeps legacy snake_case
-  # classes plus multiple local test doubles in single files; PSR path rules do not apply.
-  - name: PhpIllegalPsrClassPathInspection
-    paths:
-      - services/nginx/app
-  # Unit-test doubles intentionally bypass integration-heavy parent constructors.
-  - name: PhpMissingParentConstructorInspection
-    paths:
-      - services/nginx/app/tests
-  # These focused tests configure doubles through public fields before invoking behavior.
-  - name: PhpObjectFieldsAreOnlyWrittenInspection
-    paths:
-      - services/nginx/app/tests/Unit/Bird/BirdGateCallFlowTest.php
-      - services/nginx/app/tests/Unit/Invoicing/EconomicCustomersDiscountFallbackTest.php
-      - services/nginx/app/tests/Unit/Selfserve/SelfserveCustomerLaneAccessTest.php
-  # API coverage markers are intentional statement-style calls in the Pest DSL.
-  # Their return value is irrelevant; the call records route/scenario coverage.
-  - name: PhpExpressionResultUnusedInspection
-    paths:
-      - services/nginx/app/tests/Api
-  - name: All
-    paths:
-      - services/nginx/app/vendor
-      - services/nginx/app/modules/washcertificates/vendor
-      - services/nginx/app/build
-      - services/nginx/app/.phpunit.cache
-      - services/nginx/app/tests/Legacy
-      - services/edge-agent/node_modules
-      - services/edge-broker/node_modules
-      - services/edge-agent/dist
-      - documentation/generated
-      - documentation/topics/generated
-      - documentation/_build
-      - documentation/_site_rebuild_20260317
-      - docs_bird_voice_calls.html
-      - .tmp
-      - .openclaw
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+# Quality gate. Will fail the CI/CD pipeline if any condition is not met
+# severityThresholds - configures maximum thresholds for different problem severities
+# testCoverageThresholds - configures minimum code coverage on a whole project and newly added code
+# Code Coverage is available in Ultimate and Ultimate Plus plans
+#failureConditions:
+#  severityThresholds:
+#    any: 15
+#    critical: 5
+#  testCoverageThresholds:
+#    fresh: 70
+#    total: 50
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-php:2025.3
@@ -1,102 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-suite="${1:-}"
-case "$suite" in
-  unit|integration|api|legacy|all)
-    ;;
-  *)
-    echo "Usage: $0 <unit|integration|api|legacy|all>" >&2
-    exit 2
-    ;;
-esac
-
-script_dir="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
-repo_root="$(CDPATH= cd -- "$script_dir/.." && pwd)"
-cd "$repo_root"
-
-compose_files="-f docker-compose.yml -f .github/docker-compose.ci.yml"
-project_suffix="$(date +%s)-$$"
-export COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-php-local-${suite}-${project_suffix}}"
-
-log_dir=".tmp/ci-logs/$suite"
-mkdir -p "$log_dir"
-
-env_backup_dir=".tmp/php-ci-env-backup-$project_suffix"
-mkdir -p "$env_backup_dir"
-had_env=0
-had_env_staging=0
-if [ -f .env ]; then
-  cp .env "$env_backup_dir/env"
-  had_env=1
-fi
-if [ -f .env.staging ]; then
-  cp .env.staging "$env_backup_dir/env.staging"
-  had_env_staging=1
-fi
-
-cp .github/ci.env .env
-cp .github/ci.env.staging .env.staging
-
-collect_logs() {
-  status="$1"
-  if [ "$status" -eq 0 ]; then
-    return
-  fi
-
-  mkdir -p "$log_dir"
-  docker compose $compose_files ps > "$log_dir/docker-compose-ps.txt" 2>&1 || true
-  docker compose $compose_files logs --no-color > "$log_dir/docker-compose.log" 2>&1 || true
-  docker compose $compose_files cp php1:/var/www/html/build/logs "$log_dir/app-build-logs" >/dev/null 2>&1 || true
-  docker compose $compose_files cp php1:/var/log/php "$log_dir/php-logs" >/dev/null 2>&1 || true
-}
-
-cleanup() {
-  status="$?"
-  collect_logs "$status"
-  docker compose $compose_files down -v >/dev/null 2>&1 || true
-  if [ "$had_env" -eq 1 ]; then
-    cp "$env_backup_dir/env" .env
-  else
-    rm -f .env
-  fi
-  if [ "$had_env_staging" -eq 1 ]; then
-    cp "$env_backup_dir/env.staging" .env.staging
-  else
-    rm -f .env.staging
-  fi
-  rm -rf "$env_backup_dir"
-  exit "$status"
-}
-trap cleanup EXIT INT TERM
-
-docker compose $compose_files up -d redis mysql-debug php1
-
-docker compose $compose_files exec -T php1 sh -lc '
-  set -eu
-  for i in $(seq 1 90); do
-    if MYSQL_PWD="${CONFIG_DB_PASSWORD:-debug_root_password}" mysqladmin \
-      -h "${CONFIG_DB_HOST:-mysql-debug}" \
-      -P "${CONFIG_DB_PORT:-3306}" \
-      -u "${CONFIG_DB_USER:-root}" \
-      ping --silent >/dev/null 2>&1; then
-      exit 0
-    fi
-    sleep 1
-  done
-  echo "Timed out waiting for mysql-debug" >&2
-  exit 1
-'
-
-tar \
-  --exclude='./vendor' \
-  --exclude='./.phpunit.cache' \
-  --exclude='./build/logs' \
-  -C services/nginx/app -cf - . \
-  | docker compose $compose_files exec -T php1 tar -C /var/www/html -xf -
-
-docker compose $compose_files exec -T php1 sh -lc \
-  'cd /var/www/html && composer install --no-interaction --prefer-dist --no-progress'
-
-docker compose $compose_files exec -T php1 sh -lc \
-  "cd /var/www/html && composer test:ci:$suite"
@@ -1,35 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    fwrite(STDERR, "This command is CLI-only.\n");
-    exit(2);
-}
-
-const WD = __DIR__ . '/../services/nginx/app';
-require_once WD . '/vendor/autoload.php';
-require_once WD . '/config.php';
-require_once WD . '/classes/db.php';
-require_once WD . '/classes/account_deletion_schema_bootstrap.php';
-
-$response = null;
-$db = new \classes\db($CONFIG_DB);
-$db->connect();
-$command = $argv[1] ?? 'check';
-
-if ($command === 'apply') {
-    if (($argv[2] ?? '') !== '--yes') {
-        fwrite(STDERR, "Refusing schema mutation without: apply --yes\n");
-        exit(2);
-    }
-    \classes\account_deletion_schema_bootstrap::apply();
-}
-
-if (!in_array($command, ['check', 'apply'], true)) {
-    fwrite(STDERR, "Usage: scripts/account-deletion-schema.php check|apply --yes\n");
-    exit(2);
-}
-
-$status = \classes\account_deletion_schema_bootstrap::check();
-fwrite(STDOUT, json_encode($status, JSON_UNESCAPED_SLASHES) . PHP_EOL);
-exit($status['ready'] ? 0 : 1);
@@ -1,58 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    fwrite(STDERR, "This command is CLI-only.\n");
-    exit(2);
-}
-
-$command = $argv[1] ?? 'check';
-if (!in_array($command, ['check', 'apply', 'webhooks-check', 'webhooks-apply'], true)) {
-    fwrite(
-        STDERR,
-        "Usage: scripts/bird-control-plane-activate.php check|apply|webhooks-check|webhooks-apply [--yes]\n"
-    );
-    exit(2);
-}
-if (in_array($command, ['apply', 'webhooks-apply'], true) && ($argv[2] ?? '') !== '--yes') {
-    fwrite(STDERR, "Refusing Bird activation without: apply --yes\n");
-    exit(2);
-}
-
-$appDirectory = __DIR__ . '/../services/nginx/app';
-if (!is_file($appDirectory . '/config.php')) {
-    $appDirectory = dirname(__DIR__);
-}
-define('WD', $appDirectory);
-require_once WD . '/vendor/autoload.php';
-require_once WD . '/config.php';
-require_once WD . '/classes/db.php';
-require_once WD . '/modules/bird/classes/bird_control_plane_activator.php';
-require_once WD . '/modules/bird/classes/bird_webhook_subscription_reconciler.php';
-
-try {
-    $pdo = \classes\db::getPDO();
-    if (str_starts_with($command, 'webhooks-')) {
-        $reconciler = new \bird\classes\bird_webhook_subscription_reconciler($pdo);
-        $organizationId = trim((string)(getenv('BIRD_ORGANIZATION_ID') ?: ''));
-        $status = $command === 'webhooks-apply'
-            ? $reconciler->apply($organizationId)
-            : $reconciler->check($organizationId);
-    } else {
-        $activator = new \bird\classes\bird_control_plane_activator($pdo);
-        $status = $command === 'apply' ? $activator->apply([
-            'controlPlaneToken' => trim((string)(getenv('BIRD_CONTROL_PLANE_TOKEN') ?: '')),
-            'webhookSigningKey' => trim((string)(getenv('BIRD_WEBHOOK_SIGNING_KEY') ?: '')),
-            'participantId' => trim((string)(getenv('BIRD_PARTICIPANT_ID') ?: '')),
-        ]) : $activator->check();
-    }
-    fwrite(STDOUT, json_encode($status, JSON_UNESCAPED_SLASHES) . PHP_EOL);
-    exit(($status['ready'] ?? false) === true ? 0 : 1);
-} catch (Throwable $throwable) {
-    error_log('[bird-control-plane-activate] Failed: ' . get_class($throwable));
-    fwrite(STDOUT, json_encode([
-        'ready' => false,
-        'errorCode' => 'bird_activation_failed',
-    ], JSON_UNESCAPED_SLASHES) . PHP_EOL);
-    exit(1);
-}
@@ -1,28 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    exit(2);
-}
-
-$appDirectory = __DIR__ . '/../services/nginx/app';
-if (!is_file($appDirectory . '/config.php')) {
-    $appDirectory = dirname(__DIR__);
-}
-define('WD', $appDirectory);
-require_once WD . '/vendor/autoload.php';
-require_once WD . '/config.php';
-require_once WD . '/classes/db.php';
-require_once WD . '/modules/bird/classes/bird_control_plane_auto_activation.php';
-
-try {
-    $status = (new \bird\classes\bird_control_plane_auto_activation(
-        \classes\db::getPDO()
-    ))->run();
-    fwrite(STDOUT, json_encode($status, JSON_UNESCAPED_SLASHES) . PHP_EOL);
-    exit(($status['ready'] ?? false) === true ? 0 : 1);
-} catch (Throwable $throwable) {
-    error_log('[bird-control-plane-auto-activate] Failed: ' . get_class($throwable));
-    fwrite(STDOUT, '{"ready":false,"errorCode":"bird_auto_activation_failed"}' . PHP_EOL);
-    exit(1);
-}
@@ -1,79 +0,0 @@
-#!/bin/sh
-set -eu
-
-bootstrap_url='https://api.truckwash.io:4433/bird/control-plane/v1/bootstrap'
-status_url='https://api.truckwash.io:4433/bird/control-plane/v1/status'
-expected_algorithm='RSA-OAEP-256'
-expected_fingerprint='6dc63c6ffe33b8de0b1396d7f529f56aea0a685ef98168016161cf721ddc8c21'
-private_key='/home/jeppe/.openclaw/credentials/bird.bootstrap-private.pem'
-credential_dir='/home/jeppe/.openclaw/credentials'
-destination="$credential_dir/bird.gateway-token"
-
-umask 077
-mkdir -p "$credential_dir"
-envelope_file="$(mktemp "$credential_dir/.bird-bootstrap-envelope.XXXXXX")"
-candidate_file="$(mktemp "$credential_dir/.bird-gateway-token.XXXXXX")"
-payload_file="$(mktemp "$credential_dir/.bird-bootstrap-payload.XXXXXX")"
-status_file="$(mktemp "$credential_dir/.bird-bootstrap-status.XXXXXX")"
-cleanup() {
-    rm -f "$envelope_file" "$candidate_file" "$payload_file" "$status_file"
-}
-trap cleanup EXIT HUP INT TERM
-
-test -r "$private_key"
-test "$(stat -c '%a' "$private_key")" = '600'
-
-curl --proto '=https' --tlsv1.2 --fail --silent --show-error \
-    --max-time 30 "$bootstrap_url" > "$envelope_file"
-
-test "$(jq -r '.success // false' "$envelope_file")" = 'true'
-test "$(jq -r '.data.algorithm // empty' "$envelope_file")" = "$expected_algorithm"
-test "$(jq -r '.data.keyFingerprint // empty' "$envelope_file")" = "$expected_fingerprint"
-jq -e '.data | keys == ["algorithm","ciphertext","keyFingerprint","tokenVersion","updatedAt"]' \
-    "$envelope_file" >/dev/null
-jq -e '.data.tokenVersion | type == "number" and . >= 1 and floor == .' \
-    "$envelope_file" >/dev/null
-jq -e '.data.updatedAt | type == "string" and test("^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$")' \
-    "$envelope_file" >/dev/null
-jq -e '.data.ciphertext | type == "string" and length == 512 and test("^[A-Za-z0-9+/]{512}$")' \
-    "$envelope_file" >/dev/null
-
-jq -r '.data.ciphertext' "$envelope_file" \
-    | base64 -d \
-    | openssl pkeyutl -decrypt -inkey "$private_key" \
-        -pkeyopt rsa_padding_mode:oaep \
-        -pkeyopt rsa_oaep_md:sha256 \
-        -pkeyopt rsa_mgf1_md:sha256 > "$payload_file"
-
-jq -e '. | keys == ["algorithm","keyFingerprint","token","tokenVersion","updatedAt"]' \
-    "$payload_file" >/dev/null
-test "$(jq -r '.algorithm // empty' "$payload_file")" = "$expected_algorithm"
-test "$(jq -r '.keyFingerprint // empty' "$payload_file")" = "$expected_fingerprint"
-test "$(jq -r '.tokenVersion // empty' "$payload_file")" = \
-    "$(jq -r '.data.tokenVersion' "$envelope_file")"
-test "$(jq -r '.updatedAt // empty' "$payload_file")" = \
-    "$(jq -r '.data.updatedAt' "$envelope_file")"
-jq -j '.token' "$payload_file" > "$candidate_file"
-
-test "$(wc -c < "$candidate_file")" = '64'
-grep -Eq '^[A-Za-z0-9_-]{64}$' "$candidate_file"
-chmod 600 "$candidate_file"
-
-token="$(cat "$candidate_file")"
-{
-    printf 'url = "%s"\n' "$status_url"
-    printf 'proto = "=https"\n'
-    printf 'tlsv1.2\n'
-    printf 'fail\nsilent\nshow-error\n'
-    printf 'max-time = 30\n'
-    printf 'header = "Authorization: Bearer %s"\n' "$token"
-} | curl --config - > "$status_file"
-unset token
-
-jq -e '.success == true and .data.enabled == true and .data.webhookConfigured == true' \
-    "$status_file" >/dev/null
-mv -f "$candidate_file" "$destination"
-chmod 600 "$destination"
-trap - EXIT HUP INT TERM
-rm -f "$envelope_file" "$payload_file" "$status_file"
-printf 'Bird gateway credential bootstrapped and authenticated.\n'
@@ -1,32 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    fwrite(STDERR, "This command is CLI-only.\n");
-    exit(2);
-}
-
-const WD = __DIR__ . '/../services/nginx/app';
-require_once WD . '/vendor/autoload.php';
-require_once WD . '/config.php';
-require_once WD . '/classes/db.php';
-require_once WD . '/modules/bird/classes/bird_control_plane_schema_bootstrap.php';
-
-$command = $argv[1] ?? 'check';
-if (!in_array($command, ['check', 'apply'], true)) {
-    fwrite(STDERR, "Usage: scripts/bird-control-plane-schema.php check|apply --yes\n");
-    exit(2);
-}
-
-$pdo = \classes\db::getPDO();
-if ($command === 'apply') {
-    if (($argv[2] ?? '') !== '--yes') {
-        fwrite(STDERR, "Refusing schema mutation without: apply --yes\n");
-        exit(2);
-    }
-    \bird\classes\bird_control_plane_schema_bootstrap::apply($pdo);
-}
-
-$status = \bird\classes\bird_control_plane_schema_bootstrap::check($pdo);
-fwrite(STDOUT, json_encode($status, JSON_UNESCAPED_SLASHES) . PHP_EOL);
-exit($status['ready'] ? 0 : 1);
@@ -1,45 +0,0 @@
-#!/usr/bin/env sh
-set -eu
-
-if [ "$#" -eq 0 ]; then
-  echo "Usage: $0 <service> [service ...]" >&2
-  exit 2
-fi
-
-compose_files="${CI_DOCKER_COMPOSE_FILES:--f docker-compose.yml -f .github/docker-compose.ci.yml}"
-lock_file="${CI_DOCKER_LOCK_FILE:-/tmp/pleno-api-ci-docker-compose-up.lock}"
-max_attempts="${CI_DOCKER_UP_RETRIES:-${PHP_CI_DOCKER_RETRIES:-3}}"
-export COMPOSE_PROFILES="${COMPOSE_PROFILES:-dev}"
-
-compose_up() {
-  attempt=1
-  while :; do
-    docker network prune -f >/dev/null 2>&1 || true
-
-    if docker compose $compose_files up -d "$@"; then
-      return 0
-    fi
-
-    status="$?"
-    docker compose $compose_files down -v --remove-orphans >/dev/null 2>&1 || true
-
-    if [ "$attempt" -ge "$max_attempts" ]; then
-      return "$status"
-    fi
-
-    sleep_seconds=$((attempt * 5))
-    echo "Docker compose up failed with status $status; retrying in ${sleep_seconds}s (attempt $((attempt + 1))/$max_attempts)." >&2
-    sleep "$sleep_seconds"
-    attempt=$((attempt + 1))
-  done
-}
-
-if command -v flock >/dev/null 2>&1; then
-  (
-    flock 9
-    compose_up "$@"
-  ) 9>"$lock_file"
-else
-  echo "flock is not available; running Docker compose startup without a host lock." >&2
-  compose_up "$@"
-fi
@@ -1,453 +0,0 @@
-import { spawn } from "node:child_process";
-import crypto from "node:crypto";
-import fs from "node:fs";
-import http from "node:http";
-import net from "node:net";
-import os from "node:os";
-import path from "node:path";
-import process from "node:process";
-import { fileURLToPath } from "node:url";
-
-const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-const DEFAULT_AGENT_PATH = path.join(
-  repoRoot,
-  "services/nginx/app/resources/edge-gateway-agent/agent.php"
-);
-const DEFAULT_PHP_IMAGE = "php:8.2-cli-bookworm";
-const DEFAULT_TIMEOUT_MS = 12000;
-
-function parseArgs(argv = process.argv.slice(2)) {
-  const options = {
-    agentPath: DEFAULT_AGENT_PATH,
-    phpImage: DEFAULT_PHP_IMAGE,
-    timeoutMs: DEFAULT_TIMEOUT_MS,
-    keepTemp: false,
-    help: false,
-  };
-
-  for (let index = 0; index < argv.length; index += 1) {
-    const arg = argv[index];
-    const next = argv[index + 1];
-
-    switch (arg) {
-      case "--agent-path":
-        options.agentPath = path.resolve(String(next || "").trim());
-        index += 1;
-        break;
-      case "--php-image":
-        options.phpImage = String(next || "").trim() || DEFAULT_PHP_IMAGE;
-        index += 1;
-        break;
-      case "--timeout-ms":
-        options.timeoutMs = Number.parseInt(String(next || ""), 10) || DEFAULT_TIMEOUT_MS;
-        index += 1;
-        break;
-      case "--keep-temp":
-        options.keepTemp = true;
-        break;
-      case "--help":
-      case "-h":
-        options.help = true;
-        break;
-      default:
-        throw new Error(`Unknown argument: ${arg}`);
-    }
-  }
-
-  return options;
-}
-
-function printUsage() {
-  process.stdout.write(`Usage:
-  node scripts/edge-agent-command-drain-proof.mjs [options]
-
-Verifies that a broker-connected PHP compose edge agent still drains API-queued
-SET_RELAY_STATE jobs to the LAN worker /relay/switch endpoint.
-
-Options:
-  --agent-path <path>   PHP agent artifact to execute.
-                       Default: ${DEFAULT_AGENT_PATH}
-  --php-image <image>   Docker PHP image with curl, sqlite3, and pdo_sqlite.
-                       Default: ${DEFAULT_PHP_IMAGE}
-  --timeout-ms <ms>     Proof timeout. Default: ${DEFAULT_TIMEOUT_MS}
-  --keep-temp           Keep the temporary config/runtime directory.
-  --help                Show this help text.
-`);
-}
-
-function readJson(request) {
-  return new Promise((resolve) => {
-    let raw = "";
-    request.setEncoding("utf8");
-    request.on("data", (chunk) => {
-      raw += chunk;
-    });
-    request.on("end", () => {
-      if (raw.trim() === "") {
-        resolve({});
-        return;
-      }
-
-      try {
-        resolve(JSON.parse(raw));
-      } catch {
-        resolve({ __invalid: raw });
-      }
-    });
-  });
-}
-
-function sendJson(response, status, payload) {
-  const body = JSON.stringify(payload);
-  response.writeHead(status, {
-    "content-type": "application/json; charset=utf-8",
-    "content-length": Buffer.byteLength(body),
-  });
-  response.end(body);
-}
-
-function listen(server) {
-  return new Promise((resolve) => {
-    server.listen(0, "127.0.0.1", () => resolve(server.address().port));
-  });
-}
-
-function closeServer(server) {
-  return new Promise((resolve) => {
-    server.close(() => resolve());
-  });
-}
-
-function websocketAcceptKey(key) {
-  return crypto
-    .createHash("sha1")
-    .update(`${key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11`)
-    .digest("base64");
-}
-
-function createBrokerServer(state) {
-  const sockets = new Set();
-  const server = net.createServer((socket) => {
-    sockets.add(socket);
-    socket.on("close", () => sockets.delete(socket));
-
-    let buffer = "";
-    socket.on("data", (chunk) => {
-      buffer += chunk.toString("binary");
-      if (state.brokerHandshakeSeen || !buffer.includes("\r\n\r\n")) {
-        return;
-      }
-
-      const requestText = Buffer.from(buffer, "binary").toString("utf8");
-      const key = requestText.match(/Sec-WebSocket-Key:\s*(.+)\r\n/i)?.[1]?.trim();
-      const requestLine = requestText.split("\r\n")[0] || "";
-      if (!requestLine.includes("/ws/agent?")) {
-        state.failure = new Error(`unexpected broker path: ${requestLine}`);
-      }
-      if (!key) {
-        state.failure = new Error("broker handshake missing Sec-WebSocket-Key");
-        return;
-      }
-
-      socket.write([
-        "HTTP/1.1 101 Switching Protocols",
-        "Upgrade: websocket",
-        "Connection: Upgrade",
-        `Sec-WebSocket-Accept: ${websocketAcceptKey(key)}`,
-        "",
-        "",
-      ].join("\r\n"));
-      state.brokerHandshakeSeen = true;
-      buffer = "";
-    });
-  });
-
-  return { server, sockets };
-}
-
-function createWorkerServer(state) {
-  return http.createServer(async (request, response) => {
-    const url = new URL(request.url, "http://127.0.0.1");
-    const body = await readJson(request);
-    state.requests.push({ service: "worker", method: request.method, path: url.pathname, body });
-
-    if (request.method === "GET" && url.pathname === "/health") {
-      sendJson(response, 200, { status: "healthy", timestamp: new Date().toISOString() });
-      return;
-    }
-
-    if (request.method === "POST" && url.pathname === "/relay/switch") {
-      state.relaySwitchSeen = true;
-      if (body.local_ip !== "10.123.0.31" || body.channel !== 0 || body.on !== true) {
-        state.failure = new Error(`unexpected relay switch payload: ${JSON.stringify(body)}`);
-      }
-      sendJson(response, 200, {
-        online: true,
-        on: true,
-        output: true,
-        raw: { source: "fake-worker" },
-      });
-      return;
-    }
-
-    sendJson(response, 404, { message: "not found" });
-  });
-}
-
-function createApiServer(state, brokerPort, workerPort) {
-  return http.createServer(async (request, response) => {
-    const url = new URL(request.url, "http://127.0.0.1");
-    const body = await readJson(request);
-    state.requests.push({ service: "api", method: request.method, path: url.pathname, body });
-
-    if (request.method === "POST" && url.pathname === "/edge-agent/gateways/42/heartbeat") {
-      sendJson(response, 200, { data: { ok: true, broker_url: `ws://127.0.0.1:${brokerPort}` } });
-      return;
-    }
-
-    if (request.method === "POST" && url.pathname === "/edge-agent/gateways/42/selfserve/machine-signal-bindings") {
-      sendJson(response, 200, { data: { monitors: [] } });
-      return;
-    }
-
-    if (request.method === "POST" && url.pathname === "/edge-agent/gateways/42/commands/poll") {
-      state.commandPollSeen = true;
-      if (body.wait_seconds !== 0) {
-        state.failure = new Error(
-          `broker-connected command poll should be non-blocking, got wait_seconds=${body.wait_seconds}`
-        );
-      }
-
-      if (!state.commandDelivered) {
-        state.commandDelivered = true;
-        sendJson(response, 200, {
-          data: {
-            id: 77,
-            command_type: "SET_RELAY_STATE",
-            payload: {
-              localIp: "10.123.0.31",
-              channel: 0,
-              on: true,
-              relayId: "relay-proof",
-            },
-          },
-        });
-        return;
-      }
-
-      sendJson(response, 200, { data: null });
-      return;
-    }
-
-    if (request.method === "POST" && url.pathname === "/edge-agent/gateways/42/commands/77/result") {
-      state.resultSeen = true;
-      if (body.ok !== true || body.result?.on !== true || body.result?.raw?.source !== "fake-worker") {
-        state.failure = new Error(`unexpected command result: ${JSON.stringify(body)}`);
-      }
-      sendJson(response, 200, { data: { acknowledged: true } });
-      return;
-    }
-
-    sendJson(response, 404, { message: "not found", path: url.pathname, workerPort });
-  });
-}
-
-function writeConfig(tempDir, apiPort, brokerPort, workerPort) {
-  const containerProofDir = "/proof";
-  const runtimeDir = `${containerProofDir}/runtime`;
-  const config = {
-    apiUrl: `http://127.0.0.1:${apiPort}`,
-    brokerUrl: `ws://127.0.0.1:${brokerPort}`,
-    gatewayId: 42,
-    agentToken: "agent-token",
-    installDir: containerProofDir,
-    runtimeDir,
-    stateDatabasePath: `${runtimeDir}/gateway-state.sqlite`,
-    workerBaseUrl: `http://127.0.0.1:${workerPort}`,
-    heartbeatIntervalSeconds: 60,
-    operationPollTimeoutSeconds: 20,
-  };
-
-  const configPath = path.join(tempDir, "config.json");
-  fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-  return { configPath, containerConfigPath: `${containerProofDir}/config.json` };
-}
-
-function spawnAgent({ agentPath, phpImage, tempDir, containerConfigPath }) {
-  return spawn("docker", [
-    "run",
-    "--rm",
-    "--network",
-    "host",
-    "-v",
-    `${agentPath}:/agent.php:ro`,
-    "-v",
-    `${tempDir}:/proof`,
-    phpImage,
-    "php",
-    "/agent.php",
-    "--config",
-    containerConfigPath,
-  ], { stdio: ["ignore", "pipe", "pipe"] });
-}
-
-async function stopChild(child) {
-  if (child.exitCode !== null || child.signalCode !== null) {
-    return;
-  }
-
-  child.kill("SIGTERM");
-  const hardKill = setTimeout(() => {
-    if (child.exitCode === null && child.signalCode === null) {
-      child.kill("SIGKILL");
-    }
-  }, 1500);
-
-  await Promise.race([
-    new Promise((resolve) => child.once("exit", resolve)),
-    new Promise((resolve) => setTimeout(resolve, 2200)),
-  ]);
-  clearTimeout(hardKill);
-}
-
-function evidenceFromState(state, childExited) {
-  return {
-    brokerHandshakeSeen: state.brokerHandshakeSeen,
-    commandPollSeen: state.commandPollSeen,
-    relaySwitchSeen: state.relaySwitchSeen,
-    resultSeen: state.resultSeen,
-    agentStayedRunningUntilProofComplete: !childExited,
-  };
-}
-
-export async function runProof(options) {
-  if (process.platform !== "linux") {
-    throw new Error("This proof uses Docker --network host and currently expects Linux.");
-  }
-  if (!fs.existsSync(options.agentPath)) {
-    throw new Error(`Agent artifact not found: ${options.agentPath}`);
-  }
-
-  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "edge-agent-command-drain-proof-"));
-  fs.mkdirSync(path.join(tempDir, "runtime"), { recursive: true });
-
-  const state = {
-    brokerHandshakeSeen: false,
-    commandPollSeen: false,
-    relaySwitchSeen: false,
-    resultSeen: false,
-    commandDelivered: false,
-    failure: null,
-    requests: [],
-  };
-
-  const broker = createBrokerServer(state);
-  const workerServer = createWorkerServer(state);
-  let apiServer = null;
-  let child = null;
-  let stdout = "";
-  let stderr = "";
-  let childExited = false;
-
-  try {
-    const brokerPort = await listen(broker.server);
-    const workerPort = await listen(workerServer);
-    apiServer = createApiServer(state, brokerPort, workerPort);
-    const apiPort = await listen(apiServer);
-    const { containerConfigPath } = writeConfig(tempDir, apiPort, brokerPort, workerPort);
-
-    child = spawnAgent({ ...options, tempDir, containerConfigPath });
-    child.stdout.on("data", (chunk) => {
-      stdout += chunk.toString();
-    });
-    child.stderr.on("data", (chunk) => {
-      stderr += chunk.toString();
-    });
-    child.once("exit", () => {
-      childExited = true;
-    });
-
-    const deadline = Date.now() + options.timeoutMs;
-    while (Date.now() < deadline && !state.failure && !childExited) {
-      if (state.brokerHandshakeSeen && state.commandPollSeen && state.relaySwitchSeen && state.resultSeen) {
-        break;
-      }
-      await new Promise((resolve) => setTimeout(resolve, 100));
-    }
-
-    const evidence = evidenceFromState(state, childExited);
-    if (
-      state.failure ||
-      !state.brokerHandshakeSeen ||
-      !state.commandPollSeen ||
-      !state.relaySwitchSeen ||
-      !state.resultSeen
-    ) {
-      const error = state.failure || new Error("missing proof evidence");
-      error.evidence = evidence;
-      error.requests = state.requests;
-      error.stdout = stdout.slice(-3000);
-      error.stderr = stderr.slice(-3000);
-      throw error;
-    }
-
-    return {
-      evidence,
-      agentPath: options.agentPath,
-      phpImage: options.phpImage,
-      tempDir,
-      requestCount: state.requests.length,
-    };
-  } finally {
-    if (child) {
-      await stopChild(child);
-    }
-    for (const socket of broker.sockets) {
-      socket.destroy();
-    }
-    await Promise.allSettled([
-      closeServer(broker.server),
-      closeServer(workerServer),
-      apiServer ? closeServer(apiServer) : Promise.resolve(),
-    ]);
-    if (!options.keepTemp) {
-      fs.rmSync(tempDir, { recursive: true, force: true });
-    }
-  }
-}
-
-async function main() {
-  const options = parseArgs();
-  if (options.help) {
-    printUsage();
-    return;
-  }
-
-  const result = await runProof(options);
-  process.stdout.write("PASS broker-connected API command poll triggered local relay switch and posted result\n");
-  process.stdout.write(`${JSON.stringify(result.evidence)}\n`);
-  process.stdout.write(`Agent: ${result.agentPath}\n`);
-  process.stdout.write(`PHP image: ${result.phpImage}\n`);
-  if (options.keepTemp) {
-    process.stdout.write(`Temp dir: ${result.tempDir}\n`);
-  }
-}
-
-if (import.meta.url === `file://${process.argv[1]}`) {
-  main().catch((error) => {
-    process.stderr.write(`FAIL ${error.message}\n`);
-    if (error.evidence) {
-      process.stderr.write(`Evidence: ${JSON.stringify(error.evidence)}\n`);
-    }
-    if (error.requests) {
-      process.stderr.write(`Requests: ${JSON.stringify(error.requests, null, 2)}\n`);
-    }
-    if (error.stdout) {
-      process.stderr.write(`stdout: ${error.stdout}\n`);
-    }
-    if (error.stderr) {
-      process.stderr.write(`stderr: ${error.stderr}\n`);
-    }
-    process.exit(1);
-  });
-}
@@ -1,619 +0,0 @@
-import { spawn } from "node:child_process";
-import crypto from "node:crypto";
-import fs from "node:fs";
-import http from "node:http";
-import net from "node:net";
-import os from "node:os";
-import path from "node:path";
-import process from "node:process";
-import { fileURLToPath } from "node:url";
-
-const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-const DEFAULT_AGENT_PATH = path.join(
-  repoRoot,
-  "services/nginx/app/resources/edge-gateway-agent/agent.php"
-);
-const DEFAULT_WORKER_PATH = path.join(
-  repoRoot,
-  "services/nginx/app/resources/edge-gateway-agent/lan-worker.php"
-);
-const DEFAULT_PHP_IMAGE = "php:8.2-cli-bookworm";
-const DEFAULT_TIMEOUT_MS = 15000;
-const AGENT_TOKEN = "agent-token";
-
-function parseArgs(argv = process.argv.slice(2)) {
-  const options = {
-    agentPath: DEFAULT_AGENT_PATH,
-    workerPath: DEFAULT_WORKER_PATH,
-    phpImage: DEFAULT_PHP_IMAGE,
-    timeoutMs: DEFAULT_TIMEOUT_MS,
-    keepTemp: false,
-    help: false,
-  };
-
-  for (let index = 0; index < argv.length; index += 1) {
-    const arg = argv[index];
-    const next = argv[index + 1];
-
-    switch (arg) {
-      case "--agent-path":
-        options.agentPath = path.resolve(String(next || "").trim());
-        index += 1;
-        break;
-      case "--worker-path":
-        options.workerPath = path.resolve(String(next || "").trim());
-        index += 1;
-        break;
-      case "--php-image":
-        options.phpImage = String(next || "").trim() || DEFAULT_PHP_IMAGE;
-        index += 1;
-        break;
-      case "--timeout-ms":
-        options.timeoutMs = Number.parseInt(String(next || ""), 10) || DEFAULT_TIMEOUT_MS;
-        index += 1;
-        break;
-      case "--keep-temp":
-        options.keepTemp = true;
-        break;
-      case "--help":
-      case "-h":
-        options.help = true;
-        break;
-      default:
-        throw new Error(`Unknown argument: ${arg}`);
-    }
-  }
-
-  return options;
-}
-
-function printUsage() {
-  process.stdout.write(`Usage:
-  node scripts/edge-agent-to-shelly-proof.mjs [options]
-
-Runs the PHP edge agent and real LAN worker against fake broker, API, and
-Shelly RPC endpoints. Verifies that a broker-connected SET_RELAY_STATE command
-drains from the API, reaches the worker, triggers a Shelly-style Switch.Set
-call, reads Switch.GetStatus, and posts the command result.
-
-Options:
-  --agent-path <path>   PHP agent artifact to execute.
-                       Default: ${DEFAULT_AGENT_PATH}
-  --worker-path <path>  PHP LAN worker artifact to execute.
-                       Default: ${DEFAULT_WORKER_PATH}
-  --php-image <image>   Docker PHP image with curl, sqlite3, and pdo_sqlite.
-                       Default: ${DEFAULT_PHP_IMAGE}
-  --timeout-ms <ms>     Proof timeout. Default: ${DEFAULT_TIMEOUT_MS}
-  --keep-temp           Keep the temporary config/runtime directory.
-  --help                Show this help text.
-`);
-}
-
-function readJson(request) {
-  return new Promise((resolve) => {
-    let raw = "";
-    request.setEncoding("utf8");
-    request.on("data", (chunk) => {
-      raw += chunk;
-    });
-    request.on("end", () => {
-      if (raw.trim() === "") {
-        resolve({});
-        return;
-      }
-
-      try {
-        resolve(JSON.parse(raw));
-      } catch {
-        resolve({ __invalid: raw });
-      }
-    });
-  });
-}
-
-function sendJson(response, status, payload) {
-  const body = JSON.stringify(payload);
-  response.writeHead(status, {
-    "content-type": "application/json; charset=utf-8",
-    "content-length": Buffer.byteLength(body),
-  });
-  response.end(body);
-}
-
-function requestJson({ method = "GET", port, path: requestPath, body = null, headers = {} }) {
-  return new Promise((resolve, reject) => {
-    const payload = body === null ? null : JSON.stringify(body);
-    const request = http.request({
-      hostname: "127.0.0.1",
-      port,
-      path: requestPath,
-      method,
-      headers: {
-        accept: "application/json",
-        ...(payload === null ? {} : {
-          "content-type": "application/json",
-          "content-length": Buffer.byteLength(payload),
-        }),
-        ...headers,
-      },
-      timeout: 1000,
-    }, (response) => {
-      let raw = "";
-      response.setEncoding("utf8");
-      response.on("data", (chunk) => {
-        raw += chunk;
-      });
-      response.on("end", () => {
-        let decoded;
-        try {
-          decoded = raw.trim() === "" ? {} : JSON.parse(raw);
-        } catch {
-          decoded = { __invalid: raw };
-        }
-        resolve({ status: response.statusCode || 0, body: decoded });
-      });
-    });
-    request.on("error", reject);
-    request.on("timeout", () => {
-      request.destroy(new Error("request timed out"));
-    });
-    if (payload !== null) {
-      request.write(payload);
-    }
-    request.end();
-  });
-}
-
-function listen(server) {
-  return new Promise((resolve) => {
-    server.listen(0, "127.0.0.1", () => resolve(server.address().port));
-  });
-}
-
-function closeServer(server) {
-  return new Promise((resolve) => {
-    server.close(() => resolve());
-  });
-}
-
-async function reservePort() {
-  const server = net.createServer();
-  const port = await new Promise((resolve) => {
-    server.listen(0, "127.0.0.1", () => resolve(server.address().port));
-  });
-  await closeServer(server);
-  return port;
-}
-
-function websocketAcceptKey(key) {
-  return crypto
-    .createHash("sha1")
-    .update(`${key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11`)
-    .digest("base64");
-}
-
-function createBrokerServer(state) {
-  const sockets = new Set();
-  const server = net.createServer((socket) => {
-    sockets.add(socket);
-    socket.on("close", () => sockets.delete(socket));
-
-    let buffer = "";
-    socket.on("data", (chunk) => {
-      buffer += chunk.toString("binary");
-      if (state.brokerHandshakeSeen || !buffer.includes("\r\n\r\n")) {
-        return;
-      }
-
-      const requestText = Buffer.from(buffer, "binary").toString("utf8");
-      const key = requestText.match(/Sec-WebSocket-Key:\s*(.+)\r\n/i)?.[1]?.trim();
-      const requestLine = requestText.split("\r\n")[0] || "";
-      if (!requestLine.includes("/ws/agent?")) {
-        state.failure = new Error(`unexpected broker path: ${requestLine}`);
-      }
-      if (!key) {
-        state.failure = new Error("broker handshake missing Sec-WebSocket-Key");
-        return;
-      }
-
-      socket.write([
-        "HTTP/1.1 101 Switching Protocols",
-        "Upgrade: websocket",
-        "Connection: Upgrade",
-        `Sec-WebSocket-Accept: ${websocketAcceptKey(key)}`,
-        "",
-        "",
-      ].join("\r\n"));
-      state.brokerHandshakeSeen = true;
-      buffer = "";
-    });
-  });
-
-  return { server, sockets };
-}
-
-function createShellyServer(state) {
-  return http.createServer((request, response) => {
-    const url = new URL(request.url, "http://127.0.0.1");
-    state.requests.push({
-      service: "shelly",
-      method: request.method,
-      path: url.pathname,
-      query: Object.fromEntries(url.searchParams.entries()),
-    });
-
-    if (request.method === "GET" && url.pathname === "/rpc/Switch.Set") {
-      state.shellySwitchSetSeen = true;
-      if (url.searchParams.get("id") !== "0" || url.searchParams.get("on") !== "true") {
-        state.failure = new Error(`unexpected Shelly Switch.Set query: ${url.search}`);
-      }
-      sendJson(response, 200, { was_on: false, output: true });
-      return;
-    }
-
-    if (request.method === "GET" && url.pathname === "/rpc/Switch.GetStatus") {
-      state.shellyStatusSeen = true;
-      if (url.searchParams.get("id") !== "0") {
-        state.failure = new Error(`unexpected Shelly Switch.GetStatus query: ${url.search}`);
-      }
-      sendJson(response, 200, { id: 0, output: true, source: "fake-shelly-rpc" });
-      return;
-    }
-
-    if (url.pathname.startsWith("/relay/")) {
-      state.failure = new Error(`legacy Shelly endpoint should not be used for generation 2 proof: ${url.pathname}`);
-    }
-
-    sendJson(response, 404, { message: "not found" });
-  });
-}
-
-function createApiServer(state, brokerPort, shellyAddress) {
-  return http.createServer(async (request, response) => {
-    const url = new URL(request.url, "http://127.0.0.1");
-    const body = await readJson(request);
-    state.requests.push({ service: "api", method: request.method, path: url.pathname, body });
-
-    if (request.method === "POST" && url.pathname === "/edge-agent/gateways/42/heartbeat") {
-      sendJson(response, 200, { data: { ok: true, broker_url: `ws://127.0.0.1:${brokerPort}` } });
-      return;
-    }
-
-    if (request.method === "POST" && url.pathname === "/edge-agent/gateways/42/selfserve/machine-signal-bindings") {
-      sendJson(response, 200, { data: { monitors: [] } });
-      return;
-    }
-
-    if (request.method === "POST" && url.pathname === "/edge-agent/gateways/42/commands/poll") {
-      state.commandPollSeen = true;
-      if (body.wait_seconds !== 0) {
-        state.failure = new Error(
-          `broker-connected command poll should be non-blocking, got wait_seconds=${body.wait_seconds}`
-        );
-      }
-
-      if (!state.commandDelivered) {
-        state.commandDelivered = true;
-        sendJson(response, 200, {
-          data: {
-            id: 77,
-            command_type: "SET_RELAY_STATE",
-            payload: {
-              localIp: shellyAddress,
-              local_ip: shellyAddress,
-              channel: 0,
-              on: true,
-              relayId: "relay-proof",
-              relay_id: "relay-proof",
-              deviceGeneration: 2,
-              device_generation: 2,
-            },
-          },
-        });
-        return;
-      }
-
-      sendJson(response, 200, { data: null });
-      return;
-    }
-
-    if (request.method === "POST" && url.pathname === "/edge-agent/gateways/42/commands/77/result") {
-      state.resultSeen = true;
-      if (
-        body.ok !== true ||
-        body.result?.on !== true ||
-        body.result?.output !== true ||
-        body.result?.raw?.source !== "fake-shelly-rpc"
-      ) {
-        state.failure = new Error(`unexpected command result: ${JSON.stringify(body)}`);
-      }
-      sendJson(response, 200, { data: { acknowledged: true } });
-      return;
-    }
-
-    sendJson(response, 404, { message: "not found", path: url.pathname });
-  });
-}
-
-function writeConfig(tempDir, apiPort, brokerPort, workerPort) {
-  const containerProofDir = "/proof";
-  const runtimeDir = `${containerProofDir}/runtime`;
-  const config = {
-    apiUrl: `http://127.0.0.1:${apiPort}`,
-    brokerUrl: `ws://127.0.0.1:${brokerPort}`,
-    gatewayId: 42,
-    agentToken: AGENT_TOKEN,
-    installDir: containerProofDir,
-    runtimeDir,
-    stateDatabasePath: `${runtimeDir}/gateway-state.sqlite`,
-    workerBaseUrl: `http://127.0.0.1:${workerPort}`,
-    heartbeatIntervalSeconds: 60,
-    operationPollTimeoutSeconds: 20,
-  };
-
-  const configPath = path.join(tempDir, "config.json");
-  fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-  return { containerConfigPath: `${containerProofDir}/config.json` };
-}
-
-function spawnWorker({ workerPath, phpImage, workerPort }) {
-  return spawn("docker", [
-    "run",
-    "--rm",
-    "--network",
-    "host",
-    "-e",
-    `TRUCKWASH_WORKER_TOKEN=${AGENT_TOKEN}`,
-    "-v",
-    `${workerPath}:/lan-worker.php:ro`,
-    phpImage,
-    "php",
-    "-S",
-    `127.0.0.1:${workerPort}`,
-    "/lan-worker.php",
-  ], { stdio: ["ignore", "pipe", "pipe"] });
-}
-
-function spawnAgent({ agentPath, phpImage, tempDir, containerConfigPath }) {
-  return spawn("docker", [
-    "run",
-    "--rm",
-    "--network",
-    "host",
-    "-v",
-    `${agentPath}:/agent.php:ro`,
-    "-v",
-    `${tempDir}:/proof`,
-    phpImage,
-    "php",
-    "/agent.php",
-    "--config",
-    containerConfigPath,
-  ], { stdio: ["ignore", "pipe", "pipe"] });
-}
-
-async function waitForWorker(workerPort, child, timeoutMs) {
-  const deadline = Date.now() + timeoutMs;
-  let lastError = null;
-  while (Date.now() < deadline) {
-    if (child.exitCode !== null || child.signalCode !== null) {
-      throw new Error(`LAN worker exited before becoming healthy: ${child.exitCode ?? child.signalCode}`);
-    }
-
-    try {
-      const response = await requestJson({ port: workerPort, path: "/health" });
-      if (response.status === 200 && response.body?.service === "lan-worker") {
-        return;
-      }
-    } catch (error) {
-      lastError = error;
-    }
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  }
-  throw lastError || new Error("LAN worker did not become healthy");
-}
-
-async function stopChild(child) {
-  if (child.exitCode !== null || child.signalCode !== null) {
-    return;
-  }
-
-  child.kill("SIGTERM");
-  const hardKill = setTimeout(() => {
-    if (child.exitCode === null && child.signalCode === null) {
-      child.kill("SIGKILL");
-    }
-  }, 1500);
-
-  await Promise.race([
-    new Promise((resolve) => child.once("exit", resolve)),
-    new Promise((resolve) => setTimeout(resolve, 2200)),
-  ]);
-  clearTimeout(hardKill);
-}
-
-function evidenceFromState(state, agentExited, workerExited) {
-  return {
-    brokerHandshakeSeen: state.brokerHandshakeSeen,
-    commandPollSeen: state.commandPollSeen,
-    shellySwitchSetSeen: state.shellySwitchSetSeen,
-    shellyStatusSeen: state.shellyStatusSeen,
-    resultSeen: state.resultSeen,
-    agentStayedRunningUntilProofComplete: !agentExited,
-    workerStayedRunningUntilProofComplete: !workerExited,
-  };
-}
-
-export async function runProof(options) {
-  if (process.platform !== "linux") {
-    throw new Error("This proof uses Docker --network host and currently expects Linux.");
-  }
-  if (!fs.existsSync(options.agentPath)) {
-    throw new Error(`Agent artifact not found: ${options.agentPath}`);
-  }
-  if (!fs.existsSync(options.workerPath)) {
-    throw new Error(`LAN worker artifact not found: ${options.workerPath}`);
-  }
-
-  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "edge-agent-to-shelly-proof-"));
-  fs.mkdirSync(path.join(tempDir, "runtime"), { recursive: true });
-
-  const state = {
-    brokerHandshakeSeen: false,
-    commandPollSeen: false,
-    shellySwitchSetSeen: false,
-    shellyStatusSeen: false,
-    resultSeen: false,
-    commandDelivered: false,
-    failure: null,
-    requests: [],
-  };
-
-  const broker = createBrokerServer(state);
-  const shellyServer = createShellyServer(state);
-  let apiServer = null;
-  let agent = null;
-  let worker = null;
-  let agentStdout = "";
-  let agentStderr = "";
-  let workerStdout = "";
-  let workerStderr = "";
-  let agentExited = false;
-  let workerExited = false;
-
-  try {
-    const brokerPort = await listen(broker.server);
-    const shellyPort = await listen(shellyServer);
-    const workerPort = await reservePort();
-    const shellyAddress = `127.0.0.1:${shellyPort}`;
-    apiServer = createApiServer(state, brokerPort, shellyAddress);
-    const apiPort = await listen(apiServer);
-    const { containerConfigPath } = writeConfig(tempDir, apiPort, brokerPort, workerPort);
-
-    worker = spawnWorker({ ...options, workerPort });
-    worker.stdout.on("data", (chunk) => {
-      workerStdout += chunk.toString();
-    });
-    worker.stderr.on("data", (chunk) => {
-      workerStderr += chunk.toString();
-    });
-    worker.once("exit", () => {
-      workerExited = true;
-    });
-    await waitForWorker(workerPort, worker, 5000);
-
-    agent = spawnAgent({ ...options, tempDir, containerConfigPath });
-    agent.stdout.on("data", (chunk) => {
-      agentStdout += chunk.toString();
-    });
-    agent.stderr.on("data", (chunk) => {
-      agentStderr += chunk.toString();
-    });
-    agent.once("exit", () => {
-      agentExited = true;
-    });
-
-    const deadline = Date.now() + options.timeoutMs;
-    while (Date.now() < deadline && !state.failure && !agentExited && !workerExited) {
-      if (
-        state.brokerHandshakeSeen &&
-        state.commandPollSeen &&
-        state.shellySwitchSetSeen &&
-        state.shellyStatusSeen &&
-        state.resultSeen
-      ) {
-        break;
-      }
-      await new Promise((resolve) => setTimeout(resolve, 100));
-    }
-
-    const evidence = evidenceFromState(state, agentExited, workerExited);
-    if (
-      state.failure ||
-      !state.brokerHandshakeSeen ||
-      !state.commandPollSeen ||
-      !state.shellySwitchSetSeen ||
-      !state.shellyStatusSeen ||
-      !state.resultSeen
-    ) {
-      const error = state.failure || new Error("missing proof evidence");
-      error.evidence = evidence;
-      error.requests = state.requests;
-      error.agentStdout = agentStdout.slice(-3000);
-      error.agentStderr = agentStderr.slice(-3000);
-      error.workerStdout = workerStdout.slice(-3000);
-      error.workerStderr = workerStderr.slice(-3000);
-      throw error;
-    }
-
-    return {
-      evidence,
-      agentPath: options.agentPath,
-      workerPath: options.workerPath,
-      phpImage: options.phpImage,
-      tempDir,
-      requestCount: state.requests.length,
-    };
-  } finally {
-    if (agent) {
-      await stopChild(agent);
-    }
-    if (worker) {
-      await stopChild(worker);
-    }
-    for (const socket of broker.sockets) {
-      socket.destroy();
-    }
-    await Promise.allSettled([
-      closeServer(broker.server),
-      closeServer(shellyServer),
-      apiServer ? closeServer(apiServer) : Promise.resolve(),
-    ]);
-    if (!options.keepTemp) {
-      fs.rmSync(tempDir, { recursive: true, force: true });
-    }
-  }
-}
-
-async function main() {
-  const options = parseArgs();
-  if (options.help) {
-    printUsage();
-    return;
-  }
-
-  const result = await runProof(options);
-  process.stdout.write("PASS broker-connected API command triggered real LAN worker Shelly RPC signal and posted result\n");
-  process.stdout.write(`${JSON.stringify(result.evidence)}\n`);
-  process.stdout.write(`Agent: ${result.agentPath}\n`);
-  process.stdout.write(`LAN worker: ${result.workerPath}\n`);
-  process.stdout.write(`PHP image: ${result.phpImage}\n`);
-  if (options.keepTemp) {
-    process.stdout.write(`Temp dir: ${result.tempDir}\n`);
-  }
-}
-
-if (import.meta.url === `file://${process.argv[1]}`) {
-  main().catch((error) => {
-    process.stderr.write(`FAIL ${error.message}\n`);
-    if (error.evidence) {
-      process.stderr.write(`Evidence: ${JSON.stringify(error.evidence)}\n`);
-    }
-    if (error.requests) {
-      process.stderr.write(`Requests: ${JSON.stringify(error.requests, null, 2)}\n`);
-    }
-    if (error.agentStdout) {
-      process.stderr.write(`agent stdout: ${error.agentStdout}\n`);
-    }
-    if (error.agentStderr) {
-      process.stderr.write(`agent stderr: ${error.agentStderr}\n`);
-    }
-    if (error.workerStdout) {
-      process.stderr.write(`worker stdout: ${error.workerStdout}\n`);
-    }
-    if (error.workerStderr) {
-      process.stderr.write(`worker stderr: ${error.workerStderr}\n`);
-    }
-    process.exit(1);
-  });
-}
@@ -10,7 +10,7 @@ import { promisify } from "node:util";
 import { DEFAULT_CONFIG_FILE_NAME, DEFAULT_HOST_API_URL } from "./test-gateway.mjs";

 const execFile = promisify(execFileCallback);
-const COMPOSE_SERVICES = ["traefik", "redis", "mysql-debug", "edge-broker", "php1", "php2", "php3", "php4", "php5", "caddy"];
+const COMPOSE_SERVICES = ["traefik", "redis", "mysql-debug", "edge-broker", "php1", "caddy"];

 function composeArgs(projectName, args) {
  return ["compose", "-p", projectName, ...args];
@@ -94,23 +94,9 @@ function directCaddyBaseUrl(baseUrl) {
  return normalizeBaseUrl(url.toString());
 }

-function isLocalHost(hostname) {
-  const normalized = String(hostname || "").toLowerCase().replace(/^\x5b|\x5d$/g, "");
-  return normalized === "localhost" || normalized === "127.0.0.1" || normalized === "::1";
-}
-
 function resolveBrokerWebSocketUrl(rawUrl, apiBaseUrl) {
  const websocketUrl = new URL(String(rawUrl));
  const apiUrl = new URL(normalizeBaseUrl(apiBaseUrl));
-  const ciBrokerPort = String(process.env.EDGE_BROKER_CI_PORT || "").trim();
-
-  if (isLocalHost(apiUrl.hostname) && websocketUrl.hostname === "edge-broker" && ciBrokerPort !== "") {
-    websocketUrl.protocol = apiUrl.protocol === "https:" ? "wss:" : "ws:";
-    websocketUrl.hostname = apiUrl.hostname;
-    websocketUrl.port = ciBrokerPort;
-    websocketUrl.pathname = websocketUrl.pathname.replace(/^\/edge-broker(?=\/|$)/, "") || "/";
-    return websocketUrl.toString();
-  }

  if (apiUrl.hostname === "caddy" && websocketUrl.hostname === "caddy") {
    websocketUrl.hostname = "edge-broker";
@@ -118,18 +104,6 @@ function resolveBrokerWebSocketUrl(rawUrl, apiBaseUrl) {
    websocketUrl.pathname = websocketUrl.pathname.replace(/^\/edge-broker(?=\/|$)/, "") || "/";
  }

-  if (isLocalHost(apiUrl.hostname) && ["caddy", "edge-broker"].includes(websocketUrl.hostname)) {
-    const brokerPath = websocketUrl.pathname.replace(/^\/edge-broker(?=\/|$)/, "") || "/";
-    websocketUrl.protocol = apiUrl.protocol === "https:" ? "wss:" : "ws:";
-    websocketUrl.hostname = apiUrl.hostname;
-    websocketUrl.port = apiUrl.port;
-    websocketUrl.pathname = `/api/edge-broker${brokerPath}`;
-  }
-
-  if (isLocalHost(websocketUrl.hostname)) {
-    websocketUrl.pathname = websocketUrl.pathname.replace(/^\/edge-broker(?=\/|$)/, "") || "/";
-  }
-
  return websocketUrl.toString();
 }

@@ -227,7 +201,11 @@ async function connectCurrentContainerToComposeNetwork(rootDir, composeProject)
    return true;
  }

-  return /already exists|already connected/i.test(stderr);
+  if (/already exists|already connected/i.test(stderr)) {
+    return true;
+  }
+
+  return false;
 }

 async function disconnectCurrentContainerFromComposeNetwork(rootDir, composeProject) {
@@ -536,10 +514,6 @@ function shouldCopyGatewayConfig() {
  return /^(1|true|yes)$/i.test(String(process.env.EDGE_GATEWAY_E2E_COPY_CONFIG || "").trim());
 }

-function shouldSkipComposeUp() {
-  return /^(1|true|yes)$/i.test(String(process.env.EDGE_GATEWAY_E2E_SKIP_COMPOSE_UP || "").trim());
-}
-
 function collectMessages(rows) {
  return Array.isArray(rows)
    ? rows
@@ -577,38 +551,6 @@ function summarizeStreamMessages(messages, limit = 12) {
    .filter(Boolean);
 }

-async function readGatewayDiagnostics({ baseUrl, authToken, gatewayId, containerName }) {
-  const diagnostics = {};
-
-  if (gatewayId !== null && gatewayId > 0 && authToken) {
-    try {
-      const detail = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}`, {
-        token: authToken,
-      });
-      diagnostics.gateway = {
-        status: detail?.data?.status ?? null,
-        channelStatus: detail?.data?.channel_status ?? null,
-        brokerPresence: detail?.data?.metadata?.broker_presence ?? null,
-        brokerConnected: detail?.data?.metadata?.broker_connected ?? null,
-        brokerLastError: detail?.data?.metadata?.broker_last_error ?? null,
-      };
-    } catch (error) {
-      diagnostics.gatewayError = error instanceof Error ? error.message : String(error);
-    }
-  }
-
-  try {
-    const logs = await runCommand("docker", ["logs", "--tail", "120", containerName], {
-      allowFailure: true,
-    });
-    diagnostics.containerLogs = String(`${logs.stdout || ""}${logs.stderr || ""}`).trim().split(/\r?\n/).slice(-120);
-  } catch (error) {
-    diagnostics.containerLogError = error instanceof Error ? error.message : String(error);
-  }
-
-  return diagnostics;
-}
-
 async function main() {
  const scriptPath = fileURLToPath(import.meta.url);
  const rootDir = await resolveRootDir(scriptPath);
@@ -628,9 +570,7 @@ async function main() {
  let runnerNetworkAttached = false;

  try {
-    if (!shouldSkipComposeUp()) {
    await ensureComposeServices(rootDir, composeProject);
-    }
    runnerNetworkAttached = await connectCurrentContainerToComposeNetwork(rootDir, composeProject);
    baseUrl = await waitForApiReady(baseUrl, rootDir, composeProject, runnerNetworkAttached);
    process.stdout.write(`Using API base URL ${baseUrl}\n`);
@@ -723,7 +663,6 @@ async function main() {
      }
    );

-    try {
    await waitForCondition(
      async () => {
        const detail = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}`, {
@@ -740,18 +679,6 @@ async function main() {
        message: "Gateway never established a live broker connection after install.",
      }
    );
-    } catch (error) {
-      const diagnostics = await readGatewayDiagnostics({
-        baseUrl,
-        authToken,
-        gatewayId,
-        containerName,
-      });
-      throw new Error([
-        error instanceof Error ? error.message : String(error),
-        `Broker diagnostics: ${JSON.stringify(diagnostics, null, 2)}`,
-      ].join("\n"));
-    }

    const WebSocketImpl = await loadWebSocketImplementation();
    const streamSession = await apiRequest(baseUrl, "POST", `/edge-gateways/${gatewayId}/stream-session`, {
@@ -774,14 +701,11 @@ async function main() {
      { timeoutMs: 15_000, message: "Gateway stream never became ready." }
    );

-    await waitForSocketMessage(
-      streamMessages,
-      (message) => (
-        message?.type === "gateway.stream.ready" && message?.connected === true
-      ) || (
-        message?.type === "presence.changed" && message?.status === "connected"
-      ),
-      { timeoutMs: 45_000, message: "Gateway stream never observed a connected broker presence." }
+    const readyMessage = streamMessages.find((message) => message?.type === "gateway.stream.ready");
+    assert.equal(
+      Boolean(readyMessage?.connected),
+      true,
+      "Gateway stream became ready before the broker reported the gateway as connected."
    );

    const operationResponse = await apiRequest(baseUrl, "POST", `/edge-gateways/${gatewayId}/operations`, {
@@ -809,27 +733,13 @@ async function main() {
    assert.ok(operationId > 0, "Operation creation did not return an operation id.");

    try {
-      await waitForCondition(
-        async () => {
-          const operations = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/operations`, {
-            token: authToken,
-          });
-
-          const operation = Array.isArray(operations?.data)
-            ? operations.data.find((item) => Number(item?.id || 0) === operationId)
-            : null;
-
-          return operation?.status === "COMPLETED"
-            || streamMessages.some((message) => (
-              message?.type === "task.updated"
-              && Number(message?.operationId || 0) === operationId
-              && message?.operation?.status === "COMPLETED"
-            ));
-        },
-        { timeoutMs: 180_000, message: "Gateway operation never completed through the live agent." }
+      await waitForSocketMessage(
+        streamMessages,
+        (message) => message?.type === "task.updated" && Number(message?.operationId || 0) === operationId,
+        { timeoutMs: 180_000, message: "Live gateway stream never emitted task.updated for the queued operation." }
      );
    } catch (error) {
-      let operationSnapshot;
+      let operationSnapshot = null;
      try {
        const operations = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/operations`, {
          token: authToken,
@@ -849,6 +759,21 @@ async function main() {
      throw new Error(diagnostic);
    }

+    await waitForCondition(
+      async () => {
+        const operations = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/operations`, {
+          token: authToken,
+        });
+
+        const operation = Array.isArray(operations?.data)
+          ? operations.data.find((item) => Number(item?.id || 0) === operationId)
+          : null;
+
+        return operation?.status === "COMPLETED";
+      },
+      { timeoutMs: 180_000, message: "Gateway operation never completed through the live agent." }
+    );
+
    await waitForSocketMessage(
      streamMessages,
      (message) => message?.type === "gateway.telemetry" || message?.type === "stats.updated",
@@ -924,20 +849,22 @@ async function main() {
      { timeoutMs: 20_000, message: "Browser shell never closed cleanly." }
    );

-    await waitForCondition(
-      async () => {
    const logsAfterShell = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/logs`, {
      token: authToken,
    });
    const shellTranscripts = Array.isArray(logsAfterShell?.data?.shell_sessions)
      ? logsAfterShell.data.shell_sessions.map((session) => String(session?.transcript || ""))
      : [];
-        const timelineMessages = collectMessages(logsAfterShell?.data?.timeline || []);

-        return shellTranscripts.some((transcript) => transcript.includes("edge-e2e-shell"))
-          && timelineMessages.includes("GATEWAY_SHELL_SESSION_CLOSED");
-      },
-      { timeoutMs: 30_000, message: "Gateway logs page did not persist the shell transcript and close audit event." }
+    assert.ok(
+      shellTranscripts.some((transcript) => transcript.includes("edge-e2e-shell")),
+      "Gateway logs page did not persist the shell transcript."
+    );
+
+    const timelineMessages = collectMessages(logsAfterShell?.data?.timeline || []);
+    assert.ok(
+      timelineMessages.includes("GATEWAY_SHELL_SESSION_CLOSED"),
+      "Gateway logs page did not include the shell close audit event."
    );

    process.stdout.write("Edge gateway E2E smoke completed successfully.\n");
@@ -955,10 +882,9 @@ async function main() {
      allowFailure: true,
    }).catch(() => {});

-    const fixtureAuthToken = fixture?.auth_token;
-    if (gatewayId !== null && fixtureAuthToken) {
+    if (gatewayId !== null && fixture?.auth_token) {
      await apiRequest(baseUrl, "DELETE", `/edge-gateways/${gatewayId}`, {
-        token: String(fixtureAuthToken),
+        token: String(fixture.auth_token),
      }).catch(() => {});
    }

@@ -405,10 +405,6 @@ def render_api_reference_topic() -> str:
        '       title="API Reference" id="API-Reference">\n'
        f"\n    <!-- {AUTOGEN_NOTE} -->\n"
        "    <p>Comprehensive API reference generated from the repository root <code>openapi.yaml</code>.</p>\n"
-        "    <p>The edge broker's <code>/api/health</code> response additionally exposes a "
-        "<code>lastActivityAt</code> field (ISO 8601 timestamp). It reports the most recent "
-        "successful HTTP request handled by the broker container and defaults to the container's "
-        "start time when no request has been processed yet.</p>\n"
        "</topic>\n"
    )

@@ -18,7 +18,6 @@ cd "$repo_root"
 compose_files="-f docker-compose.yml -f .github/docker-compose.ci.yml"
 project_suffix="$(date +%s)-$$"
 export COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-php-local-${suite}-${project_suffix}}"
-export COMPOSE_PROFILES="${COMPOSE_PROFILES:-dev}"

 log_dir=".tmp/ci-logs/$suite"
 mkdir -p "$log_dir"
@@ -52,50 +51,6 @@ collect_logs() {
  docker compose $compose_files cp php1:/var/log/php "$log_dir/php-logs" >/dev/null 2>&1 || true
 }

-retry_command() {
-  max_attempts="$1"
-  shift
-  attempt=1
-  while :; do
-    "$@" && return 0
-    status="$?"
-    if [ "$attempt" -ge "$max_attempts" ]; then
-      return "$status"
-    fi
-    sleep_seconds=$((attempt * 5))
-    echo "Command failed with status $status; retrying in ${sleep_seconds}s (attempt $((attempt + 1))/$max_attempts): $*" >&2
-    sleep "$sleep_seconds"
-    attempt=$((attempt + 1))
-  done
-}
-
-composer_install() {
-  dist_attempts="${PHP_CI_COMPOSER_RETRIES:-3}"
-  source_attempts="${PHP_CI_COMPOSER_SOURCE_RETRIES:-2}"
-
-  if retry_command "$dist_attempts" \
-    docker compose $compose_files exec -T php1 sh -lc \
-    'cd /var/www/html && composer install --no-interaction --prefer-dist --no-progress'; then
-    return 0
-  fi
-
-  echo "Composer dist install failed after ${dist_attempts} attempts; retrying with --prefer-source." >&2
-  retry_command "$source_attempts" \
-    docker compose $compose_files exec -T php1 sh -lc \
-    'cd /var/www/html && composer install --no-interaction --prefer-source --no-progress'
-}
-
-configure_ci_docker_subnet() {
-  if [ -n "${CI_DOCKER_SUBNET:-}" ]; then
-    return
-  fi
-
-  checksum="$(printf '%s' "$COMPOSE_PROJECT_NAME" | cksum | awk '{print $1}')"
-  subnet_second=$((64 + ((checksum / 256) % 64)))
-  subnet_third=$((checksum % 256))
-  export CI_DOCKER_SUBNET="10.${subnet_second}.${subnet_third}.0/24"
-}
-
 cleanup() {
  status="$?"
  collect_logs "$status"
@@ -115,8 +70,7 @@ cleanup() {
 }
 trap cleanup EXIT INT TERM

-configure_ci_docker_subnet
-sh scripts/ci-docker-compose-up.sh redis mysql-debug php1
+docker compose $compose_files up -d redis mysql-debug php1

 docker compose $compose_files exec -T php1 sh -lc '
  set -eu
@@ -139,25 +93,10 @@ tar \
  --exclude='./.phpunit.cache' \
  --exclude='./build/logs' \
  -C services/nginx/app -cf - . \
-  | docker compose $compose_files exec -T php1 tar --no-same-owner -C /var/www/html -xf -
-
-docker compose $compose_files exec -T php1 sh -lc 'rm -rf /var/www/repo-root && mkdir -p /var/www/repo-root'
-tar \
-  -cf - \
-  Dockerfile \
-  Dockerfile.coolify-api \
-  docker-compose.yml \
-  docker-compose.example.yml \
-  docker-compose.prod.standalone.yml \
-  scripts/bird-control-plane-auto-activate.php \
-  scripts/bird-control-plane-bootstrap-local.sh \
-  scripts/xlvask-automation-migrate.php \
-  services/coolify/api/start.sh \
-  services/php/Dockerfile \
-  services/php/php-fpm-pool.conf \
-  | docker compose $compose_files exec -T php1 tar --no-same-owner -C /var/www/repo-root -xf -
-
-composer_install
+  | docker compose $compose_files exec -T php1 tar -C /var/www/html -xf -

 docker compose $compose_files exec -T php1 sh -lc \
-  "cd /var/www/html && PLENO_REPO_ROOT_FOR_TESTS=/var/www/repo-root composer test:ci:$suite"
+  'cd /var/www/html && composer install --no-interaction --prefer-dist --no-progress'
+
+docker compose $compose_files exec -T php1 sh -lc \
+  "cd /var/www/html && composer test:ci:$suite"
@@ -1,64 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Pre-deploy schema bootstrap runner.
- *
- * Loads and runs every `*_schema_bootstrap` class so the production
- * database has all the columns the current code expects. Each
- * bootstrap is additive and idempotent — safe to run on every deploy.
- *
- * Run via:
- *   php scripts/run-schema-bootstraps.php
- *
- * Used in .github/workflows/deploy.yml as a pre-deploy step.
- *
- * When you add a new *_schema_bootstrap class, you don't need to
- * edit this file — the runner auto-discovers any class whose name
- * ends in `_schema_bootstrap`.
- */
-
-namespace scripts;
-
-// Load the app entry point so $db is wired up the same way as in
-// normal request handling.
-$index = __DIR__ . '/../services/nginx/app/index.php';
-if (!file_exists($index)) {
-    fwrite(STDERR, "Cannot find app entry point at {$index}\n");
-    exit(2);
-}
-require_once $index;
-
-$classesDir = __DIR__ . '/../services/nginx/app/classes';
-$bootstraps = glob($classesDir . '/*_schema_bootstrap.php');
-if (!$bootstraps) {
-    fwrite(STDERR, "No *_schema_bootstrap.php files found in {$classesDir}\n");
-    exit(0);
-}
-
-$ran = 0;
-$skipped = 0;
-foreach ($bootstraps as $file) {
-    require_once $file;
-    $base = basename($file, '.php');
-    $class = "classes\\{$base}";
-    if (!class_exists($class)) {
-        fwrite(STDERR, "  [skip] {$base}: class not found\n");
-        $skipped++;
-        continue;
-    }
-    if (!method_exists($class, 'ensureSchema')) {
-        fwrite(STDERR, "  [skip] {$base}: no ensureSchema() method\n");
-        $skipped++;
-        continue;
-    }
-    try {
-        $class::ensureSchema();
-        echo "  [ok]   {$base}\n";
-        $ran++;
-    } catch (\Throwable $e) {
-        fwrite(STDERR, "  [FAIL] {$base}: " . $e->getMessage() . "\n");
-        exit(1);
-    }
-}
-
-echo "Schema bootstraps complete: {$ran} ran, {$skipped} skipped.\n";
@@ -1,96 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Schema health check — verifies all required DB columns exist.
- *
- * Run via:
- *   GET  /api/admin/schema-check    (returns JSON report)
- *   php  scripts/schema-health-check.php   (CLI, exits 0/1)
- *
- * Lists the columns that the code expects to find in each critical
- * table. If a column is missing, the response is 503 (HTTP) or
- * exit code 1 (CLI) — clearly distinct from a generic 500.
- *
- * Add to the list when introducing a new optional column.
- */
-
-namespace scripts;
-
-require_once __DIR__ . '/../services/nginx/app/classes/customer_invoice_email_schema_bootstrap.php';
-
-use classes\customer_invoice_email_schema_bootstrap;
-
-const SCHEMA_REQUIREMENTS = [
-    'users' => [
-        'invoice_email',       // TRU-77 (added 2026-08-16)
-        'wash_certificate_email',
-        'email',
-        'customer_number',
-    ],
-    'invoices' => [
-        'po_number',
-        'closed_at',
-        'customer_number',
-    ],
-    'bookings' => [
-        'id',
-        'customer_number',
-        'department',
-    ],
-];
-
-function check_schema(): array
-{
-    global $db;
-    $report = [
-        'ok' => true,
-        'missing' => [],
-        'tables_checked' => 0,
-        'columns_checked' => 0,
-        'timestamp' => date('c'),
-    ];
-
-    if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-        $report['ok'] = false;
-        $report['error'] = 'no_db_connection';
-        return $report;
-    }
-
-    // First: run the schema bootstrap (additive, idempotent) so we
-    // give the DB a chance to self-heal.
-    if (class_exists(customer_invoice_email_schema_bootstrap::class)) {
-        customer_invoice_email_schema_bootstrap::ensureSchema();
-    }
-
-    foreach (SCHEMA_REQUIREMENTS as $table => $columns) {
-        $report['tables_checked']++;
-
-        // Confirm the table itself exists
-        $tableSafe = str_replace('`', '', $table);
-        $result = $db->query("SHOW TABLES LIKE '{$tableSafe}'");
-        if (!$result || (int)$result->num_rows === 0) {
-            $report['ok'] = false;
-            $report['missing'][] = "table `{$table}` does not exist";
-            continue;
-        }
-
-        foreach ($columns as $column) {
-            $report['columns_checked']++;
-            $colSafe = str_replace("'", '', $column);
-            $r = $db->query("SHOW COLUMNS FROM `{$tableSafe}` LIKE '{$colSafe}'");
-            if (!$r || (int)$r->num_rows === 0) {
-                $report['ok'] = false;
-                $report['missing'][] = "{$table}.{$column}";
-            }
-        }
-    }
-
-    return $report;
-}
-
-// CLI mode
-if (PHP_SAPI === 'cli') {
-    $report = check_schema();
-    echo json_encode($report, JSON_PRETTY_PRINT) . "\n";
-    exit($report['ok'] ? 0 : 1);
-}
@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-# Generic smoke test for any deployed app.
-#
-# Usage: ./scripts/smoke-test.sh [base_url]
-# Default: https://staging.truckwash.io
-#
-# Required env vars (set by GitHub Action):
-#   SMOKE_BASE_URL  - base URL to test (default: https://staging.truckwash.io)
-#
-# Optional env vars:
-#   SMOKE_TOKEN     - bearer token for authenticated checks
-#   SMOKE_TIMEOUT   - curl timeout in seconds (default: 10)
-#
-# Exits 0 on all-pass, 1 on any failure.
-
-set -euo pipefail
-
-BASE_URL="${SMOKE_BASE_URL:-${1:-https://staging.truckwash.io}}"
-TIMEOUT="${SMOKE_TIMEOUT:-10}"
-
-# Color codes
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m'
-
-FAIL=0
-
-check() {
-  local name="$1"
-  local url="$2"
-  local expected="${3:-200}"
-  local method="${4:-GET}"
-
-  local status
-  status=$(curl -s -o /dev/null -w "%{http_code}" -X "$method" --max-time "$TIMEOUT" "$url" || echo "000")
-
-  if [[ "$status" =~ ^($expected)$ ]] || [[ "$expected" == "2xx" && "$status" =~ ^2 ]]; then
-    echo -e "  ${GREEN}✓${NC} $name ($status) — $url"
-  else
-    echo -e "  ${RED}✗${NC} $name (expected $expected, got $status) — $url"
-    FAIL=1
-  fi
-}
-
-echo "Smoke test against $BASE_URL"
-echo "  (timeout ${TIMEOUT}s per check)"
-echo
-
-# === Health endpoints (universal) ===
-check "health check"  "$BASE_URL/healthz"     "2xx"
-check "ping"          "$BASE_URL/api/ping"    "2xx"
-
-# === Authentication (should NOT 500) ===
-check "login page"    "$BASE_URL/login"       "2xx"
-
-# === Public endpoints (api repo) ===
-check "customer list (public schema)"  "$BASE_URL/api/customer"            "2xx"
-check "kundeoprettelse form"           "$BASE_URL/kundeoprettelse"         "2xx"
-
-# === Public endpoints (pleno-vue) ===
-check "self-serve program picker"  "$BASE_URL/self-serve/program"  "2xx"
-check "vehicle step"               "$BASE_URL/self-serve/vehicle"  "2xx"
-
-# === Custom 404 should not 500 ===
-check "404 page"  "$BASE_URL/this-route-does-not-exist"  "404"
-
-# === Optional authenticated check ===
-if [ -n "${SMOKE_TOKEN:-}" ]; then
-  check "auth check"  "$BASE_URL/api/me"  "2xx"
-fi
-
-echo
-if [ "$FAIL" -eq 0 ]; then
-  echo -e "${GREEN}✓ All smoke tests passed${NC}"
-  exit 0
-else
-  echo -e "${RED}✗ Some smoke tests failed${NC}"
-  exit 1
-fi
@@ -1,32 +1,14 @@
 import process from "node:process";
 import path from "node:path";
-import { createHash } from "node:crypto";
 import { pathToFileURL } from "node:url";

 export const DEFAULT_STAGING_BASE_URL = "https://api.truckwash.io:4433";
-export const EXPECTED_INSTALL_VERSION = "compose-php-agent-v3";
-export const REQUIRED_MANIFEST_ARTIFACTS = [
-  "agent.php",
-  "lan-worker.php",
-  "auto-updater.php",
-  "docker-compose.gateway.yml",
-  "Dockerfile.edge-agent",
-  "Dockerfile.lan-worker",
-  "Dockerfile.auto-updater",
-  "gateway-launcher.sh",
-  "truckwash-edge-gateway-stack.service",
-  "truckwash-edge-agent.service",
-];
 export const INSTALLER_SCRIPT_REQUIRED_SNIPPETS = [
  "/edge-agent/install-token/status",
-  "/edge-agent/artifacts/manifest.json",
  "report_install_status",
  'begin_install_phase "VERIFY_TOKEN"',
-  'begin_install_phase "VERIFY_ARTIFACTS"',
  'begin_install_phase "WAIT_FOR_CLAIM"',
  'report_install_status "FAILED"',
-  "verify_manifest_artifact",
-  EXPECTED_INSTALL_VERSION,
 ];

 export function normalizeBaseUrl(url) {
@@ -73,20 +55,13 @@ export function buildChecks(baseUrl, installToken) {
      name: "Ping",
      url: `${normalizedBaseUrl}/ping`,
    },
-    {
-      name: "Artifact manifest",
-      url: `${normalizedBaseUrl}/edge-agent/artifacts/manifest.json`,
-      artifactName: "manifest.json",
-    },
    {
      name: "Agent PHP artifact",
      url: `${normalizedBaseUrl}/edge-agent/artifacts/agent.php`,
-      artifactName: "agent.php",
    },
    {
      name: "Service unit artifact",
      url: `${normalizedBaseUrl}/edge-agent/artifacts/truckwash-edge-agent.service`,
-      artifactName: "truckwash-edge-agent.service",
    },
    {
      name: "Installer script",
@@ -95,42 +70,6 @@ export function buildChecks(baseUrl, installToken) {
  ];
 }

-export function validateArtifactManifestBody(body) {
-  const manifest = JSON.parse(String(body || ""));
-  if (manifest.version !== EXPECTED_INSTALL_VERSION) {
-    throw new Error(`Artifact manifest version mismatch: expected ${EXPECTED_INSTALL_VERSION}, got ${manifest.version}`);
-  }
-  if (!Array.isArray(manifest.artifacts)) {
-    throw new Error("Artifact manifest is missing artifacts.");
-  }
-
-  const byName = new Map(manifest.artifacts.map((artifact) => [artifact?.name, artifact]));
-  const missingArtifacts = REQUIRED_MANIFEST_ARTIFACTS.filter((artifactName) => !byName.has(artifactName));
-  if (missingArtifacts.length) {
-    throw new Error(`Artifact manifest is missing required artifacts: ${missingArtifacts.join(", ")}`);
-  }
-
-  return manifest;
-}
-
-export function validateArtifactBodyAgainstManifest(manifest, artifactName, body) {
-  const artifact = manifest?.artifacts?.find((entry) => entry?.name === artifactName);
-  if (!artifact) {
-    throw new Error(`Artifact ${artifactName} is missing from manifest.`);
-  }
-
-  const buffer = Buffer.isBuffer(body) ? body : Buffer.from(String(body || ""));
-  const sha256 = createHash("sha256").update(buffer).digest("hex");
-  if (sha256 !== artifact.sha256) {
-    throw new Error(`Artifact ${artifactName} hash mismatch: ${sha256} !== ${artifact.sha256}`);
-  }
-  if (buffer.length !== artifact.bytes) {
-    throw new Error(`Artifact ${artifactName} size mismatch: ${buffer.length} !== ${artifact.bytes}`);
-  }
-
-  return artifact;
-}
-
 export function validateInstallerScriptBody(body) {
  const source = String(body || "");
  const missingSnippets = INSTALLER_SCRIPT_REQUIRED_SNIPPETS.filter((snippet) => !source.includes(snippet));
@@ -168,17 +107,16 @@ export async function runSmoke({ baseUrl, installToken }) {

  const checks = buildChecks(baseUrl, installToken);
  const results = [];
-  let artifactManifest = null;

  for (const check of checks) {
    process.stdout.write(`[staging-smoke] GET ${check.url}\n`);
    const response = await fetch(check.url);
-    const body = Buffer.from(await response.arrayBuffer());
+    const body = await response.text();
    const result = {
      ...check,
      status: response.status,
      ok: response.ok,
-      bodyPreview: previewBody(body.toString("utf8")),
+      bodyPreview: previewBody(body),
    };
    results.push(result);

@@ -189,16 +127,8 @@ export async function runSmoke({ baseUrl, installToken }) {
      );
    }

-    if (check.name === "Artifact manifest") {
-      artifactManifest = validateArtifactManifestBody(body.toString("utf8"));
-      result.version = artifactManifest.version;
-      result.artifactCount = artifactManifest.artifacts.length;
-    }
-    if (artifactManifest && check.artifactName && check.artifactName !== "manifest.json") {
-      result.verifiedArtifact = validateArtifactBodyAgainstManifest(artifactManifest, check.artifactName, body);
-    }
    if (check.name === "Installer script") {
-      result.verifiedSnippets = validateInstallerScriptBody(body.toString("utf8"));
+      result.verifiedSnippets = validateInstallerScriptBody(body);
    }
  }

@@ -3,13 +3,10 @@ import assert from "node:assert/strict";

 import {
  DEFAULT_STAGING_BASE_URL,
-  EXPECTED_INSTALL_VERSION,
  INSTALLER_SCRIPT_REQUIRED_SNIPPETS,
  buildChecks,
  normalizeBaseUrl,
  parseArgs,
-  validateArtifactBodyAgainstManifest,
-  validateArtifactManifestBody,
  validateInstallerScriptBody,
 } from "./staging-edge-gateway-smoke.mjs";

@@ -35,58 +32,18 @@ test("buildChecks targets the public staging endpoints", () => {

  assert.deepEqual(checks.map((check) => check.url), [
    "https://api.truckwash.io:4433/ping",
-    "https://api.truckwash.io:4433/edge-agent/artifacts/manifest.json",
    "https://api.truckwash.io:4433/edge-agent/artifacts/agent.php",
    "https://api.truckwash.io:4433/edge-agent/artifacts/truckwash-edge-agent.service",
    "https://api.truckwash.io:4433/edge-agent/install.sh?token=abc%20123",
  ]);
 });

-test("validateArtifactManifestBody requires v3 install artifacts", () => {
-  const artifacts = [
-    "agent.php",
-    "lan-worker.php",
-    "auto-updater.php",
-    "docker-compose.gateway.yml",
-    "Dockerfile.edge-agent",
-    "Dockerfile.lan-worker",
-    "Dockerfile.auto-updater",
-    "gateway-launcher.sh",
-    "truckwash-edge-gateway-stack.service",
-    "truckwash-edge-agent.service",
-  ].map((name) => ({ name, sha256: "abc", bytes: 1 }));
-
-  const manifest = validateArtifactManifestBody(JSON.stringify({
-    version: EXPECTED_INSTALL_VERSION,
-    artifacts,
-  }));
-
-  assert.equal(manifest.version, EXPECTED_INSTALL_VERSION);
-});
-
-test("validateArtifactBodyAgainstManifest verifies size and hash", () => {
-  const body = Buffer.from("hello");
-  const manifest = {
-    artifacts: [{
-      name: "agent.php",
-      sha256: "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824",
-      bytes: body.length,
-    }],
-  };
-
-  assert.equal(validateArtifactBodyAgainstManifest(manifest, "agent.php", body).name, "agent.php");
-});
-
 test("validateInstallerScriptBody requires install-session reporting wiring", () => {
  const script = `
    INSTALL_STATUS_URL="https://api.truckwash.io:4433/edge-agent/install-token/status"
-    fetch_http "Download artifact manifest" "https://api.truckwash.io:4433/edge-agent/artifacts/manifest.json"
    report_install_status "FAILED"
    begin_install_phase "VERIFY_TOKEN" "Verifying install token"
-    begin_install_phase "VERIFY_ARTIFACTS" "Verifying edge gateway artifacts"
    begin_install_phase "WAIT_FOR_CLAIM" "Waiting for gateway heartbeat and claim"
-    verify_manifest_artifact
-    ${EXPECTED_INSTALL_VERSION}
  `;

  assert.deepEqual(validateInstallerScriptBody(script), INSTALLER_SCRIPT_REQUIRED_SNIPPETS);
@@ -12,7 +12,7 @@ export const DEFAULT_IMAGE_TAG = "truckwash-edge-agent:test-gateway";
 export const DEFAULT_CONFIG_FILE_NAME = "test-gateway.json";
 export const DEFAULT_HOST_API_URL = "http://localhost/api";
 export const DEFAULT_CONTAINER_API_URL = "http://caddy";
-export const DEFAULT_CONTAINER_BROKER_URL = "ws://edge-broker:4300";
+export const DEFAULT_CONTAINER_BROKER_URL = "http://edge-broker:4300";
 export const DEFAULT_INSTALL_DIR = "/opt/truckwash-edge-agent";
 export const DEFAULT_RUNTIME_DIR = `${DEFAULT_INSTALL_DIR}/runtime`;
 export const DEFAULT_STATE_DATABASE_PATH = `${DEFAULT_RUNTIME_DIR}/gateway-state.sqlite`;
@@ -25,16 +25,6 @@ function composeArgs(projectName, args) {
  return ["compose", "-p", projectName, ...args];
 }

-function usesWindowsPathSyntax(filePath) {
-  return /^[A-Za-z]:($|[\\/])/.test(filePath) || filePath.startsWith("\\\\") || filePath.includes("\\");
-}
-
-function pathForInputs(...filePaths) {
-  const hasWindowsPath = filePaths.some((filePath) => usesWindowsPathSyntax(String(filePath || "")));
-
-  return hasWindowsPath ? path.win32 : path;
-}
-
 async function resolveRootDir(scriptPath) {
  const cwd = process.cwd();

@@ -76,7 +66,7 @@ export function resolveComposeProjectName(rootDir, env = process.env) {
    return explicit;
  }

-  return pathForInputs(rootDir).basename(rootDir);
+  return path.basename(rootDir);
 }

 export function resolveComposeNetworkName(rootDir, env = process.env) {
@@ -84,13 +74,11 @@ export function resolveComposeNetworkName(rootDir, env = process.env) {
 }

 export function resolveConfigDirectory(rootDir, explicitDir = null) {
-  const pathModule = pathForInputs(rootDir, explicitDir);
-
  if (explicitDir) {
-    return pathModule.resolve(rootDir, explicitDir);
+    return path.resolve(rootDir, explicitDir);
  }

-  return pathModule.join(rootDir, ".tmp", "test-gateway");
+  return path.join(rootDir, ".tmp", "test-gateway");
 }

 export function shouldClaimGateway(existingConfig = {}, installToken = "") {
@@ -409,20 +397,14 @@ async function startContainer({
  });

  if (copyConfig) {
-    const configFilePath = path.join(configDir, DEFAULT_CONFIG_FILE_NAME);
-    await fs.chmod(configFilePath, 0o666).catch(() => {});
-    try {
    await runCommand("docker", [
      "cp",
-        configFilePath,
+      path.join(configDir, DEFAULT_CONFIG_FILE_NAME),
      `${containerName}:${containerConfigPath}`,
    ], {
      cwd: rootDir,
      stdio: "inherit",
    });
-    } finally {
-      await fs.chmod(configFilePath, 0o600).catch(() => {});
-    }

    await runCommand("docker", ["start", containerName], {
      cwd: rootDir,
@@ -10,11 +10,6 @@
    # CORS is handled at the edge by Traefik's headers middleware.
    # Do not set or strip Access-Control-* headers here to avoid conflicts.

-    # Do not expose local replication bootstrap material from the public web root.
-    # Bootstrap snapshots contain sensitive failover credentials.
-    @replicationBootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
-    respond @replicationBootstrap 404
-
    # PHP handling via FastCGI to php-fpm pool
    php_fastcgi php1:9000 php2:9000 php3:9000 php4:9000 php5:9000

@@ -10,11 +10,6 @@
    # CORS is handled at the edge by Traefik's headers middleware.
    # Do not set or strip Access-Control-* headers here to avoid conflicts.

-    # Do not expose local replication bootstrap material from the public web root.
-    # Bootstrap snapshots contain sensitive failover credentials.
-    @replicationBootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
-    respond @replicationBootstrap 404
-
    # PHP handling via FastCGI to php-fpm pool
    php_fastcgi php-staging:9000

@@ -18,7 +18,6 @@ const DEFAULT_UPDATE_VERIFY_INTERVAL_MS = 500;
 const DEFAULT_UPDATE_RESTART_GRACE_MS = 150;
 const DEFAULT_BROKER_RECONNECT_DELAY_MS = 1500;
 const DEFAULT_SHELLY_LOCAL_HTTP_TIMEOUT_MS = 1200;
-const MAX_RELAY_TOGGLE_AFTER_SECONDS = 5;
 const UPDATE_VERIFY_COMMAND = "post-update-verify";
 const execFile = promisify(execFileCallback);

@@ -152,10 +151,6 @@ function buildTransportHeartbeatState(brokerState = {}) {
  };
 }

-function isShellAccessEnabled(config = {}) {
-  return config.enableShellAccess === true;
-}
-
 function normalizeBrokerBaseUrl(value) {
  const trimmed = String(value || "").trim().replace(/\/+$/, "");
  if (trimmed === "") {
@@ -483,7 +478,7 @@ function resolveRelayToggleAfterSeconds(payload = {}) {
    return null;
  }

-  return Math.min(Math.floor(configured), MAX_RELAY_TOGGLE_AFTER_SECONDS);
+  return Math.floor(configured);
 }

 async function fetchJson(url, fetchImpl = fetch, options = {}) {
@@ -754,74 +749,11 @@ export async function setRelayState(payload, fetchImpl = fetch) {
  }
 }

-async function mapWithConcurrency(items, limit, mapper) {
-  const results = new Array(items.length);
-  let nextIndex = 0;
-  const workerCount = Math.max(1, Math.min(Number(limit) || 1, items.length || 1));
-
-  await Promise.all(Array.from({ length: workerCount }, async () => {
-    while (nextIndex < items.length) {
-      const index = nextIndex;
-      nextIndex += 1;
-      results[index] = await mapper(items[index], index);
-    }
-  }));
-
-  return results;
-}
-
-async function executeRelayBatch(command, handler, fetchImpl = fetch) {
-  const commands = Array.isArray(command?.payload?.commands)
-    ? command.payload.commands
-    : Array.isArray(command?.commands)
-      ? command.commands
-      : [];
-  const concurrency = Math.max(1, Math.min(Number(command?.payload?.concurrency || command?.concurrency || 5), 5));
-
-  const results = await mapWithConcurrency(commands, concurrency, async (entry = {}) => {
-    const target = String(entry.target || entry.relay || "");
-    const relayId = String(entry.relayId || entry.relay_id || "");
-    try {
-      const payload = await handler(entry, fetchImpl);
-      return {
-        target,
-        relayId,
-        relay_id: relayId,
-        ok: true,
-        payload,
-      };
-    } catch (error) {
-      return {
-        target,
-        relayId,
-        relay_id: relayId,
-        ok: false,
-        error: error instanceof Error ? error.message : String(error),
-      };
-    }
-  });
-
-  return {
-    batchId: command?.payload?.batchId || command?.payload?.batch_id || command?.batchId || command?.batch_id || null,
-    batch_id: command?.payload?.batch_id || command?.payload?.batchId || command?.batch_id || command?.batchId || null,
-    results,
-  };
-}
-
 async function fetchArtifactBuffer(url, expectedSha256, label, fetchImpl = fetch) {
  if (!url) {
    return null;
  }

-  if (!expectedSha256) {
-    throw new Error(`${label} checksum is required`);
-  }
-
-  const normalizedExpectedSha256 = String(expectedSha256).toLowerCase();
-  if (!/^[a-f0-9]{64}$/.test(normalizedExpectedSha256)) {
-    throw new Error(`${label} checksum must be a valid sha256 hex digest`);
-  }
-
  const response = await fetchImpl(url);
  if (!response.ok) {
    throw new Error(`${label} download failed: HTTP ${response.status}`);
@@ -829,7 +761,7 @@ async function fetchArtifactBuffer(url, expectedSha256, label, fetchImpl = fetch

  const buffer = Buffer.from(await response.arrayBuffer());
  const sha256 = createHash("sha256").update(buffer).digest("hex");
-  if (normalizedExpectedSha256 !== sha256.toLowerCase()) {
+  if (expectedSha256 && String(expectedSha256).toLowerCase() !== sha256.toLowerCase()) {
    throw new Error(`${label} checksum mismatch`);
  }

@@ -1470,10 +1402,6 @@ export async function handleAgentCommand(command, deps = {}) {
      return await getRelayStatus(command.payload || {}, fetchImpl);
    case "SET_RELAY_STATE":
      return await setRelayState(command.payload || {}, fetchImpl);
-    case "BATCH_RELAY_STATUS":
-      return await executeRelayBatch(command, getRelayStatus, fetchImpl);
-    case "BATCH_SET_RELAY_STATE":
-      return await executeRelayBatch(command, setRelayState, fetchImpl);
    case "RUN_UPDATE":
      return await runUpdate(command.payload || {}, fetchImpl, deps);
    case "UNINSTALL_AGENT":
@@ -1857,10 +1785,6 @@ export async function processPolledShellAction(config, action, shell, fetchImpl
  }

  try {
-    if (!isShellAccessEnabled(config)) {
-      throw new Error("Shell access is disabled by local configuration");
-    }
-
    if (actionType === "OPEN") {
      await shell.open(payload);
    } else if (actionType === "INPUT") {
@@ -1995,30 +1919,18 @@ function createBrokerBridge({
        }

        if (message.type === "OPEN_ROOT_SHELL") {
-          if (!isShellAccessEnabled(config)) {
-            throw new Error("Shell access is disabled by local configuration");
-          }
          await shell.open(message.payload || {});
          return;
        }
        if (message.type === "SHELL_INPUT") {
-          if (!isShellAccessEnabled(config)) {
-            throw new Error("Shell access is disabled by local configuration");
-          }
          shell.input(message.payload || {});
          return;
        }
        if (message.type === "RESIZE_ROOT_SHELL") {
-          if (!isShellAccessEnabled(config)) {
-            throw new Error("Shell access is disabled by local configuration");
-          }
          shell.resize(message.payload || {});
          return;
        }
        if (message.type === "CLOSE_ROOT_SHELL") {
-          if (!isShellAccessEnabled(config)) {
-            throw new Error("Shell access is disabled by local configuration");
-          }
          shell.close(message.payload || {});
        }
      } catch {
@@ -1,7 +1,6 @@
 import test from "node:test";
 import assert from "node:assert/strict";
 import { execFile as execFileCallback } from "node:child_process";
-import { createHash } from "node:crypto";
 import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
@@ -18,7 +17,6 @@ import {
  getRelayStatus,
  loadConfig,
  parseCliArgs,
-  processPolledShellAction,
  processPolledCommand,
  runCli,
  runUpdate,
@@ -41,10 +39,6 @@ function makeFetchResponse(body) {
  };
 }

-function sha256Hex(body) {
-  return createHash("sha256").update(body).digest("hex");
-}
-
 async function waitFor(predicate, { timeoutMs = 1000, intervalMs = 10, description = "condition" } = {}) {
  const deadline = Date.now() + timeoutMs;

@@ -127,39 +121,6 @@ test("relay status and switch commands support both Shelly RPC and legacy endpoi
  assert.equal(switched.on, false);
 });

-test("batch relay commands return per-relay results without failing the whole batch", async () => {
-  const fakeFetch = async (url) => {
-    const value = String(url);
-    if (value.includes("10.1.0.31")) {
-      return {
-        ok: true,
-        async json() {
-          return { output: true };
-        },
-      };
-    }
-    throw new Error("relay offline");
-  };
-
-  const result = await handleAgentCommand({
-    commandType: "BATCH_SET_RELAY_STATE",
-    payload: {
-      batch_id: "batch-1",
-      commands: [
-        { target: "MACHINE", relayId: "relay-machine", localIp: "10.1.0.31", channel: 0, on: true },
-        { target: "EXIT", relayId: "relay-out", localIp: "10.1.0.32", channel: 0, on: true },
-      ],
-    },
-  }, { fetchImpl: fakeFetch });
-
-  assert.equal(result.batch_id, "batch-1");
-  assert.equal(result.results.length, 2);
-  assert.equal(result.results[0].ok, true);
-  assert.equal(result.results[0].target, "MACHINE");
-  assert.equal(result.results[1].ok, false);
-  assert.match(result.results[1].error, /relay offline/);
-});
-
 test("Shelly discovery infers Gen3 from S3 relay model codes when generation is omitted", async () => {
  const inventory = await discoverShellyDevices({ candidateIps: ["192.168.1.2"] }, async (url) => {
    assert.equal(String(url), "http://192.168.1.2/shelly");
@@ -309,31 +270,6 @@ test("relay switch commands pass timer values to local Shelly APIs", async () =>
    "http://10.1.0.31/rpc/Switch.Set?id=0&on=true&toggle_after=3",
    "http://10.1.0.31/relay/0?turn=on&timer=3",
  ]);
-
-  const cappedUrls = [];
-  const cappedFetch = async (url) => {
-    cappedUrls.push(String(url));
-
-    return {
-      ok: true,
-      async json() {
-        return { output: true };
-      },
-    };
-  };
-
-  await setRelayState({
-    localIp: "10.1.0.31",
-    channel: 0,
-    on: true,
-    toggle_after: 999999999,
-    device_generation: 3,
-  }, cappedFetch);
-
-  assert.equal(
-    cappedUrls[0],
-    "http://10.1.0.31/rpc/Switch.Set?id=0&on=true&toggle_after=5"
-  );
 });

 test("runUpdate stages a pending verification restart after installing new artifacts", async () => {
@@ -358,23 +294,19 @@ test("runUpdate stages a pending verification restart after installing new artif
    execCalls.push({ command, args, options });
    return { stdout: "{}" };
  };
-  const agentBody = "// new agent\n";
-  const packageBody = JSON.stringify({ name: "new-edge-agent" }, null, 2);
  const fakeFetch = async (url) => {
    if (String(url).endsWith("/agent.mjs")) {
-      return makeFetchResponse(agentBody);
+      return makeFetchResponse("// new agent\n");
    }
    if (String(url).endsWith("/package.json")) {
-      return makeFetchResponse(packageBody);
+      return makeFetchResponse(JSON.stringify({ name: "new-edge-agent" }, null, 2));
    }
    throw new Error(`Unexpected URL: ${url}`);
  };

  const result = await runUpdate({
    artifactUrl: "https://api.example.test/edge-agent/artifacts/agent.mjs",
-    sha256: sha256Hex(agentBody),
    packageUrl: "https://api.example.test/edge-agent/artifacts/package.json",
-    packageSha256: sha256Hex(packageBody),
    targetVersion: "1.1.0",
    releaseChannel: "stable",
    restartMode: "spawn",
@@ -402,45 +334,6 @@ test("runUpdate stages a pending verification restart after installing new artif

  await rm(tempDir, { recursive: true, force: true });
 });
-test("runUpdate rejects artifacts without required checksums", async () => {
-  const tempDir = await mkdtemp(path.join(os.tmpdir(), "edge-agent-update-checksum-"));
-  const configPath = path.join(tempDir, "config.json");
-  const liveConfig = {
-    apiUrl: "https://api.example.test",
-    gatewayId: 42,
-    agentToken: "agent-token",
-    installDir: tempDir,
-    restartMode: "spawn",
-    installedVersion: "1.0.0",
-    targetVersion: "1.0.0",
-  };
-
-  await writeFile(configPath, JSON.stringify(liveConfig, null, 2));
-  await writeFile(path.join(tempDir, "agent.mjs"), "// old agent\n");
-
-  let fetchCalled = false;
-  await assert.rejects(
-    runUpdate({
-      artifactUrl: "https://api.example.test/edge-agent/artifacts/agent.mjs",
-      targetVersion: "1.1.0",
-    }, async () => {
-      fetchCalled = true;
-      return makeFetchResponse("// new agent\n");
-    }, {
-      configPath,
-      config: liveConfig,
-      liveConfig,
-      execFileImpl: async () => ({ stdout: "{}" }),
-    }),
-    /Agent artifact checksum is required/
-  );
-
-  assert.equal(fetchCalled, false);
-  assert.equal(await readFile(path.join(tempDir, "agent.mjs"), "utf8"), "// old agent\n");
-
-  await rm(tempDir, { recursive: true, force: true });
-});
-

 test("handleAgentCommand returns an uninstall follow-up envelope for gateway removal", async () => {
  const tempDir = await mkdtemp(path.join(os.tmpdir(), "edge-agent-uninstall-envelope-"));
@@ -777,7 +670,6 @@ test("startAgent reports API polling metadata, executes polled commands, and upl
    commandPollRetryDelayMs: 5,
    shellActionPollTimeoutSeconds: 0,
    shellActionPollRetryDelayMs: 5,
-    enableShellAccess: true,
  }));

  const heartbeats = [];
@@ -1036,61 +928,6 @@ test("startAgent reports API polling metadata, executes polled commands, and upl
  }
 });

-test("processPolledShellAction denies shell access when locally disabled", async () => {
-  const submissions = [];
-  const fakeFetch = async (url, options = {}) => {
-    if (/\/shell-actions\/\d+\/result$/.test(String(url))) {
-      submissions.push({ url, body: JSON.parse(options.body) });
-      return {
-        ok: true,
-        async json() {
-          return { data: { acknowledged: true } };
-        },
-      };
-    }
-
-    throw new Error(`Unexpected URL: ${url}`);
-  };
-
-  const shell = {
-    async open() {
-      throw new Error("should not run");
-    },
-    input() {
-      throw new Error("should not run");
-    },
-    resize() {
-      throw new Error("should not run");
-    },
-    close() {
-      throw new Error("should not run");
-    },
-  };
-
-  const result = await processPolledShellAction(
-    {
-      apiUrl: "https://api.example.test",
-      gatewayId: 42,
-      agentToken: "agent-token",
-      enableShellAccess: false,
-    },
-    {
-      id: 501,
-      actionType: "OPEN",
-      payload: {
-        sessionId: 44,
-      },
-    },
-    shell,
-    fakeFetch
-  );
-
-  assert.equal(result.ok, false);
-  assert.match(result.error, /Shell access is disabled/);
-  assert.equal(submissions.length, 1);
-  assert.equal(submissions[0].body.ok, false);
-});
-
 test("status helpers report config without exposing the agent token", async () => {
  const tempDir = await mkdtemp(path.join(os.tmpdir(), "edge-agent-status-"));
  const configPath = path.join(tempDir, "config.json");
@@ -4,9 +4,9 @@
  "requires": true,
  "packages": {
    "node_modules/ws": {
-      "version": "8.21.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz",
-      "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
      "license": "MIT",
      "engines": {
        "node": ">=10.0.0"
@@ -40,10 +40,6 @@ class Receiver extends Writable {
   *     extensions
   * @param {Boolean} [options.isServer=false] Specifies whether to operate in
   *     client or server mode
-   * @param {Number} [options.maxBufferedChunks=0] The maximum number of
-   *     buffered data chunks
-   * @param {Number} [options.maxFragments=0] The maximum number of message
-   *     fragments
   * @param {Number} [options.maxPayload=0] The maximum allowed message length
   * @param {Boolean} [options.skipUTF8Validation=false] Specifies whether or
   *     not to skip UTF-8 validation for text and close messages
@@ -58,8 +54,6 @@ class Receiver extends Writable {
    this._binaryType = options.binaryType || BINARY_TYPES[0];
    this._extensions = options.extensions || {};
    this._isServer = !!options.isServer;
-    this._maxBufferedChunks = options.maxBufferedChunks | 0;
-    this._maxFragments = options.maxFragments | 0;
    this._maxPayload = options.maxPayload | 0;
    this._skipUTF8Validation = !!options.skipUTF8Validation;
    this[kWebSocket] = undefined;
@@ -77,7 +71,6 @@ class Receiver extends Writable {

    this._totalPayloadLength = 0;
    this._messageLength = 0;
-    this._numFragments = 0;
    this._fragments = [];

    this._errored = false;
@@ -96,22 +89,6 @@ class Receiver extends Writable {
  _write(chunk, encoding, cb) {
    if (this._opcode === 0x08 && this._state == GET_INFO) return cb();

-    if (
-      this._maxBufferedChunks > 0 &&
-      this._buffers.length >= this._maxBufferedChunks
-    ) {
-      cb(
-        this.createError(
-          RangeError,
-          'Too many buffered chunks',
-          false,
-          1008,
-          'WS_ERR_TOO_MANY_BUFFERED_PARTS'
-        )
-      );
-      return;
-    }
-
    this._bufferedBytes += chunk.length;
    this._buffers.push(chunk);
    this.startLoop(cb);
@@ -501,19 +478,6 @@ class Receiver extends Writable {
      return;
    }

-    if (this._maxFragments > 0 && ++this._numFragments > this._maxFragments) {
-      const error = this.createError(
-        RangeError,
-        'Too many message fragments',
-        false,
-        1008,
-        'WS_ERR_TOO_MANY_BUFFERED_PARTS'
-      );
-
-      cb(error);
-      return;
-    }
-
    if (this._compressed) {
      this._state = INFLATING;
      this.decompress(data, cb);
@@ -586,7 +550,6 @@ class Receiver extends Writable {
    this._totalPayloadLength = 0;
    this._messageLength = 0;
    this._fragmented = 0;
-    this._numFragments = 0;
    this._fragments = [];

    if (this._opcode === 2) {
@@ -4,9 +4,6 @@

 const { Duplex } = require('stream');
 const { randomFillSync } = require('crypto');
-const {
-  types: { isUint8Array }
-} = require('util');

 const PerMessageDeflate = require('./permessage-deflate');
 const { EMPTY_BUFFER, kWebSocket, NOOP } = require('./constants');
@@ -203,10 +200,8 @@ class Sender {

      if (typeof data === 'string') {
        buf.write(data, 2);
-      } else if (isUint8Array(data)) {
-        buf.set(data, 2);
      } else {
-        throw new TypeError('Second argument must be a string or a Uint8Array');
+        buf.set(data, 2);
      }
    }

@@ -43,10 +43,6 @@ class WebSocketServer extends EventEmitter {
   *     called
   * @param {Function} [options.handleProtocols] A hook to handle protocols
   * @param {String} [options.host] The hostname where to bind the server
-   * @param {Number} [options.maxBufferedChunks=262144] The maximum number of
-   *     buffered data chunks
-   * @param {Number} [options.maxFragments=16384] The maximum number of message
-   *     fragments
   * @param {Number} [options.maxPayload=104857600] The maximum allowed message
   *     size
   * @param {Boolean} [options.noServer=false] Enable no server mode
@@ -69,8 +65,6 @@ class WebSocketServer extends EventEmitter {
    options = {
      allowSynchronousEvents: true,
      autoPong: true,
-      maxBufferedChunks: 256 * 1024,
-      maxFragments: 16 * 1024,
      maxPayload: 100 * 1024 * 1024,
      skipUTF8Validation: false,
      perMessageDeflate: false,
@@ -430,8 +424,6 @@ class WebSocketServer extends EventEmitter {

    ws.setSocket(socket, head, {
      allowSynchronousEvents: this.options.allowSynchronousEvents,
-      maxBufferedChunks: this.options.maxBufferedChunks,
-      maxFragments: this.options.maxFragments,
      maxPayload: this.options.maxPayload,
      skipUTF8Validation: this.options.skipUTF8Validation
    });
@@ -201,10 +201,6 @@ class WebSocket extends EventEmitter {
   *     multiple times in the same tick
   * @param {Function} [options.generateMask] The function used to generate the
   *     masking key
-   * @param {Number} [options.maxBufferedChunks=0] The maximum number of
-   *     buffered data chunks
-   * @param {Number} [options.maxFragments=0] The maximum number of message
-   *     fragments
   * @param {Number} [options.maxPayload=0] The maximum allowed message size
   * @param {Boolean} [options.skipUTF8Validation=false] Specifies whether or
   *     not to skip UTF-8 validation for text and close messages
@@ -216,8 +212,6 @@ class WebSocket extends EventEmitter {
      binaryType: this.binaryType,
      extensions: this._extensions,
      isServer: this._isServer,
-      maxBufferedChunks: options.maxBufferedChunks,
-      maxFragments: options.maxFragments,
      maxPayload: options.maxPayload,
      skipUTF8Validation: options.skipUTF8Validation
    });
@@ -646,10 +640,6 @@ module.exports = WebSocket;
 *     masking key
 * @param {Number} [options.handshakeTimeout] Timeout in milliseconds for the
 *     handshake request
- * @param {Number} [options.maxBufferedChunks=262144] The maximum number of
- *     buffered data chunks
- * @param {Number} [options.maxFragments=16384] The maximum number of message
- *     fragments
 * @param {Number} [options.maxPayload=104857600] The maximum allowed message
 *     size
 * @param {Number} [options.maxRedirects=10] The maximum number of redirects
@@ -670,8 +660,6 @@ function initAsClient(websocket, address, protocols, options) {
    autoPong: true,
    closeTimeout: CLOSE_TIMEOUT,
    protocolVersion: protocolVersions[1],
-    maxBufferedChunks: 256 * 1024,
-    maxFragments: 16 * 1024,
    maxPayload: 100 * 1024 * 1024,
    skipUTF8Validation: false,
    perMessageDeflate: true,
@@ -1029,8 +1017,6 @@ function initAsClient(websocket, address, protocols, options) {
    websocket.setSocket(socket, head, {
      allowSynchronousEvents: opts.allowSynchronousEvents,
      generateMask: opts.generateMask,
-      maxBufferedChunks: opts.maxBufferedChunks,
-      maxFragments: opts.maxFragments,
      maxPayload: opts.maxPayload,
      skipUTF8Validation: opts.skipUTF8Validation
    });
@@ -1,6 +1,6 @@
 {
  "name": "ws",
-  "version": "8.21.1",
+  "version": "8.20.0",
  "description": "Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js",
  "keywords": [
    "HyBi",
@@ -66,9 +66,5 @@
    "nyc": "^15.0.0",
    "prettier": "^3.0.0",
    "utf-8-validate": "^6.0.0"
-  },
-  "allowScripts": {
-    "bufferutil": true,
-    "utf-8-validate": true
  }
 }
@@ -6,13 +6,13 @@
    "": {
      "name": "truckwash-edge-broker",
      "dependencies": {
-        "ws": "^8.21.1"
+        "ws": "^8.18.0"
      }
    },
    "node_modules/ws": {
-      "version": "8.21.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz",
-      "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
      "license": "MIT",
      "engines": {
        "node": ">=10.0.0"
@@ -7,6 +7,6 @@
    "test:live": "node --test live/live-smoke.mjs"
  },
  "dependencies": {
-    "ws": "^8.21.1"
+    "ws": "^8.18.0"
  }
 }
@@ -4,7 +4,6 @@ import { fileURLToPath } from "node:url";
 import { WebSocketServer } from "ws";

 const DEFAULT_SHELL_OPEN_TIMEOUT_MS = 15000;
-const TELEMETRY_INGEST_ERROR_MESSAGE = "Telemetry ingestion failed";

 function parseJsonBody(req) {
  return new Promise((resolve, reject) => {
@@ -49,40 +48,14 @@ function resolveManagerUrl(options = {}) {
  return trimTrailingSlash(options.managerUrl || process.env.EDGE_MANAGER_URL || process.env.EDGE_PUBLIC_API_URL || "");
 }

-function resolveAuthMode(options = {}) {
+function resolveAuthMode(options = {}, managerUrl = "") {
  if (options.authMode) {
    return options.authMode;
  }
  if (process.env.EDGE_AUTH_MODE) {
    return process.env.EDGE_AUTH_MODE;
  }
-  return "strict";
-}
-
-function resolveSharedSecret(options = {}) {
-  return String(options.sharedSecret ?? process.env.EDGE_BROKER_SHARED_SECRET ?? "").trim();
-}
-
-function requireSharedSecret(req, res, sharedSecret) {
-  if (sharedSecret === "") {
-    jsonResponse(res, 503, {
-      ok: false,
-      error: "Edge broker shared secret is not configured",
-      shared_secret_required: true,
-    });
-    return false;
-  }
-
-  if (req.headers["x-edge-broker-secret"] !== sharedSecret) {
-    jsonResponse(res, 403, {
-      ok: false,
-      error: "Forbidden",
-      shared_secret_required: true,
-    });
-    return false;
-  }
-
-  return true;
+  return "manager";
 }

 function parseScopes(value) {
@@ -177,9 +150,9 @@ function rejectUpgrade(socket, statusCode, errorCode, message, details = {}) {
 }

 export function createBrokerServer(options = {}) {
-  const sharedSecret = resolveSharedSecret(options);
+  const sharedSecret = options.sharedSecret ?? process.env.EDGE_BROKER_SHARED_SECRET ?? "";
  const managerUrl = resolveManagerUrl(options);
-  const authMode = resolveAuthMode(options);
+  const authMode = resolveAuthMode(options, managerUrl);
  const commandTimeoutMs = options.commandTimeoutMs ?? 10000;
  const shellOpenTimeoutMs = options.shellOpenTimeoutMs ?? DEFAULT_SHELL_OPEN_TIMEOUT_MS;

@@ -189,8 +162,6 @@ export function createBrokerServer(options = {}) {
  const browserStreamSessions = new Map();
  const gatewayStreamSessions = new Map();
  const inflightGatewaySyncs = new Map();
-  const containerStartedAt = currentTimestamp();
-  let lastActivityAt = containerStartedAt;

  const managerRequest = async (path, body = {}, method = "POST") => {
    if (!managerUrl) {
@@ -298,12 +269,6 @@ export function createBrokerServer(options = {}) {
      ? async (_gatewayId, payload = {}) => payload
      : async (gatewayId, payload = {}) =>
          managerRequest(`/edge-agent/internal/gateways/${gatewayId}/logs`, payload));
-  const ingestMachineSignal =
-    options.ingestMachineSignal ||
-    (authMode === "stub"
-      ? async (_gatewayId, payload = {}) => payload
-      : async (gatewayId, payload = {}) =>
-          managerRequest(`/edge-agent/internal/gateways/${gatewayId}/selfserve/machine-signal`, payload));

  const broadcastGatewayEvent = (gatewayId, message) => {
    const sessionIds = gatewayStreamSessions.get(String(gatewayId));
@@ -482,7 +447,6 @@ export function createBrokerServer(options = {}) {
  const server = http.createServer(async (req, res) => {
    try {
      const url = new URL(req.url, "http://localhost");
-      lastActivityAt = currentTimestamp();
      if (req.method === "GET" && url.pathname === "/api/health") {
        jsonResponse(res, 200, {
          ok: true,
@@ -491,25 +455,30 @@ export function createBrokerServer(options = {}) {
          manager_url_configured: Boolean(managerUrl),
          shared_secret_configured: Boolean(sharedSecret),
          agents_connected: agents.size,
-          lastActivityAt,
        });
        return;
      }

      if (req.method === "POST" && url.pathname === "/api/diagnostics/shared-secret") {
-        if (!requireSharedSecret(req, res, sharedSecret)) {
-          return;
-        }
-
-        jsonResponse(res, 200, {
-          ok: true,
+        if (sharedSecret && req.headers["x-edge-broker-secret"] !== sharedSecret) {
+          jsonResponse(res, 403, {
+            ok: false,
+            error: "Forbidden",
            shared_secret_required: true,
          });
          return;
        }

+        jsonResponse(res, 200, {
+          ok: true,
+          shared_secret_required: Boolean(sharedSecret),
+        });
+        return;
+      }
+
      if (req.method === "POST" && /^\/api\/gateways\/\d+\/commands$/.test(url.pathname)) {
-        if (!requireSharedSecret(req, res, sharedSecret)) {
+        if (sharedSecret && req.headers["x-edge-broker-secret"] !== sharedSecret) {
+          jsonResponse(res, 403, { error: "Forbidden" });
          return;
        }

@@ -552,7 +521,8 @@ export function createBrokerServer(options = {}) {
      }

      if (req.method === "POST" && /^\/api\/gateways\/\d+\/sync$/.test(url.pathname)) {
-        if (!requireSharedSecret(req, res, sharedSecret)) {
+        if (sharedSecret && req.headers["x-edge-broker-secret"] !== sharedSecret) {
+          jsonResponse(res, 403, { error: "Forbidden" });
          return;
        }

@@ -586,13 +556,12 @@ export function createBrokerServer(options = {}) {
          gatewayInfo = await validateAgent({ gatewayId, token, headers: req.headers });
        } catch (error) {
          const status = Number(error?.status) === 403 ? 403 : Number(error?.status) === 401 ? 401 : 503;
-          rejectUpgrade(socket, status, error?.code || "agent_validation_failed", "Gateway agent could not be validated.", {
+          rejectUpgrade(socket, status, error?.code || "agent_validation_failed", normalizeErrorMessage(error, "Gateway agent could not be validated."), {
            stage: "agent_validate",
          });
          return;
        }

-
        wss.handleUpgrade(req, socket, head, (ws) => {
          const existing = agents.get(gatewayId);
          if (existing && existing.readyState < 2) {
@@ -653,13 +622,12 @@ export function createBrokerServer(options = {}) {
        try {
          session = await validateShellSession({ token, headers: req.headers });
        } catch (error) {
-          rejectUpgrade(socket, Number(error?.status) === 403 ? 403 : 401, error?.code || "shell_session_invalid", "Shell session could not be validated.", {
+          rejectUpgrade(socket, Number(error?.status) === 403 ? 403 : 401, error?.code || "shell_session_invalid", normalizeErrorMessage(error, "Shell session could not be validated."), {
            stage: "shell_session_validate",
          });
          return;
        }

-
        wss.handleUpgrade(req, socket, head, (ws) => {
          ws.sessionToken = token;
          ws.sessionInfo = session;
@@ -754,7 +722,7 @@ export function createBrokerServer(options = {}) {
        return;
      }
    } catch (error) {
-      rejectUpgrade(socket, 500, "websocket_upgrade_failed", "WebSocket upgrade failed.");
+      rejectUpgrade(socket, 500, "websocket_upgrade_failed", normalizeErrorMessage(error, "WebSocket upgrade failed."));
      return;
    }

@@ -797,8 +765,8 @@ export function createBrokerServer(options = {}) {
            let ingestError = null;
            try {
              ingested = await ingestTelemetry(String(ws.gatewayId), payload);
-            } catch {
-              ingestError = TELEMETRY_INGEST_ERROR_MESSAGE;
+            } catch (error) {
+              ingestError = error instanceof Error ? error.message : String(error);
            }
            const fallbackStatistics = {
              system_metrics: payload?.metadata?.system_metrics || {},
@@ -863,11 +831,6 @@ export function createBrokerServer(options = {}) {
            return;
          }

-          if (message.type === "MACHINE_SIGNAL") {
-            await ingestMachineSignal(String(ws.gatewayId), message.payload || {});
-            return;
-          }
-
          if (["SHELL_OUTPUT", "SHELL_OPENED", "SHELL_EXIT"].includes(message.type)) {
            const sessionRecord = browserShellSessions.get(String(message.sessionId));
            if (!sessionRecord) {
@@ -1087,10 +1050,6 @@ export function createBrokerServer(options = {}) {
      pendingCommands,
      managerUrl,
      authMode,
-      containerStartedAt,
-      get lastActivityAt() {
-        return lastActivityAt;
-      },
    },
  };
 }
@@ -19,18 +19,6 @@ function waitForClose(socket) {
  });
 }

-function waitForCloseOrError(socket) {
-  return new Promise((resolve) => {
-    const onDone = () => {
-      socket.off("error", onDone);
-      socket.off("close", onDone);
-      resolve();
-    };
-    socket.once("error", onDone);
-    socket.once("close", onDone);
-  });
-}
-
 function rawUpgradeRequest(port, path) {
  return new Promise((resolve, reject) => {
    const socket = net.createConnection({ host: "127.0.0.1", port }, () => {
@@ -71,7 +59,7 @@ async function waitFor(predicate, { timeoutMs = 1000, intervalMs = 10, descripti
  throw new Error(`Timed out waiting for ${description}`);
 }

-test("broker defaults to strict auth and fails closed when manager URL is missing", async () => {
+test("broker defaults to manager auth and fails closed when manager URL is missing", async () => {
  const previousEnv = {
    EDGE_AUTH_MODE: process.env.EDGE_AUTH_MODE,
    EDGE_MANAGER_URL: process.env.EDGE_MANAGER_URL,
@@ -84,7 +72,7 @@ test("broker defaults to strict auth and fails closed when manager URL is missin
  let broker;
  try {
    broker = createBrokerServer({ sharedSecret: "secret" });
-    assert.equal(broker.state.authMode, "strict");
+    assert.equal(broker.state.authMode, "manager");
    assert.equal(broker.state.managerUrl, "");

    const address = await broker.listen(0);
@@ -95,15 +83,13 @@ test("broker defaults to strict auth and fails closed when manager URL is missin
    assert.doesNotMatch(shellResponse, /101 Switching Protocols/);
    assert.match(shellResponse, /^HTTP\/1\.1 401 Unauthorized/m);
    assert.match(shellResponse, /"error_code":"shell_session_invalid"/);
-    assert.match(shellResponse, /"message":"Shell session could not be validated\."/);
-    assert.doesNotMatch(shellResponse, /Edge manager URL is not configured/);
+    assert.match(shellResponse, /Edge manager URL is not configured/);

    assert.doesNotMatch(agentResponse, /101 Switching Protocols/);
    assert.match(agentResponse, /^HTTP\/1\.1 503 Service Unavailable/m);
    assert.match(agentResponse, /"error_code":"agent_validation_failed"/);
    assert.match(agentResponse, /"stage":"agent_validate"/);
-    assert.match(agentResponse, /"message":"Gateway agent could not be validated\."/);
-    assert.doesNotMatch(agentResponse, /Edge manager URL is not configured/);
+    assert.match(agentResponse, /Edge manager URL is not configured/);
  } finally {
    if (broker) {
      await broker.close();
@@ -118,53 +104,6 @@ test("broker defaults to strict auth and fails closed when manager URL is missin
  }
 });

-test("broker rejects protected HTTP endpoints when shared secret is missing", async () => {
-  const broker = createBrokerServer({ authMode: "stub", sharedSecret: "", commandTimeoutMs: 2000 });
-  const address = await broker.listen(0);
-  const port = address.port;
-  const agent = new WebSocket(`ws://127.0.0.1:${port}/ws/agent?gatewayId=701&token=agent-token`);
-
-  await new Promise((resolve) => agent.once("open", resolve));
-  const agentMessages = collectMessages(agent);
-
-  const commandResponse = await fetch(`http://127.0.0.1:${port}/api/gateways/701/commands`, {
-    method: "POST",
-    headers: {
-      "content-type": "application/json",
-    },
-    body: JSON.stringify({
-      commandType: "SET_RELAY_STATE",
-      payload: { relayId: "M-7", on: true },
-    }),
-  });
-  const commandJson = await commandResponse.json();
-
-  assert.equal(commandResponse.status, 503);
-  assert.equal(commandJson.ok, false);
-  assert.equal(commandJson.shared_secret_required, true);
-  assert.match(commandJson.error, /shared secret is not configured/);
-  assert.equal(agentMessages.some((message) => message.type === "COMMAND"), false);
-
-  const diagnosticsResponse = await fetch(`http://127.0.0.1:${port}/api/diagnostics/shared-secret`, {
-    method: "POST",
-  });
-  const diagnosticsJson = await diagnosticsResponse.json();
-
-  assert.equal(diagnosticsResponse.status, 503);
-  assert.equal(diagnosticsJson.shared_secret_required, true);
-
-  const syncResponse = await fetch(`http://127.0.0.1:${port}/api/gateways/701/sync`, {
-    method: "POST",
-  });
-  const syncJson = await syncResponse.json();
-
-  assert.equal(syncResponse.status, 503);
-  assert.equal(syncJson.shared_secret_required, true);
-
-  agent.terminate();
-  await broker.close();
-});
-
 test("broker dispatches commands to connected agents", async () => {
  const broker = createBrokerServer({ authMode: "stub", sharedSecret: "secret", commandTimeoutMs: 2000 });
  const address = await broker.listen(0);
@@ -219,10 +158,6 @@ test("broker exposes health and shared-secret diagnostics", async () => {
  assert.equal(healthJson.auth_mode, "manager");
  assert.equal(healthJson.manager_url_configured, true);
  assert.equal(healthJson.shared_secret_configured, true);
-  assert.equal(typeof healthJson.lastActivityAt, "string");
-  assert.match(healthJson.lastActivityAt, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/);
-  assert.ok(healthJson.lastActivityAt >= broker.state.containerStartedAt);
-  assert.equal(healthJson.lastActivityAt, broker.state.lastActivityAt);

  const invalidSecretResponse = await fetch(`http://127.0.0.1:${port}/api/diagnostics/shared-secret`, {
    method: "POST",
@@ -251,41 +186,6 @@ test("broker exposes health and shared-secret diagnostics", async () => {
  await broker.close();
 });

-test("broker updates lastActivityAt after each successful request", async () => {
-  const broker = createBrokerServer({ authMode: "manager", sharedSecret: "secret", managerUrl: "http://manager.test" });
-  const address = await broker.listen(0);
-  const port = address.port;
-
-  assert.equal(broker.state.lastActivityAt, broker.state.containerStartedAt);
-
-  const firstResponse = await fetch(`http://127.0.0.1:${port}/api/health`);
-  const firstJson = await firstResponse.json();
-  const firstActivityAt = broker.state.lastActivityAt;
-
-  assert.equal(typeof firstJson.lastActivityAt, "string");
-  assert.equal(firstJson.lastActivityAt, firstActivityAt);
-  assert.ok(firstActivityAt >= broker.state.containerStartedAt);
-
-  await new Promise((resolve) => setTimeout(resolve, 5));
-
-  await fetch(`http://127.0.0.1:${port}/api/diagnostics/shared-secret`, {
-    method: "POST",
-    headers: {
-      "x-edge-broker-secret": "secret",
-    },
-  });
-
-  assert.notEqual(broker.state.lastActivityAt, firstActivityAt);
-  assert.ok(broker.state.lastActivityAt > firstActivityAt);
-
-  const secondResponse = await fetch(`http://127.0.0.1:${port}/api/health`);
-  const secondJson = await secondResponse.json();
-
-  assert.equal(secondJson.lastActivityAt, broker.state.lastActivityAt);
-
-  await broker.close();
-});
-
 test("broker bridges browser shell sessions through the connected agent", async () => {
  const closedSessions = [];
  const broker = createBrokerServer({
@@ -438,34 +338,11 @@ test("broker rejects invalid browser shell upgrades without leaking the token",

  assert.match(response, /^HTTP\/1\.1 401 Unauthorized/m);
  assert.match(response, /"error_code":"shell_session_expired"/);
-  assert.match(response, /"message":"Shell session could not be validated\."/);
-  assert.doesNotMatch(response, /Shell session expired/);
  assert.doesNotMatch(response, new RegExp(rawToken));

  await broker.close();
 });

-test("broker rejects websocket upgrade errors without exposing exception text", async () => {
-  const broker = createBrokerServer({
-    authMode: "stub",
-    validateBrowserStream: async () => {
-      throw new Error("UPSTREAM-SENSITIVE: redis://cache.internal:6379 timeout");
-    },
-  });
-  const address = await broker.listen(0);
-  const port = address.port;
-
-  const response = await rawUpgradeRequest(port, "/ws/browser-gateway-stream?token=session-token");
-
-  assert.match(response, /^HTTP\/1\.1 500 Internal Server Error/m);
-  assert.match(response, /"error_code":"websocket_upgrade_failed"/);
-  assert.match(response, /"message":"WebSocket upgrade failed\."/);
-  assert.doesNotMatch(response, /UPSTREAM-SENSITIVE/);
-  assert.doesNotMatch(response, /redis:\/\/cache\.internal/);
-
-  await broker.close();
-});
-
 test("broker closes browser shell sessions when the agent never reports shell opened", async () => {
  const closedSessions = [];
  const broker = createBrokerServer({
@@ -541,17 +418,6 @@ test("broker closes browser shell sessions when the agent disconnects before she
  await broker.close();
 });

-test("broker defaults to strict auth when no validators are configured", async () => {
-  const broker = createBrokerServer();
-  const address = await broker.listen(0);
-  const port = address.port;
-
-  const agent = new WebSocket(`ws://127.0.0.1:${port}/ws/agent?gatewayId=701&token=agent-token`);
-  await waitForCloseOrError(agent);
-
-  await broker.close();
-});
-
 test("broker sends an agent welcome before connection progress and backlog dispatch", async () => {
  const broker = createBrokerServer({
    authMode: "stub",
@@ -805,51 +671,6 @@ test("broker fans out telemetry, task, log, and presence updates to browser gate
  await broker.close();
 });

-test("broker ingests self-serve machine signals from connected agents", async () => {
-  const machineSignals = [];
-  const broker = createBrokerServer({
-    authMode: "stub",
-    validateAgent: async () => ({ id: "701", gateway_id: "701", label: "CPH Edge 01" }),
-    ingestMachineSignal: async (gatewayId, payload) => {
-      machineSignals.push({ gatewayId, payload });
-      return { recorded: true, lane_id: payload.lane_id };
-    },
-  });
-  const address = await broker.listen(0);
-  const port = address.port;
-
-  const agent = new WebSocket(`ws://127.0.0.1:${port}/ws/agent?gatewayId=701&token=agent-token`);
-  await new Promise((resolve) => agent.once("open", resolve));
-
-  agent.send(
-    JSON.stringify({
-      type: "MACHINE_SIGNAL",
-      payload: {
-        lane_id: 3,
-        relay_id: "machine-relay",
-        component: "input",
-        channel: 0,
-        event: "input.toggle_on",
-        state: true,
-      },
-    })
-  );
-
-  await waitFor(() => machineSignals.length === 1, { description: "machine signal ingestion" });
-  assert.equal(machineSignals[0].gatewayId, "701");
-  assert.deepEqual(machineSignals[0].payload, {
-    lane_id: 3,
-    relay_id: "machine-relay",
-    component: "input",
-    channel: 0,
-    event: "input.toggle_on",
-    state: true,
-  });
-
-  agent.terminate();
-  await broker.close();
-});
-
 test("broker survives telemetry ingestion failures for stale gateways", async () => {
  const broker = createBrokerServer({
    authMode: "stub",
@@ -922,16 +743,9 @@ test("broker still fans out telemetry when manager ingestion fails", async () =>
  );

  await waitFor(
-    () =>
-      browserMessages.some(
-        (message) => message.type === "gateway.telemetry" && message.error === "Telemetry ingestion failed"
-      ),
+    () => browserMessages.some((message) => message.type === "gateway.telemetry" && message.error === "manager unavailable"),
    { description: "telemetry fanout after ingest failure" }
  );
-  assert.ok(
-    browserMessages.every((message) => message.error !== "manager unavailable"),
-    "raw manager errors must not be sent to browser streams"
-  );
  assert.ok(
    browserMessages.some(
      (message) => message.type === "stats.updated" && message.statistics?.system_metrics?.cpu_usage_pct === 31
@@ -39,8 +39,8 @@ test("traefik does not expose a dedicated public edge broker port", () => {
 test("base docker compose routes edge broker traffic through traefik", () => {
  const serviceBlock = readComposeServiceBlock(baseComposeSource, "edge-broker");
  assert.doesNotMatch(serviceBlock, /\n\s+ports:\s*\n[\s\S]*?\n\s+- "4300:4300"/);
-  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\x7bEDGE_AUTH_MODE:-strict\x7d/);
-  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\x7bEDGE_MANAGER_URL:-http:\/\/caddy\x7d/);
+  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\{EDGE_AUTH_MODE:-manager\}/);
+  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\{EDGE_MANAGER_URL:-http:\/\/caddy\}/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.priority=200/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-local\.priority=200/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.rule=Host\(`api\.truckwash\.dk`\) && PathPrefix\(`\/edge-broker`\)/);
@@ -55,8 +55,8 @@ test("base docker compose routes edge broker traffic through traefik", () => {
 test("example docker compose routes edge broker traffic through traefik", () => {
  const serviceBlock = readComposeServiceBlock(exampleComposeSource, "edge-broker");
  assert.doesNotMatch(serviceBlock, /\n\s+ports:\s*\n[\s\S]*?\n\s+- "4300:4300"/);
-  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\x7bEDGE_AUTH_MODE:-strict\x7d/);
-  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\x7bEDGE_MANAGER_URL:-http:\/\/caddy\x7d/);
+  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\{EDGE_AUTH_MODE:-manager\}/);
+  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\{EDGE_MANAGER_URL:-http:\/\/caddy\}/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.rule=Host\(`api\.example\.com`\) && PathPrefix\(`\/edge-broker`\)/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-local\.rule=Host\(`localhost`\) && PathPrefix\(`\/api\/edge-broker`\)/);
  assert.match(serviceBlock, /traefik\.http\.services\.edge-broker\.loadbalancer\.server\.port=4300/);
@@ -65,8 +65,8 @@ test("example docker compose routes edge broker traffic through traefik", () =>
 test("standalone production compose routes edge broker traffic through traefik", () => {
  const serviceBlock = readComposeServiceBlock(standaloneProdComposeSource, "edge-broker");
  assert.doesNotMatch(serviceBlock, /\n\s+ports:\s*\n[\s\S]*?\n\s+- "4300:4300"/);
-  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\x7bEDGE_AUTH_MODE:-manager\x7d/);
-  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\x7bEDGE_MANAGER_URL:-http:\/\/caddy\x7d/);
+  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\{EDGE_AUTH_MODE:-manager\}/);
+  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\{EDGE_MANAGER_URL:-http:\/\/caddy\}/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.priority=200/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-local\.priority=200/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.rule=Host\(`api\.truckwash\.dk`\) && PathPrefix\(`\/edge-broker`\)/);
@@ -76,10 +76,10 @@ test("standalone production compose routes edge broker traffic through traefik",
  assert.match(serviceBlock, /traefik\.http\.services\.edge-broker\.loadbalancer\.server\.port=4300/);
 });

-test("compose config does not provide insecure broker secret defaults", () => {
+test("php services receive broker websocket environment defaults", () => {
  for (const composeSource of [baseComposeSource, exampleComposeSource]) {
-    assert.match(composeSource, /EDGE_BROKER_URL:\s*\$\x7bEDGE_BROKER_URL:-http:\/\/edge-broker:4300\x7d/);
-    assert.match(composeSource, /EDGE_BROKER_SHARED_SECRET:\s*\$\x7bEDGE_BROKER_SHARED_SECRET:\?set EDGE_BROKER_SHARED_SECRET in \.env\x7d/);
+    assert.match(composeSource, /EDGE_BROKER_URL:\s*\$\{EDGE_BROKER_URL:-http:\/\/edge-broker:4300\}/);
+    assert.match(composeSource, /EDGE_BROKER_SHARED_SECRET:\s*\$\{EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev\}/);
  }
 });

@@ -87,7 +87,7 @@ test("base docker compose wires the broker into each php worker", () => {
  for (const serviceName of ["php1", "php2", "php3", "php4", "php5", "php-staging", "php-cron"]) {
    const serviceBlock = readComposeServiceBlock(baseComposeSource, serviceName);
    assert.match(serviceBlock, /\n\s+depends_on:\s*\n[\s\S]*?\n\s+- edge-broker/);
-    assert.match(serviceBlock, /EDGE_BROKER_URL:\s*\$\x7bEDGE_BROKER_URL:-http:\/\/edge-broker:4300\x7d/);
-    assert.match(serviceBlock, /EDGE_BROKER_SHARED_SECRET:\s*\$\x7bEDGE_BROKER_SHARED_SECRET:\?set EDGE_BROKER_SHARED_SECRET in \.env\x7d/);
+    assert.match(serviceBlock, /EDGE_BROKER_URL:\s*\$\{EDGE_BROKER_URL:-http:\/\/edge-broker:4300\}/);
+    assert.match(serviceBlock, /EDGE_BROKER_SHARED_SECRET:\s*\$\{EDGE_BROKER_SHARED_SECRET:-truckwash-edge-dev\}/);
  }
 });
@@ -1,13 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-
-class account_deletion_http_exception extends RuntimeException
-{
-    public function __construct(string $message, public readonly int $status)
-    {
-        parent::__construct($message);
-    }
-}
@@ -1,127 +0,0 @@
-<?php
-
-namespace classes;
-
-/**
- * Explicit account-deletion schema management.
- *
- * apply() must only be invoked by the dedicated CLI. Web requests and cron jobs
- * are deliberately limited to the read-only check().
- */
-class account_deletion_schema_bootstrap
-{
-    /** @return array{ready:bool,missing:array<int,string>} */
-    public static function check(): array
-    {
-        global $db;
-        $missing = [];
-        foreach (['account_deletion_requests', 'account_deletion_credential_attempts', 'account_deletion_outbox'] as $table) {
-            $tableSql = $db->escape_string($table);
-            $result = $db->query("SHOW TABLES LIKE '$tableSql'");
-            if ($result === false || $result->num_rows === 0) {
-                $missing[] = 'table:' . $table;
-            }
-        }
-        foreach (['users' => 'deleted_at', 'subusers' => 'deleted_at'] as $table => $column) {
-            $result = $db->query("SHOW COLUMNS FROM `$table` LIKE '$column'");
-            if ($result === false || $result->num_rows === 0) {
-                $missing[] = 'column:' . $table . '.' . $column;
-            }
-        }
-        if (!in_array('table:account_deletion_requests', $missing, true)) {
-            $result = $db->query("SHOW COLUMNS FROM account_deletion_requests LIKE 'manual_review_required_at'");
-            if ($result === false || $result->num_rows === 0) {
-                $missing[] = 'column:account_deletion_requests.manual_review_required_at';
-            }
-        }
-        return ['ready' => $missing === [], 'missing' => $missing];
-    }
-
-    public static function apply(): void
-    {
-        if (PHP_SAPI !== 'cli') {
-            throw new \RuntimeException('Account deletion schema changes are CLI-only.');
-        }
-        global $db;
-        self::execute("CREATE TABLE IF NOT EXISTS account_deletion_requests (
-            id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-            request_id CHAR(36) NOT NULL,
-            principal_type VARCHAR(16) NOT NULL,
-            principal_id BIGINT UNSIGNED NOT NULL,
-            customer_number_snapshot INT NULL,
-            active_principal_key VARCHAR(191) NULL,
-            status VARCHAR(32) NOT NULL DEFAULT 'requested',
-            policy_version VARCHAR(32) NOT NULL,
-            retained_data_json LONGTEXT NOT NULL,
-            request_ip VARCHAR(45) NULL,
-            request_user_agent VARCHAR(512) NULL,
-            retry_count INT UNSIGNED NOT NULL DEFAULT 0,
-            failure_code VARCHAR(191) NULL,
-            requested_at DATETIME NOT NULL,
-            processing_at DATETIME NULL,
-            completed_at DATETIME NULL,
-            next_attempt_at DATETIME NULL,
-            manual_review_required_at DATETIME NULL,
-            created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (id),
-            UNIQUE KEY uniq_account_deletion_request_id (request_id),
-            UNIQUE KEY uniq_account_deletion_active_principal (active_principal_key),
-            INDEX idx_account_deletion_worker (status, next_attempt_at, requested_at),
-            INDEX idx_account_deletion_principal (principal_type, principal_id, requested_at)
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
-        self::ensureColumn('account_deletion_requests', 'manual_review_required_at', 'DATETIME NULL AFTER `next_attempt_at`');
-        self::execute("CREATE TABLE IF NOT EXISTS account_deletion_credential_attempts (
-            throttle_key CHAR(64) NOT NULL,
-            attempt_count INT UNSIGNED NOT NULL DEFAULT 1,
-            window_started_at DATETIME NOT NULL,
-            blocked_until DATETIME NULL,
-            updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (throttle_key), INDEX idx_account_deletion_throttle_expiry (updated_at)
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
-        self::execute("CREATE TABLE IF NOT EXISTS account_deletion_outbox (
-            id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-            request_id CHAR(36) NOT NULL,
-            event_type VARCHAR(64) NOT NULL,
-            payload_json LONGTEXT NOT NULL,
-            status VARCHAR(16) NOT NULL DEFAULT 'pending',
-            attempts INT UNSIGNED NOT NULL DEFAULT 0,
-            available_at DATETIME NOT NULL,
-            processing_at DATETIME NULL,
-            delivered_at DATETIME NULL,
-            last_error VARCHAR(191) NULL,
-            created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (id), UNIQUE KEY uniq_account_deletion_outbox_event (request_id, event_type),
-            INDEX idx_account_deletion_outbox_delivery (status, available_at)
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
-        self::ensureColumn('account_deletion_outbox', 'processing_at', 'DATETIME NULL AFTER `available_at`');
-        self::ensureColumn('users', 'deleted_at', 'DATETIME NULL AFTER `updated_at`');
-        self::ensureColumn('subusers', 'deleted_at', 'DATETIME NULL AFTER `suspended_at`');
-        self::ensureIndex('users', 'idx_users_deleted_at', '`deleted_at`');
-        self::ensureIndex('subusers', 'idx_subusers_deleted_at', '`deleted_at`');
-    }
-
-    private static function execute(string $sql): void
-    {
-        global $db;
-        if ($db->query($sql) === false) {
-            throw new \RuntimeException('Account deletion schema operation failed.');
-        }
-    }
-
-    private static function ensureColumn(string $table, string $column, string $definition): void
-    {
-        global $db;
-        $result = $db->query("SHOW COLUMNS FROM `$table` LIKE '$column'");
-        if ($result === false) throw new \RuntimeException('Unable to inspect account deletion schema.');
-        if ($result->num_rows === 0) self::execute("ALTER TABLE `$table` ADD COLUMN `$column` $definition");
-    }
-
-    private static function ensureIndex(string $table, string $index, string $columns): void
-    {
-        global $db;
-        $result = $db->query("SHOW INDEX FROM `$table` WHERE Key_name = '$index'");
-        if ($result === false) throw new \RuntimeException('Unable to inspect account deletion indexes.');
-        if ($result->num_rows === 0) self::execute("ALTER TABLE `$table` ADD INDEX `$index` ($columns)");
-    }
-}
@@ -37,21 +37,8 @@ class attachment_store implements minio_uploads_i
     */
    public function isValidFilePath(string $filePath): bool
    {
-        if (
-            $filePath === ''
-            || str_starts_with($filePath, '/')
-            || preg_match('/^[a-zA-Z0-9_\-\/.]+$/', $filePath) !== 1
-        ) {
-            return false;
-        }
-
-        foreach (explode('/', $filePath) as $segment) {
-            if ($segment === '' || $segment === '.' || $segment === '..') {
-                return false;
-            }
-        }
-
-        return true;
+        // Check if the file path is valid
+        return preg_match('/^[a-zA-Z0-9_\-\/.]+$/', $filePath) === 1;
    }

    /**
@@ -95,10 +82,7 @@ class attachment_store implements minio_uploads_i
    {
        $host = 'https://api.truckwash.io';

-        $this->requireValidFilePath($fileName);
-        $encodedPath = implode('/', array_map('rawurlencode', explode('/', $fileName)));
-
        // Generate a direct download URL for the given file name
-        return $host . '/files/' . $encodedPath;
+        return $host . '/files/' . $fileName;
    }
 }
@@ -133,14 +133,8 @@ class attachments implements attachments_i
    protected function fetchAttachmentRows(string $type, array $object_ids, array $options = []): array
    {
        $options = $this->normalizeAttachmentOptions($options);
-        $rawType = trim($type, '`');
-        $objectTypes = array_values(array_unique([
-            $rawType,
-            '`' . $rawType . '`',
-        ]));
-
        return (new object_attachments_o())->getFieldsWhereIn([
-            'object_type' => $objectTypes,
+            'object_type' => $type,
            'object_id' => $object_ids,
            'deleted_at' => null
        ], $options);
@@ -2,13 +2,10 @@

 namespace classes;

-require_once WD . '/classes/account_deletion_service.php';
-
 use classes\totp;
 use Exception;
 use interfaces\authentication_i;
 use objects\plate_scanners_o;
-use objects\subuser_grants_o;
 use objects\tokens_o;
 use objects\users_o;
 use objects\subusers_o;
@@ -71,10 +68,6 @@ class authentication implements authentication_i

    public function create_2fa_token(int $id, string $type): string
    {
-        $principalType = $type === '2FA_VERIFICATION_SUBUSER' ? 'subuser' : 'customer';
-        if (account_deletion_service::principalIsBlocked($principalType, $id)) {
-            throw new Exception('Account unavailable');
-        }
        // Create a temporary 2FA token
        $token = bin2hex(random_bytes(32));
        (new tokens_o())->create($id, $token, $type);
@@ -106,9 +99,6 @@ class authentication implements authentication_i
            throw new \Exception('User not found for customer number: ' . $customer_number);
        }
        $user_id = $user->id;
-        if (account_deletion_service::principalIsBlocked('customer', (int)$user_id)) {
-            throw new Exception('Account unavailable');
-        }
        // Save the token in the database
        (new tokens_o())->create($user_id, $token, 'AUTH_TOKEN');
        return $token;
@@ -116,9 +106,6 @@ class authentication implements authentication_i

    public function create_token_by_user_id(int $user_id): string
    {
-        if (account_deletion_service::principalIsBlocked('customer', $user_id)) {
-            throw new Exception('Account unavailable');
-        }
        // Create a token
        $token = bin2hex(random_bytes(32));
        // Save the token in the database
@@ -128,9 +115,6 @@ class authentication implements authentication_i

    public function create_employee_token(int $employee_id): string
    {
-        if (account_deletion_service::principalIsBlocked('customer', $employee_id)) {
-            throw new Exception('Account unavailable');
-        }
        // Create a token
        $token = bin2hex(random_bytes(32));
        // Save the token in the database
@@ -138,34 +122,17 @@ class authentication implements authentication_i
        return $token;
    }

-    public function create_impersonation_token(int $target_user_id, int $actor_user_id): string
-    {
-        if ($actor_user_id <= 0 || account_deletion_service::principalIsBlocked('customer', $target_user_id)) {
-            throw new Exception('Account unavailable');
-        }
-        $token = bin2hex(random_bytes(32));
-        (new tokens_o())->create($target_user_id, $token, 'AUTH_TOKEN_IMPERSONATION:' . $actor_user_id);
-        return $token;
-    }
-
    public function validate_token(string $token): bool
    {
        // First: try validating as a classic user auth token
-        try {
        $dbToken = (new tokens_o())->getToken($token);
-            if ($dbToken && $dbToken->id && $this->isClassicAuthTokenType((string)$dbToken->type->value())) {
-                return !account_deletion_service::principalIsBlocked(
-                    'customer',
-                    (int)$dbToken->user_id->value()
-                );
-            }
-        } catch (Exception) {
-            // Ignore and continue to subuser session validation
+        if ($dbToken && $dbToken->id) {
+            return true;
        }
        // Fallback: try validating as a subuser session token
        $subuser = (new subusers_o())->getSubuserBySessionToken($token);
        if ($subuser !== null) {
-            return !account_deletion_service::principalIsBlocked('subuser', (int)$subuser->id);
+            return true;
        }
        return false;
    }
@@ -187,20 +154,19 @@ class authentication implements authentication_i
        // Strip the Bearer prefix
        $rawToken = str_replace('Bearer ', '', $rawToken);
        // Get the token from the database
-        try {
        $token = (new tokens_o())->getToken($rawToken);
-        } catch (Exception) {
-            return false;
-        }
        // Check if the token exists
        if (!$token->id) {
            return false;
        }
-        if (!$this->isClassicAuthTokenType((string)$token->type->value())) {
+        if ($token->type->value() === "AUTH_TOKEN_SUBUSER") {
+            // Get the customer number from the headers
+            if (!isset($headers['X-Customer-Number'])) {
                return false;
            }
-        if (account_deletion_service::principalIsBlocked('customer', (int)$token->user_id->value())) {
-            return false;
+            $customer_number = (int)$headers['X-Customer-Number'];
+            // Get the user by the customer number
+            return (new users_o())->getUserByCustomerNumber($customer_number);
        }
        // Get the user from the database
        $user = (new users_o())->getUserById($token->user_id->value());
@@ -208,11 +174,6 @@ class authentication implements authentication_i
        return $user;
    }

-    private function isClassicAuthTokenType(string $type): bool
-    {
-        return $type === 'AUTH_TOKEN' || str_starts_with($type, 'AUTH_TOKEN_IMPERSONATION:');
-    }
-
    public function get_plate_scanner(): plate_scanners_o|false
    {
        // Get the token from the headers
@@ -263,9 +224,6 @@ class authentication implements authentication_i
        if ($subuser === null) {
            return false;
        }
-        if (account_deletion_service::principalIsBlocked('subuser', (int)$subuser->id)) {
-            return false;
-        }
        $customerNumberContext = null;
        if (isset($headers['X-Customer-Number'])) {
            $customerNumberContext = (int)$headers['X-Customer-Number'];
@@ -1,127 +0,0 @@
-<?php
-
-namespace classes;
-
-class backup_schema_bootstrap
-{
-    private static bool $initialized = false;
-
-    public static function ensureTables(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS backup_records (
-                backup_uuid VARCHAR(64) NOT NULL PRIMARY KEY,
-                name VARCHAR(191) NOT NULL,
-                description TEXT NULL,
-                source VARCHAR(32) NOT NULL DEFAULT 'manual',
-                status VARCHAR(32) NOT NULL DEFAULT 'queued',
-                schema_version INT UNSIGNED NOT NULL DEFAULT 2,
-                storage_bucket VARCHAR(191) NOT NULL DEFAULT 'backups',
-                storage_prefix VARCHAR(255) NOT NULL,
-                manifest_key VARCHAR(255) NULL,
-                manifest_sha256 CHAR(64) NULL,
-                encryption_key_id VARCHAR(191) NULL,
-                component_count INT UNSIGNED NOT NULL DEFAULT 0,
-                object_count INT UNSIGNED NOT NULL DEFAULT 0,
-                total_bytes BIGINT UNSIGNED NOT NULL DEFAULT 0,
-                requested_by_user_id INT NULL,
-                started_at DATETIME NULL,
-                completed_at DATETIME NULL,
-                verified_at DATETIME NULL,
-                expires_at DATETIME NULL,
-                last_error TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_backup_records_status_created (status, created_at),
-                KEY idx_backup_records_verified (verified_at),
-                KEY idx_backup_records_expires (expires_at)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS backup_components (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                backup_uuid VARCHAR(64) NOT NULL,
-                component_type VARCHAR(32) NOT NULL,
-                logical_name VARCHAR(191) NOT NULL,
-                source_bucket VARCHAR(191) NULL,
-                source_prefix VARCHAR(255) NULL,
-                storage_key VARCHAR(255) NULL,
-                manifest_key VARCHAR(255) NULL,
-                object_count INT UNSIGNED NOT NULL DEFAULT 0,
-                byte_size BIGINT UNSIGNED NOT NULL DEFAULT 0,
-                content_sha256 CHAR(64) NULL,
-                encrypted_sha256 CHAR(64) NULL,
-                encryption_key_id VARCHAR(191) NULL,
-                status VARCHAR(32) NOT NULL DEFAULT 'pending',
-                error_message TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_backup_components_backup (backup_uuid),
-                KEY idx_backup_components_status (status),
-                KEY idx_backup_components_type_name (component_type, logical_name)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS backup_jobs (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                job_type VARCHAR(32) NOT NULL,
-                backup_uuid VARCHAR(64) NULL,
-                status VARCHAR(32) NOT NULL DEFAULT 'queued',
-                progress_percent TINYINT UNSIGNED NOT NULL DEFAULT 0,
-                progress_message VARCHAR(255) NULL,
-                payload_json LONGTEXT NULL,
-                result_json LONGTEXT NULL,
-                actor_user_id INT NULL,
-                locked_at DATETIME NULL,
-                lock_owner VARCHAR(191) NULL,
-                started_at DATETIME NULL,
-                completed_at DATETIME NULL,
-                error_message TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_backup_jobs_status_created (status, created_at),
-                KEY idx_backup_jobs_backup (backup_uuid),
-                KEY idx_backup_jobs_type_status (job_type, status)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS backup_restore_audit (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                restore_job_id BIGINT UNSIGNED NULL,
-                preview_job_id BIGINT UNSIGNED NULL,
-                backup_uuid VARCHAR(64) NOT NULL,
-                actor_user_id INT NULL,
-                target_environment VARCHAR(64) NOT NULL DEFAULT 'production',
-                confirmation_fingerprint CHAR(64) NULL,
-                reason TEXT NULL,
-                ip_address VARCHAR(64) NULL,
-                user_agent VARCHAR(255) NULL,
-                pre_restore_backup_uuid VARCHAR(64) NULL,
-                status VARCHAR(32) NOT NULL DEFAULT 'queued',
-                started_at DATETIME NULL,
-                completed_at DATETIME NULL,
-                error_message TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_backup_restore_audit_backup (backup_uuid),
-                KEY idx_backup_restore_audit_job (restore_job_id),
-                KEY idx_backup_restore_audit_created (created_at)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        self::$initialized = true;
-    }
-}
@@ -212,7 +212,19 @@ class bird implements bird_i
            throw new Exception('cURL error: ' . $err);
        }
        curl_close($ch);
+        // Debug slack
+        $data = json_decode($body, true) ?? [];
        $resp = $resp === false ? 'cURL error with no response' : $resp;
+        $slack_debug_message = "*Bird API Request Debug:*"
+            . "\nEndpoint: $url"
+            . "\nMethod: $method"
+            . "\nStatus: $code"
+            . "\nPayload Keys: " . implode(',', array_keys($data))
+            . "\nResponse: $resp";
+
+        // Send slack notification for every request for easier debugging of issues in production (can be removed later if too noisy)
+        $slack = new \classes\slack();
+        $slack->send_message($slack_debug_message);
        return [
            'status_code' => (int)$code,
            'body' => $resp,
@@ -1061,3 +1073,4 @@ class bird implements bird_i
    }
 }

+
@@ -64,11 +64,6 @@ class coolify_api_client
        return $this->request('GET', '/services');
    }

-    public function listApplications(): array
-    {
-        return $this->request('GET', '/applications');
-    }
-
    public function listGithubApps(): array
    {
        return $this->request('GET', '/github-apps');
@@ -126,16 +121,6 @@ class coolify_api_client
        ]);
    }

-    public function listApplicationEnvs(string $uuid): array
-    {
-        return $this->request('GET', '/applications/' . rawurlencode($uuid) . '/envs');
-    }
-
-    public function deleteApplicationEnv(string $uuid, string $envUuid): array
-    {
-        return $this->request('DELETE', '/applications/' . rawurlencode($uuid) . '/envs/' . rawurlencode($envUuid));
-    }
-
    private static function bulkEnvData(array $env): array
    {
        $data = [];
@@ -174,26 +159,11 @@ class coolify_api_client
        return $this->request('GET', '/applications/' . rawurlencode($uuid) . '/restart');
    }

-    public function stopService(string $uuid): array
-    {
-        return $this->request('GET', '/services/' . rawurlencode($uuid) . '/stop');
-    }
-
-    public function stopApplication(string $uuid): array
-    {
-        return $this->request('GET', '/applications/' . rawurlencode($uuid) . '/stop');
-    }
-
    public function deleteService(string $uuid): array
    {
        return $this->request('DELETE', '/services/' . rawurlencode($uuid));
    }

-    public function deleteApplication(string $uuid): array
-    {
-        return $this->request('DELETE', '/applications/' . rawurlencode($uuid));
-    }
-
    public function listDeployments(): array
    {
        return $this->request('GET', '/deployments');
@@ -5,8 +5,6 @@ namespace classes;
 use RuntimeException;
 use Throwable;

-require_once __DIR__ . '/cors_policy.php';
-
 class coolify_manager
 {
    private const KINDS = ['database', 'redis', 'minio'];
@@ -1072,9 +1070,7 @@ class coolify_manager
                        $targetPublicUrl,
                        $resourceUuid,
                        self::resourceFirstExposedPort($resource, $target),
-                        $resource['custom_labels'] ?? null,
-                        $app,
-                        self::gatewayRouteTargetCorsConfig($target)
+                        $resource['custom_labels'] ?? null
                    );
                $update = $resourceType === 'service'
                    ? $client->updateService($resourceUuid, $updatePayload)
@@ -1375,129 +1371,6 @@ class coolify_manager
        ];
    }

-    public function deployGithubRunners(array $input, ?int $actorUserId = null): array
-    {
-        $this->ensureSchema();
-
-        $dryRun = $this->toBool($input['dry_run'] ?? null, false);
-        $instanceId = (int)($input['instance_id'] ?? 0);
-        if ($instanceId <= 0) {
-            $instanceId = $this->defaultInstanceId();
-        }
-        $instance = $this->getInstance($instanceId);
-        $repositories = $this->githubRunnerRepositories($input);
-        $labels = $this->githubRunnerLabels($input['labels'] ?? null);
-        $countPerRepo = $this->githubRunnerCount($input['count_per_repo'] ?? $input['runner_count_per_repo'] ?? null);
-        $serviceName = $this->githubRunnerServiceName($input['service_name'] ?? null);
-        $resourceUuid = $this->nullableString($input['service_uuid'] ?? null)
-            ?? $this->nullableString($this->coolifyConfigValue('github_runner_service_uuid', ''));
-        $token = $this->githubRunnerToken($input);
-        $template = $this->githubRunnerComposeTemplate($repositories, $labels, $countPerRepo);
-        $hash = $this->composeHash($template);
-
-        $plan = [
-            'type' => 'deploy_github_runners',
-            'instance_id' => $instanceId,
-            'service_uuid' => $resourceUuid,
-            'service_name' => $serviceName,
-            'repositories' => $repositories,
-            'labels' => $labels,
-            'count_per_repo' => $countPerRepo,
-            'compose_hash' => $hash,
-            'action' => $resourceUuid === null ? 'create' : 'update',
-            'token_set' => $token !== '',
-            'token_source' => trim((string)($input['github_token'] ?? $input['token'] ?? '')) !== '' ? 'request' : 'config',
-        ];
-
-        if ($dryRun) {
-            $this->audit(null, $instanceId, null, 'github_runners_planned', $actorUserId, 'info', $plan);
-            return [
-                'ok' => true,
-                'dry_run' => true,
-                'mutated' => false,
-                'planned' => [$plan],
-                'applied' => [],
-                'errors' => [],
-                'service_uuid' => $resourceUuid,
-                'service_name' => $serviceName,
-                'compose_hash' => $hash,
-                'repositories' => $repositories,
-                'labels' => $labels,
-                'count_per_repo' => $countPerRepo,
-            ];
-        }
-
-        if ($token === '') {
-            throw new RuntimeException('GitHub runner token is required to deploy self-hosted runners.');
-        }
-
-        $client = $this->clientForInstance($instance);
-        $apiResult = [];
-        $action = $resourceUuid === null ? 'created' : 'updated';
-        if ($resourceUuid === null) {
-            $apiResult = $client->createService($this->githubRunnerServicePayload($instance, $input, $serviceName, $template, false));
-            $resourceUuid = trim((string)($apiResult['uuid'] ?? ''));
-            if ($resourceUuid === '') {
-                throw new RuntimeException('Coolify did not return a GitHub runner service UUID.');
-            }
-        } else {
-            try {
-                $apiResult = $client->updateService($resourceUuid, $this->githubRunnerServicePayload($instance, $input, $serviceName, $template, true));
-            } catch (Throwable $throwable) {
-                if (!str_contains(strtolower($throwable->getMessage()), '404')
-                    && !str_contains(strtolower($throwable->getMessage()), 'not found')) {
-                    throw $throwable;
-                }
-                $apiResult = $client->createService($this->githubRunnerServicePayload($instance, $input, $serviceName, $template, false));
-                $resourceUuid = trim((string)($apiResult['uuid'] ?? ''));
-                if ($resourceUuid === '') {
-                    throw new RuntimeException('Coolify did not return a GitHub runner service UUID.');
-                }
-                $action = 'created';
-            }
-        }
-
-        $client->updateServiceEnvsBulk($resourceUuid, ['GITHUB_RUNNER_TOKEN' => $token]);
-        $start = $this->startOrRestartService($client, $resourceUuid, $action === 'updated');
-        $deployment = $client->deployResource($resourceUuid, false);
-
-        $this->setModuleConfigValue('Coolify', 'github_runner_service_uuid', $resourceUuid, 'string');
-        $this->setModuleConfigValue('Coolify', 'github_runner_frontend_repository', $repositories['frontend'], 'string');
-        $this->setModuleConfigValue('Coolify', 'github_runner_backend_repository', $repositories['backend'], 'string');
-        $this->setModuleConfigValue('Coolify', 'github_runner_labels', implode(',', $labels), 'string');
-        $this->setModuleConfigValue('Coolify', 'github_runner_count_per_repo', (string)$countPerRepo, 'int');
-        if ($this->toBool($input['persist_token'] ?? null, false)) {
-            $this->setModuleConfigValue('Coolify', 'github_runner_token', replication_secret_box::encrypt($token), 'string');
-        }
-
-        $applied = array_replace($plan, [
-            'action' => $action,
-            'service_uuid' => $resourceUuid,
-            'coolify' => self::redactCoolifyResponse($apiResult),
-            'start' => self::redactCoolifyResponse(is_array($start) ? $start : []),
-            'deployment' => self::redactCoolifyResponse($deployment),
-        ]);
-
-        $this->audit(null, $instanceId, null, 'github_runners_deployed', $actorUserId, 'info', $applied);
-
-        return [
-            'ok' => true,
-            'dry_run' => false,
-            'mutated' => true,
-            'planned' => [$plan],
-            'applied' => [$applied],
-            'errors' => [],
-            'action' => $action,
-            'service_uuid' => $resourceUuid,
-            'service_name' => $serviceName,
-            'compose_hash' => $hash,
-            'repositories' => $repositories,
-            'labels' => $labels,
-            'count_per_repo' => $countPerRepo,
-            'deployment' => self::redactCoolifyResponse($deployment),
-        ];
-    }
-
    private function gatewayApiCodeVersionLabel(array $target): string
    {
        $channelSlug = trim((string)($target['channel_slug'] ?? 'gateway'));
@@ -2053,14 +1926,13 @@ class coolify_manager
                    ], $actorUserId);
                }

-                $sourceCommitSha = trim((string)($sourceTarget['latest_deployment_commit_sha'] ?? ''));
-                $deploymentInput = [
+                $deployment = $releaseManager->startDeployment([
                    'target_id' => (int)($deploymentTarget['id'] ?? 0),
                    'channel_id' => (int)$sourceTarget['channel_id'],
                    'app' => $app,
                    'repository' => (string)($sourceTarget['repository'] ?? ''),
                    'branch' => (string)($sourceTarget['branch'] ?? 'master'),
-                    'commit_mode' => $sourceCommitSha === '' ? 'latest' : 'specific',
+                    'commit_mode' => 'latest',
                    'version_label' => $this->gatewayRouteProvisionVersionLabel($sourceTarget),
                    'deployed_url' => $sourcePublicUrl,
                    'metadata' => [
@@ -2070,11 +1942,7 @@ class coolify_manager
                        'server_uuid' => $serverUuid,
                        'app' => $app,
                    ],
-                ];
-                if ($sourceCommitSha !== '') {
-                    $deploymentInput['commit_sha'] = $sourceCommitSha;
-                }
-                $deployment = $releaseManager->startDeployment($deploymentInput, $actorUserId);
+                ], $actorUserId);

                if ((string)($deployment['status'] ?? '') !== 'deployed') {
                    $errors[] = array_replace($action, [
@@ -2424,9 +2292,7 @@ class coolify_manager
        string $publicUrl,
        string $resourceUuid = '',
        ?int $port = null,
-        mixed $existingLabels = null,
-        string $app = '',
-        string $corsConfig = ''
+        mixed $existingLabels = null
    ): array
    {
        $decodedLabels = self::decodeCoolifyLabels($existingLabels);
@@ -2441,9 +2307,7 @@ class coolify_manager
            $publicUrl,
            $resourceUuid,
            $routePort,
-            self::gatewayRouteDefaultCertResolver($publicUrl),
-            $app,
-            $corsConfig
+            self::gatewayRouteDefaultCertResolver($publicUrl)
        );
        if ($labels !== []) {
            $payload['custom_labels'] = base64_encode(implode("\n", self::mergeCoolifyLabels(
@@ -2468,49 +2332,6 @@ class coolify_manager
        ];
    }

-    private static function gatewayRouteTargetCorsConfig(array $target): string
-    {
-        $context = self::jsonDecode($target['deploy_context_json'] ?? null);
-        $configured = null;
-
-        foreach (['coolify_env', 'runtime_env', 'environment_variables'] as $key) {
-            $env = $context[$key] ?? null;
-            if (is_array($env) && array_key_exists('CORS', $env) && is_scalar($env['CORS'])) {
-                $configured = (string)$env['CORS'];
-            }
-        }
-
-        foreach (['coolify_env_file', 'env'] as $key) {
-            $raw = $context[$key] ?? null;
-            if (!is_string($raw)) {
-                continue;
-            }
-            foreach (preg_split('/\r\n|\r|\n/', $raw) ?: [] as $line) {
-                $line = trim((string)$line);
-                if ($line === '' || str_starts_with($line, '#') || !str_contains($line, '=')) {
-                    continue;
-                }
-                [$envKey, $value] = explode('=', $line, 2);
-                if (trim($envKey) === 'CORS') {
-                    $configured = $value;
-                }
-            }
-        }
-
-        if ($configured === null) {
-            $runtimeValue = getenv('CORS');
-            if ($runtimeValue !== false) {
-                $configured = $runtimeValue;
-            } elseif (array_key_exists('CORS', $_ENV ?? [])) {
-                $configured = (string)$_ENV['CORS'];
-            } elseif (array_key_exists('CORS', $_SERVER ?? [])) {
-                $configured = (string)$_SERVER['CORS'];
-            }
-        }
-
-        return cors_policy::withRequiredOrigins((string)($configured ?? ''));
-    }
-
    private static function coolifyProxyUrl(string $publicUrl, ?int $port): string
    {
        if ($port === null || $port <= 0) {
@@ -2534,9 +2355,7 @@ class coolify_manager
        string $publicUrl,
        string $resourceUuid,
        ?int $port = null,
-        ?string $certResolver = null,
-        string $app = '',
-        string $corsConfig = ''
+        ?string $certResolver = null
    ): array
    {
        $resourceUuid = self::gatewayRouteLabelId($resourceUuid);
@@ -2561,7 +2380,6 @@ class coolify_manager
        $certResolver = trim((string)($certResolver ?? ''));
        $httpLabel = 'http-0-' . $resourceUuid;
        $httpsLabel = 'https-0-' . $resourceUuid;
-        $isApi = strtolower(trim($app)) === 'api';
        $labels = [
            'traefik.enable=true',
            'traefik.http.middlewares.gzip.compress=true',
@@ -2575,18 +2393,12 @@ class coolify_manager
                $labels[] = "traefik.http.routers.{$httpsLabel}.service={$httpsLabel}";
                $labels[] = "traefik.http.services.{$httpsLabel}.loadbalancer.server.port={$routePort}";
            }
-            $httpsMiddlewares = [];
-            if ($isApi) {
-                $corsMiddleware = "{$httpsLabel}-cors";
-                $labels = array_merge($labels, cors_policy::traefikHeadersMiddlewareLabels($corsMiddleware, $corsConfig));
-                $httpsMiddlewares[] = $corsMiddleware;
-            }
            if ($path !== '/') {
                $labels[] = "traefik.http.middlewares.{$httpsLabel}-stripprefix.stripprefix.prefixes={$path}";
-                $httpsMiddlewares[] = "{$httpsLabel}-stripprefix";
+                $labels[] = "traefik.http.routers.{$httpsLabel}.middlewares={$httpsLabel}-stripprefix,gzip";
+            } else {
+                $labels[] = "traefik.http.routers.{$httpsLabel}.middlewares=gzip";
            }
-            $httpsMiddlewares[] = 'gzip';
-            $labels[] = "traefik.http.routers.{$httpsLabel}.middlewares=" . implode(',', $httpsMiddlewares);
            $labels[] = "traefik.http.routers.{$httpsLabel}.tls=true";
            if ($certResolver !== '') {
                $labels[] = "traefik.http.routers.{$httpsLabel}.tls.certresolver={$certResolver}";
@@ -3449,141 +3261,6 @@ class coolify_manager
        ];
    }

-    private function githubRunnerRepositories(array $input): array
-    {
-        return [
-            'frontend' => $this->normalizeGithubRepository(
-                $input['frontend_repository'] ?? $input['frontend_repo'] ?? $this->coolifyConfigValue('github_runner_frontend_repository', 'copenhagentruckwash/pleno-vue'),
-                'frontend'
-            ),
-            'backend' => $this->normalizeGithubRepository(
-                $input['backend_repository'] ?? $input['backend_repo'] ?? $this->coolifyConfigValue('github_runner_backend_repository', 'copenhagentruckwash/api'),
-                'backend'
-            ),
-        ];
-    }
-
-    private function normalizeGithubRepository(mixed $value, string $label): string
-    {
-        $repository = trim((string)$value);
-        $repository = preg_replace('#^https://github\.com/#i', '', $repository) ?? $repository;
-        $repository = preg_replace('#^git@github\.com:#i', '', $repository) ?? $repository;
-        $repository = preg_replace('#\.git$#i', '', $repository) ?? $repository;
-        $repository = trim($repository, " \t\n\r\0\x0B/");
-        if (!preg_match('#^[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+$#', $repository)) {
-            throw new RuntimeException('GitHub ' . $label . ' repository must be in owner/repo format.');
-        }
-        return $repository;
-    }
-
-    private function githubRunnerLabels(mixed $value): array
-    {
-        $raw = trim((string)($value ?? ''));
-        if ($raw === '') {
-            $raw = $this->coolifyConfigValue('github_runner_labels', 'self-hosted,Linux,X64,default');
-        }
-
-        $labels = array_values(array_unique(array_filter(array_map(
-            static fn(string $label): string => trim($label),
-            preg_split('/[,\s]+/', $raw) ?: []
-        ))));
-
-        return $labels !== [] ? $labels : ['self-hosted', 'Linux', 'X64', 'default'];
-    }
-
-    private function githubRunnerCount(mixed $value): int
-    {
-        $count = (int)($value ?? 0);
-        if ($count <= 0) {
-            $count = (int)$this->coolifyConfigValue('github_runner_count_per_repo', '1');
-        }
-        return max(1, min(10, $count));
-    }
-
-    private function githubRunnerServiceName(mixed $value): string
-    {
-        $name = strtolower(trim((string)($value ?? 'truckwash-github-runners')));
-        $name = preg_replace('/[^a-z0-9-]+/', '-', $name) ?: '';
-        $name = trim($name, '-') ?: 'truckwash-github-runners';
-        return substr($name, 0, 120);
-    }
-
-    private function githubRunnerToken(array $input): string
-    {
-        $token = trim((string)($input['github_token'] ?? $input['token'] ?? ''));
-        if ($token !== '') {
-            return $token;
-        }
-
-        $envToken = trim((string)(getenv('GITHUB_RUNNER_TOKEN') ?: getenv('GITHUB_TOKEN') ?: ''));
-        if ($envToken !== '') {
-            return $envToken;
-        }
-
-        return replication_secret_box::decrypt($this->coolifyConfigValue('github_runner_token', ''));
-    }
-
-    private function githubRunnerComposeTemplate(array $repositories, array $labels, int $countPerRepo): array
-    {
-        $lines = ['services:'];
-        foreach ($repositories as $key => $repository) {
-            for ($index = 1; $index <= $countPerRepo; $index++) {
-                $service = 'github-runner-' . $key . '-' . $index;
-                $runnerName = 'truckwash-' . $key . '-' . $index;
-                $runnerLabels = array_values(array_unique(array_merge($labels, [$key])));
-                $lines = array_merge($lines, [
-                    '  ' . $service . ':',
-                    '    image: myoung34/github-runner:latest',
-                    '    restart: unless-stopped',
-                    '    environment:',
-                    '      REPO_URL: ' . self::yamlScalar('https://github.com/' . $repository),
-                    '      RUNNER_NAME: ' . self::yamlScalar($runnerName),
-                    '      RUNNER_SCOPE: repo',
-                    '      RUNNER_WORKDIR: /tmp/runner/work',
-                    '      LABELS: ' . self::yamlScalar(implode(',', $runnerLabels)),
-                    '      EPHEMERAL: "false"',
-                    '      RUN_AS_ROOT: "true"',
-                    '      ACCESS_TOKEN: ${GITHUB_RUNNER_TOKEN}',
-                    '    volumes:',
-                    '      - /var/run/docker.sock:/var/run/docker.sock',
-                ]);
-            }
-        }
-
-        return [
-            'compose' => implode("\n", $lines) . "\n",
-            'env' => 'GITHUB_RUNNER_TOKEN=${GITHUB_RUNNER_TOKEN}',
-        ];
-    }
-
-    private function githubRunnerServicePayload(array $instance, array $input, string $serviceName, array $template, bool $update): array
-    {
-        $payload = [
-            'name' => $serviceName,
-            'description' => 'Truckwash GitHub self-hosted runners for frontend and backend workflows.',
-            'instant_deploy' => false,
-            'docker_compose_raw' => $this->encodedDockerCompose($template),
-            'force_domain_override' => false,
-        ];
-
-        if (!$update) {
-            $payload = array_replace($payload, [
-                'project_uuid' => $this->targetMapping($input, $instance, 'project_uuid'),
-                'environment_name' => $this->targetMapping($input, $instance, 'environment_name') ?: 'production',
-                'environment_uuid' => $this->targetMapping($input, $instance, 'environment_uuid'),
-                'server_uuid' => $this->targetMapping($input, $instance, 'server_uuid'),
-                'destination_uuid' => $this->targetMapping($input, $instance, 'destination_uuid'),
-            ]);
-        }
-
-        return array_filter($payload, static fn($value): bool => $value !== null && $value !== '');
-    }
-
-    private static function yamlScalar(string $value): string
-    {
-        return '"' . str_replace(['\\', '"'], ['\\\\', '\\"'], $value) . '"';
-    }
-
    private function publicLoadBalancerConfig(array $config): array
    {
        unset($config['token']);
@@ -154,12 +154,6 @@ class coolify_schema_bootstrap
        self::ensureModuleConfigDefault('Coolify', 'hetzner_cloud_api_token', '', 'string');
        self::ensureModuleConfigDefault('Coolify', 'public_gateway_host', 'api-v2.truckwash.io', 'string');
        self::ensureModuleConfigDefault('Coolify', 'public_gateway_probe_path', '', 'string');
-        self::ensureModuleConfigDefault('Coolify', 'github_runner_token', '', 'string');
-        self::ensureModuleConfigDefault('Coolify', 'github_runner_service_uuid', '', 'string');
-        self::ensureModuleConfigDefault('Coolify', 'github_runner_frontend_repository', 'copenhagentruckwash/pleno-vue', 'string');
-        self::ensureModuleConfigDefault('Coolify', 'github_runner_backend_repository', 'copenhagentruckwash/api', 'string');
-        self::ensureModuleConfigDefault('Coolify', 'github_runner_labels', 'self-hosted,Linux,X64,default', 'string');
-        self::ensureModuleConfigDefault('Coolify', 'github_runner_count_per_repo', '1', 'int');

        self::ensureDefaultGateway('node1.truckwash.io', '94.130.142.41', 10);
        self::ensureDefaultGateway('node2.truckwash.io', '65.21.214.30', 20);
@@ -6,7 +6,6 @@ class cors_policy
 {
    public const ALLOWED_HEADERS = 'Content-Type, Authorization, X-Customer-Number, X-Release-Trace, X-Release-Channel, X-Frontend-Version, Cache-Control, Pragma, *';
    public const ALLOWED_METHODS = 'GET, POST, PUT, PATCH, DELETE, OPTIONS';
-    public const EXPOSED_HEADERS = 'Server-Timing';
    public const MAX_AGE_SECONDS = '86400';

    private const REQUIRED_ALLOWED_ORIGINS = [
@@ -26,10 +25,6 @@ class cors_policy
        'https://localhost:4433',
        'https://twdev.jeppeb.dk',
        'http://localhost:5173',
-        'http://localhost:5174',
-        'http://127.0.0.1:5173',
-        'http://127.0.0.1:5174',
-        'capacitor://localhost',
    ];

    public static function normalizeOrigin(?string $value): string
@@ -39,7 +34,7 @@ class cors_policy
            return $value;
        }

-        if (preg_match('#^[a-z][a-z0-9+.-]*://#i', $value) !== 1) {
+        if (preg_match('#^https?://#i', $value) !== 1) {
            return '';
        }

@@ -49,7 +44,7 @@ class cors_policy
        }

        $scheme = strtolower((string)$parts['scheme']);
-        if (!in_array($scheme, ['http', 'https', 'capacitor'], true)) {
+        if (!in_array($scheme, ['http', 'https'], true)) {
            return '';
        }

@@ -59,27 +54,6 @@ class cors_policy
        return $scheme . '://' . $host . $port;
    }

-    public static function normalizeRequestOrigin(?string $value): string
-    {
-        $value = trim((string)$value);
-        if ($value === '' || $value === '*') {
-            return '';
-        }
-
-        $parts = parse_url($value);
-        if (!is_array($parts)) {
-            return '';
-        }
-
-        foreach (['user', 'pass', 'path', 'query', 'fragment'] as $disallowedPart) {
-            if (array_key_exists($disallowedPart, $parts)) {
-                return '';
-            }
-        }
-
-        return self::normalizeOrigin($value);
-    }
-
    /**
     * @return array<int,string>
     */
@@ -88,39 +62,6 @@ class cors_policy
        return self::REQUIRED_ALLOWED_ORIGINS;
    }

-    /**
-     * @return array<int,string>
-     */
-    public static function traefikHeadersMiddlewareLabels(string $middlewareName, string $corsConfig = ''): array
-    {
-        $middlewareName = trim($middlewareName);
-        if ($middlewareName === '' || preg_match('/^[a-zA-Z0-9-]+$/', $middlewareName) !== 1) {
-            return [];
-        }
-
-        $allowedHeaders = array_values(array_filter(
-            array_map('trim', explode(',', self::ALLOWED_HEADERS)),
-            static fn(string $header): bool => $header !== '' && $header !== '*'
-        ));
-        $allowedMethods = array_values(array_filter(array_map('trim', explode(',', self::ALLOWED_METHODS))));
-        $exposedHeaders = array_values(array_filter(array_map('trim', explode(',', self::EXPOSED_HEADERS))));
-        $prefix = "traefik.http.middlewares.{$middlewareName}.headers";
-        $allowedOrigins = self::allowedOrigins($corsConfig);
-        $originLabel = $allowedOrigins === ['*']
-            ? "{$prefix}.accesscontrolalloworiginlistregex=^(https?://[^/]+|capacitor://[^/]+)$"
-            : "{$prefix}.accesscontrolalloworiginlist=" . implode(',', $allowedOrigins);
-
-        return [
-            "{$prefix}.accesscontrolallowcredentials=true",
-            "{$prefix}.accesscontrolallowheaders=" . implode(',', $allowedHeaders),
-            "{$prefix}.accesscontrolallowmethods=" . implode(',', $allowedMethods),
-            $originLabel,
-            "{$prefix}.accesscontrolexposeheaders=" . implode(',', $exposedHeaders),
-            "{$prefix}.accesscontrolmaxage=" . self::MAX_AGE_SECONDS,
-            "{$prefix}.addvaryheader=true",
-        ];
-    }
-
    /**
     * @return array<int,string>
     */
@@ -160,8 +101,8 @@ class cors_policy

    public static function isOriginAllowed(?string $origin, string $corsConfig): bool
    {
-        $origin = self::normalizeRequestOrigin($origin);
-        if ($origin === '') {
+        $origin = self::normalizeOrigin($origin);
+        if ($origin === '' || $origin === '*') {
            return false;
        }

@@ -174,7 +115,7 @@ class cors_policy
     */
    public static function responseHeaders(?string $origin, string $corsConfig): array
    {
-        $origin = self::normalizeRequestOrigin($origin);
+        $origin = self::normalizeOrigin($origin);
        if ($origin === '' || !self::isOriginAllowed($origin, $corsConfig)) {
            return [];
        }
@@ -184,9 +125,7 @@ class cors_policy
            'Access-Control-Allow-Credentials' => 'true',
            'Access-Control-Allow-Headers' => self::ALLOWED_HEADERS,
            'Access-Control-Allow-Methods' => self::ALLOWED_METHODS,
-            'Access-Control-Expose-Headers' => self::EXPOSED_HEADERS,
            'Access-Control-Max-Age' => self::MAX_AGE_SECONDS,
-            'Timing-Allow-Origin' => $origin,
            'Vary' => 'Origin',
        ];
    }
@@ -1,58 +0,0 @@
-<?php
-
-namespace classes;
-
-use InvalidArgumentException;
-
-class cron_schedule
-{
-    public static function normalize(array $schedule): array
-    {
-        $type = strtolower(trim((string)($schedule['type'] ?? 'interval')));
-        if ($type !== 'interval') {
-            throw new InvalidArgumentException('Unsupported cron schedule type: ' . $type);
-        }
-
-        $seconds = (int)($schedule['seconds'] ?? $schedule['interval'] ?? 0);
-        if ($seconds < 30 || $seconds > 2678400) {
-            throw new InvalidArgumentException('Cron interval must be between 30 seconds and 31 days.');
-        }
-
-        return [
-            'type' => 'interval',
-            'seconds' => $seconds,
-        ];
-    }
-
-    public static function nextRunAt(array $schedule, ?string $anchorDateTime, int $now): string
-    {
-        $normalized = self::normalize($schedule);
-        $anchor = $anchorDateTime !== null && trim($anchorDateTime) !== ''
-            ? strtotime($anchorDateTime)
-            : false;
-        $base = $anchor !== false ? (int)$anchor : $now;
-        $next = $base + (int)$normalized['seconds'];
-
-        if ($next <= $now) {
-            $missed = (int)floor(($now - $next) / (int)$normalized['seconds']) + 1;
-            $next += $missed * (int)$normalized['seconds'];
-        }
-
-        return date('Y-m-d H:i:s', $next);
-    }
-
-    public static function dueAt(array $schedule, ?string $lastRunAt, int $now, ?int $legacyLastRun = null): string
-    {
-        $normalized = self::normalize($schedule);
-
-        if ($lastRunAt !== null && trim($lastRunAt) !== '') {
-            return self::nextRunAt($normalized, $lastRunAt, $now);
-        }
-
-        if ($legacyLastRun !== null && $legacyLastRun > 0) {
-            return date('Y-m-d H:i:s', $legacyLastRun + (int)$normalized['seconds']);
-        }
-
-        return date('Y-m-d H:i:s', $now);
-    }
-}
@@ -1,702 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-use Throwable;
-
-class cron_scheduler
-{
-    private cron_task_registry $registry;
-    private string $lock_owner;
-
-    public function __construct(?cron_task_registry $registry = null)
-    {
-        $this->registry = $registry ?? new cron_task_registry();
-        $this->lock_owner = gethostname() . ':' . getmypid() . ':' . bin2hex(random_bytes(4));
-    }
-
-    public function listTasks(): array
-    {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $states = $this->stateRows();
-        $estimates = $this->durationEstimates();
-        $tasks = [];
-        $now = time();
-
-        foreach ($this->registry->definitions() as $definition) {
-            $state = $states[$definition->id] ?? [];
-            $schedule = is_array($state['schedule'] ?? null) && $state['schedule'] !== []
-                ? $state['schedule']
-                : $definition->schedule;
-            $nextRunAt = $state['next_run_at'] ?? null;
-            if ($nextRunAt === null || trim((string)$nextRunAt) === '') {
-                $nextRunAt = cron_schedule::dueAt($schedule, $state['last_run_at'] ?? null, $now);
-            }
-
-            $task = $definition->asArray($state + ['next_run_at' => $nextRunAt], $estimates[$definition->id] ?? null);
-            $task['due'] = strtotime($nextRunAt) !== false && strtotime($nextRunAt) <= $now;
-            $task['seconds_until_due'] = max(0, (int)strtotime($nextRunAt) - $now);
-            $tasks[] = $task;
-        }
-
-        return [
-            'tasks' => $tasks,
-            'summary' => [
-                'total' => count($tasks),
-                'enabled' => count(array_filter($tasks, static fn(array $task): bool => (bool)$task['enabled'])),
-                'due' => count(array_filter($tasks, static fn(array $task): bool => (bool)$task['due'] && (bool)$task['enabled'])),
-            ],
-        ];
-    }
-
-    public function listRuns(?string $task_id = null, int $limit = 50): array
-    {
-        $this->ensureReady();
-        $limit = max(1, min(200, $limit));
-
-        $where = '';
-        if ($task_id !== null && trim($task_id) !== '') {
-            $where = "WHERE task_id = " . $this->sql($task_id);
-        }
-
-        return $this->fetchAll(
-            "SELECT * FROM cron_task_runs $where ORDER BY id DESC LIMIT $limit"
-        );
-    }
-
-    public function queueTaskRun(string $task_id_or_legacy_name, ?int $actor_user_id = null, bool $force = false): array
-    {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $definition = $this->registry->get($task_id_or_legacy_name);
-        if ($definition === null) {
-            throw new RuntimeException('Cron task not found.');
-        }
-
-        $state = $this->stateRows()[$definition->id] ?? [];
-        $enabled = (bool)($state['enabled'] ?? $definition->enabled);
-        if (!$enabled && !$force) {
-            throw new RuntimeException('Cron task is disabled.');
-        }
-        if ($this->taskIsLocked($state)) {
-            throw new RuntimeException('Cron task is already running.');
-        }
-
-        $existing = $this->fetchOne(
-            "SELECT * FROM cron_task_runs
-            WHERE task_id = " . $this->sql($definition->id) . " AND status = 'queued'
-            ORDER BY id DESC LIMIT 1"
-        );
-        if ($existing !== null) {
-            $this->markTaskQueued($definition);
-            return $this->publicRun($existing);
-        }
-
-        $scheduled_for = date('Y-m-d H:i:s');
-        $this->query(
-            "INSERT INTO cron_task_runs
-                (task_id, module, source, status, actor_user_id, scheduled_for, force_run)
-            VALUES ("
-                . $this->sql($definition->id) . ', '
-                . $this->sql($definition->module) . ", 'manual', 'queued', "
-                . ($actor_user_id === null ? 'NULL' : (string)(int)$actor_user_id) . ', '
-                . $this->sql($scheduled_for) . ', '
-                . ($force ? '1' : '0')
-            . ")"
-        );
-
-        $run_id = (int)$this->insertId();
-        $this->markTaskQueued($definition);
-
-        return $this->publicRun($this->fetchOne("SELECT * FROM cron_task_runs WHERE id = $run_id") ?? []);
-    }
-
-    public function runDue(string $source = 'automatic'): array
-    {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $ran = [];
-        foreach ($this->queuedRuns() as $queuedRun) {
-            try {
-                $run = $this->runQueuedRun($queuedRun);
-                if ($run !== null) {
-                    $ran[] = $run;
-                }
-            } catch (Throwable $throwable) {
-                $ran[] = [
-                    'task_id' => (string)($queuedRun['task_id'] ?? ''),
-                    'module' => (string)($queuedRun['module'] ?? ''),
-                    'source' => (string)($queuedRun['source'] ?? 'manual'),
-                    'status' => 'skipped',
-                    'error_message' => $throwable->getMessage(),
-                ];
-            }
-        }
-
-        $now = time();
-        $states = $this->stateRows();
-        foreach ($this->registry->definitions() as $definition) {
-            $state = $states[$definition->id] ?? [];
-            if (!(bool)($state['enabled'] ?? $definition->enabled)) {
-                continue;
-            }
-
-            $nextRunAt = (string)($state['next_run_at'] ?? '');
-            if ($nextRunAt === '' || strtotime($nextRunAt) === false || strtotime($nextRunAt) > $now) {
-                continue;
-            }
-
-            try {
-                $ran[] = $this->runTask($definition->id, $source, null, false, $nextRunAt);
-            } catch (Throwable $throwable) {
-                $ran[] = [
-                    'task_id' => $definition->id,
-                    'module' => $definition->module,
-                    'source' => $source,
-                    'status' => 'skipped',
-                    'error_message' => $throwable->getMessage(),
-                ];
-            }
-        }
-
-        return [
-            'ran' => $ran,
-            'count' => count($ran),
-        ];
-    }
-
-    public function markExpiredRunningRuns(): int
-    {
-        $this->ensureReady();
-        $now = date('Y-m-d H:i:s');
-        $message = 'Task lock expired before completion.';
-
-        $this->query(
-            "UPDATE cron_task_runs r
-            INNER JOIN cron_task_state s ON s.task_id = r.task_id AND s.current_run_id = r.id
-            SET r.status = 'timed_out',
-                r.completed_at = COALESCE(s.locked_until, " . $this->sql($now) . "),
-                r.error_message = COALESCE(r.error_message, " . $this->sql($message) . "),
-                s.current_run_id = NULL,
-                s.locked_until = NULL,
-                s.lock_owner = NULL,
-                s.last_status = 'timed_out',
-                s.last_error = " . $this->sql($message) . "
-            WHERE r.status = 'running'
-              AND s.locked_until IS NOT NULL
-              AND s.locked_until < " . $this->sql($now)
-        );
-
-        return $this->affectedRows();
-    }
-
-    public function runTask(
-        string $task_id_or_legacy_name,
-        string $source = 'manual',
-        ?int $actor_user_id = null,
-        bool $force = false,
-        ?string $scheduled_for = null
-    ): array {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $definition = $this->registry->get($task_id_or_legacy_name);
-        if ($definition === null) {
-            throw new RuntimeException('Cron task not found.');
-        }
-
-        $state = $this->stateRows()[$definition->id] ?? [];
-        $enabled = (bool)($state['enabled'] ?? $definition->enabled);
-        if (!$enabled && !$force) {
-            throw new RuntimeException('Cron task is disabled.');
-        }
-
-        if (!$this->claimLock($definition)) {
-            throw new RuntimeException('Cron task is already running.');
-        }
-
-        $started = microtime(true);
-        $started_at = date('Y-m-d H:i:s', (int)$started);
-        $run_id = $this->createRun($definition, $source, $actor_user_id, $scheduled_for, $started_at, $force);
-        $this->query(
-            "UPDATE cron_task_state SET current_run_id = $run_id WHERE task_id = " . $this->sql($definition->id)
-        );
-
-        return $this->executeClaimedRun($definition, $run_id, $started, $scheduled_for);
-    }
-
-    private function executeClaimedRun(
-        cron_task_definition $definition,
-        int $run_id,
-        float $started,
-        ?string $scheduled_for = null
-    ): array
-    {
-        $status = 'succeeded';
-        $summary = [];
-        $error_message = null;
-        $output = '';
-
-        try {
-            if (function_exists('set_time_limit')) {
-                @set_time_limit($definition->timeout_seconds + 30);
-            }
-
-            $this->ensureLegacyFunctionsLoaded($definition);
-            if (!is_callable($definition->handler)) {
-                throw new RuntimeException('Cron task handler is not callable: ' . $definition->handler);
-            }
-
-            ob_start();
-            $result = call_user_func($definition->handler);
-            $output = (string)ob_get_clean();
-            $summary = is_array($result) ? $result : [];
-        } catch (Throwable $throwable) {
-            if (ob_get_level() > 0) {
-                $output .= (string)ob_get_clean();
-            }
-            $status = 'failed';
-            $error_message = $throwable->getMessage();
-        }
-
-        $completed = microtime(true);
-        $duration_ms = (int)round(($completed - $started) * 1000);
-        if ($duration_ms > ($definition->timeout_seconds * 1000) && $status === 'succeeded') {
-            $status = 'timed_out';
-            $error_message = 'Task exceeded its configured timeout window.';
-        }
-
-        if ($output !== '') {
-            $summary['output'] = substr($output, 0, 8000);
-        }
-
-        $completed_at = date('Y-m-d H:i:s', (int)$completed);
-        $this->completeRun($run_id, $status, $completed_at, $duration_ms, $summary, $error_message);
-        $this->releaseLock($definition, $status, $error_message, $completed_at, $scheduled_for);
-
-        return $this->publicRun($this->fetchOne("SELECT * FROM cron_task_runs WHERE id = $run_id") ?? []);
-    }
-
-    public function updateTaskConfig(string $task_id, array $config): array
-    {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $definition = $this->registry->get($task_id);
-        if ($definition === null) {
-            throw new RuntimeException('Cron task not found.');
-        }
-
-        $updates = [];
-        if (array_key_exists('enabled', $config)) {
-            $updates[] = 'enabled = ' . ((bool)$config['enabled'] ? '1' : '0');
-        }
-
-        if (array_key_exists('schedule', $config)) {
-            $schedule = $config['schedule'] === null ? null : cron_schedule::normalize((array)$config['schedule']);
-            $updates[] = 'schedule_json = ' . ($schedule === null ? 'NULL' : $this->sql(json_encode($schedule)));
-            $anchor = (string)($this->fetchOne("SELECT last_run_at FROM cron_task_state WHERE task_id = " . $this->sql($definition->id))['last_run_at'] ?? '');
-            $updates[] = 'next_run_at = ' . $this->sql(cron_schedule::dueAt($schedule ?? $definition->schedule, $anchor !== '' ? $anchor : null, time()));
-        }
-
-        if ($updates !== []) {
-            $this->query(
-                "UPDATE cron_task_state SET " . implode(', ', $updates) . " WHERE task_id = " . $this->sql($definition->id)
-            );
-        }
-
-        return $this->listTasks();
-    }
-
-    private function ensureReady(): void
-    {
-        cron_schema_bootstrap::ensureTables();
-    }
-
-    private function syncDefinitions(): void
-    {
-        $now = time();
-        foreach ($this->registry->definitions() as $definition) {
-            $row = $this->fetchOne(
-                "SELECT * FROM cron_task_state WHERE task_id = " . $this->sql($definition->id)
-            );
-            if ($row !== null) {
-                continue;
-            }
-
-            $legacyLastRun = $this->legacyLastRun($definition);
-            $nextRunAt = cron_schedule::dueAt($definition->schedule, null, $now, $legacyLastRun);
-            $this->query(
-                "INSERT INTO cron_task_state (task_id, module, enabled, schedule_json, next_run_at)
-                VALUES ("
-                . $this->sql($definition->id) . ', '
-                . $this->sql($definition->module) . ', '
-                . ($definition->enabled ? '1' : '0') . ', NULL, '
-                . $this->sql($nextRunAt)
-                . ")"
-            );
-        }
-    }
-
-    private function legacyLastRun(cron_task_definition $definition): ?int
-    {
-        if ($definition->legacy_name === null || !defined('redis')) {
-            return null;
-        }
-
-        try {
-            $last_run = redis->get_last_crond_run($definition->legacy_name);
-            return $last_run !== null ? (int)$last_run : null;
-        } catch (Throwable) {
-            return null;
-        }
-    }
-
-    private function claimLock(cron_task_definition $definition): bool
-    {
-        $now = date('Y-m-d H:i:s');
-        $locked_until = date('Y-m-d H:i:s', time() + $definition->timeout_seconds + 60);
-        $this->query(
-            "UPDATE cron_task_state
-            SET locked_until = " . $this->sql($locked_until) . ",
-                lock_owner = " . $this->sql($this->lock_owner) . "
-            WHERE task_id = " . $this->sql($definition->id) . "
-              AND (locked_until IS NULL OR locked_until < " . $this->sql($now) . ")"
-        );
-
-        return $this->affectedRows() === 1;
-    }
-
-    private function taskIsLocked(array $state): bool
-    {
-        $lockedUntil = (string)($state['locked_until'] ?? '');
-        return $lockedUntil !== ''
-            && strtotime($lockedUntil) !== false
-            && strtotime($lockedUntil) >= time();
-    }
-
-    private function markTaskQueued(cron_task_definition $definition): void
-    {
-        $now = date('Y-m-d H:i:s');
-        $this->query(
-            "UPDATE cron_task_state
-            SET last_status = 'queued',
-                last_error = NULL,
-                next_run_at = CASE
-                    WHEN next_run_at IS NULL OR next_run_at > " . $this->sql($now) . " THEN " . $this->sql($now) . "
-                    ELSE next_run_at
-                END
-            WHERE task_id = " . $this->sql($definition->id)
-        );
-    }
-
-    /**
-     * @return array<int, array<string, mixed>>
-     */
-    private function queuedRuns(): array
-    {
-        return $this->fetchAll("SELECT * FROM cron_task_runs WHERE status = 'queued' ORDER BY id ASC LIMIT 50");
-    }
-
-    private function runQueuedRun(array $queuedRun): ?array
-    {
-        $run_id = (int)($queuedRun['id'] ?? 0);
-        $definition = $this->registry->get((string)($queuedRun['task_id'] ?? ''));
-        if ($run_id < 1 || $definition === null) {
-            if ($run_id > 0) {
-                $this->skipQueuedRun($run_id, 'Cron task not found.');
-                return $this->publicRun($this->fetchOne("SELECT * FROM cron_task_runs WHERE id = $run_id") ?? []);
-            }
-            return null;
-        }
-
-        $force = (bool)($queuedRun['force_run'] ?? false);
-        $state = $this->stateRows()[$definition->id] ?? [];
-        $enabled = (bool)($state['enabled'] ?? $definition->enabled);
-        if (!$enabled && !$force) {
-            $this->skipQueuedRun($run_id, 'Cron task is disabled.', $definition);
-            return $this->publicRun($this->fetchOne("SELECT * FROM cron_task_runs WHERE id = $run_id") ?? []);
-        }
-
-        if (!$this->claimLock($definition)) {
-            return null;
-        }
-
-        $started = microtime(true);
-        $started_at = date('Y-m-d H:i:s', (int)$started);
-        $this->query(
-            "UPDATE cron_task_runs
-            SET status = 'running',
-                started_at = " . $this->sql($started_at) . ",
-                lock_owner = " . $this->sql($this->lock_owner) . "
-            WHERE id = $run_id AND status = 'queued'"
-        );
-
-        if ($this->affectedRows() !== 1) {
-            $this->clearClaimedLock($definition);
-            return null;
-        }
-
-        $this->query(
-            "UPDATE cron_task_state SET current_run_id = $run_id WHERE task_id = " . $this->sql($definition->id)
-        );
-
-        return $this->executeClaimedRun(
-            $definition,
-            $run_id,
-            $started,
-            isset($queuedRun['scheduled_for']) ? (string)$queuedRun['scheduled_for'] : null
-        );
-    }
-
-    private function skipQueuedRun(int $run_id, string $message, ?cron_task_definition $definition = null): void
-    {
-        $completed_at = date('Y-m-d H:i:s');
-        $this->query(
-            "UPDATE cron_task_runs
-            SET status = 'skipped',
-                completed_at = " . $this->sql($completed_at) . ",
-                duration_ms = 0,
-                error_message = " . $this->sql($message) . "
-            WHERE id = $run_id AND status = 'queued'"
-        );
-        $updated = $this->affectedRows() === 1;
-        if (!$updated || $definition === null) {
-            return;
-        }
-
-        $this->query(
-            "UPDATE cron_task_state
-            SET last_status = 'skipped',
-                last_error = " . $this->sql($message) . "
-            WHERE task_id = " . $this->sql($definition->id)
-        );
-    }
-
-    private function clearClaimedLock(cron_task_definition $definition): void
-    {
-        $this->query(
-            "UPDATE cron_task_state
-            SET locked_until = NULL,
-                lock_owner = NULL
-            WHERE task_id = " . $this->sql($definition->id) . "
-              AND lock_owner = " . $this->sql($this->lock_owner)
-        );
-    }
-
-    private function releaseLock(
-        cron_task_definition $definition,
-        string $status,
-        ?string $error_message,
-        string $completed_at,
-        ?string $scheduled_for = null
-    ): void
-    {
-        $state = $this->fetchOne("SELECT schedule_json FROM cron_task_state WHERE task_id = " . $this->sql($definition->id));
-        $schedule = $this->decodeJson($state['schedule_json'] ?? null);
-        if ($schedule === []) {
-            $schedule = $definition->schedule;
-        }
-
-        // Automatic runs stay anchored to their intended schedule slot. Anchoring
-        // to completion time causes every task to drift by its execution time.
-        $scheduleAnchor = $scheduled_for !== null && strtotime($scheduled_for) !== false
-            ? $scheduled_for
-            : $completed_at;
-        $nextRunAt = cron_schedule::nextRunAt($schedule, $scheduleAnchor, time());
-        if ($status !== 'succeeded') {
-            $retrySeconds = min(300, max(60, (int)$schedule['seconds']));
-            $nextRunAt = date('Y-m-d H:i:s', time() + $retrySeconds);
-        }
-
-        $this->query(
-            "UPDATE cron_task_state
-            SET last_run_at = " . $this->sql($completed_at) . ",
-                next_run_at = " . $this->sql($nextRunAt) . ",
-                locked_until = NULL,
-                lock_owner = NULL,
-                current_run_id = NULL,
-                last_status = " . $this->sql($status) . ",
-                last_error = " . $this->nullableSql($error_message) . "
-            WHERE task_id = " . $this->sql($definition->id) . "
-              AND lock_owner = " . $this->sql($this->lock_owner)
-        );
-
-        if ($definition->legacy_name !== null && defined('redis')) {
-            try {
-                redis->set_last_crond_run($definition->legacy_name, time());
-            } catch (Throwable) {
-            }
-        }
-    }
-
-    private function createRun(
-        cron_task_definition $definition,
-        string $source,
-        ?int $actor_user_id,
-        ?string $scheduled_for,
-        string $started_at,
-        bool $force = false
-    ): int {
-        $this->query(
-            "INSERT INTO cron_task_runs
-                (task_id, module, source, status, actor_user_id, scheduled_for, started_at, lock_owner, force_run)
-            VALUES ("
-                . $this->sql($definition->id) . ', '
-                . $this->sql($definition->module) . ', '
-                . $this->sql($source) . ", 'running', "
-                . ($actor_user_id === null ? 'NULL' : (string)(int)$actor_user_id) . ', '
-                . $this->nullableSql($scheduled_for) . ', '
-                . $this->sql($started_at) . ', '
-                . $this->sql($this->lock_owner) . ', '
-                . ($force ? '1' : '0')
-            . ")"
-        );
-
-        return $this->insertId();
-    }
-
-    private function completeRun(
-        int $run_id,
-        string $status,
-        string $completed_at,
-        int $duration_ms,
-        array $summary,
-        ?string $error_message
-    ): void {
-        $this->query(
-            "UPDATE cron_task_runs
-            SET status = " . $this->sql($status) . ",
-                completed_at = " . $this->sql($completed_at) . ",
-                duration_ms = " . (string)$duration_ms . ",
-                summary_json = " . $this->sql(json_encode($summary, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)) . ",
-                error_message = " . $this->nullableSql($error_message) . "
-            WHERE id = " . (string)$run_id
-        );
-    }
-
-    private function ensureLegacyFunctionsLoaded(cron_task_definition $definition): void
-    {
-        if (function_exists($definition->handler)) {
-            return;
-        }
-
-        if (!defined('WD')) {
-            return;
-        }
-
-        if (!defined('CRON_LOAD_LEGACY_FUNCTIONS_ONLY')) {
-            define('CRON_LOAD_LEGACY_FUNCTIONS_ONLY', true);
-        }
-
-        require_once WD . '/cron/Cron.php';
-    }
-
-    /**
-     * @return array<string, array<string, mixed>>
-     */
-    private function stateRows(): array
-    {
-        $rows = $this->fetchAll("SELECT * FROM cron_task_state");
-        $states = [];
-        foreach ($rows as $row) {
-            $row['enabled'] = (bool)$row['enabled'];
-            $row['schedule'] = $this->decodeJson($row['schedule_json'] ?? null);
-            $states[(string)$row['task_id']] = $row;
-        }
-        return $states;
-    }
-
-    /**
-     * @return array<string, int>
-     */
-    private function durationEstimates(): array
-    {
-        $rows = $this->fetchAll(
-            "SELECT task_id, AVG(duration_ms) AS avg_duration_ms
-            FROM (
-                SELECT task_id, duration_ms
-                FROM cron_task_runs
-                WHERE status = 'succeeded' AND duration_ms IS NOT NULL
-                ORDER BY id DESC
-                LIMIT 500
-            ) recent_runs
-            GROUP BY task_id"
-        );
-
-        $estimates = [];
-        foreach ($rows as $row) {
-            $estimates[(string)$row['task_id']] = (int)round((float)$row['avg_duration_ms']);
-        }
-        return $estimates;
-    }
-
-    private function decodeJson(mixed $json): array
-    {
-        if (!is_string($json) || trim($json) === '') {
-            return [];
-        }
-        $decoded = json_decode($json, true);
-        return is_array($decoded) ? $decoded : [];
-    }
-
-    private function publicRun(array $run): array
-    {
-        if ($run === []) {
-            return [];
-        }
-
-        $run['force_run'] = (bool)($run['force_run'] ?? false);
-        $run['summary'] = $this->decodeJson($run['summary_json'] ?? null);
-        return $run;
-    }
-
-    private function fetchOne(string $sql): ?array
-    {
-        $rows = $this->fetchAll($sql);
-        return $rows[0] ?? null;
-    }
-
-    private function fetchAll(string $sql): array
-    {
-        $result = $this->query($sql);
-        if ($result === false || $result === true) {
-            return [];
-        }
-        return $result->fetch_all(MYSQLI_ASSOC);
-    }
-
-    private function query(string $sql): \mysqli_result|bool
-    {
-        global $db;
-        return $db->query($sql);
-    }
-
-    private function sql(string $value): string
-    {
-        global $db;
-        return "'" . $db->escape_string($value) . "'";
-    }
-
-    private function nullableSql(?string $value): string
-    {
-        return $value === null ? 'NULL' : $this->sql($value);
-    }
-
-    private function affectedRows(): int
-    {
-        global $db;
-        return (int)$db->conn()->affected_rows;
-    }
-
-    private function insertId(): int
-    {
-        global $db;
-        return (int)$db->insert_id();
-    }
-}
@@ -1,121 +0,0 @@
-<?php
-
-namespace classes;
-
-class cron_schema_bootstrap
-{
-    private static bool $initialized = false;
-
-    public static function ensureTables(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS cron_task_state (
-                task_id VARCHAR(191) NOT NULL PRIMARY KEY,
-                module VARCHAR(64) NOT NULL,
-                enabled TINYINT(1) NOT NULL DEFAULT 1,
-                schedule_json LONGTEXT NULL,
-                last_run_at DATETIME NULL,
-                next_run_at DATETIME NULL,
-                locked_until DATETIME NULL,
-                lock_owner VARCHAR(191) NULL,
-                current_run_id BIGINT UNSIGNED NULL,
-                last_status VARCHAR(32) NULL,
-                last_error TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_cron_task_state_next_run (enabled, next_run_at),
-                KEY idx_cron_task_state_lock (locked_until)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS cron_task_runs (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                task_id VARCHAR(191) NOT NULL,
-                module VARCHAR(64) NOT NULL,
-                source VARCHAR(32) NOT NULL,
-                status VARCHAR(32) NOT NULL DEFAULT 'running',
-                actor_user_id INT NULL,
-                scheduled_for DATETIME NULL,
-                started_at DATETIME NULL,
-                completed_at DATETIME NULL,
-                duration_ms INT UNSIGNED NULL,
-                summary_json LONGTEXT NULL,
-                error_message TEXT NULL,
-                lock_owner VARCHAR(191) NULL,
-                force_run TINYINT(1) NOT NULL DEFAULT 0,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_cron_task_runs_task_created (task_id, created_at),
-                KEY idx_cron_task_runs_status_created (status, created_at),
-                KEY idx_cron_task_runs_module_created (module, created_at)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-        self::ensureColumn('cron_task_runs', 'force_run', 'TINYINT(1) NOT NULL DEFAULT 0 AFTER lock_owner');
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS cron_worker_state (
-                worker_id VARCHAR(191) NOT NULL PRIMARY KEY,
-                name VARCHAR(191) NOT NULL,
-                hostname VARCHAR(191) NULL,
-                pid INT UNSIGNED NULL,
-                source VARCHAR(64) NOT NULL DEFAULT 'coolify_worker',
-                status VARCHAR(32) NOT NULL DEFAULT 'starting',
-                release_channel_id BIGINT UNSIGNED NULL,
-                release_target_id BIGINT UNSIGNED NULL,
-                coolify_resource_uuid VARCHAR(128) NULL,
-                coolify_resource_type VARCHAR(32) NULL,
-                commit_sha VARCHAR(64) NULL,
-                poll_seconds INT UNSIGNED NOT NULL DEFAULT 15,
-                last_run_count INT UNSIGNED NOT NULL DEFAULT 0,
-                last_stale_run_count INT UNSIGNED NOT NULL DEFAULT 0,
-                last_error TEXT NULL,
-                started_at DATETIME NULL,
-                last_heartbeat_at DATETIME NULL,
-                last_loop_started_at DATETIME NULL,
-                last_loop_finished_at DATETIME NULL,
-                last_loop_gap_seconds INT UNSIGNED NULL,
-                consecutive_minute_loops INT UNSIGNED NOT NULL DEFAULT 0,
-                stopped_at DATETIME NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_cron_worker_state_heartbeat (last_heartbeat_at),
-                KEY idx_cron_worker_state_status (status),
-                KEY idx_cron_worker_state_release_target (release_target_id),
-                KEY idx_cron_worker_state_coolify_resource (coolify_resource_uuid)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-        self::ensureColumn('cron_worker_state', 'last_loop_gap_seconds', 'INT UNSIGNED NULL AFTER last_loop_finished_at');
-        self::ensureColumn('cron_worker_state', 'consecutive_minute_loops', 'INT UNSIGNED NOT NULL DEFAULT 0 AFTER last_loop_gap_seconds');
-
-        self::$initialized = true;
-    }
-
-    private static function ensureColumn(string $table, string $column, string $definition): void
-    {
-        global $db;
-
-        $table = preg_replace('/[^a-zA-Z0-9_]/', '', $table);
-        $column = preg_replace('/[^a-zA-Z0-9_]/', '', $column);
-        if ($table === '' || $column === '') {
-            return;
-        }
-
-        $result = $db->query("SHOW COLUMNS FROM `{$table}` LIKE '{$column}'");
-        if ($result && $result->num_rows > 0) {
-            return;
-        }
-
-        $db->query("ALTER TABLE `{$table}` ADD COLUMN `{$column}` {$definition}");
-    }
-}
@@ -1,85 +0,0 @@
-<?php
-
-namespace classes;
-
-use InvalidArgumentException;
-
-class cron_task_definition
-{
-    public string $id;
-    public string $name;
-    public string $description;
-    public string $module;
-    public string $handler;
-    public array $schedule;
-    public bool $enabled;
-    public int $timeout_seconds;
-    public int $estimated_duration_ms;
-    public int $priority;
-    public ?string $legacy_name;
-
-    public function __construct(array $definition)
-    {
-        $this->id = self::requiredString($definition, 'id');
-        $this->name = self::requiredString($definition, 'name');
-        $this->description = (string)($definition['description'] ?? '');
-        $this->module = self::requiredString($definition, 'module');
-        $this->handler = self::requiredString($definition, 'handler');
-        $this->schedule = cron_schedule::normalize($definition['schedule'] ?? []);
-        $this->enabled = (bool)($definition['enabled'] ?? true);
-        $this->timeout_seconds = max(30, (int)($definition['timeout_seconds'] ?? 600));
-        $this->estimated_duration_ms = max(0, (int)($definition['estimated_duration_ms'] ?? 0));
-        $this->priority = (int)($definition['priority'] ?? 100);
-        $legacy_name = trim((string)($definition['legacy_name'] ?? ''));
-        $this->legacy_name = $legacy_name !== '' ? $legacy_name : null;
-
-        if (!preg_match('/^[a-z0-9][a-z0-9_.-]{1,190}$/', $this->id)) {
-            throw new InvalidArgumentException('Invalid cron task id: ' . $this->id);
-        }
-        if (!preg_match('/^[a-z0-9][a-z0-9_-]{1,63}$/', $this->module)) {
-            throw new InvalidArgumentException('Invalid cron task module: ' . $this->module);
-        }
-    }
-
-    public function asArray(?array $state = null, ?int $estimatedDurationMs = null): array
-    {
-        $schedule = is_array($state['schedule'] ?? null) && ($state['schedule'] ?? []) !== []
-            ? $state['schedule']
-            : $this->schedule;
-        $enabled = array_key_exists('enabled', $state ?? [])
-            ? (bool)$state['enabled']
-            : $this->enabled;
-
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'description' => $this->description,
-            'module' => $this->module,
-            'handler' => $this->handler,
-            'schedule' => $schedule,
-            'default_schedule' => $this->schedule,
-            'enabled' => $enabled,
-            'default_enabled' => $this->enabled,
-            'timeout_seconds' => $this->timeout_seconds,
-            'estimated_duration_ms' => $estimatedDurationMs ?? $this->estimated_duration_ms,
-            'priority' => $this->priority,
-            'legacy_name' => $this->legacy_name,
-            'last_run_at' => $state['last_run_at'] ?? null,
-            'next_run_at' => $state['next_run_at'] ?? null,
-            'locked_until' => $state['locked_until'] ?? null,
-            'lock_owner' => $state['lock_owner'] ?? null,
-            'current_run_id' => $state['current_run_id'] ?? null,
-            'last_status' => $state['last_status'] ?? null,
-            'last_error' => $state['last_error'] ?? null,
-        ];
-    }
-
-    private static function requiredString(array $definition, string $key): string
-    {
-        $value = trim((string)($definition[$key] ?? ''));
-        if ($value === '') {
-            throw new InvalidArgumentException('Missing cron task definition field: ' . $key);
-        }
-        return $value;
-    }
-}
@@ -1,85 +0,0 @@
-<?php
-
-namespace classes;
-
-use InvalidArgumentException;
-
-class cron_task_registry
-{
-    private string $modules_root;
-
-    /** @var array<string, cron_task_definition>|null */
-    private ?array $definitions = null;
-
-    public function __construct(?string $modules_root = null)
-    {
-        $this->modules_root = $modules_root ?? (defined('WD') ? WD . '/modules' : dirname(__DIR__) . '/modules');
-    }
-
-    /**
-     * @return array<string, cron_task_definition>
-     */
-    public function definitions(): array
-    {
-        if ($this->definitions !== null) {
-            return $this->definitions;
-        }
-
-        $definitions = [];
-        foreach ($this->definitionFiles() as $file) {
-            $module_definitions = require $file;
-            if (!is_array($module_definitions)) {
-                throw new InvalidArgumentException('Cron definition file must return an array: ' . $file);
-            }
-
-            foreach ($module_definitions as $definition) {
-                $task = new cron_task_definition($definition);
-                if (isset($definitions[$task->id])) {
-                    throw new InvalidArgumentException('Duplicate cron task id: ' . $task->id);
-                }
-                $definitions[$task->id] = $task;
-            }
-        }
-
-        uasort($definitions, static function (cron_task_definition $left, cron_task_definition $right): int {
-            if ($left->priority !== $right->priority) {
-                return $left->priority <=> $right->priority;
-            }
-            return strcmp($left->id, $right->id);
-        });
-
-        $this->definitions = $definitions;
-        return $definitions;
-    }
-
-    public function get(string $id_or_legacy_name): ?cron_task_definition
-    {
-        $normalized = trim($id_or_legacy_name);
-        if ($normalized === '') {
-            return null;
-        }
-
-        $definitions = $this->definitions();
-        if (isset($definitions[$normalized])) {
-            return $definitions[$normalized];
-        }
-
-        foreach ($definitions as $definition) {
-            if ($definition->legacy_name !== null && hash_equals($definition->legacy_name, $normalized)) {
-                return $definition;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @return array<int, string>
-     */
-    private function definitionFiles(): array
-    {
-        $files = glob($this->modules_root . '/*/cron/tasks.php') ?: [];
-        sort($files, SORT_STRING);
-        return $files;
-    }
-}
@@ -1,361 +0,0 @@
-<?php
-
-namespace classes;
-
-use Throwable;
-use traits\boolean_normalization_t;
-
-require_once __DIR__ . '/../traits/boolean_normalization_t.php';
-
-class cron_worker
-{
-    use boolean_normalization_t;
-
-    private cron_scheduler $scheduler;
-    private string $worker_id;
-    private string $name;
-    private string $source;
-    private int $poll_seconds;
-    private int $heartbeat_seconds;
-    private int $max_runtime_seconds;
-    private bool $should_stop = false;
-    private int $last_heartbeat = 0;
-
-    public function __construct(?cron_scheduler $scheduler = null, array $options = [])
-    {
-        $this->scheduler = $scheduler ?? new cron_scheduler();
-        $this->name = $this->stringOption($options, 'name', 'CRON_WORKER_NAME', 'cron-worker');
-        $this->worker_id = $this->stringOption($options, 'worker_id', 'CRON_WORKER_ID', $this->name);
-        $this->source = $this->stringOption($options, 'source', 'CRON_WORKER_SOURCE', 'coolify_worker');
-        $this->poll_seconds = $this->intOption($options, 'poll_seconds', 'CRON_WORKER_POLL_SECONDS', 15, 1, 300);
-        $this->heartbeat_seconds = $this->intOption($options, 'heartbeat_seconds', 'CRON_WORKER_HEARTBEAT_SECONDS', 30, 5, 300);
-        $this->max_runtime_seconds = $this->intOption($options, 'max_runtime_seconds', 'CRON_WORKER_MAX_RUNTIME_SECONDS', 0, 0, 86400);
-    }
-
-    public function run(): int
-    {
-        if (!$this->boolOption('CRON_WORKER_ENABLED', true)) {
-            $this->heartbeat('disabled', 0, 0, null, true);
-            return 0;
-        }
-
-        $this->registerSignalHandlers();
-        $started = time();
-        $this->heartbeat('starting', 0, 0, null, true);
-
-        while (!$this->should_stop) {
-            $pollStarted = microtime(true);
-            $result = $this->tick();
-            $this->writeStatusLine($result);
-
-            if ($this->max_runtime_seconds > 0 && time() - $started >= $this->max_runtime_seconds) {
-                $this->should_stop = true;
-                break;
-            }
-
-            $this->sleepUntilNextPoll($pollStarted + $this->poll_seconds);
-        }
-
-        $this->heartbeat('stopped', 0, 0, null, true, true);
-        return 0;
-    }
-
-    public function tick(): array
-    {
-        $this->heartbeat('running');
-        $loopStartedAt = date('Y-m-d H:i:s');
-        $staleRuns = 0;
-        $ran = ['count' => 0, 'ran' => []];
-        $error = null;
-        $status = 'running';
-
-        try {
-            $staleRuns = $this->scheduler->markExpiredRunningRuns();
-            $ran = $this->scheduler->runDue($this->source);
-        } catch (Throwable $throwable) {
-            $status = 'failed';
-            $error = $throwable->getMessage();
-        }
-
-        $this->heartbeat($status, (int)($ran['count'] ?? 0), $staleRuns, $error, true, false, $loopStartedAt);
-
-        return [
-            'worker_id' => $this->worker_id,
-            'status' => $status,
-            'ran' => (int)($ran['count'] ?? 0),
-            'stale_runs' => $staleRuns,
-            'error' => $error,
-        ];
-    }
-
-    public function listWorkers(): array
-    {
-        cron_schema_bootstrap::ensureTables();
-        $rows = $this->fetchAll('SELECT * FROM cron_worker_state ORDER BY last_heartbeat_at DESC, worker_id');
-        $workers = [];
-        foreach ($rows as $row) {
-            $workers[] = $this->publicWorker($row);
-        }
-
-        return [
-            'workers' => $workers,
-            'summary' => [
-                'total' => count($workers),
-                'running' => count(array_filter($workers, static fn(array $worker): bool => ($worker['status'] ?? '') === 'running')),
-                'stale' => count(array_filter($workers, static fn(array $worker): bool => (bool)($worker['stale'] ?? false))),
-            ],
-        ];
-    }
-
-    private function registerSignalHandlers(): void
-    {
-        if (!function_exists('pcntl_signal')) {
-            return;
-        }
-
-        if (function_exists('pcntl_async_signals')) {
-            pcntl_async_signals(true);
-        }
-
-        pcntl_signal(SIGTERM, function (): void {
-            $this->should_stop = true;
-        });
-        pcntl_signal(SIGINT, function (): void {
-            $this->should_stop = true;
-        });
-    }
-
-    private function sleepUntilNextPoll(float $nextPollAt): void
-    {
-        while (!$this->should_stop) {
-            $remaining = $nextPollAt - microtime(true);
-            if ($remaining <= 0) {
-                return;
-            }
-            usleep((int)(min(1.0, $remaining) * 1000000));
-            if (time() - $this->last_heartbeat >= $this->heartbeat_seconds) {
-                $this->heartbeat('running');
-            }
-        }
-    }
-
-    private function heartbeat(
-        string $status,
-        int $runCount = 0,
-        int $staleRunCount = 0,
-        ?string $error = null,
-        bool $force = false,
-        bool $stopped = false,
-        ?string $loopStartedAt = null
-    ): void {
-        if (!$force && time() - $this->last_heartbeat < $this->heartbeat_seconds) {
-            return;
-        }
-
-        cron_schema_bootstrap::ensureTables();
-        $this->last_heartbeat = time();
-        $now = date('Y-m-d H:i:s');
-        $workerId = $this->sql($this->worker_id);
-        $name = $this->sql($this->name);
-        $hostname = $this->nullableSql(gethostname() ?: null);
-        $pid = getmypid() ?: 0;
-        $source = $this->sql($this->source);
-        $statusSql = $this->sql($status);
-        $releaseChannelId = $this->nullableInt($this->env('CRON_WORKER_RELEASE_CHANNEL_ID'));
-        $releaseTargetId = $this->nullableInt($this->env('CRON_WORKER_RELEASE_TARGET_ID'));
-        $resourceUuid = $this->nullableSql($this->env('COOLIFY_RESOURCE_UUID') ?: $this->env('CRON_WORKER_COOLIFY_RESOURCE_UUID'));
-        $resourceType = $this->nullableSql($this->env('COOLIFY_RESOURCE_TYPE') ?: $this->env('CRON_WORKER_COOLIFY_RESOURCE_TYPE') ?: 'application');
-        $commitSha = $this->nullableSql($this->commitSha());
-        $errorSql = $this->nullableSql($error);
-        $loopStarted = $this->nullableSql($loopStartedAt);
-        $stoppedAt = $stopped ? $this->sql($now) : 'NULL';
-        $nowSql = $this->sql($now);
-
-        $this->query(
-            "INSERT INTO cron_worker_state (
-                worker_id, name, hostname, pid, source, status, release_channel_id, release_target_id,
-                coolify_resource_uuid, coolify_resource_type, commit_sha, poll_seconds, last_run_count,
-                last_stale_run_count, last_error, started_at, last_heartbeat_at, last_loop_started_at,
-                last_loop_finished_at, last_loop_gap_seconds, consecutive_minute_loops, stopped_at
-            ) VALUES (
-                $workerId, $name, $hostname, $pid, $source, $statusSql, $releaseChannelId, $releaseTargetId,
-                $resourceUuid, $resourceType, $commitSha, $this->poll_seconds, $runCount,
-                $staleRunCount, $errorSql, $nowSql, $nowSql, $loopStarted,
-                $nowSql, NULL, " . ($loopStartedAt !== null ? '1' : '0') . ", $stoppedAt
-            )
-            ON DUPLICATE KEY UPDATE
-                name = VALUES(name),
-                hostname = VALUES(hostname),
-                pid = VALUES(pid),
-                source = VALUES(source),
-                status = VALUES(status),
-                release_channel_id = VALUES(release_channel_id),
-                release_target_id = VALUES(release_target_id),
-                coolify_resource_uuid = VALUES(coolify_resource_uuid),
-                coolify_resource_type = VALUES(coolify_resource_type),
-                commit_sha = VALUES(commit_sha),
-                poll_seconds = VALUES(poll_seconds),
-                last_run_count = VALUES(last_run_count),
-                last_stale_run_count = VALUES(last_stale_run_count),
-                last_error = VALUES(last_error),
-                last_heartbeat_at = VALUES(last_heartbeat_at),
-                last_loop_gap_seconds = CASE
-                    WHEN VALUES(last_loop_started_at) IS NULL OR last_loop_started_at IS NULL THEN last_loop_gap_seconds
-                    ELSE GREATEST(0, TIMESTAMPDIFF(SECOND, last_loop_started_at, VALUES(last_loop_started_at)))
-                END,
-                consecutive_minute_loops = CASE
-                    WHEN VALUES(last_loop_started_at) IS NULL THEN consecutive_minute_loops
-                    WHEN last_loop_started_at IS NULL THEN 1
-                    WHEN TIMESTAMPDIFF(SECOND, last_loop_started_at, VALUES(last_loop_started_at)) BETWEEN 0 AND 60
-                        THEN consecutive_minute_loops + 1
-                    ELSE 1
-                END,
-                last_loop_started_at = COALESCE(VALUES(last_loop_started_at), last_loop_started_at),
-                last_loop_finished_at = VALUES(last_loop_finished_at),
-                stopped_at = VALUES(stopped_at)"
-        );
-    }
-
-    private function publicWorker(array $row): array
-    {
-        $heartbeatAt = (string)($row['last_heartbeat_at'] ?? '');
-        $heartbeatTs = strtotime($heartbeatAt);
-        $threshold = max(60, ((int)($row['poll_seconds'] ?? 15) * 4) + 30);
-        $age = $heartbeatTs !== false ? max(0, time() - $heartbeatTs) : null;
-        $loopStartedAt = (string)($row['last_loop_started_at'] ?? '');
-        $loopStartedTs = strtotime($loopStartedAt);
-        $loopAge = $loopStartedTs !== false ? max(0, time() - $loopStartedTs) : null;
-        $loopGap = isset($row['last_loop_gap_seconds']) ? (int)$row['last_loop_gap_seconds'] : null;
-        $consecutiveMinuteLoops = (int)($row['consecutive_minute_loops'] ?? 0);
-        $minuteCadenceVerified = ($row['status'] ?? '') === 'running'
-            && $loopAge !== null
-            && $loopAge <= 60
-            && $loopGap !== null
-            && $loopGap <= 60
-            && $consecutiveMinuteLoops >= 2;
-
-        return [
-            'worker_id' => (string)($row['worker_id'] ?? ''),
-            'name' => (string)($row['name'] ?? ''),
-            'hostname' => $row['hostname'] ?? null,
-            'pid' => isset($row['pid']) ? (int)$row['pid'] : null,
-            'source' => (string)($row['source'] ?? ''),
-            'status' => (string)($row['status'] ?? 'unknown'),
-            'release_channel_id' => isset($row['release_channel_id']) ? (int)$row['release_channel_id'] : null,
-            'release_target_id' => isset($row['release_target_id']) ? (int)$row['release_target_id'] : null,
-            'coolify_resource_uuid' => $row['coolify_resource_uuid'] ?? null,
-            'coolify_resource_type' => $row['coolify_resource_type'] ?? null,
-            'commit_sha' => $row['commit_sha'] ?? null,
-            'poll_seconds' => (int)($row['poll_seconds'] ?? 0),
-            'last_run_count' => (int)($row['last_run_count'] ?? 0),
-            'last_stale_run_count' => (int)($row['last_stale_run_count'] ?? 0),
-            'last_error' => $row['last_error'] ?? null,
-            'started_at' => $row['started_at'] ?? null,
-            'last_heartbeat_at' => $heartbeatAt !== '' ? $heartbeatAt : null,
-            'last_heartbeat_age_seconds' => $age,
-            'last_loop_started_at' => $row['last_loop_started_at'] ?? null,
-            'last_loop_finished_at' => $row['last_loop_finished_at'] ?? null,
-            'last_loop_age_seconds' => $loopAge,
-            'last_loop_gap_seconds' => $loopGap,
-            'consecutive_minute_loops' => $consecutiveMinuteLoops,
-            'minute_cadence' => [
-                'verified' => $minuteCadenceVerified,
-                'maximum_gap_seconds' => 60,
-                'last_gap_seconds' => $loopGap,
-                'consecutive_loops' => $consecutiveMinuteLoops,
-            ],
-            'stopped_at' => $row['stopped_at'] ?? null,
-            'stale' => $age === null || $age > $threshold,
-            'stale_after_seconds' => $threshold,
-        ];
-    }
-
-    private function writeStatusLine(array $result): void
-    {
-        echo '[' . date('Y-m-d H:i:s') . '][CRON_WORKER] '
-            . json_encode($result, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
-            . PHP_EOL;
-    }
-
-    private function stringOption(array $options, string $key, string $env, string $default): string
-    {
-        $value = trim((string)($options[$key] ?? $this->env($env) ?? ''));
-        return $value !== '' ? $value : $default;
-    }
-
-    private function intOption(array $options, string $key, string $env, int $default, int $min, int $max): int
-    {
-        $value = (int)($options[$key] ?? $this->env($env) ?? $default);
-        return max($min, min($max, $value));
-    }
-
-    private function boolOption(string $env, bool $default): bool
-    {
-        $value = $this->env($env);
-        if ($value === null || trim($value) === '') {
-            return $default;
-        }
-
-        return self::normalizeBoolean($value);
-    }
-
-    private function commitSha(): string
-    {
-        foreach (['CRON_WORKER_COMMIT_SHA', 'API_COMMIT_SHA', 'RELEASE_COMMIT_SHA', 'COMMIT_SHA', 'GITHUB_SHA'] as $key) {
-            $value = trim((string)($this->env($key) ?? ''));
-            if ($value !== '') {
-                return $value;
-            }
-        }
-
-        return '';
-    }
-
-    private function env(string $key): ?string
-    {
-        $value = getenv($key);
-        if ($value !== false) {
-            return (string)$value;
-        }
-
-        return isset($_SERVER[$key]) ? (string)$_SERVER[$key] : null;
-    }
-
-    private function nullableInt(?string $value): string
-    {
-        $value = trim((string)$value);
-        if ($value === '' || filter_var($value, FILTER_VALIDATE_INT) === false) {
-            return 'NULL';
-        }
-
-        return (string)max(0, (int)$value);
-    }
-
-    private function nullableSql(?string $value): string
-    {
-        $value = $value !== null ? trim($value) : '';
-        return $value === '' ? 'NULL' : $this->sql($value);
-    }
-
-    private function fetchAll(string $sql): array
-    {
-        $result = $this->query($sql);
-        if ($result === false || $result === true) {
-            return [];
-        }
-
-        return $result->fetch_all(MYSQLI_ASSOC);
-    }
-
-    private function query(string $sql): \mysqli_result|bool
-    {
-        global $db;
-        return $db->query($sql);
-    }
-
-    private function sql(string $value): string
-    {
-        global $db;
-        return "'" . $db->escape_string($value) . "'";
-    }
-}
@@ -1,93 +0,0 @@
-<?php
-
-namespace classes;
-
-/**
- * Ensures additive schema for the customer `invoice_email` field
- * (TRU-77 / DRIFT 16). The field is optional and stores an
- * e-mail address that should receive the customer's invoices
- * separately from the customer's primary `email`.
- */
-class customer_invoice_email_schema_bootstrap
-{
-    private static bool $initialized = false;
-    private const TABLE = 'users';
-    private const COLUMN = 'invoice_email';
-
-    public static function ensureSchema(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        self::ensureUsersTable($db);
-        self::ensureInvoiceEmailColumn($db);
-
-        self::$initialized = true;
-    }
-
-    private static function ensureUsersTable(object $db): void
-    {
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS users (
-                id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                customer_number INT NOT NULL,
-                display_name VARCHAR(255) NULL,
-                email VARCHAR(255) NULL,
-                phone_country_code INT NULL,
-                phone BIGINT NULL,
-                password VARCHAR(255) NULL,
-                group_id INT NOT NULL DEFAULT 0,
-                xlvask_customer_id VARCHAR(255) NULL,
-                sms_notifications_enabled TINYINT(1) NOT NULL DEFAULT 0,
-                email_notifications_enabled TINYINT(1) NOT NULL DEFAULT 0,
-                wash_certificate_email VARCHAR(255) NULL,
-                invoice_email VARCHAR(255) NULL,
-                two_factor_enabled TINYINT(1) NOT NULL DEFAULT 0,
-                two_factor_secret VARCHAR(255) NULL,
-                created_at DATETIME NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                deleted_at DATETIME NULL,
-                KEY idx_users_customer_number (customer_number),
-                KEY idx_users_group_id (group_id)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-    }
-
-    private static function ensureInvoiceEmailColumn(object $db): void
-    {
-        if (!self::tableExists($db, self::TABLE)) {
-            return;
-        }
-        if (self::columnExists($db, self::TABLE, self::COLUMN)) {
-            return;
-        }
-
-        $safeTable = str_replace('`', '', self::TABLE);
-        $db->query(
-            "ALTER TABLE `{$safeTable}`
-                ADD COLUMN " . self::COLUMN . " VARCHAR(255) NULL
-                AFTER wash_certificate_email"
-        );
-    }
-
-    private static function tableExists(object $db, string $table): bool
-    {
-        $safeTable = str_replace('`', '', $table);
-        $result = $db->query("SHOW TABLES LIKE '{$safeTable}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-
-    private static function columnExists(object $db, string $table, string $column): bool
-    {
-        $safeTable = str_replace('`', '', $table);
-        $safeColumn = str_replace("'", '', $column);
-        $result = $db->query("SHOW COLUMNS FROM `{$safeTable}` LIKE '{$safeColumn}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-}
@@ -14,10 +14,6 @@ class customer_mass_import_service
     */
    public function import(array $payload): array
    {
-        // TRU-77 / DRIFT 16: ensure the invoice_email column exists before we
-        // attempt to populate it on a local customer.
-        customer_invoice_email_schema_bootstrap::ensureSchema();
-
        $normalized = $this->normalizePayload($payload);
        $this->assertValidNormalizedPayload($normalized);

@@ -66,15 +62,9 @@ class customer_mass_import_service
        }

        $normalized['name'] = $this->resolveCreateName($normalized);
-        // TRU-77 / DRIFT 16: resolve the e-conomic delivery address into a
-        // local variable instead of overwriting $normalized['email']. The
-        // primary customer email must remain intact for the result payload
-        // and for downstream local-customer sync; the create call needs the
-        // dedicated invoice address (or the primary as a fallback) on its
-        // own.
-        $createEmail = $this->resolveCreateEmail($normalized, $warnings);
+        $normalized['email'] = $this->resolveCreateEmail($normalized, $warnings);

-        $createResponse = $this->createEconomicCustomer($normalized, $createEmail);
+        $createResponse = $this->createEconomicCustomer($normalized);
        $createdCustomerNumber = $this->extractEconomicCustomerNumber($createResponse);

        if ($createdCustomerNumber !== $customerNumber) {
@@ -121,7 +111,6 @@ class customer_mass_import_service
            'cvr' => $this->normalizeDigitString($payload['cvr'] ?? null),
            'name' => $this->normalizeText($payload['name'] ?? $payload['company_name'] ?? null),
            'email' => $this->normalizeEmail($payload['email'] ?? null),
-            'invoice_email' => $this->normalizeInvoiceEmail($payload['invoice_email'] ?? null),
            'ean' => $this->normalizeDigitString($payload['ean'] ?? null),
        ];
    }
@@ -148,10 +137,6 @@ class customer_mass_import_service
        if ($cvrLength < 8 || $cvrLength > 20) {
            throw new \RuntimeException('CVR must be between 8 and 20 digits.', 400);
        }
-
-        if ($normalized['ean'] !== null && strlen((string)$normalized['ean']) > 13) {
-            throw new \RuntimeException('EAN must be at most 13 digits.', 400);
-        }
    }

    protected function normalizePositiveInt(mixed $value): ?int
@@ -204,42 +189,6 @@ class customer_mass_import_service
        return $email;
    }

-    /**
-     * Normalize the optional dedicated invoice email (TRU-77 / DRIFT 16).
-     * Empty/whitespace values collapse to null. An explicit non-empty value
-     * must be a syntactically valid email address; an invalid value is
-     * rejected to keep invoices from being routed to a malformed address.
-     */
-    protected function normalizeInvoiceEmail(mixed $value): ?string
-    {
-        $email = $this->normalizeText($value);
-        if ($email === null) {
-            return null;
-        }
-        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            throw new \RuntimeException('Invalid invoice email address.', 400);
-        }
-        return $email;
-    }
-
-    /**
-     * Resolve the e-mail address that e-conomic should use to deliver
-     * invoices for the customer (TRU-77 / DRIFT 16). Prefers the dedicated
-     * `invoice_email` when provided, falling back to the customer's primary
-     * `email`.
-     */
-    protected function resolveInvoiceEmail(array $normalized, array &$warnings): string
-    {
-        if (!empty($normalized['invoice_email'])) {
-            return (string)$normalized['invoice_email'];
-        }
-        if (!empty($normalized['email'])) {
-            return (string)$normalized['email'];
-        }
-        $warnings[] = 'No invoice email was provided, defaulted to jb@truckwash.dk for the new e-conomic customer.';
-        return 'jb@truckwash.dk';
-    }
-
    protected function resolveCreateName(array $normalized): string
    {
        if ($normalized['name'] !== null) {
@@ -256,9 +205,12 @@ class customer_mass_import_service

    protected function resolveCreateEmail(array $normalized, array &$warnings): string
    {
-        // TRU-77 / DRIFT 16: invoices must be routed to the dedicated
-        // invoice_email when provided, otherwise to the customer's email.
-        return $this->resolveInvoiceEmail($normalized, $warnings);
+        if ($normalized['email'] !== null) {
+            return $normalized['email'];
+        }
+
+        $warnings[] = 'No email was provided, defaulted to jb@truckwash.dk for the new e-conomic customer.';
+        return 'jb@truckwash.dk';
    }

    protected function searchEconomicCustomersByCvr(string $cvr): array
@@ -273,7 +225,7 @@ class customer_mass_import_service
        return is_array($response) ? $response : [];
    }

-    protected function createEconomicCustomer(array $normalized, string $createEmail): object
+    protected function createEconomicCustomer(array $normalized): object
    {
        $payload = [
            'customerNumber' => (int)$normalized['customer_number'],
@@ -285,10 +237,7 @@ class customer_mass_import_service
                'paymentTermsNumber' => 12,
            ],
            'name' => (string)$normalized['name'],
-            // TRU-77 / DRIFT 16: the dedicated invoice_email (or the
-            // primary email as a fallback) is passed in explicitly so the
-            // caller's $normalized['email'] is never mutated here.
-            'email' => $createEmail,
+            'email' => (string)$normalized['email'],
            'phone' => (int)$normalized['phone'],
            'telephoneAndFaxNumber' => (string)$normalized['phone'],
            'mobilePhone' => (string)$normalized['phone'],
@@ -443,7 +392,6 @@ class customer_mass_import_service
            'cvr' => (string)$normalized['cvr'],
            'name' => $customerName,
            'email' => $normalized['email'],
-            'invoice_email' => $normalized['invoice_email'] ?? null,
            'ean' => $normalized['ean'],
            'action' => $action,
            'message' => $message,
@@ -464,7 +412,6 @@ class customer_mass_import_service

        $name = $normalized['name'] ?? null;
        $email = $normalized['email'] ?? null;
-        $invoice_email = $normalized['invoice_email'] ?? null;
        $phone = $normalized['phone'] ?? null;

        $displayName = trim((string)($customer->display_name->value() ?? ''));
@@ -480,16 +427,6 @@ class customer_mass_import_service
            }
        }

-        // TRU-77 / DRIFT 16: persist the dedicated invoice email override
-        // when provided so invoice routing survives subsequent local edits.
-        if ($invoice_email !== null && $customer->getInvoiceEmailOverride() === null) {
-            try {
-                $customer->setInvoiceEmail($invoice_email);
-            } catch (\Throwable $throwable) {
-                $warnings[] = 'Unable to update local invoice email: ' . $throwable->getMessage();
-            }
-        }
-
        if ($phone !== null && empty($customer->phone->value())) {
            try {
                $customer->setPhoneNumber((int)$phone);
@@ -1,46 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-
-class customer_order_product_policy
-{
-    public static function assertOrderAllowsProduct(int $orderId, int $productId): void
-    {
-        $message = self::orderProductViolationMessage($orderId, $productId);
-        if ($message !== null) {
-            throw new RuntimeException($message);
-        }
-    }
-
-    public static function orderProductViolationMessage(int $orderId, int $productId): ?string
-    {
-        $customerNumber = self::loadOrderCustomerNumber($orderId);
-        if ($customerNumber === null) {
-            return null;
-        }
-        $violation = (new customer_rule_product_restriction_service())
-            ->violationForCustomerProduct($customerNumber, $productId);
-        return $violation === null ? null : (string)$violation['message'];
-    }
-
-    private static function loadOrderCustomerNumber(int $orderId): ?int
-    {
-        global $db;
-
-        if ($orderId < 1) {
-            return null;
-        }
-
-        $result = $db->query("SELECT customer_id FROM orders WHERE id = {$orderId} LIMIT 1");
-        if (!$result || $result->num_rows < 1) {
-            return null;
-        }
-
-        $row = $result->fetch_assoc();
-        $customerNumber = (int)($row['customer_id'] ?? 0);
-        return $customerNumber > 0 ? $customerNumber : null;
-    }
-
-}
@@ -1,33 +0,0 @@
-<?php
-
-namespace classes;
-
-use objects\orders_o;
-
-class customer_product_rule_service
-{
-    public const BLOCK_MESSAGE = 'This product is not allowed for the selected customer';
-
-    /**
-     * @return array{rule:string,rules:list<string>,collections:list<int>,product_id:int,code:string,message:string}|null
-     */
-    public function firstViolationForOrderItem(int $orderId, int $productId, ?int $relatedItemId): ?array
-    {
-        $order = (new orders_o())->getOrderById($orderId);
-        if (!$order->exists()) {
-            return null;
-        }
-        $violation = (new customer_rule_product_restriction_service())->violationForCustomerProduct(
-            (int)$order->customer_id->value(),
-            $productId
-        );
-        if ($violation === null) {
-            return null;
-        }
-
-        // Keep the singular key during the API migration for existing invoice
-        // and logging consumers while also returning every matching rule.
-        return ['rule' => (string)$violation['rules'][0]] + $violation;
-    }
-
-}
@@ -1,291 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-use Throwable;
-
-/**
- * Additive schema and the one-time legacy-to-exact-product migration for
- * customer-rule product restrictions.
- */
-class customer_rule_product_restriction_schema_bootstrap
-{
-    public const LEGACY_SEED_KEY = 'legacy_exact_product_sets_v1';
-
-    private static bool $initialized = false;
-
-    /** @var array<string, string> */
-    private const RULES = [
-        'restrictAdditionalServices' => 'Additional services',
-        'restrictTankCleaning' => 'Tank cleaning',
-        'restrictSpotFree' => 'SpotFree',
-        'restrictInteriorCleaning' => 'Interior cleaning',
-        'onlyTankCleaning' => 'Non-tank products',
-    ];
-
-    public static function ensureSchema(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        self::createTables($db);
-        self::deduplicateCustomerAttributes($db);
-        self::seedLegacyProductSets($db);
-        self::$initialized = true;
-    }
-
-    private static function createTables(object $db): void
-    {
-        $statements = [
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_restrictions (
-                attribute VARCHAR(191) NOT NULL,
-                version INT UNSIGNED NOT NULL DEFAULT 1,
-                created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (attribute)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_collections (
-                id INT UNSIGNED NOT NULL AUTO_INCREMENT,
-                attribute VARCHAR(191) NOT NULL,
-                name VARCHAR(191) NOT NULL,
-                sort_order INT NOT NULL DEFAULT 0,
-                created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (id),
-                UNIQUE KEY uniq_customer_rule_collection_name (attribute, name),
-                KEY idx_customer_rule_collection_attribute_order (attribute, sort_order, id),
-                CONSTRAINT fk_customer_rule_collection_attribute
-                    FOREIGN KEY (attribute) REFERENCES customer_rule_product_restrictions(attribute)
-                    ON DELETE CASCADE ON UPDATE CASCADE
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_collection_products (
-                collection_id INT UNSIGNED NOT NULL,
-                product_id INT UNSIGNED NOT NULL,
-                created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (collection_id, product_id),
-                KEY idx_customer_rule_collection_product (product_id, collection_id),
-                CONSTRAINT fk_customer_rule_collection_product_collection
-                    FOREIGN KEY (collection_id) REFERENCES customer_rule_product_collections(id)
-                    ON DELETE CASCADE ON UPDATE CASCADE
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_migrations (
-                migration_key VARCHAR(191) NOT NULL,
-                details_json LONGTEXT NULL,
-                applied_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (migration_key)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_audit_logs (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-                actor_user_id INT UNSIGNED NULL,
-                attribute VARCHAR(191) NOT NULL,
-                old_version INT UNSIGNED NOT NULL,
-                new_version INT UNSIGNED NOT NULL,
-                changes_json LONGTEXT NOT NULL,
-                created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (id),
-                KEY idx_customer_rule_product_audit_attribute (attribute, created_at),
-                KEY idx_customer_rule_product_audit_actor (actor_user_id, created_at)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-        ];
-
-        foreach ($statements as $statement) {
-            if ($db->query($statement) === false) {
-                throw new RuntimeException('Unable to initialize customer-rule product restriction schema');
-            }
-        }
-    }
-
-    private static function deduplicateCustomerAttributes(object $db): void
-    {
-        if (!self::tableExists($db, 'customer_attributes')) {
-            return;
-        }
-
-        if (self::indexExists($db, 'customer_attributes', 'uniq_customer_attributes_user_attribute')) {
-            return;
-        }
-
-        if ($db->query(
-            'DELETE duplicate_row FROM customer_attributes duplicate_row
-             INNER JOIN customer_attributes keep_row
-                ON keep_row.user_id = duplicate_row.user_id
-               AND keep_row.attribute = duplicate_row.attribute
-               AND keep_row.id < duplicate_row.id'
-        ) === false) {
-            throw new RuntimeException('Unable to deduplicate customer attributes');
-        }
-
-        if ($db->query(
-            'ALTER TABLE customer_attributes
-             ADD UNIQUE KEY uniq_customer_attributes_user_attribute (user_id, attribute)'
-        ) === false) {
-            throw new RuntimeException('Unable to enforce unique customer attributes');
-        }
-    }
-
-    private static function seedLegacyProductSets(object $db): void
-    {
-        if (!self::tableExists($db, 'products') || !self::tableExists($db, 'categories')) {
-            return;
-        }
-
-        $migrationKey = self::escape($db, self::LEGACY_SEED_KEY);
-        $existing = $db->query(
-            "SELECT migration_key FROM customer_rule_product_migrations WHERE migration_key = '{$migrationKey}' LIMIT 1"
-        );
-        if ($existing && (int)$existing->num_rows > 0) {
-            return;
-        }
-
-        if ($db->query('START TRANSACTION') === false) {
-            throw new RuntimeException('Unable to start customer-rule product migration');
-        }
-        try {
-            if ($db->query(
-                "INSERT IGNORE INTO customer_rule_product_migrations (migration_key, details_json)
-                 VALUES ('{$migrationKey}', '{\"status\":\"in_progress\"}')"
-            ) === false) {
-                throw new RuntimeException('Unable to claim customer-rule product migration');
-            }
-            if (self::affectedRows($db) === 0) {
-                $db->query('ROLLBACK');
-                return;
-            }
-
-            foreach (array_keys(self::RULES) as $attribute) {
-                $safeAttribute = self::escape($db, $attribute);
-                if ($db->query(
-                    "INSERT IGNORE INTO customer_rule_product_restrictions (attribute, version)
-                     VALUES ('{$safeAttribute}', 1)"
-                ) === false) {
-                    throw new RuntimeException("Unable to initialize restriction {$attribute}");
-                }
-            }
-
-            $counts = [];
-            $seededProductIds = [];
-            foreach (self::RULES as $attribute => $collectionName) {
-                $safeAttribute = self::escape($db, $attribute);
-                $safeName = self::escape($db, 'Legacy migration: ' . $collectionName);
-                if ($db->query(
-                    "INSERT INTO customer_rule_product_collections (attribute, name, sort_order)
-                     VALUES ('{$safeAttribute}', '{$safeName}', 0)"
-                ) === false) {
-                    throw new RuntimeException("Unable to create seed collection for {$attribute}");
-                }
-                $collectionId = (int)$db->insert_id();
-                if ($collectionId < 1) {
-                    throw new RuntimeException("Unable to create seed collection for {$attribute}");
-                }
-
-                $predicate = self::legacyPredicate($db, $attribute);
-                $activePredicate = self::columnExists($db, 'products', 'deleted_at')
-                    ? 'p.deleted_at IS NULL'
-                    : '1 = 1';
-                $insert = $db->query(
-                    "INSERT IGNORE INTO customer_rule_product_collection_products (collection_id, product_id)
-                     SELECT {$collectionId}, p.id
-                     FROM products p
-                     LEFT JOIN categories c ON c.id = p.category
-                     WHERE ({$activePredicate}) AND ({$predicate})"
-                );
-                if ($insert === false) {
-                    throw new RuntimeException("Unable to seed products for {$attribute}");
-                }
-                $counts[$attribute] = self::affectedRows($db);
-                $seeded = $db->query(
-                    "SELECT product_id FROM customer_rule_product_collection_products
-                     WHERE collection_id = {$collectionId} ORDER BY product_id"
-                );
-                $seededProductIds[$attribute] = [];
-                if ($seeded) {
-                    while ($row = $seeded->fetch_assoc()) {
-                        $seededProductIds[$attribute][] = (int)$row['product_id'];
-                    }
-                }
-            }
-
-            $details = self::escape($db, (string)json_encode([
-                'counts' => $counts,
-                'product_ids' => $seededProductIds,
-                'seeded_at' => gmdate(DATE_ATOM),
-            ], JSON_UNESCAPED_SLASHES));
-            if ($db->query(
-                "UPDATE customer_rule_product_migrations
-                 SET details_json = '{$details}', applied_at = NOW()
-                 WHERE migration_key = '{$migrationKey}'"
-            ) === false) {
-                throw new RuntimeException('Unable to record customer-rule product migration');
-            }
-            if ($db->query('COMMIT') === false) {
-                throw new RuntimeException('Unable to commit customer-rule product migration');
-            }
-        } catch (Throwable $throwable) {
-            $db->query('ROLLBACK');
-            throw $throwable;
-        }
-    }
-
-    private static function legacyPredicate(object $db, string $attribute): string
-    {
-        $text = "LOWER(CONCAT(COALESCE(p.name, ''), ' ', COALESCE(c.name, '')))";
-
-        return match ($attribute) {
-            'restrictAdditionalServices' => "p.category = 8 OR LOWER(COALESCE(c.name, '')) IN ('tillægsydelser', 'tillaegsydelser')" .
-                (self::tableExists($db, 'products_options') && self::columnExists($db, 'products_options', 'option_id')
-                    ? ' OR EXISTS (SELECT 1 FROM products_options po WHERE po.option_id = p.id)'
-                    : ''),
-            'restrictTankCleaning' => "p.category = 5 OR {$text} LIKE '%tank cleaning%' OR {$text} LIKE '%tankcleaning%' OR {$text} LIKE '%tankrens%' OR {$text} LIKE '%tank rens%'",
-            'restrictSpotFree' => "p.id IN (23, 24) OR {$text} LIKE '%spot free%' OR {$text} LIKE '%spotfree%' OR {$text} LIKE '%skylning med ro%'",
-            'restrictInteriorCleaning' => "{$text} LIKE '%interior%' OR {$text} LIKE '%indvendig%'",
-            'onlyTankCleaning' => "NOT (p.category = 5 OR {$text} LIKE '%tank cleaning%' OR {$text} LIKE '%tankcleaning%' OR {$text} LIKE '%tankrens%' OR {$text} LIKE '%tank rens%')",
-            default => '0 = 1',
-        };
-    }
-
-    private static function tableExists(object $db, string $table): bool
-    {
-        $safeTable = self::escape($db, $table);
-        $result = $db->query("SHOW TABLES LIKE '{$safeTable}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-
-    private static function indexExists(object $db, string $table, string $index): bool
-    {
-        $safeTable = str_replace('`', '', $table);
-        $safeIndex = self::escape($db, $index);
-        $result = $db->query("SHOW INDEX FROM `{$safeTable}` WHERE Key_name = '{$safeIndex}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-
-    private static function columnExists(object $db, string $table, string $column): bool
-    {
-        $safeTable = str_replace('`', '', $table);
-        $safeColumn = self::escape($db, $column);
-        $result = $db->query("SHOW COLUMNS FROM `{$safeTable}` LIKE '{$safeColumn}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-
-    private static function escape(object $db, string $value): string
-    {
-        return method_exists($db, 'escape_string')
-            ? $db->escape_string($value)
-            : addslashes($value);
-    }
-
-    private static function affectedRows(object $db): int
-    {
-        if (method_exists($db, 'conn')) {
-            $connection = $db->conn();
-            return (int)($connection->affected_rows ?? 0);
-        }
-        return (int)($db->affected_rows ?? 0);
-    }
-}
@@ -1,508 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-use Throwable;
-
-class customer_rule_product_restriction_exception extends RuntimeException
-{
-    public function __construct(string $message, private readonly int $httpStatus = 422, string $code = 'INVALID_CUSTOMER_RULE_CONFIGURATION')
-    {
-        parent::__construct($message);
-        $this->restrictionCode = $code;
-    }
-
-    private string $restrictionCode;
-
-    public function httpStatus(): int
-    {
-        return $this->httpStatus;
-    }
-
-    public function restrictionCode(): string
-    {
-        return $this->restrictionCode;
-    }
-}
-
-/**
- * Source of truth for globally configured customer-rule product collections.
- */
-class customer_rule_product_restriction_service
-{
-    /** @var list<string> */
-    public const PRODUCT_IMPACT_ATTRIBUTES = [
-        'restrictAdditionalServices',
-        'restrictTankCleaning',
-        'restrictSpotFree',
-        'restrictInteriorCleaning',
-        'onlyTankCleaning',
-    ];
-
-    /** @var list<string> */
-    public const SUPPORTED_ATTRIBUTES = [
-        'restrictAdditionalServices',
-        'restrictTankCleaning',
-        'restrictSpotFree',
-        'restrictInteriorCleaning',
-        'onlyTankCleaning',
-        'requiresReferenceNumber',
-        'requiresRegistrationNumbersInvoice',
-        'invoiceAllOrdersIndividually',
-        'invoiceWithStripe',
-        'showPricesOnBookingPage',
-        'usePONumbers',
-        'exemptFromAdministrationFee',
-    ];
-
-    public function __construct()
-    {
-        customer_rule_product_restriction_schema_bootstrap::ensureSchema();
-    }
-
-    /** @return array{rules:list<array<string,mixed>>,products:list<array<string,mixed>>} */
-    public function listConfiguration(): array
-    {
-        return [
-            'rules' => array_map(fn(string $attribute): array => $this->ruleConfiguration($attribute), self::PRODUCT_IMPACT_ATTRIBUTES),
-            'products' => $this->productCatalog(),
-        ];
-    }
-
-    /** @return array<string,mixed> */
-    public function ruleConfiguration(string $attribute): array
-    {
-        $this->assertSupportedAttribute($attribute);
-        global $db;
-
-        $safeAttribute = $this->escape($attribute);
-        $versionResult = $db->query(
-            "SELECT version FROM customer_rule_product_restrictions WHERE attribute = '{$safeAttribute}' LIMIT 1"
-        );
-        if (!$versionResult || $versionResult->num_rows < 1) {
-            throw new RuntimeException("Unable to load customer-rule restriction version for {$attribute}");
-        }
-        $versionRow = $versionResult->fetch_assoc();
-
-        $result = $db->query(
-            "SELECT c.id AS collection_id, c.name, c.sort_order, cp.product_id
-             FROM customer_rule_product_collections c
-             LEFT JOIN customer_rule_product_collection_products cp ON cp.collection_id = c.id
-             WHERE c.attribute = '{$safeAttribute}'
-             ORDER BY c.sort_order ASC, c.id ASC, cp.product_id ASC"
-        );
-
-        if (!$result) {
-            throw new RuntimeException("Unable to load customer-rule restriction collections for {$attribute}");
-        }
-
-        $collections = [];
-        $disabled = [];
-        while ($row = $result->fetch_assoc()) {
-            $collectionId = (int)$row['collection_id'];
-            if (!isset($collections[$collectionId])) {
-                $collections[$collectionId] = [
-                    'id' => $collectionId,
-                    'name' => (string)$row['name'],
-                    'sort_order' => (int)$row['sort_order'],
-                    'product_ids' => [],
-                ];
-            }
-            if ($row['product_id'] !== null) {
-                $productId = (int)$row['product_id'];
-                $collections[$collectionId]['product_ids'][] = $productId;
-                $disabled[$productId] = true;
-            }
-        }
-
-        return [
-            'attribute' => $attribute,
-            'version' => max(1, (int)($versionRow['version'] ?? 1)),
-            'collections' => array_values($collections),
-            'disabled_product_ids' => array_map('intval', array_keys($disabled)),
-        ];
-    }
-
-    /**
-     * @param array<string,mixed> $payload
-     * @return array<string,mixed>
-     */
-    public function replaceRuleConfiguration(string $attribute, array $payload, int $actorUserId): array
-    {
-        $this->assertSupportedAttribute($attribute);
-        $expectedVersion = $this->positiveInt($payload['version'] ?? null, 'version');
-        $collections = $this->validateCollections($attribute, $payload['collections'] ?? null);
-
-        global $db;
-        $safeAttribute = $this->escape($attribute);
-        if ($db->query('START TRANSACTION') === false) {
-            throw new customer_rule_product_restriction_exception('Unable to start configuration transaction', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-        }
-        try {
-            $versionResult = $db->query(
-                "SELECT version FROM customer_rule_product_restrictions
-                 WHERE attribute = '{$safeAttribute}' FOR UPDATE"
-            );
-            if (!$versionResult || $versionResult->num_rows < 1) {
-                throw new customer_rule_product_restriction_exception('Customer rule configuration was not found', 404, 'CUSTOMER_RULE_CONFIGURATION_NOT_FOUND');
-            }
-            $versionRow = $versionResult->fetch_assoc();
-            $currentVersion = (int)$versionRow['version'];
-            if ($currentVersion !== $expectedVersion) {
-                throw new customer_rule_product_restriction_exception(
-                    'Customer rule configuration has changed; reload before saving',
-                    409,
-                    'CUSTOMER_RULE_CONFIGURATION_CONFLICT'
-                );
-            }
-
-            $old = $this->ruleConfiguration($attribute);
-            $existingIds = $this->existingCollectionIds($attribute);
-            foreach ($collections as $collection) {
-                if ($collection['id'] !== null && !isset($existingIds[$collection['id']])) {
-                    throw new customer_rule_product_restriction_exception('A collection does not belong to this customer rule');
-                }
-            }
-
-            // Avoid temporary unique-name collisions while two collections swap names.
-            foreach ($existingIds as $collectionId => $_) {
-                $temporaryName = $this->escape('__pending_' . $collectionId . '_' . bin2hex(random_bytes(6)));
-                if ($db->query(
-                    "UPDATE customer_rule_product_collections
-                     SET name = '{$temporaryName}'
-                     WHERE id = {$collectionId} AND attribute = '{$safeAttribute}'"
-                ) === false) {
-                    throw new customer_rule_product_restriction_exception('Unable to prepare collection update', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-                }
-            }
-
-            $keptIds = [];
-            foreach ($collections as $collection) {
-                $name = $this->escape($collection['name']);
-                $sortOrder = (int)$collection['sort_order'];
-                $collectionId = $collection['id'];
-                if ($collectionId === null) {
-                    if ($db->query(
-                        "INSERT INTO customer_rule_product_collections (attribute, name, sort_order)
-                         VALUES ('{$safeAttribute}', '{$name}', {$sortOrder})"
-                    ) === false) {
-                        throw new customer_rule_product_restriction_exception('Unable to create collection');
-                    }
-                    $collectionId = (int)$db->insert_id();
-                } else {
-                    if ($db->query(
-                        "UPDATE customer_rule_product_collections
-                         SET name = '{$name}', sort_order = {$sortOrder}
-                         WHERE id = {$collectionId} AND attribute = '{$safeAttribute}'"
-                    ) === false) {
-                        throw new customer_rule_product_restriction_exception('Unable to update collection');
-                    }
-                }
-
-                $keptIds[$collectionId] = true;
-                if ($db->query("DELETE FROM customer_rule_product_collection_products WHERE collection_id = {$collectionId}") === false) {
-                    throw new customer_rule_product_restriction_exception('Unable to replace collection products', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-                }
-                foreach ($collection['product_ids'] as $productId) {
-                    if ($db->query(
-                        "INSERT INTO customer_rule_product_collection_products (collection_id, product_id)
-                         VALUES ({$collectionId}, {$productId})"
-                    ) === false) {
-                        throw new customer_rule_product_restriction_exception('Unable to save collection products');
-                    }
-                }
-            }
-
-            $removeIds = array_values(array_diff(array_keys($existingIds), array_keys($keptIds)));
-            if ($removeIds !== []) {
-                if ($db->query(
-                    'DELETE FROM customer_rule_product_collections WHERE attribute = \'' . $safeAttribute . '\' AND id IN (' .
-                    implode(',', array_map('intval', $removeIds)) . ')'
-                ) === false) {
-                    throw new customer_rule_product_restriction_exception('Unable to remove collections', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-                }
-            }
-
-            $newVersion = $currentVersion + 1;
-            if ($db->query(
-                "UPDATE customer_rule_product_restrictions
-                 SET version = {$newVersion}, updated_at = NOW()
-                 WHERE attribute = '{$safeAttribute}'"
-            ) === false) {
-                throw new customer_rule_product_restriction_exception('Unable to update configuration version', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-            }
-            $new = $this->ruleConfiguration($attribute);
-            $changes = $this->escape((string)json_encode([
-                'before' => $old,
-                'after' => $new,
-            ], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-            if ($db->query(
-                "INSERT INTO customer_rule_product_audit_logs
-                    (actor_user_id, attribute, old_version, new_version, changes_json)
-                 VALUES ({$actorUserId}, '{$safeAttribute}', {$currentVersion}, {$newVersion}, '{$changes}')"
-            ) === false) {
-                throw new customer_rule_product_restriction_exception('Unable to audit configuration update', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-            }
-            if ($db->query('COMMIT') === false) {
-                throw new customer_rule_product_restriction_exception('Unable to commit configuration update', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-            }
-            return $new;
-        } catch (Throwable $throwable) {
-            $db->query('ROLLBACK');
-            throw $throwable;
-        }
-    }
-
-    /**
-     * Return configured product restrictions for all active product-impact
-     * attributes belonging to any account with the customer number.
-     *
-     * @return list<array<string,mixed>>
-     */
-    public function restrictionsForCustomerNumber(int $customerNumber): array
-    {
-        if ($customerNumber < 1) {
-            return [];
-        }
-
-        global $db;
-        $result = $db->query(
-            "SELECT DISTINCT ca.attribute
-             FROM users u
-             INNER JOIN customer_attributes ca ON ca.user_id = u.id
-             WHERE u.customer_number = {$customerNumber}"
-        );
-        if (!$result) {
-            throw new RuntimeException('Unable to load active customer-rule product restrictions');
-        }
-        $activeAttributes = [];
-        while ($row = $result->fetch_assoc()) {
-            $attribute = (string)$row['attribute'];
-            if (in_array($attribute, self::PRODUCT_IMPACT_ATTRIBUTES, true)) {
-                $activeAttributes[$attribute] = true;
-            }
-        }
-
-        $active = [];
-        foreach (self::PRODUCT_IMPACT_ATTRIBUTES as $attribute) {
-            if (isset($activeAttributes[$attribute])) {
-                $active[] = $this->ruleConfiguration($attribute);
-            }
-        }
-        return $active;
-    }
-
-    /** @return array{rules:list<string>,collections:list<int>,message:string,code:string,product_id:int}|null */
-    public function violationForCustomerProduct(int $customerNumber, int $productId): ?array
-    {
-        if ($productId < 1) {
-            return null;
-        }
-        $rules = [];
-        $collections = [];
-        foreach ($this->restrictionsForCustomerNumber($customerNumber) as $restriction) {
-            if (!in_array($productId, $restriction['disabled_product_ids'], true)) {
-                continue;
-            }
-            $rules[] = (string)$restriction['attribute'];
-            foreach ($restriction['collections'] as $collection) {
-                if (in_array($productId, $collection['product_ids'], true)) {
-                    $collections[] = (int)$collection['id'];
-                }
-            }
-        }
-        if ($rules === []) {
-            return null;
-        }
-        return [
-            'code' => 'CUSTOMER_RULE_PRODUCT_RESTRICTED',
-            'message' => customer_product_rule_service::BLOCK_MESSAGE,
-            'product_id' => $productId,
-            'rules' => array_values(array_unique($rules)),
-            'collections' => array_values(array_unique($collections)),
-        ];
-    }
-
-    /**
-     * @param list<array<string,mixed>> $attributes
-     * @return list<array<string,mixed>>
-     */
-    public function enrichAttributes(int $customerNumber, array $attributes): array
-    {
-        $restrictions = [];
-        foreach ($this->restrictionsForCustomerNumber($customerNumber) as $restriction) {
-            $restrictions[(string)$restriction['attribute']] = [
-                'attribute' => (string)$restriction['attribute'],
-                'version' => (int)$restriction['version'],
-                'collections' => $restriction['collections'],
-                'disabled_product_ids' => $restriction['disabled_product_ids'],
-            ];
-        }
-
-        foreach ($attributes as &$attribute) {
-            $key = (string)($attribute['attribute'] ?? '');
-            $attribute['product_restriction'] = $restrictions[$key] ?? null;
-        }
-        unset($attribute);
-        return $attributes;
-    }
-
-    /** @return list<array<string,mixed>> */
-    private function productCatalog(): array
-    {
-        global $db;
-        $activeExpression = $this->columnExists('products', 'deleted_at')
-            ? 'CASE WHEN p.deleted_at IS NULL THEN 1 ELSE 0 END'
-            : '1';
-        $result = $db->query(
-            "SELECT p.id, p.name, p.category AS category_id, c.name AS category_name,
-                    {$activeExpression} AS active
-             FROM products p
-             LEFT JOIN categories c ON c.id = p.category
-             ORDER BY c.name ASC, p.name ASC, p.id ASC"
-        );
-        if (!$result) {
-            throw new RuntimeException('Unable to load the customer-rule product catalog');
-        }
-        $products = [];
-        while ($row = $result->fetch_assoc()) {
-            $products[] = [
-                'id' => (int)$row['id'],
-                'name' => (string)$row['name'],
-                'category_id' => (int)$row['category_id'],
-                'category_name' => (string)($row['category_name'] ?? ''),
-                'active' => (bool)$row['active'],
-            ];
-        }
-        return $products;
-    }
-
-    /**
-     * @return array<int,true>
-     */
-    private function existingCollectionIds(string $attribute): array
-    {
-        global $db;
-        $safeAttribute = $this->escape($attribute);
-        $result = $db->query("SELECT id FROM customer_rule_product_collections WHERE attribute = '{$safeAttribute}'");
-        if (!$result) {
-            throw new RuntimeException("Unable to load existing collections for {$attribute}");
-        }
-        $ids = [];
-        while ($row = $result->fetch_assoc()) {
-            $ids[(int)$row['id']] = true;
-        }
-        return $ids;
-    }
-
-    /** @return list<array{id: ?int, name: string, sort_order: int, product_ids: list<int>}> */
-    private function validateCollections(string $attribute, mixed $value): array
-    {
-        if (!is_array($value)) {
-            throw new customer_rule_product_restriction_exception('collections must be an array');
-        }
-        $normalized = [];
-        $names = [];
-        $collectionIds = [];
-        $allProductIds = [];
-        foreach (array_values($value) as $index => $collection) {
-            if (!is_array($collection)) {
-                throw new customer_rule_product_restriction_exception("Collection {$index} must be an object");
-            }
-            $name = trim((string)($collection['name'] ?? ''));
-            if ($name === '' || mb_strlen($name) > 191) {
-                throw new customer_rule_product_restriction_exception('Collection names must be between 1 and 191 characters');
-            }
-            $nameKey = mb_strtolower($name);
-            if (isset($names[$nameKey])) {
-                throw new customer_rule_product_restriction_exception('Collection names must be unique within a rule');
-            }
-            $names[$nameKey] = true;
-            if (!isset($collection['product_ids']) || !is_array($collection['product_ids'])) {
-                throw new customer_rule_product_restriction_exception('product_ids must be an array');
-            }
-            $productIds = [];
-            foreach ($collection['product_ids'] as $productId) {
-                $id = $this->positiveInt($productId, 'product_id');
-                $productIds[$id] = true;
-                $allProductIds[$id] = true;
-            }
-            $id = isset($collection['id']) && $collection['id'] !== null
-                ? $this->positiveInt($collection['id'], 'collection id')
-                : null;
-            if ($id !== null && isset($collectionIds[$id])) {
-                throw new customer_rule_product_restriction_exception('Collection IDs must be unique within a rule');
-            }
-            if ($id !== null) {
-                $collectionIds[$id] = true;
-            }
-            $normalized[] = [
-                'id' => $id,
-                'name' => $name,
-                'sort_order' => isset($collection['sort_order']) && is_numeric($collection['sort_order'])
-                    ? (int)$collection['sort_order']
-                    : $index,
-                'product_ids' => array_map('intval', array_keys($productIds)),
-            ];
-        }
-
-        $this->assertProductsExist(array_map('intval', array_keys($allProductIds)));
-        return $normalized;
-    }
-
-    /** @param list<int> $productIds */
-    private function assertProductsExist(array $productIds): void
-    {
-        if ($productIds === []) {
-            return;
-        }
-        global $db;
-        $result = $db->query('SELECT id FROM products WHERE id IN (' . implode(',', $productIds) . ')');
-        if (!$result) {
-            throw new customer_rule_product_restriction_exception(
-                'Unable to validate collection products',
-                500,
-                'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED'
-            );
-        }
-        $found = [];
-        while ($row = $result->fetch_assoc()) {
-            $found[(int)$row['id']] = true;
-        }
-        $missing = array_values(array_diff($productIds, array_keys($found)));
-        if ($missing !== []) {
-            throw new customer_rule_product_restriction_exception('Unknown product IDs: ' . implode(', ', $missing));
-        }
-    }
-
-    private function assertSupportedAttribute(string $attribute): void
-    {
-        if (!in_array($attribute, self::PRODUCT_IMPACT_ATTRIBUTES, true)) {
-            throw new customer_rule_product_restriction_exception('Unsupported product-impact customer rule');
-        }
-    }
-
-    private function positiveInt(mixed $value, string $field): int
-    {
-        if (!is_numeric($value) || (int)$value < 1 || (string)(int)$value !== trim((string)$value)) {
-            throw new customer_rule_product_restriction_exception("{$field} must be a positive integer");
-        }
-        return (int)$value;
-    }
-
-    private function escape(string $value): string
-    {
-        global $db;
-        return method_exists($db, 'escape_string') ? $db->escape_string($value) : addslashes($value);
-    }
-
-    private function columnExists(string $table, string $column): bool
-    {
-        global $db;
-        $safeTable = str_replace('`', '', $table);
-        $safeColumn = $this->escape($column);
-        $result = $db->query("SHOW COLUMNS FROM `{$safeTable}` LIKE '{$safeColumn}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-}
@@ -177,19 +177,15 @@ class db
        return $this->database;
    }

-    public function getPort(): int
-    {
-        return $this->port;
-    }
-
-    public function getSslMode(): string
-    {
-        return $this->ssl_mode;
-    }
-
    public function backupDatabase(string $path): bool
    {
+        // Save the database to the path
+        // Build a safe mysqldump command with configurable SSL (MariaDB-compatible flags)
        $mode = strtoupper(trim($this->ssl_mode));
+        // Map ssl_mode to MariaDB client flags
+        // DISABLED => --skip-ssl (no TLS)
+        // PREFERRED => (no flag; client decides)
+        // REQUIRED/VERIFY_* => --ssl (enable TLS without strict verification unless CA materials provided)
        $sslFlag = '';
        switch ($mode) {
            case 'DISABLED':
@@ -205,42 +201,17 @@ class db
                $sslFlag = '--ssl';
                break;
        }
-
        $host = escapeshellarg($this->host);
        $user = escapeshellarg($this->user);
+        $pass = escapeshellarg($this->password);
        $db   = escapeshellarg($this->database);
        $port = (int)$this->port;
+        $outfile = escapeshellarg($path);
        $sslPart = $sslFlag !== '' ? ($sslFlag . ' ') : '';
-        $command = "mysqldump {$sslPart}--single-transaction --quick --routines --triggers --events --hex-blob -h $host -P $port -u $user $db";
-
-        $directory = dirname($path);
-        if (!is_dir($directory) && !mkdir($directory, 0770, true) && !is_dir($directory)) {
-            return false;
-        }
-
-        $environment = array_merge(getenv() ?: [], $_ENV);
-        $environment['MYSQL_PWD'] = $this->password;
-        $descriptors = [
-            0 => ['pipe', 'r'],
-            1 => ['file', $path, 'w'],
-            2 => ['pipe', 'w'],
-        ];
-
-        $process = proc_open($command, $descriptors, $pipes, null, $environment);
-        if (!is_resource($process)) {
-            return false;
-        }
-
-        fclose($pipes[0]);
-        $stderr = stream_get_contents($pipes[2]);
-        fclose($pipes[2]);
-        $return = proc_close($process);
-
-        if ($return !== 0 && is_string($stderr) && $stderr !== '') {
-            @file_put_contents($path . '.error.log', $stderr);
-        }
-
-        return $return === 0 && is_file($path) && filesize($path) !== false;
+        $command = "mysqldump {$sslPart}-h $host -P $port -u $user --password=$pass $db > $outfile 2>&1";
+        exec($command, $output, $return);
+        // Check if the command was successful
+        return $return === 0;
    }

    public function getView(string $view): array
@@ -1,44 +0,0 @@
-<?php
-
-namespace classes;
-
-/**
- * Ensures additive schema for department-scoped customer price overrides.
- */
-class department_customer_price_overrides_schema_bootstrap
-{
-    private static bool $initialized = false;
-
-    public static function ensureTables(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS `department_customer_price_overrides` (
-                `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-                `department_id` INT NOT NULL,
-                `user_id` INT NOT NULL,
-                `is_category` TINYINT(1) NOT NULL DEFAULT 0,
-                `product_or_category_id` VARCHAR(191) NOT NULL,
-                `percentage` INT NOT NULL DEFAULT 0,
-                `fixed_price` INT NULL DEFAULT NULL,
-                `created_at` DATETIME NULL DEFAULT CURRENT_TIMESTAMP,
-                `updated_at` DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (`id`),
-                UNIQUE KEY `uniq_department_customer_price_overrides_lookup` (`department_id`, `user_id`, `is_category`, `product_or_category_id`),
-                KEY `idx_department_customer_price_overrides_department` (`department_id`),
-                KEY `idx_department_customer_price_overrides_user` (`user_id`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        self::$initialized = true;
-    }
-}
@@ -1,458 +0,0 @@
-<?php
-
-namespace classes;
-
-use objects\department_customer_price_overrides_o;
-use objects\departments_o;
-use objects\products_o;
-use objects\users_o;
-
-class department_customer_pricing_service
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function getPricing(int $departmentId, int $userId): array
-    {
-        $department = $this->department($departmentId);
-        $customer = $this->customer($userId);
-        $this->assertEnabled($department);
-
-        $overrides = (new department_customer_price_overrides_o())->getAllPrices($departmentId, $userId);
-
-        return [
-            'department' => $department,
-            'customer' => $customer,
-            'overrides' => $overrides,
-            'categories' => $this->catalog($departmentId, $customer['id']),
-            'revision' => $this->revision($overrides),
-        ];
-    }
-
-    /**
-     * @param array<string, mixed> $payload
-     * @return array<string, mixed>
-     */
-    public function updatePricing(int $departmentId, int $userId, array $payload): array
-    {
-        $department = $this->department($departmentId);
-        $customer = $this->customer($userId);
-        $this->assertEnabled($department);
-
-        if (array_key_exists('department_id', $payload) && (int)$payload['department_id'] !== $departmentId) {
-            throw new limited_backoffice_exception('Department ID in body does not match the route.', 400);
-        }
-        if (array_key_exists('user_id', $payload) && (int)$payload['user_id'] !== $userId) {
-            throw new limited_backoffice_exception('User ID in body does not match the route.', 400);
-        }
-
-        $overrides = $payload['overrides'] ?? null;
-        if (!is_array($overrides)) {
-            throw new limited_backoffice_exception('Overrides are required.', 400);
-        }
-
-        $normalized = $this->normalizeOverrides($departmentId, $overrides);
-        $overrideObject = new department_customer_price_overrides_o();
-        $expectedRevision = $this->normalizeExpectedRevision($payload['expected_revision'] ?? null);
-        $existingOverrides = [];
-        $normalizedKeys = [];
-        foreach ($normalized as $override) {
-            $normalizedKeys[$this->overrideKey((bool)$override['is_category'], $override['product_or_category_id'])] = true;
-        }
-
-        global $db;
-        $mysqli = $db->conn();
-        $mysqli->begin_transaction();
-        try {
-            $this->lockDepartment($departmentId);
-            $existingOverrides = $overrideObject->getAllPrices($departmentId, $customer['id']);
-            $currentRevision = $this->revision($existingOverrides);
-            if ($expectedRevision !== null && !hash_equals($currentRevision, $expectedRevision)) {
-                throw $this->revisionConflict($currentRevision);
-            }
-
-            $deleteStatement = $mysqli->prepare(
-                'DELETE FROM `department_customer_price_overrides` WHERE `department_id` = ? AND `user_id` = ?'
-            );
-            $insertStatement = $mysqli->prepare(
-                'INSERT INTO `department_customer_price_overrides`
-                    (`department_id`, `user_id`, `is_category`, `product_or_category_id`, `percentage`, `fixed_price`)
-                 VALUES (?, ?, ?, ?, ?, ?)'
-            );
-            if ($deleteStatement === false || $insertStatement === false) {
-                throw new \RuntimeException('Unable to prepare department customer pricing update.');
-            }
-
-            $customerId = (int)$customer['id'];
-            $deleteStatement->bind_param('ii', $departmentId, $customerId);
-            if (!$deleteStatement->execute()) {
-                throw new \RuntimeException('Unable to clear department customer pricing.');
-            }
-
-            foreach ($normalized as $override) {
-                $isCategory = (int)(bool)$override['is_category'];
-                $objectId = (string)$override['product_or_category_id'];
-                $percentage = (int)$override['percentage'];
-                $fixedPrice = $override['fixed_price'] === null ? null : (int)$override['fixed_price'];
-                $insertStatement->bind_param(
-                    'iiisii',
-                    $departmentId,
-                    $customerId,
-                    $isCategory,
-                    $objectId,
-                    $percentage,
-                    $fixedPrice
-                );
-                if (!$insertStatement->execute()) {
-                    throw new \RuntimeException('Unable to save department customer pricing.');
-                }
-            }
-
-            $deleteStatement->close();
-            $insertStatement->close();
-            $mysqli->commit();
-        } catch (limited_backoffice_exception $exception) {
-            $mysqli->rollback();
-            throw $exception;
-        } catch (\Throwable) {
-            $mysqli->rollback();
-            throw new limited_backoffice_exception('Unable to update department customer pricing.', 500);
-        }
-
-        foreach ($normalized as $override) {
-            $this->recordVersion($customer, $departmentId, $override);
-        }
-
-        foreach ($existingOverrides as $existingOverride) {
-            $key = $this->overrideKey((bool)$existingOverride['is_category'], $existingOverride['product_or_category_id']);
-            if (isset($normalizedKeys[$key])) {
-                continue;
-            }
-
-            $this->recordVersion($customer, $departmentId, [
-                'is_category' => (bool)$existingOverride['is_category'],
-                'product_or_category_id' => $existingOverride['product_or_category_id'],
-                'percentage' => 0,
-                'fixed_price' => null,
-            ]);
-        }
-
-        return $this->getPricing($departmentId, $customer['id']);
-    }
-
-    /**
-     * @return array{id:int,name:string,description:string,custom_pricing_only:bool}
-     */
-    private function department(int $departmentId): array
-    {
-        $department = (new departments_o())->getDepartmentById($departmentId);
-        if (!is_array($department) || empty($department)) {
-            throw new limited_backoffice_exception('Department not found', 404);
-        }
-
-        return [
-            'id' => (int)$department['id'],
-            'name' => (string)$department['name'],
-            'description' => (string)($department['description'] ?? ''),
-            'custom_pricing_only' => (bool)(int)($department['custom_pricing_only'] ?? 0),
-        ];
-    }
-
-    /**
-     * @return array{id:int,customer_number:int,display_name:string}
-     */
-    private function customer(int $userId): array
-    {
-        $customer = (new users_o())->getUserById($userId);
-        if (!$customer->exists()) {
-            throw new limited_backoffice_exception('Customer not found', 404);
-        }
-
-        return [
-            'id' => (int)$customer->id,
-            'customer_number' => (int)$customer->customer_number->value(),
-            'display_name' => (string)($customer->display_name->value() ?: ('Customer #' . $customer->customer_number->value())),
-        ];
-    }
-
-    /**
-     * @param array<string, mixed> $department
-     */
-    private function assertEnabled(array $department): void
-    {
-        if (!($department['custom_pricing_only'] ?? false)) {
-            throw new limited_backoffice_exception('Department customer pricing is disabled.', 409, [
-                'message' => 'Department customer pricing is disabled.',
-                'code' => 'department_customer_pricing_disabled',
-                'department' => $department,
-            ]);
-        }
-    }
-
-    /**
-     * @return array<int, array<string, mixed>>
-     */
-    private function catalog(int $departmentId, int $userId): array
-    {
-        global $db;
-
-        $sql = "
-            SELECT
-                c.`id` AS `category_id`,
-                c.`name` AS `category_name`,
-                c.`description` AS `category_description`,
-                p.*,
-                pdp.`price` AS `department_price`
-            FROM `department_categories` dc
-            INNER JOIN `categories` c ON c.`id` = dc.`category_id`
-            INNER JOIN `products` p ON p.`category` = dc.`category_id`
-            LEFT JOIN `product_department_prices` pdp
-                ON pdp.`department_id` = dc.`department_id`
-               AND pdp.`product_id` = p.`id`
-            WHERE dc.`department_id` = " . (int)$departmentId . "
-              AND dc.`deleted_at` IS NULL
-            ORDER BY c.`name` ASC, c.`id` ASC, p.`order_priority` ASC, p.`name` ASC, p.`id` ASC";
-
-        $result = $db->query($sql);
-        $rows = $result ? $db->fetch_all($result) : [];
-        $customer = (new users_o())->getUserById($userId);
-        $categories = [];
-        $seen = [];
-
-        foreach ($rows as $row) {
-            $productId = (int)$row['id'];
-            if (isset($seen[$productId])) {
-                continue;
-            }
-            $seen[$productId] = true;
-
-            $categoryId = (int)$row['category_id'];
-            if (!isset($categories[$categoryId])) {
-                $categories[$categoryId] = [
-                    'id' => $categoryId,
-                    'name' => (string)$row['category_name'],
-                    'description' => (string)($row['category_description'] ?? ''),
-                    'products' => [],
-                ];
-            }
-
-            $departmentPrice = $row['department_price'] === null ? null : (int)$row['department_price'];
-            $effectivePrice = products_o::CUSTOM_PRICING_MISSING_PRICE;
-            if ($departmentPrice !== null) {
-                $effectivePrice = $customer->applyProductCustomerPricing($productId, $departmentPrice, true, $departmentId);
-            }
-
-            $categories[$categoryId]['products'][] = [
-                'id' => $productId,
-                'name' => (string)$row['name'],
-                'description' => (string)($row['description'] ?? ''),
-                'category' => $categoryId,
-                'apply_category_discount' => (bool)$row['apply_category_discount'],
-                'base_price' => (int)$row['price'],
-                'department_price' => $departmentPrice,
-                'effective_price' => $effectivePrice,
-                'missing_department_price' => $departmentPrice === null,
-            ];
-        }
-
-        return array_values($categories);
-    }
-
-    /**
-     * @param array<int, mixed> $overrides
-     * @return array<int, array{is_category:bool,product_or_category_id:int|string,percentage:int,fixed_price:int|null}>
-     */
-    private function normalizeOverrides(int $departmentId, array $overrides): array
-    {
-        $normalized = [];
-        foreach ($overrides as $override) {
-            if (!is_array($override)) {
-                throw new limited_backoffice_exception('Invalid override payload.', 400);
-            }
-
-            $isCategory = (bool)($override['is_category'] ?? false);
-            $objectId = $override['product_or_category_id'] ?? $override['object_id'] ?? null;
-            if ($objectId === null || $objectId === '') {
-                throw new limited_backoffice_exception('Override object is required.', 400);
-            }
-
-            $percentage = filter_var($override['discount'] ?? $override['percentage'] ?? 0, FILTER_VALIDATE_INT);
-            if ($percentage === false || $percentage < 0 || $percentage > 100) {
-                throw new limited_backoffice_exception('Discount must be between 0 and 100.', 400);
-            }
-
-            $fixedPrice = null;
-            if (array_key_exists('fixed_price', $override) && $override['fixed_price'] !== null && $override['fixed_price'] !== '') {
-                $fixedPrice = filter_var($override['fixed_price'], FILTER_VALIDATE_INT);
-                if ($fixedPrice === false || $fixedPrice < 0) {
-                    throw new limited_backoffice_exception('Fixed price must be zero or more.', 400);
-                }
-            }
-
-            if ($isCategory) {
-                if ($fixedPrice !== null) {
-                    throw new limited_backoffice_exception('Fixed prices can only be assigned to products.', 400);
-                }
-                $fixedPrice = null;
-                $objectId = (string)$objectId;
-                if ($objectId !== 'global') {
-                    $this->assertDepartmentCategory($departmentId, $objectId);
-                }
-            } else {
-                $objectId = (int)$objectId;
-                $this->assertDepartmentProduct($departmentId, $objectId);
-            }
-
-            if ($percentage <= 0 && $fixedPrice === null) {
-                continue;
-            }
-
-            $key = $this->overrideKey($isCategory, $objectId);
-            if (isset($normalized[$key])) {
-                throw new limited_backoffice_exception('Duplicate customer price overrides are not allowed.', 400);
-            }
-
-            if ($fixedPrice !== null && $percentage > 0) {
-                throw new limited_backoffice_exception('Choose either a discount or a fixed price.', 400);
-            }
-
-            $normalized[$key] = [
-                'is_category' => $isCategory,
-                'product_or_category_id' => $objectId,
-                'percentage' => (int)$percentage,
-                'fixed_price' => $fixedPrice === null ? null : (int)$fixedPrice,
-            ];
-        }
-
-        return array_values($normalized);
-    }
-
-    /**
-     * @param array{id:int,customer_number:int,display_name:string} $customer
-     * @param array{is_category:bool,product_or_category_id:int|string,percentage:int,fixed_price:int|null} $override
-     */
-    private function recordVersion(array $customer, int $departmentId, array $override): void
-    {
-        try {
-            (new economic_v2_versioning_service())->recordDiscountOverrideVersion(
-                (int)$customer['id'],
-                (int)$customer['customer_number'],
-                (bool)$override['is_category'],
-                (string)$override['product_or_category_id'],
-                (int)$override['percentage'],
-                date('Y-m-d H:i:s'),
-                'live.department_discount_override.route',
-                1.0,
-                false,
-                [
-                    'route' => 'department_customer_pricing',
-                    'department_id' => $departmentId,
-                ],
-                $override['fixed_price'],
-                $departmentId
-            );
-        } catch (\Throwable) {
-        }
-    }
-
-    private function overrideKey(bool $isCategory, int|string $objectId): string
-    {
-        return ((int)$isCategory) . ':' . (string)$objectId;
-    }
-
-    /**
-     * @param array<int, array<string, mixed>> $overrides
-     */
-    private function revision(array $overrides): string
-    {
-        $revisionRows = array_map(static fn(array $override): array => [
-            'is_category' => (bool)$override['is_category'],
-            'product_or_category_id' => (string)$override['product_or_category_id'],
-            'percentage' => (int)$override['percentage'],
-            'fixed_price' => $override['fixed_price'] === null ? null : (int)$override['fixed_price'],
-        ], $overrides);
-
-        usort($revisionRows, static function (array $left, array $right): int {
-            return [$left['is_category'] ? 0 : 1, $left['product_or_category_id']]
-                <=> [$right['is_category'] ? 0 : 1, $right['product_or_category_id']];
-        });
-
-        return hash('sha256', json_encode($revisionRows, JSON_THROW_ON_ERROR));
-    }
-
-    private function normalizeExpectedRevision(mixed $value): ?string
-    {
-        if ($value === null || $value === '') {
-            // Keep the backend-first rollout compatible with the currently deployed UI.
-            return null;
-        }
-
-        if (!is_string($value) || preg_match('/^[a-f0-9]{64}$/', $value) !== 1) {
-            throw new limited_backoffice_exception('Expected revision is invalid.', 400, [
-                'message' => 'Expected revision is invalid.',
-                'code' => 'pricing_revision_invalid',
-            ]);
-        }
-
-        return $value;
-    }
-
-    private function lockDepartment(int $departmentId): void
-    {
-        global $db;
-
-        $result = $db->query(
-            'SELECT `id` FROM `departments` WHERE `id` = ' . (int)$departmentId . ' FOR UPDATE'
-        );
-        if (!$result || $result->num_rows < 1) {
-            throw new limited_backoffice_exception('Department not found', 404);
-        }
-    }
-
-    private function revisionConflict(string $currentRevision): limited_backoffice_exception
-    {
-        return new limited_backoffice_exception('Pricing has changed. Reload and try again.', 409, [
-            'message' => 'Pricing has changed. Reload and try again.',
-            'code' => 'pricing_revision_conflict',
-            'current_revision' => $currentRevision,
-        ]);
-    }
-
-    private function assertDepartmentProduct(int $departmentId, int $productId): void
-    {
-        global $db;
-
-        $result = $db->query(
-            'SELECT p.`id`
-             FROM `department_categories` dc
-             INNER JOIN `products` p ON p.`category` = dc.`category_id`
-             WHERE dc.`department_id` = ' . (int)$departmentId . '
-               AND dc.`deleted_at` IS NULL
-               AND p.`id` = ' . (int)$productId . '
-             LIMIT 1'
-        );
-
-        if (!$result || $result->num_rows < 1) {
-            throw new limited_backoffice_exception('Product is not available for this department.', 400);
-        }
-    }
-
-    private function assertDepartmentCategory(int $departmentId, string $categoryId): void
-    {
-        global $db;
-
-        $categoryId = $db->escape_string($categoryId);
-        $result = $db->query(
-            "SELECT `id`
-             FROM `department_categories`
-             WHERE `department_id` = " . (int)$departmentId . "
-               AND `deleted_at` IS NULL
-               AND `category_id` = '{$categoryId}'
-             LIMIT 1"
-        );
-
-        if (!$result || $result->num_rows < 1) {
-            throw new limited_backoffice_exception('Category is not available for this department.', 400);
-        }
-    }
-}
@@ -302,10 +302,10 @@ class department_outside_hours_statistics_service
     * @param array<int,array<string,mixed>> $opening_hours_by_department_id
     * @param array<string,array<int,bool>>|null $missing_lookup_by_day
     * @return array{
-     *   counted: bool,
-     *   reason: string,
-     *   candidate_date: ?string,
-     *   department_id: int
+     *   counted:bool,
+     *   reason:string,
+     *   candidate_date:?string,
+     *   department_id:int
     * }
     */
    public function classifyCandidateAgainstOpeningHours(
@@ -1,252 +0,0 @@
-<?php
-
-namespace classes;
-
-require_once WD . '/classes/selfserve_schema_bootstrap.php';
-
-use Exception;
-
-class department_wash_count_service
-{
-    /**
-     * @throws Exception
-     */
-    public function countInDateRange(string $date_start, string $date_end, int $department_id): int
-    {
-        $rows = $this->countByHourForDepartments($date_start, $date_end, [$department_id]);
-        $total = 0;
-
-        foreach ($rows as $row) {
-            $total += (int)($row['wash_count'] ?? 0);
-        }
-
-        return $total;
-    }
-
-    /**
-     * @param array<int|string> $department_ids
-     * @return array<int,array{department_id:int,hour_bucket:string,wash_count:int}>
-     * @throws Exception
-     */
-    public function countByHourForDepartments(string $date_start, string $date_end, array $department_ids): array
-    {
-        global $db;
-
-        $this->validateDateRange($date_start, $date_end);
-        $normalized_department_ids = $this->normalizeIds($department_ids);
-        if ($normalized_department_ids === []) {
-            return [];
-        }
-
-        selfserve_schema_bootstrap::ensureTables();
-
-        $department_ids_sql = implode(',', $normalized_department_ids);
-        $escaped_start = $db->escape_string($date_start);
-        $escaped_end = $db->escape_string($date_end);
-        $candidate_sql = $this->candidateUnionSql($department_ids_sql, $escaped_start, $escaped_end);
-
-        $sql = "SELECT deduped.department_id,
-                       DATE_FORMAT(deduped.counted_at, '%Y-%m-%d %H:00:00') AS hour_bucket,
-                       COUNT(*) AS wash_count
-                FROM (
-                    SELECT dedupe_key,
-                           department_id,
-                           MIN(counted_at) AS counted_at
-                    FROM ($candidate_sql) candidates
-                    GROUP BY dedupe_key, department_id
-                ) deduped
-                GROUP BY deduped.department_id, DATE_FORMAT(deduped.counted_at, '%Y-%m-%d %H:00:00')
-                ORDER BY deduped.department_id ASC, hour_bucket ASC";
-
-        $result = $db->query($sql);
-        if (!is_object($result) || $result->num_rows === 0) {
-            return [];
-        }
-
-        $rows = [];
-        while ($row = $result->fetch_assoc()) {
-            $rows[] = [
-                'department_id' => (int)($row['department_id'] ?? 0),
-                'hour_bucket' => (string)($row['hour_bucket'] ?? ''),
-                'wash_count' => (int)($row['wash_count'] ?? 0),
-            ];
-        }
-
-        return $rows;
-    }
-
-    /**
-     * @param array<int|string> $department_ids
-     * @return array{quantity:int,products:int,earnings:int,washes:int}
-     * @throws Exception
-     */
-    public function transactionSummary(string $date_start, string $date_end, array $department_ids): array
-    {
-        global $db;
-
-        $this->validateDateRange($date_start, $date_end);
-        $normalized_department_ids = $this->normalizeIds($department_ids);
-        if ($normalized_department_ids === []) {
-            return [
-                'quantity' => 0,
-                'products' => 0,
-                'earnings' => 0,
-                'washes' => 0,
-            ];
-        }
-
-        $department_ids_sql = implode(',', $normalized_department_ids);
-        $escaped_start = $db->escape_string($date_start);
-        $escaped_end = $db->escape_string($date_end);
-
-        $sql = "SELECT COUNT(DISTINCT o.id) AS quantity,
-                       COALESCE(SUM(oi.quantity), 0) AS products,
-                       COALESCE(SUM(oi.price * oi.quantity), 0) AS earnings
-                FROM orders o
-                JOIN order_items oi ON oi.order_id = o.id
-                WHERE o.department_id IN ($department_ids_sql)
-                  AND o.created_at BETWEEN '$escaped_start' AND '$escaped_end'
-                  AND o.deleted_at IS NULL
-                  AND oi.deleted_at IS NULL";
-
-        $result = $db->query($sql);
-        $row = is_object($result) ? $result->fetch_assoc() : null;
-
-        return [
-            'quantity' => (int)($row['quantity'] ?? 0),
-            'products' => (int)($row['products'] ?? 0),
-            'earnings' => (int)round((float)($row['earnings'] ?? 0)),
-            'washes' => $this->countRows($date_start, $date_end, $normalized_department_ids),
-        ];
-    }
-
-    /**
-     * @param array<int|string> $department_ids
-     * @return array<int,array{id:int,department_id:int,created_at:string}>
-     * @throws Exception
-     */
-    public function listTransactions(string $date_start, string $date_end, array $department_ids): array
-    {
-        global $db;
-
-        $this->validateDateRange($date_start, $date_end);
-        $normalized_department_ids = $this->normalizeIds($department_ids);
-        if ($normalized_department_ids === []) {
-            return [];
-        }
-
-        selfserve_schema_bootstrap::ensureTables();
-
-        $department_ids_sql = implode(',', $normalized_department_ids);
-        $escaped_start = $db->escape_string($date_start);
-        $escaped_end = $db->escape_string($date_end);
-        $candidate_sql = $this->candidateUnionSql($department_ids_sql, $escaped_start, $escaped_end);
-
-        $sql = "SELECT CAST(SUBSTRING_INDEX(GROUP_CONCAT(entity_id ORDER BY source_priority ASC, entity_id ASC), ',', 1) AS UNSIGNED) AS id,
-                       department_id,
-                       MIN(counted_at) AS created_at
-                FROM ($candidate_sql) candidates
-                GROUP BY dedupe_key, department_id
-                ORDER BY created_at ASC";
-
-        $result = $db->query($sql);
-        if (!is_object($result) || $result->num_rows === 0) {
-            return [];
-        }
-
-        $rows = [];
-        while ($row = $result->fetch_assoc()) {
-            $rows[] = [
-                'id' => (int)($row['id'] ?? 0),
-                'department_id' => (int)($row['department_id'] ?? 0),
-                'created_at' => (string)($row['created_at'] ?? ''),
-            ];
-        }
-
-        return $rows;
-    }
-
-    /**
-     * @param array<int> $department_ids
-     * @throws Exception
-     */
-    private function countRows(string $date_start, string $date_end, array $department_ids): int
-    {
-        $rows = $this->countByHourForDepartments($date_start, $date_end, $department_ids);
-        $total = 0;
-
-        foreach ($rows as $row) {
-            $total += (int)($row['wash_count'] ?? 0);
-        }
-
-        return $total;
-    }
-
-    private function candidateUnionSql(string $department_ids_sql, string $escaped_start, string $escaped_end): string
-    {
-        return "SELECT CONCAT('order:', o.id) AS dedupe_key,
-                       o.id AS entity_id,
-                       o.department_id,
-                       o.created_at AS counted_at,
-                       0 AS source_priority
-                FROM orders o
-                JOIN order_items oi ON oi.order_id = o.id
-                JOIN products p ON p.id = oi.product_id
-                WHERE o.department_id IN ($department_ids_sql)
-                  AND o.created_at BETWEEN '$escaped_start' AND '$escaped_end'
-                  AND o.deleted_at IS NULL
-                  AND oi.deleted_at IS NULL
-                  AND p.is_wash = 1
-                UNION ALL
-                SELECT CASE
-                           WHEN linked_o.id IS NOT NULL THEN CONCAT('order:', linked_o.id)
-                           ELSE CONCAT('selfserve:', s.id)
-                       END AS dedupe_key,
-                       CASE
-                           WHEN linked_o.id IS NOT NULL THEN linked_o.id
-                           ELSE s.id
-                       END AS entity_id,
-                       COALESCE(linked_o.department_id, s.department_id) AS department_id,
-                       COALESCE(linked_o.created_at, s.completed_at) AS counted_at,
-                       1 AS source_priority
-                FROM selfserve_wash_sessions s
-                LEFT JOIN orders linked_o
-                  ON linked_o.id = s.order_id
-                 AND linked_o.deleted_at IS NULL
-                WHERE COALESCE(linked_o.department_id, s.department_id) IN ($department_ids_sql)
-                  AND COALESCE(linked_o.created_at, s.completed_at) BETWEEN '$escaped_start' AND '$escaped_end'
-                  AND s.deleted_at IS NULL
-                  AND s.completed_at IS NOT NULL
-                  AND UPPER(TRIM(s.status)) = 'COMPLETED'";
-    }
-
-    /**
-     * @param array<int|string> $ids
-     * @return array<int>
-     */
-    private function normalizeIds(array $ids): array
-    {
-        $normalized = [];
-        foreach ($ids as $id) {
-            $value = (int)$id;
-            if ($value > 0) {
-                $normalized[$value] = $value;
-            }
-        }
-
-        return array_values($normalized);
-    }
-
-    /**
-     * @throws Exception
-     */
-    private function validateDateRange(string $date_start, string $date_end): void
-    {
-        if (strtotime($date_start) === false || strtotime($date_end) === false) {
-            throw new Exception('Invalid date range provided');
-        }
-        if (strtotime($date_start) > strtotime($date_end)) {
-            throw new Exception('The start date cannot be after the end date');
-        }
-    }
-}
@@ -34,14 +34,6 @@ class departments_schema_bootstrap
            );
        }

-        if (!self::columnExists($db, 'departments', 'custom_pricing_only')) {
-            $db->query(
-                "ALTER TABLE departments
-                    ADD COLUMN custom_pricing_only TINYINT(1) NOT NULL DEFAULT 0
-                    AFTER archived"
-            );
-        }
-
        if (!self::indexExists($db, 'departments', self::ARCHIVED_INDEX)) {
            $db->query(
                "ALTER TABLE departments
@@ -172,8 +172,7 @@ class economic implements economic_i
        string $email,
        int $phone,
        ?int $mobile_phone = null,
-        object|array|null $company_information = null,
-        ?string $ean = null
+        object|array|null $company_information = null
    ): object
    {
        $payload = [
@@ -197,37 +196,10 @@ class economic implements economic_i
        ];

        $payload = array_replace($payload, $this->buildCustomerPayloadFromCompanyInformation($company_information));
-        $normalized_ean = self::normalizeCustomerEan($ean);
-        if ($normalized_ean !== null) {
-            $payload['ean'] = $normalized_ean;
-        }

        return $this->customers->customers->create($payload);
    }

-    public static function normalizeCustomerEan(mixed $value): ?string
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        $digits = preg_replace('/\D+/', '', (string)$value);
-        if (!is_string($digits)) {
-            return null;
-        }
-
-        $digits = trim($digits);
-        if ($digits === '') {
-            return null;
-        }
-
-        if (strlen($digits) > 13) {
-            throw new \InvalidArgumentException('EAN must be at most 13 digits.');
-        }
-
-        return $digits;
-    }
-
    private function buildCustomerPayloadFromCompanyInformation(object|array|null $company_information): array
    {
        if ($company_information === null) {
@@ -240,13 +240,7 @@ class economic_transfer_executor
            'Queued transfer processed successfully for collected invoice #' . $collected_invoice_id
        );

-        $result = $collected_order_invoices->asArray();
-        $transfer_metrics = $collected_order_invoices->getLastEconomicTransferMetrics();
-        if ($transfer_metrics !== null) {
-            $result['economic_transfer_metrics'] = $transfer_metrics;
-        }
-
-        return $result;
+        return $collected_order_invoices->asArray();
    }

    /**
@@ -328,21 +322,23 @@ class economic_transfer_executor
        $economic_dimension_id = $department['economic_dimension_id'] ?? 0;
        $order_item_price = (float)($order_item['price'] ?? 0);
        $product_price = (float)($order_item['product']['price'] ?? 0);
-        $discount_percentage = 0.0;
-        if (abs($product_price) > 0.00001 && $order_item_price < $product_price) {
-            $discount_percentage = round((($product_price - $order_item_price) / $product_price) * 100, 10);
-        }

        $economic_invoice_draft->addLine(
            $product_number,
            $product_name,
            $quantity,
            $order_item_price,
-            $discount_percentage,
+            0,
            (int)$economic_department_id ?? 0,
            (int)$economic_dimension_id ?? 0
        );

+        $show_discount = abs($order_item_price - $product_price) > 0.00001;
+        if ($show_discount && abs($product_price) > 0.00001) {
+            $discount_percentage = round((($product_price - $order_item_price) / $product_price) * 100, 0);
+            $economic_invoice_draft->addLineTEXT('Rabat: ' . ($order_item_price - $product_price) . ' DKK (' . $discount_percentage . '%)');
+        }
+
        if ($reference !== '') {
            $economic_invoice_draft->addLineTEXT('Reference:');
            if (str_contains($reference, "\n")) {
@@ -40,14 +40,9 @@ class economic_transfer_queue
        $max_attempts = max(1, min(10, $max_attempts));
        $transfer_type = $this->validateTransferType($transfer_type);
        $payload = $this->normalizePayloadForTransferType($transfer_type, $payload, $created_by);
-        $collected_invoice_lock = $this->acquireCollectedInvoiceExportLock($transfer_type, $payload);
-        if ($collected_invoice_lock !== null) {
-            $this->assertCollectedInvoiceExportIsStillEligible($payload);
-        }

-        $active_job = $this->findActiveJobByTarget($transfer_type, $payload, $created_by);
+        $active_job = $this->findActiveJobByTarget($transfer_type, $payload);
        if ($active_job !== null) {
-            $this->registerJobRequester((int)($active_job['id'] ?? 0), $created_by);
            $target_label = $this->buildTargetLabel($transfer_type, $payload);
            $this->logQueueEvent(
                1,
@@ -80,8 +75,6 @@ class economic_transfer_queue
        $job_id = (int)$db->insert_id();
        $stmt->close();

-        $this->registerJobRequester($job_id, $created_by);
-
        $this->logQueueEvent(
            1,
            $created_by,
@@ -142,98 +135,6 @@ class economic_transfer_queue
        return $jobs;
    }

-    public function getJobByIdForUser(int $job_id, int $created_by): ?array
-    {
-        global $db;
-
-        $job_id = max(0, $job_id);
-        $created_by = max(0, $created_by);
-        if ($job_id < 1 || $created_by < 1) {
-            return null;
-        }
-
-        $stmt = $db->prepare(
-            "SELECT q.*
-             FROM economic_transfer_queue_jobs q
-             LEFT JOIN economic_transfer_queue_job_requesters r
-               ON r.queue_job_id = q.id AND r.user_id = ?
-             WHERE q.id = ? AND (q.created_by = ? OR r.user_id = ?)
-             LIMIT 1"
-        );
-        if (!$stmt) {
-            return null;
-        }
-
-        $stmt->bind_param('iiii', $created_by, $job_id, $created_by, $created_by);
-        if (!$stmt->execute()) {
-            $stmt->close();
-            return null;
-        }
-
-        $result = $stmt->get_result();
-        $row = $result instanceof mysqli_result ? $result->fetch_assoc() : null;
-        $stmt->close();
-
-        if (!$row) {
-            return null;
-        }
-        return $this->normalizeJobRow($row);
-    }
-
-    public function listJobsForCreatedBy(array $statuses = [], int $limit = 50, int $offset = 0, ?string $transfer_type = null, int $created_by = 0): array
-    {
-        global $db;
-
-        $created_by = max(0, $created_by);
-        if ($created_by < 1) {
-            return [];
-        }
-
-        $limit = max(1, min(500, $limit));
-        $offset = max(0, $offset);
-
-        $where = $this->buildListJobsWhereClause($statuses, $transfer_type);
-        $visibility = $this->jobVisibilitySql('economic_transfer_queue_jobs', $created_by);
-        $where .= $where === '' ? 'WHERE ' . $visibility : ' AND ' . $visibility;
-        $sql = "SELECT * FROM economic_transfer_queue_jobs $where ORDER BY id DESC LIMIT $limit OFFSET $offset";
-        $result = $db->query($sql);
-        if (!$result instanceof mysqli_result) {
-            return [];
-        }
-
-        $jobs = [];
-        while ($row = $result->fetch_assoc()) {
-            $jobs[] = $this->normalizeJobRow($row);
-        }
-        return $jobs;
-    }
-
-    public function countJobsForCreatedBy(array $statuses = [], ?string $transfer_type = null, int $created_by = 0): int
-    {
-        global $db;
-
-        $created_by = max(0, $created_by);
-        if ($created_by < 1) {
-            return 0;
-        }
-
-        $where = $this->buildListJobsWhereClause($statuses, $transfer_type);
-        $visibility = $this->jobVisibilitySql('economic_transfer_queue_jobs', $created_by);
-        $where .= $where === '' ? 'WHERE ' . $visibility : ' AND ' . $visibility;
-        $sql = "SELECT COUNT(*) AS total FROM economic_transfer_queue_jobs $where";
-        $result = $db->query($sql);
-        if (!$result instanceof mysqli_result) {
-            return 0;
-        }
-
-        $row = $result->fetch_assoc();
-        if (!is_array($row) || !isset($row['total'])) {
-            return 0;
-        }
-
-        return max(0, (int)$row['total']);
-    }
-
    public function countJobs(array $statuses = [], ?string $transfer_type = null): int
    {
        global $db;
@@ -258,9 +159,6 @@ class economic_transfer_queue
        global $db;

        $user_id = max(0, $user_id);
-        if ($user_id < 1) {
-            return [];
-        }
        $limit = max(1, min(100, $limit));
        try {
            $normalized_transfer_type = $transfer_type !== null && trim($transfer_type) !== ''
@@ -281,7 +179,7 @@ class economic_transfer_queue
                  ON d.queue_job_id = q.id
                 AND d.user_id = $user_id
                 AND d.dismissed_status = q.status
-                WHERE " . $this->jobVisibilitySql('q', $user_id) . "
+                WHERE 1 = 1
                  $transfer_condition
                  AND (
                    q.status IN ('" . self::STATUS_QUEUED . "', '" . self::STATUS_PROCESSING . "')
@@ -316,7 +214,7 @@ class economic_transfer_queue
            throw new Exception('Queue job and user are required');
        }

-        $job = $this->getJobByIdForUser($job_id, $user_id);
+        $job = $this->getJobById($job_id);
        if ($job === null) {
            throw new Exception('Queue job not found');
        }
@@ -374,8 +272,7 @@ class economic_transfer_queue
                  ON d.queue_job_id = q.id
                 AND d.user_id = $user_id
                 AND d.dismissed_status = q.status
-                WHERE " . $this->jobVisibilitySql('q', $user_id) . "
-                  AND q.status IN ('" . self::STATUS_COMPLETED . "', '" . self::STATUS_FAILED . "')
+                WHERE q.status IN ('" . self::STATUS_COMPLETED . "', '" . self::STATUS_FAILED . "')
                  $transfer_condition
                  AND d.queue_job_id IS NULL
                ON DUPLICATE KEY UPDATE dismissed_status = VALUES(dismissed_status), dismissed_at = NOW()";
@@ -387,30 +284,13 @@ class economic_transfer_queue
     * @throws Exception
     */
    public function retryJob(int $job_id): array
-    {
-        return $this->retryJobInternal($job_id);
-    }
-
-    public function retryJobForUser(int $job_id, int $created_by): array
-    {
-        return $this->retryJobInternal($job_id, $created_by);
-    }
-
-    private function retryJobInternal(int $job_id, ?int $created_by = null): array
    {
        global $db;

-        $job_id = max(0, $job_id);
-        $created_by = $created_by === null ? null : max(0, $created_by);
-        $existing_job = $created_by === null
-            ? $this->getJobById($job_id)
-            : $this->getJobByIdForUser($job_id, $created_by);
+        $existing_job = $this->getJobById($job_id);
        if ($existing_job === null) {
            throw new Exception('Queue job not found');
        }
-        if ($created_by !== null && (int)($existing_job['created_by'] ?? 0) !== $created_by) {
-            throw new Exception('Only the queue job creator can retry this job');
-        }
        if ((string)($existing_job['status'] ?? '') !== self::STATUS_FAILED) {
            throw new Exception('Only failed jobs can be retried');
        }
@@ -418,26 +298,19 @@ class economic_transfer_queue
            throw new Exception('Queue job reached max retry attempts');
        }

-        $sql = "UPDATE economic_transfer_queue_jobs
+        $stmt = $db->prepare(
+            "UPDATE economic_transfer_queue_jobs
             SET status = ?, progress_percent = 0, progress_message = 'Queued for retry',
                 error_message = NULL, result_json = NULL, started_at = NULL, completed_at = NULL, locked_at = NULL
-             WHERE id = ? AND status = ?";
-        if ($created_by !== null) {
-            $sql .= " AND created_by = ?";
-        }
-
-        $stmt = $db->prepare($sql);
+             WHERE id = ? AND status = ?"
+        );
        if (!$stmt) {
            throw new Exception('Failed to prepare retry statement');
        }

        $queued = self::STATUS_QUEUED;
        $failed = self::STATUS_FAILED;
-        if ($created_by !== null) {
-            $stmt->bind_param('sisi', $queued, $job_id, $failed, $created_by);
-        } else {
        $stmt->bind_param('sis', $queued, $job_id, $failed);
-        }
        $stmt->execute();
        $affected = $stmt->affected_rows;
        $stmt->close();
@@ -448,9 +321,7 @@ class economic_transfer_queue

        $this->clearDismissalsForJob($job_id);

-        $job = $created_by === null
-            ? $this->getJobById($job_id)
-            : $this->getJobByIdForUser($job_id, $created_by);
+        $job = $this->getJobById($job_id);
        if ($job === null) {
            throw new Exception('Retry updated job could not be loaded');
        }
@@ -632,53 +503,11 @@ class economic_transfer_queue
        if ($collected_invoice_id < 1) {
            throw new Exception('collected_invoice_id is required');
        }
-        $collection_lock = $this->acquireCollectedInvoiceExportLock(
-            self::TYPE_COLLECTED_INVOICE_EXPORT,
-            $payload
-        );
-        $this->assertCollectedInvoiceExportIsStillEligible($payload);
        $send_as_is = (bool)($payload['send_as_is'] ?? false);
        $this->updateProgress((int)$job['id'], 65, 'Exporting collected invoice');
        return $this->executor->exportCollectedInvoice($collected_invoice_id, $send_as_is, $requested_by);
    }

-    /**
-     * Enqueue, worker execution, payments, and invoice-tree mutations share the
-     * same collection lock. The returned object intentionally stays in scope
-     * for the complete enqueue/export operation and releases in its destructor.
-     *
-     * @throws Exception
-     */
-    private function acquireCollectedInvoiceExportLock(string $transfer_type, array $payload): ?order_payment_lock
-    {
-        if ($transfer_type !== self::TYPE_COLLECTED_INVOICE_EXPORT) {
-            return null;
-        }
-        $collected_invoice_id = (int)($payload['collected_invoice_id'] ?? 0);
-        if ($collected_invoice_id < 1) {
-            throw new Exception('collected_invoice_id is required');
-        }
-        $lock = order_payment_lock::tryAcquireInvoiceCollection($collected_invoice_id);
-        if ($lock === null) {
-            throw new Exception('Invoice collection is currently being changed or paid. Try again.');
-        }
-        return $lock;
-    }
-
-    /**
-     * Re-read eligibility after acquiring the collection lock so a queued job
-     * cannot export a collection that was booked or superseded while waiting.
-     *
-     * @throws Exception
-     */
-    private function assertCollectedInvoiceExportIsStillEligible(array $payload): void
-    {
-        $collection = (new \objects\collected_order_invoices_o())->select(
-            (int)($payload['collected_invoice_id'] ?? 0)
-        );
-        invoice_collection_bulk_action_service::assertCollectionCanQueueEconomic($collection);
-    }
-
    private function updateProgress(int $job_id, int $percent, string $message): void
    {
        global $db;
@@ -791,38 +620,6 @@ class economic_transfer_queue
        $db->query("DELETE FROM economic_transfer_queue_job_dismissals WHERE queue_job_id = $job_id");
    }

-    private function registerJobRequester(int $job_id, int $user_id): void
-    {
-        global $db;
-
-        if ($job_id < 1 || $user_id < 1) {
-            return;
-        }
-        $stmt = $db->prepare(
-            "INSERT INTO economic_transfer_queue_job_requesters (queue_job_id, user_id, requested_at)
-             VALUES (?, ?, NOW())
-             ON DUPLICATE KEY UPDATE requested_at = VALUES(requested_at)"
-        );
-        if (!$stmt) {
-            throw new Exception('Failed to prepare queue requester registration');
-        }
-        $stmt->bind_param('ii', $job_id, $user_id);
-        if (!$stmt->execute()) {
-            $stmt->close();
-            throw new Exception('Failed to register queue requester');
-        }
-        $stmt->close();
-    }
-
-    private function jobVisibilitySql(string $alias, int $user_id): string
-    {
-        $user_id = max(0, $user_id);
-        return "($alias.created_by = $user_id OR EXISTS (
-            SELECT 1 FROM economic_transfer_queue_job_requesters requester
-            WHERE requester.queue_job_id = $alias.id AND requester.user_id = $user_id
-        ))";
-    }
-
    /**
     * Release jobs stuck in PROCESSING due to crashes or killed workers.
     */
@@ -852,14 +649,11 @@ class economic_transfer_queue
            $normalized_payload['requested_by'] = max(0, (int)$normalized_payload['requested_by']);
        }

-        if ($transfer_type === self::TYPE_COLLECTED_INVOICE_EXPORT) {
-            return $this->normalizeCollectedInvoicePayload($normalized_payload, $created_by);
-        }
-        if (!in_array($transfer_type, [self::TYPE_ORDER_DRAFT_EXPORT, self::TYPE_ORDER_INVOICE_EXPORT], true)) {
-            $this->rejectPayload($created_by, 'Unsupported transfer type payload: ' . $transfer_type);
-        }
-
-        return $this->normalizeOrderPayload($normalized_payload, $created_by);
+        return match ($transfer_type) {
+            self::TYPE_ORDER_DRAFT_EXPORT, self::TYPE_ORDER_INVOICE_EXPORT => $this->normalizeOrderPayload($normalized_payload, $created_by),
+            self::TYPE_COLLECTED_INVOICE_EXPORT => $this->normalizeCollectedInvoicePayload($normalized_payload, $created_by),
+            default => $this->rejectPayload($created_by, 'Unsupported transfer type payload: ' . $transfer_type),
+        };
    }

    /**
@@ -869,7 +663,7 @@ class economic_transfer_queue
    {
        $order_id = $payload['order_id'] ?? null;
        if ($order_id === null || !is_numeric($order_id) || (int)$order_id < 1) {
-            $this->rejectPayload($created_by, 'order_id is required and must be a positive number');
+            return $this->rejectPayload($created_by, 'order_id is required and must be a positive number');
        }
        $payload['order_id'] = (int)$order_id;
        return $payload;
@@ -882,7 +676,7 @@ class economic_transfer_queue
    {
        $collected_invoice_id = $payload['collected_invoice_id'] ?? null;
        if ($collected_invoice_id === null || !is_numeric($collected_invoice_id) || (int)$collected_invoice_id < 1) {
-            $this->rejectPayload($created_by, 'collected_invoice_id is required and must be a positive number');
+            return $this->rejectPayload($created_by, 'collected_invoice_id is required and must be a positive number');
        }

        $payload['collected_invoice_id'] = (int)$collected_invoice_id;
@@ -903,43 +697,40 @@ class economic_transfer_queue
            if ($numeric === 0 || $numeric === 1) {
                return $numeric === 1;
            }
-            $this->rejectPayload($created_by, $field_name . ' must be a boolean');
+            return $this->rejectPayload($created_by, $field_name . ' must be a boolean');
        }
        if (is_string($value)) {
            $normalized = strtolower(trim($value));
            if (in_array($normalized, ['true', 'false', '1', '0'], true)) {
                return in_array($normalized, ['true', '1'], true);
            }
-            $this->rejectPayload($created_by, $field_name . ' must be a boolean');
+            return $this->rejectPayload($created_by, $field_name . ' must be a boolean');
        }

-        $this->rejectPayload($created_by, $field_name . ' must be a boolean');
+        return $this->rejectPayload($created_by, $field_name . ' must be a boolean');
    }

-    private function findActiveJobByTarget(string $transfer_type, array $payload, int $created_by): ?array
+    private function findActiveJobByTarget(string $transfer_type, array $payload): ?array
    {
        return match ($transfer_type) {
            self::TYPE_ORDER_DRAFT_EXPORT, self::TYPE_ORDER_INVOICE_EXPORT => $this->findActiveJobByJsonNumericTarget(
                $transfer_type,
                '$.order_id',
-                (int)($payload['order_id'] ?? 0),
-                $created_by
+                (int)($payload['order_id'] ?? 0)
            ),
            self::TYPE_COLLECTED_INVOICE_EXPORT => $this->findActiveJobByJsonNumericTarget(
                $transfer_type,
                '$.collected_invoice_id',
-                (int)($payload['collected_invoice_id'] ?? 0),
-                $created_by
+                (int)($payload['collected_invoice_id'] ?? 0)
            ),
            default => null,
        };
    }

-    private function findActiveJobByJsonNumericTarget(string $transfer_type, string $json_path, int $target_value, int $created_by): ?array
+    private function findActiveJobByJsonNumericTarget(string $transfer_type, string $json_path, int $target_value): ?array
    {
        global $db;

-        // Active work is unique by transfer type and business target across all requesting users.
        if ($target_value < 1) {
            return null;
        }
@@ -54,17 +54,6 @@ class economic_transfer_queue_schema_bootstrap
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
        );

-        $db->query(
-            "CREATE TABLE IF NOT EXISTS economic_transfer_queue_job_requesters (
-                queue_job_id BIGINT UNSIGNED NOT NULL,
-                user_id INT NOT NULL,
-                requested_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (queue_job_id, user_id),
-                INDEX idx_economic_transfer_queue_job_requesters_user (user_id, queue_job_id),
-                INDEX idx_economic_transfer_queue_job_requesters_job (queue_job_id)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
        self::$initialized = true;
    }
 }
@@ -40,7 +40,6 @@ class economic_v2_distribution_service

    public function __construct(?economic_v2_versioning_service $versioning = null, ?economic $economic = null)
    {
-        department_customer_price_overrides_schema_bootstrap::ensureTables();
        $this->versioning = $versioning ?? new economic_v2_versioning_service();
        $this->economic = $economic;
    }
@@ -389,16 +388,7 @@ class economic_v2_distribution_service
                    continue;
                }

-                $discount_row = $this->resolveDiscountForProduct($customer_number, $product_id, $created_at, $department_id);
-                if ($discount_row === null) {
-                    continue;
-                }
-                if (array_key_exists('fixed_price', $discount_row) && $discount_row['fixed_price'] !== null) {
-                    $fixed_price = (float)$discount_row['fixed_price'];
-                    $order_discount_total += (($base_price - $fixed_price) * $quantity);
-                    continue;
-                }
-
+                $discount_row = $this->resolveDiscountForProduct($customer_number, $product_id, $created_at);
                $discount_percentage = (float)($discount_row['discount'] ?? 0);
                if ($discount_percentage <= 0) {
                    continue;
@@ -1529,13 +1519,7 @@ class economic_v2_distribution_service
                $line_price = ((float)$this->getProductDepartmentPrice($product_id, $department_id)) * $quantity;
            }

-            $discount_row = $this->resolveDiscountForProduct($customer_number, $product_id, $timestamp, $department_id);
-            if ($discount_row !== null && array_key_exists('fixed_price', $discount_row) && $discount_row['fixed_price'] !== null) {
-                $line_price = ((float)$discount_row['fixed_price']) * $quantity;
-                $total += $line_price;
-                continue;
-            }
-
+            $discount_row = $this->resolveDiscountForProduct($customer_number, $product_id, $timestamp);
            $discount_percentage = (float)($discount_row['discount'] ?? 0);
            if ($discount_percentage > 0) {
                $line_price *= (1 - ($discount_percentage / 100));
@@ -1545,22 +1529,15 @@ class economic_v2_distribution_service
        return $total;
    }

-    protected function resolveDiscountForProduct(int $customer_number, int $product_id, string $timestamp, ?int $department_id = null): ?array
+    protected function resolveDiscountForProduct(int $customer_number, int $product_id, string $timestamp): ?array
    {
-        $cache_key = $customer_number . '|' . $product_id . '|' . (int)($department_id ?? 0) . '|' . substr($timestamp, 0, 19);
+        $cache_key = $customer_number . '|' . $product_id . '|' . substr($timestamp, 0, 19);
        if (array_key_exists($cache_key, $this->discount_resolution_cache)) {
            return $this->discount_resolution_cache[$cache_key];
        }

-        $scopedDepartmentId = $department_id !== null && (new \objects\departments_o())->isCustomPricingOnly((int)$department_id)
-            ? (int)$department_id
-            : null;
-
-        $direct = $this->versioning->resolveDiscountOverrideAt($customer_number, false, (string)$product_id, $timestamp, $scopedDepartmentId);
-        if ($direct !== null && (
-            (array_key_exists('fixed_price', $direct) && $direct['fixed_price'] !== null)
-            || (int)($direct['discount'] ?? 0) > 0
-        )) {
+        $direct = $this->versioning->resolveDiscountOverrideAt($customer_number, false, (string)$product_id, $timestamp);
+        if ($direct !== null && (int)($direct['discount'] ?? 0) > 0) {
            return $this->discount_resolution_cache[$cache_key] = $direct;
        }

@@ -1568,20 +1545,13 @@ class economic_v2_distribution_service
        if ($product !== null) {
            $category = (string)$product->category->value();
            if ($category !== '') {
-                $category_discount = $this->versioning->resolveDiscountOverrideAt($customer_number, true, $category, $timestamp, $scopedDepartmentId);
+                $category_discount = $this->versioning->resolveDiscountOverrideAt($customer_number, true, $category, $timestamp);
                if ($category_discount !== null && (int)($category_discount['discount'] ?? 0) > 0) {
                    return $this->discount_resolution_cache[$cache_key] = $category_discount;
                }
            }
        }

-        if ($scopedDepartmentId !== null) {
-            $global_discount = $this->versioning->resolveDiscountOverrideAt($customer_number, true, 'global', $timestamp, $scopedDepartmentId);
-            if ($global_discount !== null && (int)($global_discount['discount'] ?? 0) > 0) {
-                return $this->discount_resolution_cache[$cache_key] = $global_discount;
-            }
-        }
-
        return $this->discount_resolution_cache[$cache_key] = null;
    }

@@ -10,7 +10,7 @@ class economic_v2_revenue_statistics_service

    private economic $economic;

-    /** @var array<int, array{customer_number: int, name: ?string, barred: ?bool, status: string}> */
+    /** @var array<int, array{customer_number:int,name:?string,barred:?bool,status:string}> */
    private array $customer_cache = [];

    public function __construct(?economic $economic = null)
@@ -44,6 +44,7 @@ class economic_v2_revenue_statistics_service
        $summary = [
            'invoice_count' => 0,
            'line_count' => 0,
+            'unique_customers' => 0,
            'net_amount' => 0.0,
            'vat_amount' => 0.0,
            'gross_amount' => 0.0,
@@ -397,7 +398,7 @@ class economic_v2_revenue_statistics_service
    }

    /**
-     * @return array{customer_number: int, name: ?string, barred: ?bool, status: string}
+     * @return array{customer_number:int,name:?string,barred:?bool,status:string}
     */
    private function resolveCustomerSnapshot(int $customer_number, array &$warnings): array
    {
@@ -499,3 +500,4 @@ class economic_v2_revenue_statistics_service
        return $data;
    }
 }
+
@@ -60,13 +60,11 @@ class economic_v2_schema_bootstrap

            "CREATE TABLE IF NOT EXISTS customer_discount_override_versions (
                id INT AUTO_INCREMENT PRIMARY KEY,
-                department_id INT NULL DEFAULT NULL,
                user_id INT NOT NULL,
                customer_number INT NOT NULL,
                is_category TINYINT(1) NOT NULL,
                object_id VARCHAR(64) NOT NULL,
                discount INT NOT NULL,
-                fixed_price INT NULL DEFAULT NULL,
                effective_from DATETIME NOT NULL,
                effective_to DATETIME NULL,
                source VARCHAR(64) NOT NULL DEFAULT 'live',
@@ -76,7 +74,6 @@ class economic_v2_schema_bootstrap
                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
                updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                INDEX idx_discount_override_versions_lookup (customer_number, is_category, object_id, effective_from, effective_to),
-                INDEX idx_discount_override_versions_department_lookup (department_id, customer_number, is_category, object_id, effective_from, effective_to),
                INDEX idx_discount_override_versions_user (user_id),
                INDEX idx_discount_override_versions_source (source)
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
@@ -86,22 +83,6 @@ class economic_v2_schema_bootstrap
            $db->query($sql);
        }

-        if (!self::tableHasColumn('customer_discount_override_versions', 'fixed_price')) {
-            $db->query(
-                "ALTER TABLE customer_discount_override_versions
-                    ADD COLUMN fixed_price INT NULL DEFAULT NULL
-                    AFTER discount"
-            );
-        }
-
-        if (!self::tableHasColumn('customer_discount_override_versions', 'department_id')) {
-            $db->query(
-                "ALTER TABLE customer_discount_override_versions
-                    ADD COLUMN department_id INT NULL DEFAULT NULL
-                    AFTER id"
-            );
-        }
-
        self::$initialized = true;
    }

@@ -125,3 +106,4 @@ class economic_v2_schema_bootstrap
        return ((int)($row['c'] ?? 0)) > 0;
    }
 }
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jeppe Bundgaard	a3f685c949	Merge remote-tracking branch 'origin/master' into beta	2026-05-27 11:47:40 +02:00
Jeppe Bundgaard	d288761151	Add 'test' key with 'Beta tests' label to workerRoute response data.	2026-05-21 11:39:40 +02:00