chore(version): pre-release bump to 02.34.45-dev [skip ci]

Derives MOKO-XXXX-XXXX support PIN from health token and displays
it as a badge in the cpanel header row alongside the version badge.
Also adds base_url manifest XML fallback for Send Heartbeat button.

.gitignore

@@ -121,7 +121,7 @@ releases/
 build/
 dist/
 out/
-site/
+/site/
 !source/packages/*/site/
 *.map
 *.css.map

.mokogitea/CLAUDE.md

@@ -54,7 +54,7 @@ Joomla **package** (`pkg_mokowaas`) with 17 sub-extensions:
 
 ### Update Server
 
-`updates.xml` is stored in the repo root and maintained manually. Points to ZIP assets on Gitea releases.
+MokoGitea generates update feeds dynamically from releases — no static `updates.xml` needed.
 
 ## Source Directory
 

.mokogitea/manifest.xml

@@ -9,7 +9,7 @@
     <display-name>Package - MokoWaaS</display-name>
     <org>MokoConsulting</org>
     <description>White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments</description>
-    <version>02.34.16</version>
+    <version>02.34.45</version>
     <license spdx="GPL-3.0-or-later">GNU General Public License v3</license>
   </identity>
   <governance>

.mokogitea/workflows/auto-release.yml

@@ -1,316 +1,324 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Release
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
-# PATH: /templates/workflows/universal/auto-release.yml.template
-# VERSION: 05.00.00
-# BRIEF: Universal build & release � detects platform from manifest.xml
-#
-# +========================================================================+
-# |              UNIVERSAL BUILD & RELEASE PIPELINE                        |
-# +========================================================================+
-# |                                                                        |
-# |  Reads manifest.xml (joomla|dolibarr|generic) to branch logic.       |
-# |                                                                        |
-# |  Platform-specific:                                                    |
-# |    joomla:   XML manifest, updates.xml, type-prefixed packages         |
-# |    dolibarr: mod*.class.php, update.txt, dev version reset             |
-# |    generic:  README-only, no update stream                             |
-# |                                                                        |
-# +========================================================================+
-
-name: "Universal: Build & Release"
-
-on:
-  pull_request:
-    types: [opened, closed]
-    branches:
-      - main
-  workflow_dispatch:
-    inputs:
-      action:
-        description: 'Action to perform'
-        required: false
-        type: choice
-        default: release
-        options:
-          - release
-          - promote-rc
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-  GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
-  GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
-
-permissions:
-  contents: write
-
-jobs:
-  # ── PR Opened → Rename branch to RC and build RC release ─────────────────────
-  promote-rc:
-    name: Promote to RC
-    runs-on: release
-    if: >-
-      (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
-      (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc')
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
-          fetch-depth: 1
-
-      - name: Setup moko-platform tools
-        env:
-          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
-        run: |
-          if ! command -v composer &> /dev/null; then
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api
-          composer install --no-dev --no-interaction --quiet
-          echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
-
-      - name: Rename branch to rc
-        run: |
-          php ${MOKO_CLI}/branch_rename.php \
-            --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --api-base "${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
-            --pr "${{ github.event.pull_request.number }}"
-
-      - name: Checkout rc and configure git
-        run: |
-          git fetch origin rc
-          git checkout rc
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
-
-      - name: Publish RC release
-        run: |
-          php ${MOKO_CLI}/release_publish.php \
-            --path . --stability rc --bump minor --branch rc \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --skip-update-stream
-
-      - name: Summary
-        if: always()
-        run: |
-          echo "## Promoted to Release Candidate" >> $GITHUB_STEP_SUMMARY
-          echo "Branch renamed to rc, minor bump, RC release built (updates.xml managed by Gitea Pages)" >> $GITHUB_STEP_SUMMARY
-
-  # ── Merged PR → Build & Release (or promote RC to stable) ────────────────────
-  release:
-    name: Build & Release Pipeline
-    runs-on: release
-    if: >-
-      github.event.pull_request.merged == true ||
-      (github.event_name == 'workflow_dispatch' && inputs.action != 'promote-rc')
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
-          fetch-depth: 0
-
-      - name: Configure git for bot pushes
-        run: |
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
-
-      - name: Check for merge conflict markers
-        run: |
-          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
-          if [ -n "$CONFLICTS" ]; then
-            echo "::error::Merge conflict markers found - aborting release"
-            echo "## Release Blocked: Conflict Markers" >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-            echo "$CONFLICTS" >> $GITHUB_STEP_SUMMARY
-            echo '```' >> $GITHUB_STEP_SUMMARY
-            exit 1
-          fi
-          echo "No conflict markers found"
-
-      - name: Setup moko-platform tools
-        env:
-          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_MIRROR_TOKEN }}"}}'
-        run: |
-          if ! command -v composer &> /dev/null; then
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api
-          composer install --no-dev --no-interaction --quiet
-          echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
-
-      - name: "Publish stable release"
-        run: |
-          php ${MOKO_CLI}/release_publish.php \
-            --path . --stability stable --bump minor --branch main \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --skip-update-stream
-
-      - name: Update release notes from CHANGELOG.md
-        run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-
-          # Extract [Unreleased] section from changelog
-          if [ -f "CHANGELOG.md" ]; then
-            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
-            [ -z "$NOTES" ] && NOTES="Stable release"
-          else
-            NOTES="Stable release"
-          fi
-
-          # Update release body via API
-          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
-            "${API_BASE}/releases/tags/stable" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
-
-          if [ -n "$RELEASE_ID" ]; then
-            python3 -c "
-          import json, urllib.request
-          body = open('/dev/stdin').read()
-          payload = json.dumps({'body': body}).encode()
-          req = urllib.request.Request(
-              '${API_BASE}/releases/${RELEASE_ID}',
-              data=payload, method='PATCH',
-              headers={
-                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
-                  'Content-Type': 'application/json'
-              })
-          urllib.request.urlopen(req)
-          " <<< "$NOTES"
-            echo "Release notes updated from CHANGELOG.md"
-          fi
-
-      # -- STEP 9: Mirror to GitHub (stable only) --------------------------------
-      - name: "Step 9: Mirror release to GitHub"
-        if: >-
-          steps.version.outputs.skip != 'true' &&
-          secrets.GH_MIRROR_TOKEN != ''
-        continue-on-error: true
-        run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
-          RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
-          GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php ${MOKO_CLI}/release_mirror.php \
-            --version "$VERSION" --tag "$RELEASE_TAG" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --gh-token "${{ secrets.GH_MIRROR_TOKEN }}" --gh-repo "$GH_REPO" \
-            --branch main 2>&1 || true
-          echo "GitHub mirror updated" >> $GITHUB_STEP_SUMMARY
-
-      # -- STEP 10: Sync main branch to GitHub mirror ----------------------------
-      - name: "Step 10: Push main to GitHub mirror"
-        if: >-
-          steps.version.outputs.skip != 'true' &&
-          secrets.GH_MIRROR_TOKEN != ''
-        continue-on-error: true
-        run: |
-          GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}"
-          GH_ORG=$(echo "$GH_REPO" | cut -d/ -f1)
-          GH_NAME=$(echo "$GH_REPO" | cut -d/ -f2)
-          git remote add github "https://x-access-token:${{ secrets.GH_MIRROR_TOKEN }}@github.com/${GH_ORG}/${GH_NAME}.git" 2>/dev/null || \
-            git remote set-url github "https://x-access-token:${{ secrets.GH_MIRROR_TOKEN }}@github.com/${GH_ORG}/${GH_NAME}.git"
-          git fetch origin main --depth=1
-          git push github origin/main:refs/heads/main --force 2>/dev/null \
-            && echo "main branch pushed to GitHub mirror" \
-            || echo "WARNING: GitHub mirror push failed"
-
-      - name: "Step 11: Delete rc branch and recreate dev from main"
-        if: steps.version.outputs.skip != 'true'
-        continue-on-error: true
-        run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
-
-          # Delete rc branch (ephemeral - created by promote-rc)
-          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
-            "${API_BASE}/branches/rc" 2>/dev/null \
-            && echo "Deleted rc branch" || echo "rc branch not found"
-
-          # Delete dev branch
-          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
-            "${API_BASE}/branches/dev" 2>/dev/null && echo "Deleted dev branch"
-
-          # Recreate dev from main (now includes version bump + changelog promotion)
-          curl -sf -X POST -H "Authorization: token ${TOKEN}" \
-            -H "Content-Type: application/json" \
-            "${API_BASE}/branches" \
-            -d '{"new_branch_name":"dev","old_branch_name":"main"}' 2>/dev/null && echo "Recreated dev from main"
-
-          echo "Pre-release branches cleaned, dev reset from main" >> $GITHUB_STEP_SUMMARY
-
-      - name: "Step 12: Create version branch from main"
-        if: steps.version.outputs.skip != 'true'
-        continue-on-error: true
-        run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
-          BRANCH_NAME="version/${VERSION}"
-          MAIN_SHA=$(git rev-parse HEAD)
-
-          # Delete old version branch if it exists (same version re-release)
-          curl -sf -X DELETE -H "Authorization: token ${TOKEN}"             "${API_BASE}/branches/${BRANCH_NAME}" 2>/dev/null && echo "Deleted old ${BRANCH_NAME}"
-
-          # Create version/XX.YY.ZZ from main
-          curl -sf -X POST -H "Authorization: token ${TOKEN}"             -H "Content-Type: application/json"             "${API_BASE}/branches"             -d "{\"new_branch_name\":\"${BRANCH_NAME}\",\"old_branch_name\":\"main\"}" 2>/dev/null             && echo "Created ${BRANCH_NAME} from main (${MAIN_SHA})"             || echo "WARNING: ${BRANCH_NAME} creation failed"
-
-          echo "Version branch created: ${BRANCH_NAME} (${MAIN_SHA})" >> $GITHUB_STEP_SUMMARY
-
-
-
-      # -- Dolibarr post-release: Reset dev version -----------------------------
-      - name: "Post-release: Reset dev version"
-        if: steps.version.outputs.skip != 'true'
-        continue-on-error: true
-        run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php ${MOKO_CLI}/version_reset_dev.php \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "${API_BASE}" \
-            --branch dev --path . 2>&1 || true
-
-      # -- Summary --------------------------------------------------------------
-      - name: Pipeline Summary
-        if: always()
-        run: |
-          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
-          PLATFORM="${{ steps.platform.outputs.platform }}"
-          if [ "${{ steps.version.outputs.skip }}" = "true" ]; then
-            echo "## Release Skipped" >> $GITHUB_STEP_SUMMARY
-            echo "No VERSION in README.md" >> $GITHUB_STEP_SUMMARY
-          elif [ "${{ steps.check.outputs.already_released }}" = "true" ]; then
-            echo "## Already Released - ${VERSION}" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "## Build & Release Complete (${PLATFORM})" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "| Step | Result |" >> $GITHUB_STEP_SUMMARY
-            echo "|------|--------|" >> $GITHUB_STEP_SUMMARY
-            echo "| Platform | \`${PLATFORM}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Branch | \`${{ steps.version.outputs.branch }}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Tag | \`${{ steps.version.outputs.tag }}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Release | [View](${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/tag/${{ steps.version.outputs.tag }}) |" >> $GITHUB_STEP_SUMMARY
-          fi
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: moko-platform.Release
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# PATH: /templates/workflows/universal/auto-release.yml.template
+# VERSION: 05.00.00
+# BRIEF: Universal build & release � detects platform from manifest.xml
+#
+# +========================================================================+
+# |              UNIVERSAL BUILD & RELEASE PIPELINE                        |
+# +========================================================================+
+# |                                                                        |
+# |  Reads manifest.xml (joomla|dolibarr|generic) to branch logic.       |
+# |                                                                        |
+# |  Platform-specific:                                                    |
+# |    joomla:   XML manifest, type-prefixed packages                      |
+# |    dolibarr: mod*.class.php, update.txt, dev version reset             |
+# |    generic:  README-only, no update stream                             |
+# |                                                                        |
+# +========================================================================+
+
+name: "Universal: Build & Release"
+
+on:
+  pull_request:
+    types: [opened, closed]
+    branches:
+      - main
+  workflow_dispatch:
+    inputs:
+      action:
+        description: 'Action to perform'
+        required: false
+        type: choice
+        default: release
+        options:
+          - release
+          - promote-rc
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+  GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
+  GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
+
+permissions:
+  contents: write
+
+jobs:
+  # ── PR Opened → Rename branch to RC and build RC release ─────────────────────
+  promote-rc:
+    name: Promote to RC
+    runs-on: release
+    if: >-
+      (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
+      (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc')
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          fetch-depth: 1
+
+      - name: Setup moko-platform tools
+        env:
+          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
+        run: |
+          if [ -f /opt/moko-platform/cli/version_bump.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/moko-platform
+            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/moko-platform-api
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+            cd /tmp/moko-platform-api
+            composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/moko-platform-api/cli >> $GITHUB_ENV
+          fi
+
+      - name: Rename branch to rc
+        run: |
+          php ${MOKO_CLI}/branch_rename.php \
+            --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --api-base "${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
+            --pr "${{ github.event.pull_request.number }}"
+
+      - name: Checkout rc and configure git
+        run: |
+          git fetch origin rc
+          git checkout rc
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
+          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
+
+      - name: Publish RC release
+        run: |
+          php ${MOKO_CLI}/release_publish.php \
+            --path . --stability rc --bump minor --branch rc \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}"
+
+      - name: Summary
+        if: always()
+        run: |
+          echo "## Promoted to Release Candidate" >> $GITHUB_STEP_SUMMARY
+          echo "Branch renamed to rc, minor bump, RC release built" >> $GITHUB_STEP_SUMMARY
+
+  # ── Merged PR → Build & Release (or promote RC to stable) ────────────────────
+  release:
+    name: Build & Release Pipeline
+    runs-on: release
+    if: >-
+      github.event.pull_request.merged == true ||
+      (github.event_name == 'workflow_dispatch' && inputs.action != 'promote-rc')
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          fetch-depth: 0
+
+      - name: Configure git for bot pushes
+        run: |
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
+          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
+
+      - name: Check for merge conflict markers
+        run: |
+          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
+          if [ -n "$CONFLICTS" ]; then
+            echo "::error::Merge conflict markers found — aborting release"
+            echo "## Release Blocked: Conflict Markers" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo "$CONFLICTS" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          echo "No conflict markers found"
+
+      - name: Setup moko-platform tools
+        env:
+          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
+          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_MIRROR_TOKEN }}"}}'
+        run: |
+          if [ -f /opt/moko-platform/cli/version_bump.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/moko-platform
+            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/moko-platform-api
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+            cd /tmp/moko-platform-api
+            composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/moko-platform-api/cli >> $GITHUB_ENV
+          fi
+
+      - name: "Publish stable release"
+        run: |
+          php ${MOKO_CLI}/release_publish.php \
+            --path . --stability stable --bump minor --branch main \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}"
+
+      - name: Update release notes from CHANGELOG.md
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+
+          # Extract [Unreleased] section from changelog
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+            [ -z "$NOTES" ] && NOTES="Stable release"
+          else
+            NOTES="Stable release"
+          fi
+
+          # Update release body via API
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+            "${API_BASE}/releases/tags/stable" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
+          if [ -n "$RELEASE_ID" ]; then
+            python3 -c "
+          import json, urllib.request
+          body = open('/dev/stdin').read()
+          payload = json.dumps({'body': body}).encode()
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "Release notes updated from CHANGELOG.md"
+          fi
+
+      # -- STEP 9: Mirror to GitHub (stable only) --------------------------------
+      - name: "Step 9: Mirror release to GitHub"
+        if: >-
+          steps.version.outputs.skip != 'true' &&
+          secrets.GH_MIRROR_TOKEN != ''
+        continue-on-error: true
+        run: |
+          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
+          GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          php ${MOKO_CLI}/release_mirror.php \
+            --version "$VERSION" --tag "$RELEASE_TAG" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
+            --gh-token "${{ secrets.GH_MIRROR_TOKEN }}" --gh-repo "$GH_REPO" \
+            --branch main 2>&1 || true
+          echo "GitHub mirror updated" >> $GITHUB_STEP_SUMMARY
+
+      # -- STEP 10: Sync main branch to GitHub mirror ----------------------------
+      - name: "Step 10: Push main to GitHub mirror"
+        if: >-
+          steps.version.outputs.skip != 'true' &&
+          secrets.GH_MIRROR_TOKEN != ''
+        continue-on-error: true
+        run: |
+          GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}"
+          GH_ORG=$(echo "$GH_REPO" | cut -d/ -f1)
+          GH_NAME=$(echo "$GH_REPO" | cut -d/ -f2)
+          git remote add github "https://x-access-token:${{ secrets.GH_MIRROR_TOKEN }}@github.com/${GH_ORG}/${GH_NAME}.git" 2>/dev/null || \
+            git remote set-url github "https://x-access-token:${{ secrets.GH_MIRROR_TOKEN }}@github.com/${GH_ORG}/${GH_NAME}.git"
+          git fetch origin main --depth=1
+          git push github origin/main:refs/heads/main --force 2>/dev/null \
+            && echo "main branch pushed to GitHub mirror" \
+            || echo "WARNING: GitHub mirror push failed"
+
+      - name: "Step 11: Delete rc branch and recreate dev from main"
+        if: steps.version.outputs.skip != 'true'
+        continue-on-error: true
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+
+          # Delete rc branch (ephemeral — created by promote-rc)
+          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
+            "${API_BASE}/branches/rc" 2>/dev/null \
+            && echo "Deleted rc branch" || echo "rc branch not found"
+
+          # Delete dev branch
+          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
+            "${API_BASE}/branches/dev" 2>/dev/null && echo "Deleted dev branch"
+
+          # Recreate dev from main (now includes version bump + changelog promotion)
+          curl -sf -X POST -H "Authorization: token ${TOKEN}" \
+            -H "Content-Type: application/json" \
+            "${API_BASE}/branches" \
+            -d '{"new_branch_name":"dev","old_branch_name":"main"}' 2>/dev/null && echo "Recreated dev from main"
+
+          echo "Pre-release branches cleaned, dev reset from main" >> $GITHUB_STEP_SUMMARY
+
+      - name: "Step 12: Create version branch from main"
+        if: steps.version.outputs.skip != 'true'
+        continue-on-error: true
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          BRANCH_NAME="version/${VERSION}"
+          MAIN_SHA=$(git rev-parse HEAD)
+
+          # Delete old version branch if it exists (same version re-release)
+          curl -sf -X DELETE -H "Authorization: token ${TOKEN}"             "${API_BASE}/branches/${BRANCH_NAME}" 2>/dev/null && echo "Deleted old ${BRANCH_NAME}"
+
+          # Create version/XX.YY.ZZ from main
+          curl -sf -X POST -H "Authorization: token ${TOKEN}"             -H "Content-Type: application/json"             "${API_BASE}/branches"             -d "{\"new_branch_name\":\"${BRANCH_NAME}\",\"old_branch_name\":\"main\"}" 2>/dev/null             && echo "Created ${BRANCH_NAME} from main (${MAIN_SHA})"             || echo "WARNING: ${BRANCH_NAME} creation failed"
+
+          echo "Version branch created: ${BRANCH_NAME} (${MAIN_SHA})" >> $GITHUB_STEP_SUMMARY
+
+
+
+      # -- Dolibarr post-release: Reset dev version -----------------------------
+      - name: "Post-release: Reset dev version"
+        if: steps.version.outputs.skip != 'true'
+        continue-on-error: true
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          php ${MOKO_CLI}/version_reset_dev.php \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "${API_BASE}" \
+            --branch dev --path . 2>&1 || true
+
+      # -- Summary --------------------------------------------------------------
+      - name: Pipeline Summary
+        if: always()
+        run: |
+          VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
+          PLATFORM="${{ steps.platform.outputs.platform }}"
+          if [ "${{ steps.version.outputs.skip }}" = "true" ]; then
+            echo "## Release Skipped" >> $GITHUB_STEP_SUMMARY
+            echo "No VERSION in README.md" >> $GITHUB_STEP_SUMMARY
+          elif [ "${{ steps.check.outputs.already_released }}" = "true" ]; then
+            echo "## Already Released — ${VERSION}" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "## Build & Release Complete (${PLATFORM})" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "| Step | Result |" >> $GITHUB_STEP_SUMMARY
+            echo "|------|--------|" >> $GITHUB_STEP_SUMMARY
+            echo "| Platform | \`${PLATFORM}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Branch | \`${{ steps.version.outputs.branch }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Tag | \`${{ steps.version.outputs.tag }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Release | [View](${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/tag/${{ steps.version.outputs.tag }}) |" >> $GITHUB_STEP_SUMMARY
+          fi

.mokogitea/workflows/issue-branch.yml

@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: moko-platform.Automation
-# VERSION: 02.34.16
+# VERSION: 02.34.45
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

.mokogitea/workflows/pre-release.yml

@@ -1,241 +1,243 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
-# PATH: /templates/workflows/universal/pre-release.yml.template
-# VERSION: 05.01.00
-# BRIEF: Manual pre-release -- builds dev/alpha/beta/rc packages from any branch
-
-name: "Universal: Pre-Release"
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-      - dev
-  pull_request_target:
-    types: [synchronize, opened, reopened]
-    branches:
-      - main
-  workflow_dispatch:
-    inputs:
-      stability:
-        description: 'Pre-release channel'
-        required: true
-        type: choice
-        options:
-          - development
-          - alpha
-          - beta
-          - release-candidate
-
-permissions:
-  contents: write
-
-env:
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-  GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
-  GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
-
-jobs:
-  build:
-    name: "Build Pre-Release (${{ inputs.stability || 'development' }})"
-    runs-on: release
-    if: >-
-      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'dev') ||
-      (github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == 'main')
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
-          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || '' }}
-
-      - name: Setup moko-platform tools
-        env:
-          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
-        run: |
-          # Use pre-installed /opt/moko-platform if available (updated by cron every 6h)
-          if [ -f “/opt/moko-platform/cli/version_bump.php” ] && [ -f “/opt/moko-platform/vendor/autoload.php” ]; then
-            echo “Using pre-installed /opt/moko-platform”
-            echo “MOKO_CLI=/opt/moko-platform/cli” >> “$GITHUB_ENV”
-          else
-            echo “Falling back to fresh clone”
-            if ! command -v composer &> /dev/null; then
-              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-            fi
-            rm -rf /tmp/moko-platform-api
-            git clone --depth 1 --branch main --quiet \
-              “https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git” \
-              /tmp/moko-platform-api
-            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
-            echo “MOKO_CLI=/tmp/moko-platform-api/cli” >> “$GITHUB_ENV”
-          fi
-
-      - name: Detect platform
-        id: platform
-        run: |
-          php ${MOKO_CLI}/manifest_read.php --path . --github-output
-
-      - name: Resolve metadata and bump version
-        id: meta
-        run: |
-          # Auto-detect stability: RC for PRs targeting main, else use input or default to development
-          if [ "${{ github.event_name }}" = "pull_request_target" ] && [ "${{ github.event.pull_request.base.ref }}" = "main" ]; then
-            STABILITY="release-candidate"
-          else
-            STABILITY="${{ inputs.stability || 'development' }}"
-          fi
-
-          case "$STABILITY" in
-            development)        SUFFIX="-dev";   TAG="development" ;;
-            alpha)              SUFFIX="-alpha"; TAG="alpha" ;;
-            beta)               SUFFIX="-beta";  TAG="beta" ;;
-            release-candidate)  SUFFIX="-rc";    TAG="release-candidate" ;;
-          esac
-
-          # Bump version via CLI: patch for dev/alpha/beta, minor for RC
-          case "$STABILITY" in
-            release-candidate) BUMP="minor" ;;
-            *)                 BUMP="patch" ;;
-          esac
-
-          php ${MOKO_CLI}/version_bump.php --path . $([ "$BUMP" = "minor" ] && echo "--minor") 2>/dev/null || true
-
-          # Set stability suffix and verify consistency
-          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "00.00.01")
-          VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
-
-          php ${MOKO_CLI}/version_set_platform.php \
-            --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true
-          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
-
-          # Append suffix for output
-          if [ -n "$SUFFIX" ]; then
-            VERSION="${VERSION}${SUFFIX}"
-          fi
-
-          # Commit version bump
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
-          git add -A
-          git diff --cached --quiet || {
-            git commit -m "chore(version): pre-release bump to ${VERSION} [skip ci]"
-            git push origin HEAD 2>&1
-          }
-
-          # Auto-detect element via manifest_element.php
-          php ${MOKO_CLI}/manifest_element.php \
-            --path . --version "$VERSION" --stability "$STABILITY" \
-            --repo "${GITEA_REPO}" --github-output
-
-          # Read back element outputs
-          EXT_ELEMENT=$(grep '^ext_element=' "$GITHUB_OUTPUT" | tail -1 | cut -d= -f2)
-          ZIP_NAME=$(grep '^zip_name=' "$GITHUB_OUTPUT" | tail -1 | cut -d= -f2)
-          [ -z "$EXT_ELEMENT" ] && EXT_ELEMENT=$(echo "${GITEA_REPO}" | tr '[:upper:]' '[:lower:]' | tr -d ' -')
-          [ -z "$ZIP_NAME" ] && ZIP_NAME="${EXT_ELEMENT}-${VERSION}.zip"
-
-          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
-          echo "stability=${STABILITY}" >> "$GITHUB_OUTPUT"
-          echo "suffix=${SUFFIX}" >> "$GITHUB_OUTPUT"
-          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "zip_name=${ZIP_NAME}" >> "$GITHUB_OUTPUT"
-          echo "ext_element=${EXT_ELEMENT}" >> "$GITHUB_OUTPUT"
-
-          echo "=== Pre-Release: ${EXT_ELEMENT} ${VERSION}${SUFFIX} ==="
-
-      - name: Create release
-        id: release
-        run: |
-          TAG="${{ steps.meta.outputs.tag }}"
-          VERSION="${{ steps.meta.outputs.version }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php ${MOKO_CLI}/release_create.php \
-            --path . --version "$VERSION" --tag "$TAG" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --branch dev --prerelease
-
-      - name: Update release notes from CHANGELOG.md
-        run: |
-          TAG="${{ steps.meta.outputs.tag }}"
-          VERSION="${{ steps.meta.outputs.version }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-
-          # Extract [Unreleased] section from changelog (everything between [Unreleased] and next ## heading)
-          if [ -f "CHANGELOG.md" ]; then
-            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
-            [ -z "$NOTES" ] && NOTES="Release ${VERSION}"
-          else
-            NOTES="Release ${VERSION}"
-          fi
-
-          # Update release body via API
-          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
-            "${API_BASE}/releases/tags/${TAG}" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
-
-          if [ -n "$RELEASE_ID" ]; then
-            python3 -c "
-          import json, urllib.request
-          body = open('/dev/stdin').read()
-          payload = json.dumps({'body': body}).encode()
-          req = urllib.request.Request(
-              '${API_BASE}/releases/${RELEASE_ID}',
-              data=payload, method='PATCH',
-              headers={
-                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
-                  'Content-Type': 'application/json'
-              })
-          urllib.request.urlopen(req)
-          " <<< "$NOTES"
-            echo "Release notes updated from CHANGELOG.md"
-          fi
-
-      - name: Build package and upload
-        id: package
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          TAG="${{ steps.meta.outputs.tag }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php ${MOKO_CLI}/release_package.php \
-            --path . --version "$VERSION" --tag "$TAG" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --output /tmp || true
-
-      # updates.xml is generated dynamically by MokoGitea license server
-      # No need to build, commit, or sync updates.xml from workflows
-
-      - name: "Delete lesser pre-release channels (cascade)"
-        continue-on-error: true
-        run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
-
-          php ${MOKO_CLI}/release_cascade.php \
-            --stability "${{ steps.meta.outputs.stability }}" \
-            --token "${TOKEN}" \
-            --api-base "${API_BASE}"
-
-      - name: Summary
-        if: always()
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          STABILITY="${{ steps.meta.outputs.stability }}"
-          ZIP_NAME="${{ steps.meta.outputs.zip_name }}"
-          SHA256="${{ steps.package.outputs.sha256_zip }}"
-          echo "## Pre-Release Complete" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
-          echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
-          echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| Channel | ${STABILITY} |" >> $GITHUB_STEP_SUMMARY
-          echo "| Package | \`${ZIP_NAME}\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| SHA-256 | \`${SHA256:-n/a}\` |" >> $GITHUB_STEP_SUMMARY
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: moko-platform.Release
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# PATH: /templates/workflows/universal/pre-release.yml.template
+# VERSION: 05.01.00
+# BRIEF: Manual pre-release -- builds dev/alpha/beta/rc packages from any branch
+
+name: "Universal: Pre-Release"
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - dev
+  pull_request_target:
+    types: [synchronize, opened, reopened]
+    branches:
+      - main
+  workflow_dispatch:
+    inputs:
+      stability:
+        description: 'Pre-release channel'
+        required: true
+        type: choice
+        options:
+          - development
+          - alpha
+          - beta
+          - release-candidate
+
+permissions:
+  contents: write
+
+env:
+  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+  GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
+  GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
+
+jobs:
+  build:
+    name: "Build Pre-Release (${{ inputs.stability || 'development' }})"
+    runs-on: release
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'dev') ||
+      (github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == 'main')
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || '' }}
+
+      - name: Setup moko-platform tools
+        env:
+          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
+        run: |
+          # Use pre-installed /opt/moko-platform if available (updated by cron every 6h)
+          if [ -f /opt/moko-platform/cli/version_bump.php ] && [ -f /opt/moko-platform/cli/manifest_element.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/moko-platform
+            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/moko-platform-api
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/moko-platform-api/cli >> $GITHUB_ENV
+          fi
+
+      - name: Detect platform
+        id: platform
+        run: |
+          php ${MOKO_CLI}/manifest_read.php --path . --github-output
+
+      - name: Resolve metadata and bump version
+        id: meta
+        run: |
+          # Auto-detect stability: RC for PRs targeting main, else use input or default to development
+          if [ "${{ github.event_name }}" = "pull_request_target" ] && [ "${{ github.event.pull_request.base.ref }}" = "main" ]; then
+            STABILITY="release-candidate"
+          else
+            STABILITY="${{ inputs.stability || 'development' }}"
+          fi
+
+          case "$STABILITY" in
+            development)        SUFFIX="-dev";   TAG="development" ;;
+            alpha)              SUFFIX="-alpha"; TAG="alpha" ;;
+            beta)               SUFFIX="-beta";  TAG="beta" ;;
+            release-candidate)  SUFFIX="-rc";    TAG="release-candidate" ;;
+          esac
+
+          # Bump version via CLI: patch for dev/alpha/beta, minor for RC
+          case "$STABILITY" in
+            release-candidate) BUMP="minor" ;;
+            *)                 BUMP="patch" ;;
+          esac
+
+          php ${MOKO_CLI}/version_bump.php --path . $([ "$BUMP" = "minor" ] && echo "--minor") 2>/dev/null || true
+
+          # Set stability suffix and verify consistency
+          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "00.00.01")
+          VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
+
+          php ${MOKO_CLI}/version_set_platform.php \
+            --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true
+          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
+
+          # Ensure licensing tags (updateservers, dlid) if enabled in manifest.xml
+          php ${MOKO_CLI}/manifest_licensing.php --path . --fix 2>/dev/null || true
+
+          # Append suffix for output
+          if [ -n "$SUFFIX" ]; then
+            VERSION="${VERSION}${SUFFIX}"
+          fi
+
+          # Commit version bump
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
+          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
+          git add -A
+          git diff --cached --quiet || {
+            git commit -m "chore(version): pre-release bump to ${VERSION} [skip ci]"
+            git push origin HEAD 2>&1
+          }
+
+          # Auto-detect element via manifest_element.php
+          php ${MOKO_CLI}/manifest_element.php \
+            --path . --version "$VERSION" --stability "$STABILITY" \
+            --repo "${GITEA_REPO}" --github-output
+
+          # Read back element outputs
+          EXT_ELEMENT=$(grep '^ext_element=' "$GITHUB_OUTPUT" | tail -1 | cut -d= -f2)
+          ZIP_NAME=$(grep '^zip_name=' "$GITHUB_OUTPUT" | tail -1 | cut -d= -f2)
+          [ -z "$EXT_ELEMENT" ] && EXT_ELEMENT=$(echo "${GITEA_REPO}" | tr '[:upper:]' '[:lower:]' | tr -d ' -')
+          [ -z "$ZIP_NAME" ] && ZIP_NAME="${EXT_ELEMENT}-${VERSION}.zip"
+
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
+          echo "stability=${STABILITY}" >> "$GITHUB_OUTPUT"
+          echo "suffix=${SUFFIX}" >> "$GITHUB_OUTPUT"
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "zip_name=${ZIP_NAME}" >> "$GITHUB_OUTPUT"
+          echo "ext_element=${EXT_ELEMENT}" >> "$GITHUB_OUTPUT"
+
+          echo "=== Pre-Release: ${EXT_ELEMENT} ${VERSION}${SUFFIX} ==="
+
+      - name: Create release
+        id: release
+        run: |
+          TAG="${{ steps.meta.outputs.tag }}"
+          VERSION="${{ steps.meta.outputs.version }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          php ${MOKO_CLI}/release_create.php \
+            --path . --version "$VERSION" --tag "$TAG" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
+            --repo "${GITEA_REPO}" --branch dev --prerelease
+
+      - name: Update release notes from CHANGELOG.md
+        run: |
+          TAG="${{ steps.meta.outputs.tag }}"
+          VERSION="${{ steps.meta.outputs.version }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+
+          # Extract [Unreleased] section from changelog (everything between [Unreleased] and next ## heading)
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+            [ -z "$NOTES" ] && NOTES="Release ${VERSION}"
+          else
+            NOTES="Release ${VERSION}"
+          fi
+
+          # Update release body via API
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+            "${API_BASE}/releases/tags/${TAG}" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
+          if [ -n "$RELEASE_ID" ]; then
+            python3 -c "
+          import json, urllib.request
+          body = open('/dev/stdin').read()
+          payload = json.dumps({'body': body}).encode()
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "Release notes updated from CHANGELOG.md"
+          fi
+
+      - name: Build package and upload
+        id: package
+        run: |
+          VERSION="${{ steps.meta.outputs.version }}"
+          TAG="${{ steps.meta.outputs.tag }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          php ${MOKO_CLI}/release_package.php \
+            --path . --version "$VERSION" --tag "$TAG" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
+            --repo "${GITEA_REPO}" --output /tmp || true
+
+      # updates.xml is generated dynamically by MokoGitea license server
+      # No need to build, commit, or sync updates.xml from workflows
+
+      - name: "Delete lesser pre-release channels (cascade)"
+        continue-on-error: true
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+
+          php ${MOKO_CLI}/release_cascade.php \
+            --stability "${{ steps.meta.outputs.stability }}" \
+            --token "${TOKEN}" \
+            --api-base "${API_BASE}"
+
+      - name: Summary
+        if: always()
+        run: |
+          VERSION="${{ steps.meta.outputs.version }}"
+          STABILITY="${{ steps.meta.outputs.stability }}"
+          ZIP_NAME="${{ steps.meta.outputs.zip_name }}"
+          SHA256="${{ steps.package.outputs.sha256_zip }}"
+          echo "## Pre-Release Complete" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
+          echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
+          echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| Channel | ${STABILITY} |" >> $GITHUB_STEP_SUMMARY
+          echo "| Package | \`${ZIP_NAME}\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| SHA-256 | \`${SHA256:-n/a}\` |" >> $GITHUB_STEP_SUMMARY

CHANGELOG.md

@@ -14,7 +14,7 @@
  INGROUP: MokoWaaS.Documentation
  REPO: https://github.com/mokoconsulting-tech/mokowaas
  PATH: ./CHANGELOG.md
- VERSION: 02.34.16
+ VERSION: 02.34.45
  BRIEF: Version history using `Keep a Changelog`
 -->
 
@@ -22,6 +22,47 @@
 
 ## [Unreleased]
 
+### Added
+- RSA-signed heartbeat authentication — private key in monitor plugin manifest, public key on MokoWaaSHQ
+- Monitor plugin base_url set via manifest (hidden from admin UI), propagated via update server
+- Send Heartbeat button on health token field for manual heartbeat testing
+
+### Removed
+- PerfectPublisher webservices plugin (no longer needed)
+
+### Fixed
+- Download key lost on update: cleanupStaleUpdateSites used old /raw/branch/main/ URL format, deleting the manifest-registered update site that held the key
+
+## [02.35.00] - 2026-06-06
+
+### Added
+- Core plugin stripped to heartbeat-only config (~5,500 lines removed)
+- Extension catalog (catalog.xml) with update server discovery (#186)
+- Download key preservation across Joomla updates (#187)
+- Remote login endpoint for MokoWaaSHQ auto-login
+- Provision reset API for new client setup (hits, versions, tokens)
+- Setup required banner after provision reset
+- Support verification PIN (MOKO-XXXX-XXXX)
+- mod_mokowaas_categories — auto-category tree menu (#184)
+- Cache/temp split button in status bar
+- Dashboard version tiles for component and modules
+- Monitor plugin sends full health payload to MokoWaaSHQ
+- Firewall: block_frontend_superuser, own trusted_ip_entry.xml
+- DevTools: reset download keys toggle
+
+### Changed
+- Renamed src/ to source/ (#188)
+- Service classes relocated to owning plugins
+- API controller execute() signatures fixed (#183)
+- Joomla 5/6 event compatibility in DevTools and Monitor
+- Dead placeholder resolver removed from install script
+
+### Fixed
+- Firewall subform paths after core cleanup
+- Missing Security Headers language strings
+
+## [02.34.00] - 2026-06-04
+
 ### Added
 - Database Tools view — table status, optimize, repair, session purge (#127)
 - Cache Cleanup view — directory size reporting and one-click cleanup (#128)

CODE_OF_CONDUCT.md

@@ -14,7 +14,7 @@
 	DEFGROUP: Joomla.Plugin
 	INGROUP: MokoWaaS.Documentation
 	REPO: https://github.com/mokoconsulting-tech/mokowaas
-	VERSION: 02.34.16
+	VERSION: 02.34.45
 	PATH: ./CODE_OF_CONDUCT.md
 	BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default
 -->

GOVERNANCE.md

@@ -19,7 +19,7 @@
  DEFGROUP: mokoconsulting-tech.MokoWaaSBrand
  INGROUP: MokoStandards.Governance
  REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /GOVERNANCE.md
  BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand
 -->

LICENSE.md

@@ -15,7 +15,7 @@
 	INGROUP: MokoWaaS.Documentation
   REPO: https://github.com/mokoconsulting-tech/mokowaas
 	PATH: ./LICENSE.md
-	VERSION: 02.34.16
+	VERSION: 02.34.45
 	BRIEF: Project license (GPL-3.0-or-later)
 -->
 										GNU GENERAL PUBLIC LICENSE

README.md

@@ -9,7 +9,7 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS
  REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /README.md
  BRIEF: MokoWaaS platform plugin for Joomla
 -->

SECURITY.md

@@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME]
 INGROUP: [PROJECT_NAME].Documentation
 REPO: [REPOSITORY_URL]
 PATH: /SECURITY.md
-VERSION: 02.34.16
+VERSION: 02.34.45
 BRIEF: Security vulnerability reporting and handling policy
 -->
 

docs/guides/build-guide.md

@@ -11,13 +11,13 @@
  INGROUP: MokoWaaS.Build
  REPO: https://github.com/mokoconsulting-tech/mokowaas
  FILE: build-guide.md
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/guides/
  BRIEF: Build and packaging guide for the MokoWaaS system plugin
  NOTE: Defines environment setup, repository layout, packaging rules, and release preparation
 -->
 
-# MokoWaaS Build Guide (VERSION: 02.34.16)
+# MokoWaaS Build Guide (VERSION: 02.34.45)
 
 ## 1. Purpose
 

docs/guides/configuration-guide.md

@@ -10,13 +10,13 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/guides/configuration-guide.md
  BRIEF: Configuration guide for the MokoWaaS system plugin
  NOTE: Defines plugin parameters, expected behaviors, and recommended defaults
 -->
 
-# MokoWaaS Configuration Guide (VERSION: 02.34.16)
+# MokoWaaS Configuration Guide (VERSION: 02.34.45)
 
 ## 1. Objective
 

docs/guides/installation-guide.md

@@ -10,13 +10,13 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/guides/installation-guide.md
  BRIEF: Installation guide for the MokoWaaS system plugin
  NOTE: First document in the guide set
 -->
 
-# MokoWaaS Installation Guide (VERSION: 02.34.16)
+# MokoWaaS Installation Guide (VERSION: 02.34.45)
 
 ## Introduction
 

docs/guides/operations-guide.md

@@ -10,13 +10,13 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/guides/operations-guide.md
  BRIEF: Operational guide for administering and managing the MokoWaaS system plugin
  NOTE: Defines lifecycle, responsibilities, and operational behaviors
 -->
 
-# MokoWaaS Operations Guide (VERSION: 02.34.16)
+# MokoWaaS Operations Guide (VERSION: 02.34.45)
 
 ## Introduction
 

docs/guides/rollback-and-recovery-guide.md

@@ -10,13 +10,13 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/guides/rollback-and-recovery-guide.md
  BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents
  NOTE: Completes the core guide set for WaaS plugin governance
 -->
 
-# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.16)
+# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.45)
 
 ## Introduction
 

docs/guides/testing-guide.md

@@ -7,13 +7,13 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/guides/testing-guide.md
  BRIEF: Testing guide for MokoWaaS v02.01.08
  NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration
 -->
 
-# MokoWaaS Testing Guide (VERSION: 02.34.16)
+# MokoWaaS Testing Guide (VERSION: 02.34.45)
 
 ## 1. Prerequisites
 

docs/guides/troubleshooting-guide.md

@@ -10,13 +10,13 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/guides/troubleshooting-guide.md
  BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin
  NOTE: Designed for administrators and WaaS operations teams
 -->
 
-# MokoWaaS Troubleshooting Guide (VERSION: 02.34.16)
+# MokoWaaS Troubleshooting Guide (VERSION: 02.34.45)
 
 ## Introduction
 

docs/guides/upgrade-and-versioning-guide.md

@@ -10,13 +10,13 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/guides/upgrade-and-versioning-guide.md
  BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin
  NOTE: Defines release flow, version rules, and upgrade validation
 -->
 
-# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.16)
+# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.45)
 
 ## Introduction
 

docs/index.md

@@ -10,13 +10,13 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Documentation
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.16
+ VERSION: 02.34.45
  PATH: /docs/index.md
  BRIEF: Master index of all documentation for the MokoWaaS plugin
  NOTE: Automatically maintained index for all guide canvases
 -->
 
-# MokoWaaS Documentation Index (VERSION: 02.34.16)
+# MokoWaaS Documentation Index (VERSION: 02.34.45)
 
 ## Introduction
 

docs/plugin-basic.md

@@ -11,12 +11,12 @@
  INGROUP: MokoWaaS
  REPO: https://github.com/mokoconsulting-tech/mokowaas
  PATH: /docs/plugin-basic.md
- VERSION: 02.34.16
+ VERSION: 02.34.45
  BRIEF: Baseline documentation for the MokoWaaS system plugin
  NOTE: Foundational reference for internal and external stakeholders
 -->
 
-# MokoWaaS Plugin Overview (VERSION: 02.34.16)
+# MokoWaaS Plugin Overview (VERSION: 02.34.45)
 
 ## Introduction
 

docs/update-server.md

@@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation
 INGROUP: MokoStandards.Templates
 REPO: https://github.com/mokoconsulting-tech/MokoWaaS
 PATH: /docs/update-server.md
-VERSION: 02.34.16
+VERSION: 02.34.45
 BRIEF: How this extension's Joomla update server file (update.xml) is managed
 -->
 

source/packages/com_mokowaas/admin/catalog.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  Extension catalog for MokoWaaS Extension Manager.
- Each entry points to the extension's own updates.xml — the installer
- resolves the latest version and download URL at runtime.
+ Each entry points to the extension's own updates.xml. The installer
+ resolves the latest version and download URL at runtime, respecting
+ the site's configured update channel (dev/stable).
 
  To add an extension: copy an <extension> block and fill in the fields.
- The updateserver URL must point to a valid Joomla updates.xml file.
 -->
 <catalog>
 	<extension>
@@ -19,6 +19,16 @@
 		<protected>true</protected>
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/dev/updates.xml</updateserver>
 	</extension>
+	<extension>
+		<name>MokoWaaSHQ</name>
+		<element>pkg_mokowaashq</element>
+		<type>package</type>
+		<description>Centralized control panel for managing all MokoWaaS client installations.</description>
+		<icon>icon-tachometer-alt</icon>
+		<category>Platform</category>
+		<article>https://mokoconsulting.tech/support/products/mokowaas-base</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaSHQ/raw/branch/dev/updates.xml</updateserver>
+	</extension>
 	<extension>
 		<name>MokoOnyx</name>
 		<element>mokoonyx</element>
@@ -30,14 +40,24 @@
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
-		<name>MokoJoomTOS</name>
-		<element>com_mokojoomtos</element>
-		<type>component</type>
-		<description>Terms of Service and privacy policy component with consent tracking.</description>
-		<icon>icon-file-contract</icon>
-		<category>Components</category>
-		<article>https://mokoconsulting.tech/support/products/mokojoomtos</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomTOS/raw/branch/dev/updates.xml</updateserver>
+		<name>MokoJoomOpenGraph</name>
+		<element>pkg_mokoog</element>
+		<type>package</type>
+		<description>Open Graph, Twitter Card, and social sharing meta tags for articles, categories, and pages.</description>
+		<icon>icon-share-alt</icon>
+		<category>SEO</category>
+		<article>https://mokoconsulting.tech/support/products/mokojoomopengraph</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomOpenGraph/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+	<extension>
+		<name>MokoJoomBackup</name>
+		<element>pkg_mokojoombackup</element>
+		<type>package</type>
+		<description>Automated backup system with Borg integration, scheduled tasks, and remote storage.</description>
+		<icon>icon-archive</icon>
+		<category>Tools</category>
+		<article>https://mokoconsulting.tech/support/products/mokojoombackup</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomBackup/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
 		<name>MokoJoomHero</name>
@@ -50,14 +70,34 @@
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomHero/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
-		<name>MokoWaaS Announce</name>
-		<element>mod_mokowaas_announce</element>
+		<name>MokoJoomCommunity</name>
+		<element>pkg_mokojoomcommunity</element>
+		<type>package</type>
+		<description>Community Builder integration package with custom fields and user management.</description>
+		<icon>icon-users</icon>
+		<category>Community</category>
+		<article>https://mokoconsulting.tech/support/products/mokojoomcommunity</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomCommunity/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+	<extension>
+		<name>MokoJoomCross</name>
+		<element>plg_system_mokojoomcross</element>
+		<type>plugin</type>
+		<description>Cross-extension integration plugin for Joomla component interoperability.</description>
+		<icon>icon-link</icon>
+		<category>Plugins</category>
+		<article>https://mokoconsulting.tech/support/products/mokojoomcross</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomCross/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+	<extension>
+		<name>MokoJoomStoreLocator</name>
+		<element>mod_mokojoomstorelocator</element>
 		<type>module</type>
-		<description>Centralized announcement system via admin module.</description>
-		<icon>icon-bullhorn</icon>
+		<description>Store locator module with Google Maps integration and search.</description>
+		<icon>icon-map-marker-alt</icon>
 		<category>Modules</category>
-		<article>https://mokoconsulting.tech/support/products/mokowaas-announce</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaSAnnounce/raw/branch/dev/updates.xml</updateserver>
+		<article>https://mokoconsulting.tech/support/products/mokojoomstorelocator</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomStoreLocator/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
 		<name>DPCalendar API</name>
@@ -79,14 +119,4 @@
 		<article>https://mokoconsulting.tech/support/products/mokogallerycalendar</article>
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoGalleryCalendar/raw/branch/dev/updates.xml</updateserver>
 	</extension>
-	<extension>
-		<name>MokoJoomOpenGraph</name>
-		<element>pkg_mokoog</element>
-		<type>package</type>
-		<description>Open Graph, Twitter Card, and social sharing meta tags for articles, categories, and pages.</description>
-		<icon>icon-share-alt</icon>
-		<category>Components</category>
-		<article>https://mokoconsulting.tech/support/products/mokojoomopengraph</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomOpenGraph/raw/branch/dev/updates.xml</updateserver>
-	</extension>
 </catalog>

source/packages/com_mokowaas/admin/sql/install.mysql.sql

@@ -133,3 +133,4 @@ INSERT IGNORE INTO `#__mokowaas_retention_policies` (`id`, `content_type`, `rete
 (3, 'sessions', 7, 'delete', 1, 'Purge expired sessions older than 7 days'),
 (4, 'inactive_users', 730, 'anonymize', 0, 'Anonymize users inactive for 2 years (disabled by default)'),
 (5, 'closed_tickets', 365, 'anonymize', 0, 'Anonymize closed tickets older than 1 year (disabled by default)');
+

source/packages/com_mokowaas/admin/sql/uninstall.mysql.sql

@@ -0,0 +1,13 @@
+--
+-- MokoWaaS component uninstall — drop all tables
+--
+DROP TABLE IF EXISTS `#__mokowaas_download_keys`;
+DROP TABLE IF EXISTS `#__mokowaas_retention_policies`;
+DROP TABLE IF EXISTS `#__mokowaas_data_requests`;
+DROP TABLE IF EXISTS `#__mokowaas_consent_log`;
+DROP TABLE IF EXISTS `#__mokowaas_waf_log`;
+DROP TABLE IF EXISTS `#__mokowaas_ticket_automation`;
+DROP TABLE IF EXISTS `#__mokowaas_ticket_canned`;
+DROP TABLE IF EXISTS `#__mokowaas_ticket_replies`;
+DROP TABLE IF EXISTS `#__mokowaas_tickets`;
+DROP TABLE IF EXISTS `#__mokowaas_ticket_categories`;

source/packages/com_mokowaas/admin/sql/updates/mysql/02.34.28.sql

@@ -0,0 +1,2 @@
+-- Remove download_keys table (feature reverted — preflight handles key preservation)
+DROP TABLE IF EXISTS `#__mokowaas_download_keys`;

source/packages/com_mokowaas/admin/sql/updates/mysql/02.34.29.sql

@@ -0,0 +1,2 @@
+-- RSA signing replaces key ring — drop table if it was created
+DROP TABLE IF EXISTS `#__mokowaas_api_keys`;

source/packages/com_mokowaas/admin/src/Controller/DisplayController.php

@@ -80,6 +80,160 @@ class DisplayController extends BaseController
 	}
 
 	// ==================================================================
+	// Heartbeat
+	// ==================================================================
+
+	public function sendHeartbeat()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		try
+		{
+			$monitorPlugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokowaas_monitor');
+
+			if (!$monitorPlugin)
+			{
+				$this->jsonResponse(['success' => false, 'message' => 'Monitor plugin not enabled.']);
+
+				return;
+			}
+
+			$params = new \Joomla\Registry\Registry($monitorPlugin->params);
+			$baseUrl = rtrim($params->get('base_url', ''), '/');
+
+			// Fall back to manifest XML default if not yet saved in params
+			if (empty($baseUrl))
+			{
+				$manifestFile = JPATH_PLUGINS . '/system/mokowaas_monitor/mokowaas_monitor.xml';
+
+				if (is_file($manifestFile))
+				{
+					$xml = simplexml_load_file($manifestFile);
+
+					if ($xml)
+					{
+						foreach ($xml->xpath('//field[@name="base_url"]') as $field)
+						{
+							$baseUrl = rtrim((string) $field['default'], '/');
+							break;
+						}
+					}
+				}
+			}
+
+			if (empty($baseUrl))
+			{
+				$this->jsonResponse(['success' => false, 'message' => 'MokoWaaSHQ URL not configured in monitor plugin.']);
+
+				return;
+			}
+
+			$corePlugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokowaas');
+			$coreParams = new \Joomla\Registry\Registry($corePlugin ? $corePlugin->params : '{}');
+			$healthToken = $coreParams->get('health_api_token', '');
+
+			if (empty($healthToken))
+			{
+				$this->jsonResponse(['success' => false, 'message' => 'Health token not configured.']);
+
+				return;
+			}
+
+			$siteUrl   = rtrim(\Joomla\CMS\Uri\Uri::root(), '/');
+			$domain    = parse_url($siteUrl, PHP_URL_HOST) ?: '';
+			$timestamp = time();
+
+			$payload = json_encode([
+				'token'            => $healthToken,
+				'domain'           => $domain,
+				'site_name'        => Factory::getConfig()->get('sitename', 'Joomla'),
+				'site_url'         => $siteUrl,
+				'joomla_version'   => (new \Joomla\CMS\Version())->getShortVersion(),
+				'php_version'      => PHP_VERSION,
+				'timestamp'        => $timestamp,
+			], JSON_UNESCAPED_SLASHES);
+
+			// RSA sign the request
+			$headers = ['Content-Type: application/json'];
+			$signingKeyB64 = $params->get('signing_key', '');
+
+			// Fall back to manifest XML default if not yet saved in params
+			if (empty($signingKeyB64))
+			{
+				$manifestFile = JPATH_PLUGINS . '/system/mokowaas_monitor/mokowaas_monitor.xml';
+
+				if (is_file($manifestFile))
+				{
+					$xml = simplexml_load_file($manifestFile);
+
+					if ($xml)
+					{
+						foreach ($xml->xpath('//field[@name="signing_key"]') as $field)
+						{
+							$signingKeyB64 = (string) $field['default'];
+							break;
+						}
+					}
+				}
+			}
+
+			if (!empty($signingKeyB64))
+			{
+				$privateKeyPem = base64_decode($signingKeyB64);
+				$privateKey    = openssl_pkey_get_private($privateKeyPem);
+
+				if ($privateKey !== false)
+				{
+					$message   = $domain . '|' . $timestamp . '|' . $healthToken;
+					$signature = '';
+
+					if (openssl_sign($message, $signature, $privateKey, OPENSSL_ALGO_SHA256))
+					{
+						$headers[] = 'X-MokoWaaS-Signature: ' . base64_encode($signature);
+						$headers[] = 'X-MokoWaaS-Timestamp: ' . $timestamp;
+					}
+				}
+			}
+
+			$endpoint = $baseUrl . '/api/index.php/v1/mokowaashq/heartbeat';
+
+			$ch = curl_init($endpoint);
+			curl_setopt_array($ch, [
+				CURLOPT_POST           => true,
+				CURLOPT_HTTPHEADER     => $headers,
+				CURLOPT_POSTFIELDS     => $payload,
+				CURLOPT_RETURNTRANSFER => true,
+				CURLOPT_TIMEOUT        => 15,
+				CURLOPT_FOLLOWLOCATION => true,
+				CURLOPT_SSL_VERIFYPEER => false,
+			]);
+
+			$response = curl_exec($ch);
+			$code     = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+			$error    = curl_error($ch);
+			curl_close($ch);
+
+			if ($error)
+			{
+				$this->jsonResponse(['success' => false, 'message' => 'Connection failed: ' . $error]);
+			}
+			elseif ($code >= 200 && $code < 300)
+			{
+				$body = json_decode($response, true);
+				$this->jsonResponse(['success' => true, 'message' => 'Heartbeat sent: ' . ($body['status'] ?? 'ok')]);
+			}
+			else
+			{
+				$body = json_decode($response, true);
+				$this->jsonResponse(['success' => false, 'message' => 'HTTP ' . $code . ': ' . ($body['error'] ?? $body['message'] ?? 'Unknown')]);
+			}
+		}
+		catch (\Throwable $e)
+		{
+			$this->jsonResponse(['success' => false, 'message' => 'Error: ' . $e->getMessage()]);
+		}
+	}
+
 	// Cache
 	// ==================================================================
 
@@ -714,6 +868,7 @@ class DisplayController extends BaseController
 	private function jsonForbidden(): void
 	{
 		$this->jsonResponse(['success' => false, 'message' => Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN')]);
-return;
+		return;
 	}
+
 }

source/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php

@@ -48,6 +48,12 @@ class ExtensionsModel extends BaseDatabaseModel
 			$remoteVersion = $release['version'] ?? '';
 			$downloadUrl   = $release['download_url'] ?? '';
 
+			// Skip extensions with no release available and not installed
+			if (empty($remoteVersion) && $localVersion === null)
+			{
+				continue;
+			}
+
 			$status = 'not_installed';
 
 			if ($localVersion !== null)
@@ -62,6 +68,9 @@ class ExtensionsModel extends BaseDatabaseModel
 
 			$extensionId = $this->getExtensionId($entry['element']);
 
+			$needsDlid = $release['needs_dlid'] ?? false;
+			$hasDlid   = $needsDlid && $extensionId ? $this->hasDownloadKey($entry['element']) : false;
+
 			$packages[] = (object) [
 				'label'          => $entry['name'],
 				'description'    => $entry['description'],
@@ -76,6 +85,9 @@ class ExtensionsModel extends BaseDatabaseModel
 				'article_url'    => $entry['article'] ?? '',
 				'protected'      => ($entry['protected'] ?? 'false') === 'true',
 				'extension_id'   => $extensionId,
+				'needs_dlid'     => $needsDlid,
+				'has_dlid'       => $hasDlid,
+				'has_stable'     => $release['has_stable'] ?? false,
 			];
 		}
 
@@ -226,13 +238,36 @@ class ExtensionsModel extends BaseDatabaseModel
 			return [];
 		}
 
-		// Find the highest version entry
+		// Determine site's update channel preference
+		$channel   = 'dev'; // default to dev — show everything
+		$hasStable = false;
+		$hasDev    = false;
+
+		// Find the best version entry, preferring the site's channel
 		$bestVersion = '0.0.0';
 		$downloadUrl = '';
+		$needsDlid   = false;
 
 		foreach ($xml->update as $update)
 		{
 			$ver = (string) ($update->version ?? '');
+			$tag = '';
+
+			// Check for <tags><tag> element
+			if (isset($update->tags->tag))
+			{
+				$tag = (string) $update->tags->tag;
+			}
+
+			if ($tag === 'stable')
+			{
+				$hasStable = true;
+			}
+
+			if ($tag === 'dev')
+			{
+				$hasDev = true;
+			}
 
 			if ($ver === '' || version_compare($ver, $bestVersion, '<='))
 			{
@@ -241,10 +276,15 @@ class ExtensionsModel extends BaseDatabaseModel
 
 			$bestVersion = $ver;
 
-			// Get download URL from <downloads><downloadurl>
 			if (isset($update->downloads->downloadurl))
 			{
 				$downloadUrl = (string) $update->downloads->downloadurl;
+
+				// Check if download URL contains dlid placeholder
+				if (str_contains($downloadUrl, 'dlid='))
+				{
+					$needsDlid = true;
+				}
 			}
 		}
 
@@ -256,6 +296,9 @@ class ExtensionsModel extends BaseDatabaseModel
 		return [
 			'version'      => $bestVersion,
 			'download_url' => $downloadUrl,
+			'has_stable'   => $hasStable,
+			'has_dev'      => $hasDev,
+			'needs_dlid'   => $needsDlid,
 		];
 	}
 
@@ -299,6 +342,33 @@ class ExtensionsModel extends BaseDatabaseModel
 		return $versions;
 	}
 
+	/**
+	 * Check if an extension has a download key configured.
+	 */
+	private function hasDownloadKey(string $element): bool
+	{
+		try
+		{
+			$db = $this->getDatabase();
+
+			$query = $db->getQuery(true)
+				->select($db->quoteName('us.extra_query'))
+				->from($db->quoteName('#__update_sites', 'us'))
+				->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON us.update_site_id = use.update_site_id')
+				->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+				->where($db->quoteName('e.element') . ' = ' . $db->quote($element));
+
+			$db->setQuery($query, 0, 1);
+			$extraQuery = (string) $db->loadResult();
+
+			return !empty($extraQuery) && str_contains($extraQuery, 'dlid=');
+		}
+		catch (\Throwable $e)
+		{
+			return false;
+		}
+	}
+
 	/**
 	 * Get the extension_id for an element (for uninstall links).
 	 *

source/packages/com_mokowaas/admin/tmpl/extensions/default.php

@@ -44,7 +44,7 @@ $statusBadge = [
 		<?php
 			$badge = $statusBadge[$pkg->status] ?? $statusBadge['not_installed'];
 		?>
-		<div class="col-12 col-md-6 col-xl-4">
+		<div class="col-12 <?php echo \count($pkgs) === 1 ? '' : (\count($pkgs) === 2 ? 'col-md-6' : 'col-md-6 col-xl-4'); ?>">
 			<div class="card h-100">
 				<div class="card-body d-flex flex-column">
 					<div class="d-flex align-items-start justify-content-between mb-2">
@@ -60,6 +60,14 @@ $statusBadge = [
 
 					<p class="card-text text-muted flex-grow-1"><?php echo htmlspecialchars($pkg->description); ?></p>
 
+					<?php if (!empty($pkg->needs_dlid) && !$pkg->has_dlid && $pkg->status !== 'not_installed'): ?>
+					<div class="alert alert-danger py-1 px-2 mb-2" style="font-size:0.8rem;">
+						<span class="icon-exclamation-triangle" aria-hidden="true"></span>
+						Download key missing — updates will fail.
+						<a href="index.php?option=com_installer&view=updatesites" class="alert-link">Configure</a>
+					</div>
+					<?php endif; ?>
+
 					<div class="d-flex align-items-center justify-content-between mt-auto pt-2 border-top">
 						<div class="small text-muted">
 							<?php if ($pkg->local_version): ?>
@@ -82,7 +90,9 @@ $statusBadge = [
 							data-url="<?php echo Route::_('index.php?option=com_mokowaas&task=display.installExtension&format=json'); ?>"
 							data-download="<?php echo htmlspecialchars($pkg->download_url); ?>"
 							data-token="<?php echo $token; ?>"
-							data-label="<?php echo htmlspecialchars($pkg->label); ?>">
+							data-label="<?php echo htmlspecialchars($pkg->label); ?>"
+							data-needs-dlid="<?php echo $pkg->needs_dlid ? '1' : '0'; ?>"
+							data-element="<?php echo htmlspecialchars($pkg->element); ?>">
 							<span class="icon-refresh" aria-hidden="true"></span>
 							Update to <?php echo htmlspecialchars($pkg->remote_version); ?>
 						</button>
@@ -91,7 +101,9 @@ $statusBadge = [
 								data-url="<?php echo Route::_('index.php?option=com_mokowaas&task=display.installExtension&format=json'); ?>"
 								data-download="<?php echo htmlspecialchars($pkg->download_url); ?>"
 								data-token="<?php echo $token; ?>"
-								data-label="<?php echo htmlspecialchars($pkg->label); ?>">
+								data-label="<?php echo htmlspecialchars($pkg->label); ?>"
+								data-needs-dlid="<?php echo $pkg->needs_dlid ? '1' : '0'; ?>"
+								data-element="<?php echo htmlspecialchars($pkg->element); ?>">
 								<span class="icon-download" aria-hidden="true"></span>
 								Install
 							</button>
@@ -150,15 +162,37 @@ document.addEventListener('DOMContentLoaded', function() {
 			var token = el.dataset.token;
 			var label = el.dataset.label;
 
+			var needsDlid = el.dataset.needsDlid === '1';
+			var dlid = '';
+
+			if (needsDlid) {
+				dlid = prompt('Enter download key for ' + label + ':', '');
+				if (dlid === null) return;
+				if (!dlid.trim()) {
+					Joomla.renderMessages({error: ['Download key is required for ' + label]});
+					return;
+				}
+			}
+
 			if (!confirm('Install ' + label + '?')) return;
 
 			el.disabled = true;
 			var origHtml = el.textContent;
 			el.textContent = ' Installing...';
 
+			// Append dlid to download URL if provided
+			var finalUrl = downloadUrl;
+			if (dlid) {
+				finalUrl += (downloadUrl.indexOf('?') !== -1 ? '&' : '?') + 'dlid=' + encodeURIComponent(dlid.trim());
+			}
+
 			var fd = new FormData();
-			fd.append('download_url', downloadUrl);
+			fd.append('download_url', finalUrl);
 			fd.append(token, '1');
+			if (dlid) {
+				fd.append('dlid', dlid.trim());
+				fd.append('element', el.dataset.element || '');
+			}
 
 			fetch(url, {
 				method: 'POST',

source/packages/com_mokowaas/api/src/Controller/RemoteLoginController.php

@@ -20,7 +20,7 @@ use Joomla\Registry\Registry;
  * Remote login API controller.
  *
  * POST /api/index.php/v1/mokowaas/remote-login
- * Body: {"token": "health_api_token", "user": "requesting_username", "origin": "MokoWaaSBase"}
+ * Body: {"token": "health_api_token", "user": "requesting_username", "origin": "MokoWaaSHQ"}
  *
  * Validates the health API token, generates a one-time login token
  * for the master user, and returns a URL that auto-authenticates.

source/packages/com_mokowaas/media/css/portal.css

@@ -0,0 +1,38 @@
+/**
+ * MokoWaaS+ERP Customer Portal styles
+ * @since 02.34.16
+ */
+
+.mokowaas-portal h2,
+.mokowaas-portal-orders h2,
+.mokowaas-portal-invoices h2,
+.mokowaas-portal-license h2 {
+	color: #1a2744;
+	font-weight: 700;
+}
+
+/* Signing page */
+.mokowaas-sign-page {
+	max-width: 800px;
+	margin: 0 auto;
+}
+
+#signature-canvas {
+	border: 1px solid #dee2e6;
+	border-radius: 4px;
+	background: #fff;
+}
+
+/* Verification page */
+.mokowaas-verify-page {
+	max-width: 900px;
+	margin: 0 auto;
+}
+
+/* Portal cards */
+.mokowaas-portal .card {
+	transition: box-shadow 0.15s;
+}
+.mokowaas-portal .card:hover {
+	box-shadow: 0 4px 12px rgba(0,0,0,0.1);
+}

source/packages/com_mokowaas/media/js/signature-pad.js

@@ -0,0 +1,162 @@
+/**
+ * MokoWaaS+ERP Signature Pad — HTML5 Canvas drawing for e-signature capture.
+ * Touch-friendly, works on mobile/tablet/desktop.
+ * @since 02.34.16
+ */
+document.addEventListener('DOMContentLoaded', function () {
+	'use strict';
+
+	var canvas = document.getElementById('signature-canvas');
+	if (!canvas) { return; }
+
+	var ctx = canvas.getContext('2d');
+	var drawing = false;
+	var hasSigned = false;
+
+	// High-DPI support
+	var dpr = window.devicePixelRatio || 1;
+	var rect = canvas.getBoundingClientRect();
+	canvas.width = rect.width * dpr;
+	canvas.height = rect.height * dpr;
+	ctx.scale(dpr, dpr);
+	ctx.lineWidth = 2;
+	ctx.lineCap = 'round';
+	ctx.strokeStyle = '#000';
+
+	function getPos(e) {
+		var r = canvas.getBoundingClientRect();
+		var touch = e.touches ? e.touches[0] : e;
+		return { x: touch.clientX - r.left, y: touch.clientY - r.top };
+	}
+
+	canvas.addEventListener('mousedown', function (e) { drawing = true; ctx.beginPath(); var p = getPos(e); ctx.moveTo(p.x, p.y); });
+	canvas.addEventListener('mousemove', function (e) { if (!drawing) return; var p = getPos(e); ctx.lineTo(p.x, p.y); ctx.stroke(); hasSigned = true; });
+	canvas.addEventListener('mouseup', function () { drawing = false; });
+	canvas.addEventListener('mouseleave', function () { drawing = false; });
+
+	canvas.addEventListener('touchstart', function (e) { e.preventDefault(); drawing = true; ctx.beginPath(); var p = getPos(e); ctx.moveTo(p.x, p.y); }, { passive: false });
+	canvas.addEventListener('touchmove', function (e) { e.preventDefault(); if (!drawing) return; var p = getPos(e); ctx.lineTo(p.x, p.y); ctx.stroke(); hasSigned = true; }, { passive: false });
+	canvas.addEventListener('touchend', function () { drawing = false; });
+
+	// Clear
+	var clearBtn = document.getElementById('clear-signature');
+	if (clearBtn) {
+		clearBtn.addEventListener('click', function () {
+			ctx.clearRect(0, 0, canvas.width, canvas.height);
+			hasSigned = false;
+		});
+	}
+
+	// Submit
+	var form = document.getElementById('signing-form');
+	if (form) {
+		form.addEventListener('submit', function (e) {
+			e.preventDefault();
+
+			if (!hasSigned) {
+				alert('Please draw your signature before submitting.');
+				return;
+			}
+
+			var consentBox = document.getElementById('consent-checkbox');
+			if (consentBox && !consentBox.checked) {
+				alert('You must accept the e-signature consent agreement.');
+				return;
+			}
+
+			var token = form.dataset.token;
+			var signatureData = canvas.toDataURL('image/png');
+			var basePath = (Joomla.getOptions('system.paths') || {}).baseFull || '';
+
+			var body = {
+				token: token,
+				signature: signatureData,
+				signature_type: 'draw'
+			};
+
+			// Geolocation
+			if (navigator.geolocation) {
+				navigator.geolocation.getCurrentPosition(function (pos) {
+					body.geo_lat = pos.coords.latitude;
+					body.geo_lon = pos.coords.longitude;
+					submitSignature(basePath, body);
+				}, function () {
+					submitSignature(basePath, body);
+				}, { timeout: 5000 });
+			} else {
+				submitSignature(basePath, body);
+			}
+		});
+	}
+
+	function submitSignature(basePath, body) {
+		var btn = document.getElementById('btn-sign');
+		btn.disabled = true;
+		btn.textContent = 'Submitting...';
+
+		// If consent needed, send consent first
+		var consentBox = document.getElementById('consent-checkbox');
+		var consentPromise = Promise.resolve();
+
+		if (consentBox) {
+			consentPromise = fetch(basePath + 'api/index.php/v1/mokowaas/erp/esign/public', {
+				method: 'POST',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({ token: body.token, accepted: true, action: 'consent' })
+			}).then(function (r) { return r.json(); });
+		}
+
+		consentPromise.then(function () {
+			return fetch(basePath + 'api/index.php/v1/mokowaas/erp/esign/public', {
+				method: 'POST',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify(body)
+			});
+		})
+		.then(function (r) { return r.json(); })
+		.then(function (result) {
+			if (result.ok) {
+				document.querySelector('.mokowaas-sign-page').textContent = '';
+				var success = document.createElement('div');
+				success.className = 'alert alert-success fs-5 text-center py-5';
+				success.textContent = 'Document signed successfully. Thank you!';
+				document.querySelector('.mokowaas-sign-page').appendChild(success);
+			} else {
+				alert(result.error || 'Signing failed. Please try again.');
+				btn.disabled = false;
+				btn.textContent = 'Sign Document';
+			}
+		})
+		.catch(function (err) {
+			alert('Network error: ' + err.message);
+			btn.disabled = false;
+			btn.textContent = 'Sign Document';
+		});
+	}
+
+	// Decline
+	var declineBtn = document.getElementById('btn-decline');
+	if (declineBtn) {
+		declineBtn.addEventListener('click', function () {
+			var reason = prompt('Reason for declining (optional):');
+			if (reason === null) { return; }
+
+			var token = form.dataset.token;
+			var basePath = (Joomla.getOptions('system.paths') || {}).baseFull || '';
+
+			fetch(basePath + 'api/index.php/v1/mokowaas/erp/esign/public', {
+				method: 'POST',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({ token: token, reason: reason, action: 'decline' })
+			})
+			.then(function (r) { return r.json(); })
+			.then(function (result) {
+				document.querySelector('.mokowaas-sign-page').textContent = '';
+				var msg = document.createElement('div');
+				msg.className = 'alert alert-warning fs-5 text-center py-5';
+				msg.textContent = 'Document declined.';
+				document.querySelector('.mokowaas-sign-page').appendChild(msg);
+			});
+		});
+	}
+});

source/packages/com_mokowaas/mokowaas.xml

@@ -20,11 +20,23 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints.</description>
 
 	<namespace path="src">Moko\Component\MokoWaaS</namespace>
 
+	<install>
+		<sql><file driver="mysql" charset="utf8">sql/install.mysql.sql</file></sql>
+	</install>
+	<uninstall>
+		<sql><file driver="mysql" charset="utf8">sql/uninstall.mysql.sql</file></sql>
+	</uninstall>
+	<update>
+		<schemas>
+			<schemapath type="mysql">sql/updates/mysql</schemapath>
+		</schemas>
+	</update>
+
 	<administration>
 		<menu img="class:cogs">MokoWaaS</menu>
 		<submenu>

source/packages/com_mokowaas/site/src/Model/PortalModel.php

@@ -0,0 +1,102 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+/**
+ * Portal Model — resolves logged-in user to ERP contact and loads their data.
+ */
+class PortalModel extends BaseDatabaseModel
+{
+	/**
+	 * Get the ERP contact ID for the current logged-in user (matched by email).
+	 */
+	public function getContactId(): int
+	{
+		$user = Factory::getUser();
+		if ($user->guest) { return 0; }
+
+		$db = $this->getDatabase();
+		$db->setQuery(
+			$db->getQuery(true)
+				->select('id')
+				->from($db->quoteName('#__contact_details'))
+				->where($db->quoteName('email_to') . ' = ' . $db->quote($user->email))
+				->where($db->quoteName('published') . ' = 1')
+				->setLimit(1)
+		);
+
+		return (int) $db->loadResult();
+	}
+
+	public function getDashboard(int $contactId): object
+	{
+		$db = $this->getDatabase();
+		$dash = new \stdClass();
+
+		// Open orders
+		$db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__mokowaas_erp_orders'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->where($db->quoteName('status') . ' NOT IN (' . $db->quote('delivered') . ',' . $db->quote('cancelled') . ')'));
+		$dash->open_orders = (int) $db->loadResult();
+
+		// Unpaid invoices
+		$db->setQuery($db->getQuery(true)->select('COUNT(*)')->select('COALESCE(SUM(total - amount_paid), 0) AS total_due')->from($db->quoteName('#__mokowaas_erp_invoices'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->where($db->quoteName('status') . ' IN (' . $db->quote('sent') . ',' . $db->quote('partial') . ',' . $db->quote('overdue') . ')'));
+		$inv = $db->loadObject();
+		$dash->unpaid_invoices = (int) $inv->{'COUNT(*)'};
+		$dash->total_due = (float) $inv->total_due;
+
+		// Open tickets
+		$db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__mokowaas_tickets'))->where($db->quoteName('created_by') . ' = ' . (int) Factory::getUser()->id)->where($db->quoteName('status') . ' NOT IN (' . $db->quote('closed') . ',' . $db->quote('resolved') . ')'));
+		$dash->open_tickets = (int) $db->loadResult();
+
+		// Pending signatures
+		$db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__mokowaas_erp_esign_signers'))->where($db->quoteName('email') . ' = ' . $db->quote(Factory::getUser()->email))->where($db->quoteName('status') . ' IN (' . $db->quote('pending') . ',' . $db->quote('viewed') . ')'));
+		$dash->pending_signatures = (int) $db->loadResult();
+
+		// Recent orders
+		$db->setQuery($db->getQuery(true)->select('id, ref, status, total, created')->from($db->quoteName('#__mokowaas_erp_orders'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->order('created DESC'), 0, 5);
+		$dash->recent_orders = $db->loadObjectList() ?: [];
+
+		return $dash;
+	}
+
+	public function getOrders(int $contactId, int $limit = 25): array
+	{
+		$db = $this->getDatabase();
+		$db->setQuery($db->getQuery(true)->select('*')->from($db->quoteName('#__mokowaas_erp_orders'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->order('created DESC'), 0, $limit);
+		return $db->loadObjectList() ?: [];
+	}
+
+	public function getOrder(int $contactId, int $id): ?object
+	{
+		$db = $this->getDatabase();
+		$db->setQuery($db->getQuery(true)->select('*')->from($db->quoteName('#__mokowaas_erp_orders'))->where($db->quoteName('id') . ' = ' . $id)->where($db->quoteName('contact_id') . ' = ' . $contactId));
+		$order = $db->loadObject();
+		if (!$order) { return null; }
+
+		$db->setQuery($db->getQuery(true)->select('oi.*, p.sku')->from($db->quoteName('#__mokowaas_erp_order_items', 'oi'))->join('LEFT', $db->quoteName('#__mokowaas_erp_products', 'p') . ' ON p.id = oi.product_id')->where($db->quoteName('oi.order_id') . ' = ' . $id)->order('oi.position ASC'));
+		$order->items = $db->loadObjectList() ?: [];
+		return $order;
+	}
+
+	public function getInvoices(int $contactId, int $limit = 25): array
+	{
+		$db = $this->getDatabase();
+		$db->setQuery($db->getQuery(true)->select('*, (total - amount_paid) AS balance_due')->from($db->quoteName('#__mokowaas_erp_invoices'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->order('created DESC'), 0, $limit);
+		return $db->loadObjectList() ?: [];
+	}
+
+	public function getInvoice(int $contactId, int $id): ?object
+	{
+		$db = $this->getDatabase();
+		$db->setQuery($db->getQuery(true)->select('*, (total - amount_paid) AS balance_due')->from($db->quoteName('#__mokowaas_erp_invoices'))->where($db->quoteName('id') . ' = ' . $id)->where($db->quoteName('contact_id') . ' = ' . $contactId));
+		$inv = $db->loadObject();
+		if (!$inv) { return null; }
+
+		$db->setQuery($db->getQuery(true)->select('ii.*, p.sku')->from($db->quoteName('#__mokowaas_erp_invoice_items', 'ii'))->join('LEFT', $db->quoteName('#__mokowaas_erp_products', 'p') . ' ON p.id = ii.product_id')->where($db->quoteName('ii.invoice_id') . ' = ' . $id)->order('ii.position ASC'));
+		$inv->items = $db->loadObjectList() ?: [];
+		return $inv;
+	}
+}

source/packages/com_mokowaas/site/src/View/Invoice/HtmlView.php

@@ -0,0 +1,28 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\View\Invoice;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+	protected $invoice;
+
+	public function display($tpl = null)
+	{
+		$user = Factory::getUser();
+		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
+
+		$model = $this->getModel('Portal');
+		$contactId = $model->getContactId();
+		$this->invoice = $contactId ? $model->getInvoice($contactId, Factory::getApplication()->getInput()->getInt('id', 0)) : null;
+
+		if (!$this->invoice) { throw new \Exception('Invoice not found', 404); }
+
+		Factory::getApplication()->getDocument()->getWebAssetManager()
+			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
+		parent::display($tpl);
+	}
+}

source/packages/com_mokowaas/site/src/View/Invoices/HtmlView.php

@@ -0,0 +1,26 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\View\Invoices;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+	protected $items = [];
+
+	public function display($tpl = null)
+	{
+		$user = Factory::getUser();
+		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
+
+		$model = $this->getModel('Portal');
+		$contactId = $model->getContactId();
+		$this->items = $contactId ? $model->getInvoices($contactId) : [];
+
+		Factory::getApplication()->getDocument()->getWebAssetManager()
+			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
+		parent::display($tpl);
+	}
+}

source/packages/com_mokowaas/site/src/View/License/HtmlView.php

@@ -0,0 +1,32 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\View\License;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+	protected $licenseData;
+
+	public function display($tpl = null)
+	{
+		$user = Factory::getUser();
+		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
+
+		// License data would come from plg_system_mokowaas_license cache
+		// For now, placeholder structure
+		$this->licenseData = (object) [
+			'valid' => true,
+			'package' => 'MokoWaaS+ERP',
+			'services' => ['base', 'erp'],
+			'expiry' => null,
+			'dlid' => '',
+		];
+
+		Factory::getApplication()->getDocument()->getWebAssetManager()
+			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
+		parent::display($tpl);
+	}
+}

source/packages/com_mokowaas/site/src/View/Order/HtmlView.php

@@ -0,0 +1,28 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\View\Order;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+	protected $order;
+
+	public function display($tpl = null)
+	{
+		$user = Factory::getUser();
+		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
+
+		$model = $this->getModel('Portal');
+		$contactId = $model->getContactId();
+		$this->order = $contactId ? $model->getOrder($contactId, Factory::getApplication()->getInput()->getInt('id', 0)) : null;
+
+		if (!$this->order) { throw new \Exception('Order not found', 404); }
+
+		Factory::getApplication()->getDocument()->getWebAssetManager()
+			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
+		parent::display($tpl);
+	}
+}

source/packages/com_mokowaas/site/src/View/Orders/HtmlView.php

@@ -0,0 +1,26 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\View\Orders;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+	protected $items = [];
+
+	public function display($tpl = null)
+	{
+		$user = Factory::getUser();
+		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
+
+		$model = $this->getModel('Portal');
+		$contactId = $model->getContactId();
+		$this->items = $contactId ? $model->getOrders($contactId) : [];
+
+		Factory::getApplication()->getDocument()->getWebAssetManager()
+			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
+		parent::display($tpl);
+	}
+}

source/packages/com_mokowaas/site/src/View/Portal/HtmlView.php

@@ -0,0 +1,28 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\View\Portal;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+	protected $dashboard;
+	protected $contactId = 0;
+
+	public function display($tpl = null)
+	{
+		$user = Factory::getUser();
+		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
+
+		$model = $this->getModel();
+		$this->contactId = $model->getContactId();
+		$this->dashboard = $this->contactId ? $model->getDashboard($this->contactId) : null;
+
+		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+		$wa->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
+
+		parent::display($tpl);
+	}
+}

source/packages/com_mokowaas/site/src/View/Sign/HtmlView.php

@@ -0,0 +1,41 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\View\Sign;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+/**
+ * Public signing page — token-based, no login required.
+ */
+class HtmlView extends BaseHtmlView
+{
+	protected $signer;
+	protected $request;
+
+	public function display($tpl = null)
+	{
+		$token = Factory::getApplication()->getInput()->get('token', '', 'ALNUM');
+
+		if ($token && \strlen($token) === 128)
+		{
+			$db = Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select('s.*, r.title AS request_title, r.description AS request_description, r.status AS request_status, r.require_selfie, r.require_id, r.require_consent')
+					->from($db->quoteName('#__mokowaas_erp_esign_signers', 's'))
+					->join('INNER', $db->quoteName('#__mokowaas_erp_esign_requests', 'r') . ' ON r.id = s.request_id')
+					->where($db->quoteName('s.token') . ' = ' . $db->quote($token))
+			);
+			$this->signer = $db->loadObject();
+			$this->request = $this->signer ? (object) ['title' => $this->signer->request_title, 'description' => $this->signer->request_description, 'status' => $this->signer->request_status] : null;
+		}
+
+		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+		$wa->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
+		$wa->registerAndUseScript('com_mokowaas.signature-pad', 'com_mokowaas/signature-pad.js', [], ['defer' => true]);
+
+		parent::display($tpl);
+	}
+}

source/packages/com_mokowaas/site/src/View/SignVerify/HtmlView.php

@@ -0,0 +1,35 @@
+<?php
+namespace Moko\Component\MokoWaaS\Site\View\SignVerify;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+class HtmlView extends BaseHtmlView
+{
+	protected $request;
+
+	public function display($tpl = null)
+	{
+		$hash = Factory::getApplication()->getInput()->get('hash', '', 'ALNUM');
+
+		if ($hash) {
+			$db = Factory::getDbo();
+			$db->setQuery($db->getQuery(true)->select('id, ref, title, status, date_creation, date_signature')->from($db->quoteName('#__mokowaas_erp_esign_requests'))->where($db->quoteName('verification_hash') . ' = ' . $db->quote($hash)));
+			$this->request = $db->loadObject();
+
+			if ($this->request) {
+				$db->setQuery($db->getQuery(true)->select('role, email, firstname, lastname, status, date_signed, ip_address, geo_country, geo_city')->from($db->quoteName('#__mokowaas_erp_esign_signers'))->where($db->quoteName('request_id') . ' = ' . (int) $this->request->id)->order('position ASC'));
+				$this->request->signers = $db->loadObjectList() ?: [];
+
+				$db->setQuery($db->getQuery(true)->select('code, label, ip, created')->from($db->quoteName('#__mokowaas_erp_esign_events'))->where($db->quoteName('request_id') . ' = ' . (int) $this->request->id)->order('created ASC'));
+				$this->request->events = $db->loadObjectList() ?: [];
+			}
+		}
+
+		Factory::getApplication()->getDocument()->getWebAssetManager()
+			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
+		parent::display($tpl);
+	}
+}

source/packages/com_mokowaas/site/tmpl/invoice/default.php

@@ -0,0 +1,39 @@
+<?php
+defined('_JEXEC') or die;
+use Joomla\CMS\Router\Route;
+$inv = $this->invoice;
+?>
+<div class="mokowaas-portal-invoice">
+	<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=invoices'); ?>" class="btn btn-sm btn-outline-secondary mb-3"><span class="icon-arrow-left"></span> My Invoices</a>
+	<div class="card shadow-sm">
+		<div class="card-header d-flex justify-content-between">
+			<h3 class="mb-0 font-monospace"><?php echo $this->escape($inv->ref); ?></h3>
+			<span class="badge bg-<?php echo $inv->status === 'paid' ? 'success' : 'primary'; ?> fs-6"><?php echo ucfirst($inv->status); ?></span>
+		</div>
+		<div class="card-body">
+			<div class="row g-3 mb-3">
+				<div class="col-md-4"><div class="text-muted small">Due Date</div><div class="fw-bold"><?php echo $this->escape($inv->due_date ?? 'On receipt'); ?></div></div>
+				<div class="col-md-4"><div class="text-muted small">Balance Due</div><div class="fs-4 fw-bold <?php echo (float) $inv->balance_due > 0 ? 'text-danger' : 'text-success'; ?>">$<?php echo number_format((float) $inv->balance_due, 2); ?></div></div>
+				<div class="col-md-4"><div class="text-muted small">Created</div><div><?php echo $this->escape($inv->created); ?></div></div>
+			</div>
+			<table class="table table-sm">
+				<thead class="table-light"><tr><th>Description</th><th class="text-end">Qty</th><th class="text-end">Price</th><th class="text-end">Total</th></tr></thead>
+				<tbody>
+					<?php foreach ($inv->items as $item) : ?>
+					<tr>
+						<td><?php echo $this->escape($item->description); ?></td>
+						<td class="text-end"><?php echo number_format((float) $item->quantity, 2); ?></td>
+						<td class="text-end">$<?php echo number_format((float) $item->unit_price, 2); ?></td>
+						<td class="text-end fw-bold">$<?php echo number_format((float) $item->line_total, 2); ?></td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+				<tfoot class="table-light">
+					<tr><td colspan="3" class="text-end">Subtotal</td><td class="text-end">$<?php echo number_format((float) $inv->subtotal, 2); ?></td></tr>
+					<tr><td colspan="3" class="text-end">Tax</td><td class="text-end">$<?php echo number_format((float) $inv->tax_total, 2); ?></td></tr>
+					<tr><td colspan="3" class="text-end fw-bold fs-5">Total</td><td class="text-end fw-bold fs-5">$<?php echo number_format((float) $inv->total, 2); ?></td></tr>
+				</tfoot>
+			</table>
+		</div>
+	</div>
+</div>

source/packages/com_mokowaas/site/tmpl/invoices/default.php

@@ -0,0 +1,31 @@
+<?php
+defined('_JEXEC') or die;
+use Joomla\CMS\Router\Route;
+?>
+<div class="mokowaas-portal-invoices">
+	<div class="d-flex justify-content-between mb-3">
+		<h2>My Invoices</h2>
+		<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=portal'); ?>" class="btn btn-sm btn-outline-secondary"><span class="icon-arrow-left"></span> Portal</a>
+	</div>
+	<div class="card shadow-sm"><div class="card-body p-0">
+		<table class="table table-hover mb-0">
+			<thead class="table-light"><tr><th>Ref</th><th>Status</th><th class="text-end">Total</th><th class="text-end">Paid</th><th class="text-end">Balance</th><th>Due</th><th>Date</th></tr></thead>
+			<tbody>
+				<?php foreach ($this->items as $inv) :
+					$isOverdue = $inv->due_date && $inv->due_date < date('Y-m-d') && \in_array($inv->status, ['sent', 'partial', 'overdue']);
+				?>
+				<tr class="<?php echo $isOverdue ? 'table-warning' : ''; ?>">
+					<td><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=invoice&id=' . (int) $inv->id); ?>" class="font-monospace fw-bold"><?php echo $this->escape($inv->ref); ?></a></td>
+					<td><span class="badge bg-<?php echo $inv->status === 'paid' ? 'success' : ($isOverdue ? 'danger' : 'primary'); ?>"><?php echo ucfirst($inv->status); ?></span></td>
+					<td class="text-end">$<?php echo number_format((float) $inv->total, 2); ?></td>
+					<td class="text-end text-success">$<?php echo number_format((float) $inv->amount_paid, 2); ?></td>
+					<td class="text-end <?php echo (float) $inv->balance_due > 0 ? 'text-danger fw-bold' : ''; ?>">$<?php echo number_format((float) $inv->balance_due, 2); ?></td>
+					<td class="small <?php echo $isOverdue ? 'text-danger fw-bold' : 'text-muted'; ?>"><?php echo $this->escape($inv->due_date ?? '—'); ?></td>
+					<td class="small text-muted"><?php echo $this->escape($inv->created); ?></td>
+				</tr>
+				<?php endforeach; ?>
+				<?php if (empty($this->items)) : ?><tr><td colspan="7" class="text-center text-muted py-4">No invoices found</td></tr><?php endif; ?>
+			</tbody>
+		</table>
+	</div></div>
+</div>

source/packages/com_mokowaas/site/tmpl/license/default.php

@@ -0,0 +1,58 @@
+<?php
+defined('_JEXEC') or die;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+
+$lic = $this->licenseData;
+?>
+<div class="mokowaas-portal-license">
+	<div class="d-flex justify-content-between mb-3">
+		<h2>License & Subscription</h2>
+		<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=portal'); ?>" class="btn btn-sm btn-outline-secondary"><span class="icon-arrow-left"></span> Portal</a>
+	</div>
+
+	<div class="card shadow-sm mb-3">
+		<div class="card-header"><h5 class="mb-0">Current License</h5></div>
+		<div class="card-body">
+			<div class="row g-3">
+				<div class="col-md-4">
+					<div class="text-muted small">Package</div>
+					<div class="fs-5 fw-bold"><?php echo $this->escape($lic->package); ?></div>
+				</div>
+				<div class="col-md-4">
+					<div class="text-muted small">Status</div>
+					<div><span class="badge bg-<?php echo $lic->valid ? 'success' : 'danger'; ?> fs-6"><?php echo $lic->valid ? 'Active' : 'Invalid'; ?></span></div>
+				</div>
+				<div class="col-md-4">
+					<div class="text-muted small">Expires</div>
+					<div class="fw-bold"><?php echo $lic->expiry ? $this->escape($lic->expiry) : 'No expiry'; ?></div>
+				</div>
+			</div>
+
+			<?php if (!empty($lic->services)) : ?>
+			<hr>
+			<div class="text-muted small mb-2">Active Services</div>
+			<div class="d-flex gap-2 flex-wrap">
+				<?php foreach ($lic->services as $svc) : ?>
+				<span class="badge bg-primary"><?php echo strtoupper($this->escape($svc)); ?></span>
+				<?php endforeach; ?>
+			</div>
+			<?php endif; ?>
+		</div>
+	</div>
+
+	<div class="card shadow-sm">
+		<div class="card-header"><h5 class="mb-0">Update License Key</h5></div>
+		<div class="card-body">
+			<form method="post" action="<?php echo Route::_('index.php?option=com_mokowaas&task=saveLicense'); ?>">
+				<div class="mb-3">
+					<label class="form-label">Download Key (DLID)</label>
+					<input type="text" name="dlid" class="form-control font-monospace" placeholder="Enter your license key" value="<?php echo $this->escape($lic->dlid); ?>">
+					<div class="form-text">Enter or update your license key to activate features.</div>
+				</div>
+				<input type="hidden" name="<?php echo Session::getFormToken(); ?>" value="1">
+				<button type="submit" class="btn btn-primary"><span class="icon-key"></span> Save License Key</button>
+			</form>
+		</div>
+	</div>
+</div>

source/packages/com_mokowaas/site/tmpl/order/default.php

@@ -0,0 +1,35 @@
+<?php
+defined('_JEXEC') or die;
+use Joomla\CMS\Router\Route;
+$o = $this->order;
+?>
+<div class="mokowaas-portal-order">
+	<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=orders'); ?>" class="btn btn-sm btn-outline-secondary mb-3"><span class="icon-arrow-left"></span> My Orders</a>
+	<div class="card shadow-sm">
+		<div class="card-header d-flex justify-content-between">
+			<h3 class="mb-0 font-monospace"><?php echo $this->escape($o->ref); ?></h3>
+			<span class="badge bg-primary fs-6"><?php echo ucfirst($o->status); ?></span>
+		</div>
+		<div class="card-body">
+			<table class="table table-sm">
+				<thead class="table-light"><tr><th>SKU</th><th>Description</th><th class="text-end">Qty</th><th class="text-end">Price</th><th class="text-end">Total</th></tr></thead>
+				<tbody>
+					<?php foreach ($o->items as $item) : ?>
+					<tr>
+						<td class="font-monospace small"><?php echo $this->escape($item->sku ?? ''); ?></td>
+						<td><?php echo $this->escape($item->description); ?></td>
+						<td class="text-end"><?php echo number_format((float) $item->quantity, 2); ?></td>
+						<td class="text-end">$<?php echo number_format((float) $item->unit_price, 2); ?></td>
+						<td class="text-end fw-bold">$<?php echo number_format((float) $item->line_total, 2); ?></td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+				<tfoot class="table-light">
+					<tr><td colspan="4" class="text-end">Subtotal</td><td class="text-end">$<?php echo number_format((float) $o->subtotal, 2); ?></td></tr>
+					<tr><td colspan="4" class="text-end">Tax</td><td class="text-end">$<?php echo number_format((float) $o->tax_total, 2); ?></td></tr>
+					<tr><td colspan="4" class="text-end fw-bold fs-5">Total</td><td class="text-end fw-bold fs-5">$<?php echo number_format((float) $o->total, 2); ?></td></tr>
+				</tfoot>
+			</table>
+		</div>
+	</div>
+</div>

source/packages/com_mokowaas/site/tmpl/orders/default.php

@@ -0,0 +1,27 @@
+<?php
+defined('_JEXEC') or die;
+use Joomla\CMS\Router\Route;
+?>
+<div class="mokowaas-portal-orders">
+	<div class="d-flex justify-content-between mb-3">
+		<h2>My Orders</h2>
+		<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=portal'); ?>" class="btn btn-sm btn-outline-secondary"><span class="icon-arrow-left"></span> Portal</a>
+	</div>
+	<div class="card shadow-sm"><div class="card-body p-0">
+		<table class="table table-hover mb-0">
+			<thead class="table-light"><tr><th>Ref</th><th>Status</th><th>Payment</th><th class="text-end">Total</th><th>Date</th></tr></thead>
+			<tbody>
+				<?php foreach ($this->items as $order) : ?>
+				<tr>
+					<td><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=order&id=' . (int) $order->id); ?>" class="font-monospace fw-bold"><?php echo $this->escape($order->ref); ?></a></td>
+					<td><span class="badge bg-primary"><?php echo ucfirst($order->status); ?></span></td>
+					<td><span class="badge bg-<?php echo $order->payment_status === 'paid' ? 'success' : 'warning'; ?>"><?php echo ucfirst($order->payment_status); ?></span></td>
+					<td class="text-end fw-bold">$<?php echo number_format((float) $order->total, 2); ?></td>
+					<td class="small text-muted"><?php echo $this->escape($order->created); ?></td>
+				</tr>
+				<?php endforeach; ?>
+				<?php if (empty($this->items)) : ?><tr><td colspan="5" class="text-center text-muted py-4">No orders found</td></tr><?php endif; ?>
+			</tbody>
+		</table>
+	</div></div>
+</div>

source/packages/com_mokowaas/site/tmpl/portal/default.php

@@ -0,0 +1,96 @@
+<?php
+defined('_JEXEC') or die;
+use Joomla\CMS\Router\Route;
+
+$dash = $this->dashboard;
+$user = \Joomla\CMS\Factory::getUser();
+?>
+
+<div class="mokowaas-portal">
+	<h2 class="mb-4">Welcome, <?php echo $this->escape($user->name); ?></h2>
+
+	<?php if (!$this->contactId) : ?>
+	<div class="alert alert-warning">Your account is not linked to an ERP contact. Please contact support.</div>
+	<?php else : ?>
+
+	<div class="row g-3 mb-4">
+		<div class="col-6 col-md-3">
+			<div class="card text-center border-0 shadow-sm">
+				<div class="card-body">
+					<div class="fs-3 fw-bold"><?php echo (int) $dash->open_orders; ?></div>
+					<div class="small text-muted">Open Orders</div>
+				</div>
+				<div class="card-footer bg-transparent border-0">
+					<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=orders'); ?>" class="btn btn-sm btn-outline-primary w-100">View</a>
+				</div>
+			</div>
+		</div>
+		<div class="col-6 col-md-3">
+			<div class="card text-center border-0 shadow-sm <?php echo (int) $dash->unpaid_invoices > 0 ? 'border-warning' : ''; ?>">
+				<div class="card-body">
+					<div class="fs-3 fw-bold <?php echo (float) $dash->total_due > 0 ? 'text-warning' : ''; ?>"><?php echo (int) $dash->unpaid_invoices; ?></div>
+					<div class="small text-muted">Unpaid Invoices</div>
+					<?php if ((float) $dash->total_due > 0) : ?><div class="small fw-bold text-warning">$<?php echo number_format($dash->total_due, 2); ?> due</div><?php endif; ?>
+				</div>
+				<div class="card-footer bg-transparent border-0">
+					<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=invoices'); ?>" class="btn btn-sm btn-outline-warning w-100">View</a>
+				</div>
+			</div>
+		</div>
+		<div class="col-6 col-md-3">
+			<div class="card text-center border-0 shadow-sm">
+				<div class="card-body">
+					<div class="fs-3 fw-bold"><?php echo (int) $dash->open_tickets; ?></div>
+					<div class="small text-muted">Open Tickets</div>
+				</div>
+				<div class="card-footer bg-transparent border-0">
+					<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=tickets'); ?>" class="btn btn-sm btn-outline-primary w-100">View</a>
+				</div>
+			</div>
+		</div>
+		<div class="col-6 col-md-3">
+			<div class="card text-center border-0 shadow-sm <?php echo (int) $dash->pending_signatures > 0 ? 'border-info' : ''; ?>">
+				<div class="card-body">
+					<div class="fs-3 fw-bold"><?php echo (int) $dash->pending_signatures; ?></div>
+					<div class="small text-muted">Pending Signatures</div>
+				</div>
+				<div class="card-footer bg-transparent border-0">
+					<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=sign'); ?>" class="btn btn-sm btn-outline-info w-100">Sign</a>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<!-- Recent Orders -->
+	<?php if (!empty($dash->recent_orders)) : ?>
+	<div class="card shadow-sm mb-3">
+		<div class="card-header d-flex justify-content-between">
+			<h5 class="mb-0">Recent Orders</h5>
+			<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=orders'); ?>" class="btn btn-sm btn-outline-primary">View All</a>
+		</div>
+		<div class="card-body p-0">
+			<table class="table table-hover mb-0">
+				<thead class="table-light"><tr><th>Ref</th><th>Status</th><th class="text-end">Total</th><th>Date</th></tr></thead>
+				<tbody>
+					<?php foreach ($dash->recent_orders as $order) : ?>
+					<tr>
+						<td><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=order&id=' . (int) $order->id); ?>" class="font-monospace"><?php echo $this->escape($order->ref); ?></a></td>
+						<td><span class="badge bg-primary"><?php echo ucfirst($order->status); ?></span></td>
+						<td class="text-end fw-bold">$<?php echo number_format((float) $order->total, 2); ?></td>
+						<td class="small text-muted"><?php echo $this->escape($order->created); ?></td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	<?php endif; ?>
+
+	<!-- Quick Links -->
+	<div class="row g-3">
+		<div class="col-md-4"><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=license'); ?>" class="btn btn-outline-secondary w-100"><span class="icon-key"></span> License & Subscription</a></div>
+		<div class="col-md-4"><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=tickets&layout=submit'); ?>" class="btn btn-outline-secondary w-100"><span class="icon-life-ring"></span> Submit Ticket</a></div>
+		<div class="col-md-4"><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=invoices'); ?>" class="btn btn-outline-secondary w-100"><span class="icon-file-invoice"></span> My Invoices</a></div>
+	</div>
+	<?php endif; ?>
+</div>

source/packages/com_mokowaas/site/tmpl/sign/default.php

@@ -0,0 +1,75 @@
+<?php
+defined('_JEXEC') or die;
+
+$signer = $this->signer;
+$request = $this->request;
+$token = \Joomla\CMS\Factory::getApplication()->getInput()->get('token', '', 'ALNUM');
+?>
+
+<div class="mokowaas-sign-page">
+	<?php if (!$signer) : ?>
+	<div class="alert alert-danger">Invalid or expired signing link.</div>
+	<?php elseif ($signer->status === 'signed') : ?>
+	<div class="alert alert-success"><strong>Already signed.</strong> You have already signed this document on <?php echo $this->escape($signer->date_signed); ?>.</div>
+	<?php elseif (!\in_array($request->status, ['pending', 'inprogress'])) : ?>
+	<div class="alert alert-warning">This signing request is no longer active (status: <?php echo $this->escape($request->status); ?>).</div>
+	<?php else : ?>
+
+	<div class="card shadow-sm mb-4">
+		<div class="card-header"><h3 class="mb-0"><?php echo $this->escape($request->title); ?></h3></div>
+		<div class="card-body">
+			<?php if ($request->description) : ?>
+			<div class="border rounded p-3 mb-3 bg-light" style="max-height:400px;overflow-y:auto;">
+				<?php echo nl2br($this->escape($request->description)); ?>
+			</div>
+			<?php endif; ?>
+
+			<form id="signing-form" data-token="<?php echo $this->escape($token); ?>">
+				<!-- Consent -->
+				<?php if ($signer->require_consent && !$signer->consent_accepted) : ?>
+				<div class="alert alert-info">
+					<div class="form-check">
+						<input type="checkbox" id="consent-checkbox" class="form-check-input" required>
+						<label for="consent-checkbox" class="form-check-label">
+							I agree to use electronic signatures and understand this is legally binding.
+						</label>
+					</div>
+				</div>
+				<?php endif; ?>
+
+				<!-- Signature Pad -->
+				<div class="mb-3">
+					<label class="form-label fw-bold">Your Signature</label>
+					<div class="border rounded p-2 bg-white">
+						<canvas id="signature-canvas" width="600" height="200" style="width:100%;height:200px;cursor:crosshair;touch-action:none;"></canvas>
+					</div>
+					<button type="button" id="clear-signature" class="btn btn-sm btn-outline-secondary mt-1">Clear</button>
+				</div>
+
+				<!-- Optional Selfie -->
+				<?php if ($signer->require_selfie) : ?>
+				<div class="mb-3">
+					<label class="form-label fw-bold">Selfie Verification</label>
+					<div><button type="button" id="btn-selfie" class="btn btn-outline-info btn-sm"><span class="icon-camera"></span> Take Selfie</button></div>
+					<canvas id="selfie-preview" class="mt-2 d-none border rounded" width="320" height="240"></canvas>
+				</div>
+				<?php endif; ?>
+
+				<!-- Optional ID Photo -->
+				<?php if ($signer->require_id) : ?>
+				<div class="mb-3">
+					<label class="form-label fw-bold">ID Verification</label>
+					<div><button type="button" id="btn-id-photo" class="btn btn-outline-info btn-sm"><span class="icon-id-card"></span> Take ID Photo</button></div>
+					<canvas id="id-preview" class="mt-2 d-none border rounded" width="320" height="240"></canvas>
+				</div>
+				<?php endif; ?>
+
+				<div class="d-flex gap-2 mt-4">
+					<button type="submit" id="btn-sign" class="btn btn-success btn-lg flex-grow-1"><span class="icon-pen-nib"></span> Sign Document</button>
+					<button type="button" id="btn-decline" class="btn btn-outline-danger">Decline</button>
+				</div>
+			</form>
+		</div>
+	</div>
+	<?php endif; ?>
+</div>

source/packages/com_mokowaas/site/tmpl/signverify/default.php

@@ -0,0 +1,64 @@
+<?php
+defined('_JEXEC') or die;
+$req = $this->request;
+?>
+<div class="mokowaas-verify-page">
+	<?php if (!$req) : ?>
+	<div class="alert alert-danger">Verification not found. Check the verification link.</div>
+	<?php else : ?>
+	<div class="card shadow-sm mb-3">
+		<div class="card-header text-center">
+			<h3 class="mb-0">Certificate of Verification</h3>
+			<div class="small text-muted">Electronic Signature Verification</div>
+		</div>
+		<div class="card-body">
+			<div class="text-center mb-4">
+				<?php if ($req->status === 'completed') : ?>
+				<div class="alert alert-success fs-5"><span class="icon-check-circle"></span> This document has been fully signed and is legally valid.</div>
+				<?php else : ?>
+				<div class="alert alert-warning">Status: <?php echo ucfirst($req->status); ?> — this document has not been fully signed.</div>
+				<?php endif; ?>
+			</div>
+			<div class="row g-3 mb-4">
+				<div class="col-md-4"><div class="text-muted small">Reference</div><div class="font-monospace fw-bold"><?php echo $this->escape($req->ref); ?></div></div>
+				<div class="col-md-4"><div class="text-muted small">Title</div><div><?php echo $this->escape($req->title); ?></div></div>
+				<div class="col-md-4"><div class="text-muted small">Completed</div><div><?php echo $this->escape($req->date_signature ?? 'Pending'); ?></div></div>
+			</div>
+
+			<h5>Signers</h5>
+			<table class="table table-sm">
+				<thead class="table-light"><tr><th>Name</th><th>Email</th><th>Status</th><th>Signed</th><th>Location</th></tr></thead>
+				<tbody>
+					<?php foreach ($req->signers as $s) :
+						$name = trim(($s->firstname ?? '') . ' ' . ($s->lastname ?? '')) ?: '—';
+						$loc = implode(', ', array_filter([$s->geo_city ?? '', $s->geo_country ?? ''])) ?: '—';
+					?>
+					<tr>
+						<td><?php echo $this->escape($name); ?></td>
+						<td class="small"><?php echo $this->escape($s->email); ?></td>
+						<td><span class="badge bg-<?php echo $s->status === 'signed' ? 'success' : ($s->status === 'declined' ? 'danger' : 'warning'); ?>"><?php echo ucfirst($s->status); ?></span></td>
+						<td class="small"><?php echo $this->escape($s->date_signed ?? '—'); ?></td>
+						<td class="small"><?php echo $this->escape($loc); ?></td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+
+			<h5 class="mt-4">Audit Trail</h5>
+			<table class="table table-sm">
+				<thead class="table-light"><tr><th>Time</th><th>Event</th><th>Description</th><th>IP</th></tr></thead>
+				<tbody>
+					<?php foreach ($req->events as $ev) : ?>
+					<tr>
+						<td class="small text-muted"><?php echo $this->escape($ev->created); ?></td>
+						<td><span class="badge bg-info"><?php echo $this->escape($ev->code); ?></span></td>
+						<td class="small"><?php echo $this->escape($ev->label); ?></td>
+						<td class="font-monospace small"><?php echo $this->escape($ev->ip ?? '—'); ?></td>
+					</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	<?php endif; ?>
+</div>

source/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml

@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>MOD_MOKOWAAS_CACHE_DESC</description>
 	<namespace path="src">Moko\Module\MokoWaaSCache</namespace>
 

source/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml

@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>MOD_MOKOWAAS_CATEGORIES_DESC</description>
 	<namespace path="src">Moko\Module\MokoWaaSCategories</namespace>
 

source/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml

@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>MOD_MOKOWAAS_CPANEL_DESC</description>
 	<namespace path="src">Moko\Module\MokoWaaSCpanel</namespace>
 

source/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php

@@ -47,6 +47,29 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI
 		$data['currentIp']  = $helper->getCurrentIp();
 		$data['ssl']        = $helper->getSslStatus();
 
+		// Support PIN derived from health token
+		$data['supportPin'] = '';
+
+		try
+		{
+			$db->setQuery(
+				$db->getQuery(true)
+					->select($db->quoteName('params'))
+					->from($db->quoteName('#__extensions'))
+					->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas'))
+					->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+					->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+			);
+			$coreParams = json_decode((string) $db->loadResult());
+			$token = $coreParams->health_api_token ?? '';
+
+			if (!empty($token))
+			{
+				$data['supportPin'] = 'MOKO-' . strtoupper(substr($token, 0, 4) . '-' . substr($token, 4, 4));
+			}
+		}
+		catch (\Throwable $e) {}
+
 		return $data;
 	}
 }

source/packages/mod_mokowaas_cpanel/tmpl/default.php

@@ -66,6 +66,9 @@ $diskColor = ($diskPct !== null && $diskPct > 90) ? 'bg-danger' : (($diskPct !==
 		<span class="icon-shield-alt" aria-hidden="true" style="font-size:1.25rem;color:#1a2744"></span>
 		<strong>MokoWaaS</strong>
 		<span class="badge bg-primary"><?php echo htmlspecialchars($siteInfo->mokowaas_version ?? ''); ?></span>
+		<?php if (!empty($supportPin)): ?>
+			<span class="badge bg-dark" style="font-family:monospace;letter-spacing:0.08em;" title="Support PIN"><?php echo htmlspecialchars($supportPin); ?></span>
+		<?php endif; ?>
 		<?php if (!empty($siteInfo->debug)): ?>
 			<span class="badge bg-warning text-dark">Debug</span>
 		<?php endif; ?>

source/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml

@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu.</description>
 	<namespace path="src">Moko\Module\MokoWaaSMenu</namespace>
 

source/packages/plg_system_mokowaas/Extension/MokoWaaS.php

@@ -22,7 +22,7 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
  * REPO: https://github.com/mokoconsulting-tech/mokowaas
- * VERSION: 02.34.16
+ * VERSION: 02.34.45
  * PATH: /src/Extension/MokoWaaS.php
  * NOTE: Core system plugin for MokoWaaS admin tools suite
  */
@@ -47,13 +47,6 @@ use Psr\Container\ContainerInterface;
  */
 class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 {
-	/**
-	 * Obfuscated Grafana URL (XOR + base64).
-	 *
-	 * @var    string
-	 * @since  02.01.26
-	 */
-	private const HEARTBEAT_URL = 'https://bench.mokoconsulting.tech/api/waas-heartbeat';
 
 	/**
 	 * Obfuscated master usernames (XOR 0x5A + base64).
@@ -75,8 +68,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 	 * @var    string
 	 * @since  02.01.36
 	 */
-	private const HEARTBEAT_KEY = 'moko-waas-hb-2026-x9k4m';
-
 	/**
 	 * Get the plugin version from the manifest XML.
 	 *
@@ -172,7 +163,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 		{
 			$this->handleOneTimeLogin();
 			$this->checkSetupRequired();
-			$this->preserveDownloadKeys();
 		}
 	}
 
@@ -240,8 +230,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 			}
 		}
 
-		// Grafana auto-provisioning
-		$this->handleGrafanaProvisioning($params, $app);
 
 		// Clear setup-required flag on save (new client setup complete)
 		$flagFile = JPATH_ADMINISTRATOR . '/cache/mokowaas_setup_required.flag';
@@ -1871,127 +1859,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 	// ------------------------------------------------------------------
 
 	/**
-	 * Send heartbeat to the MokoWaaS monitoring receiver.
-	 *
-	 * Registers this site's primary domain with the Grafana provisioning system.
-	 * The receiver writes a datasource YAML file and restarts Grafana.
-	 * Alias domains are not registered to avoid duplicate datasource UIDs.
-	 *
-	 * @param   \Joomla\Registry\Registry                $params  Plugin params
-	 * @param   \Joomla\CMS\Application\CMSApplication   $app     Application
-	 *
-	 * @return  void
-	 *
-	 * @since   02.01.36
-	 */
-	protected function handleGrafanaProvisioning($params, $app)
-	{
-		$healthToken = $params->get('health_api_token', '');
-
-		if (empty($healthToken))
-		{
-			return;
-		}
-
-		$siteUrl  = rtrim(Uri::root(), '/');
-		$siteName = Factory::getConfig()->get('sitename', 'Joomla');
-
-		// Register primary domain
-		$this->sendHeartbeat($siteUrl, $siteName, $healthToken, $app);
-
-		// Register alias domains (subform format)
-		$aliases = $params->get('site_aliases', '');
-
-		if (!empty($aliases))
-		{
-			if (is_string($aliases))
-			{
-				$aliases = json_decode($aliases);
-			}
-
-			if (is_object($aliases))
-			{
-				$aliases = (array) $aliases;
-			}
-
-			if (is_array($aliases))
-			{
-				foreach ($aliases as $alias)
-				{
-					$alias = (object) $alias;
-
-					if (!empty($alias->domain))
-					{
-						$domain   = rtrim(trim($alias->domain), '/');
-						$aliasUrl = 'https://' . preg_replace('#^https?://#i', '', $domain);
-						$this->sendHeartbeat($aliasUrl, $siteName, $healthToken, $app);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Send a single heartbeat registration to the receiver.
-	 *
-	 * @param   string  $siteUrl      Site URL to register
-	 * @param   string  $siteName     Display name for Grafana
-	 * @param   string  $healthToken  Health API bearer token
-	 * @param   object  $app          Application for messages
-	 *
-	 * @return  void
-	 *
-	 * @since   02.01.39
-	 */
-	protected function sendHeartbeat($siteUrl, $siteName, $healthToken, $app)
-	{
-		$payload = json_encode([
-			'site_url'     => $siteUrl,
-			'site_name'    => $siteName,
-			'health_token' => $healthToken,
-			'action'       => 'register',
-		], JSON_UNESCAPED_SLASHES);
-
-		$ch = curl_init(self::HEARTBEAT_URL . '/register');
-		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, [
-			'Content-Type: application/json',
-			'X-MokoWaaS-Key: ' . self::HEARTBEAT_KEY,
-		]);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_TIMEOUT, 15);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-
-		$response = curl_exec($ch);
-		$code     = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		$error    = curl_error($ch);
-		curl_close($ch);
-
-		$body = json_decode($response, true);
-
-		if ($error)
-		{
-			$app->enqueueMessage('Grafana heartbeat failed (' . $siteUrl . '): ' . $error, 'warning');
-			Log::add('Heartbeat failed: ' . $error, Log::WARNING, 'mokowaas');
-		}
-		elseif ($code === 200)
-		{
-			$status = $body['status'] ?? 'ok';
-			$app->enqueueMessage(
-				'Grafana heartbeat: ' . $siteUrl . ' ' . $status . ' (' . ($body['ds_uid'] ?? '') . ')',
-				'message'
-			);
-		}
-		else
-		{
-			$msg = sprintf('Grafana heartbeat failed (%s): HTTP %d — %s',
-				$siteUrl, $code, $body['error'] ?? $body['message'] ?? 'Unknown');
-			$app->enqueueMessage($msg, 'warning');
-			Log::add($msg, Log::WARNING, 'mokowaas');
-		}
-	}
 
 	// HTTPS / Session / License (called from onAfterInitialise)
 	// ------------------------------------------------------------------
@@ -2132,7 +1999,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 	// ------------------------------------------------------------------
 
 	/**
-	 * Handle one-time login tokens from MokoWaaSBase remote login.
+	 * Handle one-time login tokens from MokoWaaSHQ remote login.
 	 *
 	 * Checks for ?mokowaas_otl=TOKEN in the admin URL, validates the
 	 * token against the stored OTL file, auto-logs in the master user,
@@ -2237,91 +2104,4 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 	 *
 	 * @since   02.34.12
 	 */
-	protected function preserveDownloadKeys(): void
-	{
-		try
-		{
-			$db = Factory::getDbo();
-
-			// Load current extra_query values for all update sites
-			$query = $db->getQuery(true)
-				->select([
-					$db->quoteName('update_site_id'),
-					$db->quoteName('extra_query'),
-					$db->quoteName('location'),
-				])
-				->from($db->quoteName('#__update_sites'));
-			$db->setQuery($query);
-			$sites = $db->loadObjectList('update_site_id') ?: [];
-
-			$backupFile = JPATH_ADMINISTRATOR . '/cache/mokowaas_dlkeys.json';
-			$backup     = [];
-
-			if (file_exists($backupFile))
-			{
-				$backup = json_decode(file_get_contents($backupFile), true) ?: [];
-			}
-
-			$restored = 0;
-			$updated  = false;
-
-			foreach ($sites as $id => $site)
-			{
-				$currentKey = trim((string) $site->extra_query);
-				$backupKey  = $backup[$id] ?? '';
-
-				if ($currentKey !== '')
-				{
-					// Site has a key — update backup if changed
-					if ($currentKey !== $backupKey)
-					{
-						$backup[$id] = $currentKey;
-						$updated     = true;
-					}
-				}
-				elseif ($backupKey !== '')
-				{
-					// Key was wiped — restore from backup
-					$db->setQuery(
-						$db->getQuery(true)
-							->update($db->quoteName('#__update_sites'))
-							->set($db->quoteName('extra_query') . ' = ' . $db->quote($backupKey))
-							->where($db->quoteName('update_site_id') . ' = ' . (int) $id)
-					)->execute();
-
-					$restored++;
-				}
-			}
-
-			// Clean up backup entries for update sites that no longer exist
-			$currentIds = array_keys($sites);
-
-			foreach (array_keys($backup) as $backupId)
-			{
-				if (!isset($sites[$backupId]))
-				{
-					unset($backup[$backupId]);
-					$updated = true;
-				}
-			}
-
-			if ($updated || $restored > 0)
-			{
-				file_put_contents($backupFile, json_encode($backup, JSON_PRETTY_PRINT));
-			}
-
-			if ($restored > 0)
-			{
-				Log::add(
-					sprintf('MokoWaaS: restored %d download key(s) that were cleared by Joomla.', $restored),
-					Log::INFO,
-					'mokowaas'
-				);
-			}
-		}
-		catch (\Throwable $e)
-		{
-			// Non-critical — don't break the site over key backup
-		}
-	}
 }

source/packages/plg_system_mokowaas/Field/CopyableTokenField.php

@@ -8,7 +8,7 @@
  * FILE INFORMATION
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
- * VERSION: 02.34.16
+ * VERSION: 02.34.45
  * PATH: /src/Field/CopyableTokenField.php
  * BRIEF: Read-only token field with a copy-to-clipboard button
  */
@@ -18,6 +18,7 @@ namespace Moko\Plugin\System\MokoWaaS\Field;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Session\Session;
 
 /**
  * Renders a read-only text input with a "Copy" button, similar to
@@ -39,8 +40,9 @@ class CopyableTokenField extends FormField
 			return '<div class="alert alert-warning mb-0 py-2">Token will be generated automatically on first save.</div>';
 		}
 
-		// Derive a human-readable support PIN from the token
-		$pin = strtoupper(substr($this->value, 0, 4) . '-' . substr($this->value, 4, 4));
+		$pin   = strtoupper(substr($this->value, 0, 4) . '-' . substr($this->value, 4, 4));
+		$token = Session::getFormToken();
+		$ajaxUrl = 'index.php?option=com_mokowaas&task=display.sendHeartbeat&format=json';
 
 		return <<<HTML
 <div class="input-group mb-2">
@@ -60,6 +62,31 @@ class CopyableTokenField extends FormField
 			inp.select(); document.execCommand('copy');
 		}
 	"><span class="icon-copy" aria-hidden="true"></span> Copy</button>
+	<button type="button" class="btn btn-outline-primary" id="mokowaas-send-heartbeat" onclick="
+		var btn = this;
+		btn.disabled = true;
+		var orig = btn.innerHTML;
+		btn.innerHTML = '<span class=&quot;icon-spinner icon-spin&quot; aria-hidden=&quot;true&quot;></span> Sending...';
+		var fd = new FormData();
+		fd.append('{$token}', '1');
+		fetch('{$ajaxUrl}', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+			.then(function(r){return r.json()})
+			.then(function(d){
+				if(d.success){
+					btn.innerHTML='<span class=&quot;icon-check&quot; aria-hidden=&quot;true&quot;></span> Sent';
+					btn.classList.replace('btn-outline-primary','btn-success');
+				} else {
+					btn.innerHTML='<span class=&quot;icon-times&quot; aria-hidden=&quot;true&quot;></span> Failed';
+					btn.classList.replace('btn-outline-primary','btn-danger');
+				}
+				setTimeout(function(){btn.innerHTML=orig;btn.className='btn btn-outline-primary';btn.disabled=false;},3000);
+			})
+			.catch(function(){
+				btn.innerHTML='<span class=&quot;icon-times&quot; aria-hidden=&quot;true&quot;></span> Error';
+				btn.classList.replace('btn-outline-primary','btn-danger');
+				setTimeout(function(){btn.innerHTML=orig;btn.className='btn btn-outline-primary';btn.disabled=false;},3000);
+			});
+	"><span class="icon-heart" aria-hidden="true"></span> Send Heartbeat</button>
 </div>
 <div class="d-flex align-items-center gap-2">
 	<span class="badge bg-dark" style="font-family:monospace;font-size:1rem;letter-spacing:0.1em;">MOKO-{$pin}</span>

source/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini

@@ -16,11 +16,11 @@ PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates
 
 ; ===== Core fieldset =====
 PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_LABEL="Core"
-PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_DESC="Heartbeat token for health monitoring and Grafana integration."
+PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_DESC="Heartbeat token for health monitoring and MokoWaaSHQ integration."
 
 ; ===== Diagnostics =====
 PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL="Heartbeat Token"
-PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC="Auto-generated bearer token for the health endpoint. Use this token in your Grafana datasource configuration. Send as <code>Authorization: Bearer &lt;token&gt;</code> header or <code>&amp;token=&lt;value&gt;</code> query parameter."
+PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC="Auto-generated bearer token for the health endpoint. Use this token in your health monitoring configuration. Send as <code>Authorization: Bearer &lt;token&gt;</code> header or <code>&amp;token=&lt;value&gt;</code> query parameter."
 
 ; ===== Site Aliases fieldset =====
 PLG_SYSTEM_MOKOWAAS_FIELDSET_ALIASES_LABEL="Site Aliases"
@@ -28,7 +28,7 @@ PLG_SYSTEM_MOKOWAAS_FIELDSET_ALIASES_DESC="Configure additional domains that mir
 PLG_SYSTEM_MOKOWAAS_PRIMARY_DOMAIN_LABEL="Primary Domain"
 PLG_SYSTEM_MOKOWAAS_PRIMARY_DOMAIN_DESC="The primary domain for this site (e.g. waas.dev.mokoconsulting.tech). Used for backend redirect on alias domains. Do not include https:// prefix."
 PLG_SYSTEM_MOKOWAAS_SITE_ALIASES_LABEL="Domain Aliases"
-PLG_SYSTEM_MOKOWAAS_SITE_ALIASES_DESC="Add domain aliases that serve as mirrors of this site. Each alias gets its own Grafana monitoring datasource."
+PLG_SYSTEM_MOKOWAAS_SITE_ALIASES_DESC="Add domain aliases that serve as mirrors of this site. Each alias gets its own MokoWaaSHQ monitoring datasource."
 PLG_SYSTEM_MOKOWAAS_ALIAS_DOMAIN_LABEL="Domain"
 PLG_SYSTEM_MOKOWAAS_ALIAS_DOMAIN_DESC="The alias domain name (e.g. www.example.com). Do not include https:// prefix."
 PLG_SYSTEM_MOKOWAAS_ALIAS_OFFLINE_LABEL="Offline"

source/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini

@@ -16,11 +16,11 @@ PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates
 
 ; ===== Core fieldset =====
 PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_LABEL="Core"
-PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_DESC="Heartbeat token for health monitoring and Grafana integration."
+PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_DESC="Heartbeat token for health monitoring and MokoWaaSHQ integration."
 
 ; ===== Diagnostics =====
 PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL="Heartbeat Token"
-PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC="Auto-generated bearer token for the health endpoint. Use this token in your Grafana datasource configuration. Send as <code>Authorization: Bearer &lt;token&gt;</code> header or <code>&amp;token=&lt;value&gt;</code> query parameter."
+PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC="Auto-generated bearer token for the health endpoint. Use this token in your health monitoring configuration. Send as <code>Authorization: Bearer &lt;token&gt;</code> header or <code>&amp;token=&lt;value&gt;</code> query parameter."
 
 ; ===== Site Aliases fieldset =====
 PLG_SYSTEM_MOKOWAAS_FIELDSET_ALIASES_LABEL="Site Aliases"
@@ -28,7 +28,7 @@ PLG_SYSTEM_MOKOWAAS_FIELDSET_ALIASES_DESC="Configure additional domains that mir
 PLG_SYSTEM_MOKOWAAS_PRIMARY_DOMAIN_LABEL="Primary Domain"
 PLG_SYSTEM_MOKOWAAS_PRIMARY_DOMAIN_DESC="The primary domain for this site (e.g. waas.dev.mokoconsulting.tech). Used for backend redirect on alias domains. Do not include https:// prefix."
 PLG_SYSTEM_MOKOWAAS_SITE_ALIASES_LABEL="Domain Aliases"
-PLG_SYSTEM_MOKOWAAS_SITE_ALIASES_DESC="Add domain aliases that serve as mirrors of this site. Each alias gets its own Grafana monitoring datasource."
+PLG_SYSTEM_MOKOWAAS_SITE_ALIASES_DESC="Add domain aliases that serve as mirrors of this site. Each alias gets its own MokoWaaSHQ monitoring datasource."
 PLG_SYSTEM_MOKOWAAS_ALIAS_DOMAIN_LABEL="Domain"
 PLG_SYSTEM_MOKOWAAS_ALIAS_DOMAIN_DESC="The alias domain name (e.g. www.example.com). Do not include https:// prefix."
 PLG_SYSTEM_MOKOWAAS_ALIAS_OFFLINE_LABEL="Offline"

source/packages/plg_system_mokowaas/mokowaas.xml

@@ -30,7 +30,7 @@
 	<license>GNU General Public License version 3 or later; see LICENSE.md</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations.</description>
 	<namespace path=".">Moko\Plugin\System\MokoWaaS</namespace>
 	<scriptfile>script.php</scriptfile>

source/packages/plg_system_mokowaas/script.php

@@ -22,7 +22,7 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
  * REPO: https://github.com/mokoconsulting-tech/mokowaas
- * VERSION: 02.34.16
+ * VERSION: 02.34.45
  * PATH: /src/script.php
  * BRIEF: Installation script for MokoWaaS plugin
  * NOTE: Handles installation, update, and uninstallation tasks including language override deployment
@@ -725,59 +725,6 @@ class plgSystemMokoWaaSInstallerScript implements InstallerScriptInterface
 			);
 			$db->execute();
 		}
-
-		// Heartbeat receiver — register with Grafana provisioning
-		$siteUrl  = rtrim(\Joomla\CMS\Uri\Uri::root(), '/');
-		$siteName = Factory::getConfig()->get('sitename', 'Joomla');
-		$token    = $params->get('health_api_token', '');
-
-		$payload = json_encode([
-			'site_url'     => $siteUrl,
-			'site_name'    => $siteName,
-			'health_token' => $token,
-			'action'       => 'register',
-		], JSON_UNESCAPED_SLASHES);
-
-		$ch = curl_init('https://bench.mokoconsulting.tech/api/waas-heartbeat/register');
-		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, [
-			'Content-Type: application/json',
-			'X-MokoWaaS-Key: moko-waas-hb-2026-x9k4m',
-		]);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-
-		$response = curl_exec($ch);
-		$code     = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		$error    = curl_error($ch);
-		curl_close($ch);
-
-		$app  = Factory::getApplication();
-		$body = json_decode($response, true);
-
-		if ($error)
-		{
-			$app->enqueueMessage('Grafana heartbeat failed: ' . $error, 'warning');
-			Log::add('Heartbeat failed: ' . $error, Log::WARNING, 'mokowaas');
-		}
-		elseif ($code === 200)
-		{
-			$status = $body['status'] ?? 'ok';
-			$app->enqueueMessage(
-				'Grafana heartbeat: ' . $status . ' (' . ($body['ds_uid'] ?? '') . ')',
-				'message'
-			);
-		}
-		else
-		{
-			$msg = sprintf('Grafana heartbeat failed: HTTP %d — %s',
-				$code, $body['error'] ?? $body['message'] ?? 'Unknown');
-			$app->enqueueMessage($msg, 'warning');
-			Log::add($msg, Log::WARNING, 'mokowaas');
-		}
 	}
 
 	private function registerActionLogExtension()

source/packages/plg_system_mokowaas/services/provider.php

@@ -22,7 +22,7 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
  * REPO: https://github.com/mokoconsulting-tech/mokowaas
- * VERSION: 02.34.16
+ * VERSION: 02.34.45
  * PATH: /src/services/provider.php
  * BRIEF: Service provider for dependency injection in Joomla 5.x
  * NOTE: Registers the plugin with Joomla's DI container

source/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml

@@ -8,7 +8,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSDevTools</namespace>
 

source/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml

@@ -8,7 +8,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSFirewall</namespace>
 

source/packages/plg_system_mokowaas_monitor/language/en-GB/plg_system_mokowaas_monitor.ini

@@ -3,11 +3,11 @@
 ; License: GPL-3.0-or-later
 
 PLG_SYSTEM_MOKOWAAS_MONITOR="System - MokoWaaS Monitor"
-PLG_SYSTEM_MOKOWAAS_MONITOR_DESC="Sends heartbeat data to a MokoWaaSBase control panel for centralized site monitoring."
+PLG_SYSTEM_MOKOWAAS_MONITOR_DESC="Sends heartbeat data to a MokoWaaSHQ control panel for centralized site monitoring."
 
 PLG_SYSTEM_MOKOWAAS_MONITOR_FIELDSET_BASIC="Monitoring"
-PLG_SYSTEM_MOKOWAAS_MONITOR_FIELDSET_BASIC_DESC="Configure heartbeat reporting to MokoWaaSBase."
+PLG_SYSTEM_MOKOWAAS_MONITOR_FIELDSET_BASIC_DESC="Configure heartbeat reporting to MokoWaaSHQ."
 PLG_SYSTEM_MOKOWAAS_MONITOR_HEARTBEAT_LABEL="Send Heartbeat"
-PLG_SYSTEM_MOKOWAAS_MONITOR_HEARTBEAT_DESC="Send heartbeat data to MokoWaaSBase when plugin settings are saved."
-PLG_SYSTEM_MOKOWAAS_MONITOR_BASE_URL_LABEL="MokoWaaSBase URL"
-PLG_SYSTEM_MOKOWAAS_MONITOR_BASE_URL_DESC="URL of the MokoWaaSBase control panel (e.g. https://mokoconsulting.tech). The heartbeat is sent to /api/index.php/v1/mokowaasbase/heartbeat on this host."
+PLG_SYSTEM_MOKOWAAS_MONITOR_HEARTBEAT_DESC="Send heartbeat data to MokoWaaSHQ when plugin settings are saved."
+PLG_SYSTEM_MOKOWAAS_MONITOR_BASE_URL_LABEL="MokoWaaSHQ URL"
+PLG_SYSTEM_MOKOWAAS_MONITOR_BASE_URL_DESC="URL of the MokoWaaSHQ control panel (e.g. https://mokoconsulting.tech). The heartbeat is sent to /api/index.php/v1/mokowaashq/heartbeat on this host."

source/packages/plg_system_mokowaas_monitor/language/en-GB/plg_system_mokowaas_monitor.sys.ini

@@ -1,3 +1,3 @@
 ; MokoWaaS Health Monitor Plugin - System strings
 PLG_SYSTEM_MOKOWAAS_MONITOR="System - MokoWaaS Monitor"
-PLG_SYSTEM_MOKOWAAS_MONITOR_DESC="Site health monitoring, Grafana heartbeat integration, and diagnostics."
+PLG_SYSTEM_MOKOWAAS_MONITOR_DESC="Site health monitoring, MokoWaaSHQ heartbeat integration, and diagnostics."

source/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml

@@ -8,7 +8,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>PLG_SYSTEM_MOKOWAAS_MONITOR_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSMonitor</namespace>
 
@@ -37,13 +37,13 @@
 					<option value="0">JNO</option>
 				</field>
 
-				<field name="base_url" type="url"
-					label="PLG_SYSTEM_MOKOWAAS_MONITOR_BASE_URL_LABEL"
-					description="PLG_SYSTEM_MOKOWAAS_MONITOR_BASE_URL_DESC"
-					default="https://mokoconsulting.tech"
-					filter="url"
-					hint="https://mokoconsulting.tech"
-					showon="heartbeat_enabled:1" />
+				<field name="base_url" type="hidden"
+					default="https://waas.dev.mokoconsulting.tech"
+					filter="url" />
+
+				<field name="signing_key" type="hidden"
+					default="LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tDQpNSUlFdmdJQkFEQU5CZ2txaGtpRzl3MEJBUUVGQUFTQ0JLZ3dnZ1NrQWdFQUFvSUJBUUMvcnVrWE0zZHB0aDg2DQpGSkRXTjM0ZjQ2cUtJem1SMmFtTWUyZ2dWbWxsWnFyMHJkRFk4OTdtQ05FRkk4Q0NwNGR5amkwOU5ETnAvalFxDQovL2JGdUFNOUFTZU5oQTlmRlpwSG5UMGkzY3N4V3RSS2NnMnRkR0wzUXhNRFVBeFJYQ1RSQXVPSWZybGp6Ky85DQpWZ0ZtWHU3M1VSaU9XY1lLeFErejFoZkRGK2ZxRTRlYW9QcUlsY2J5dmtKd2lkSkRWUEEwc2RtbVlUTFg2Q29xDQpQalVDRENlbkZoUXNteVMzM29KSXArK0c3ZzU5NmRYelZIczRQSjIwNnc0Z3JlckRRZk5GVytzZndHSnl3NjBrDQpUQTVmUzF2Wit4NEt2UUh6V1ErYS9xRS9sSGxFVzdOTWVJWExNWGczSDd1eXBabXlVU2t3S0k0djFQQXRGWmtkDQpBaVpPZWZpVkFnTUJBQUVDZ2dFQVI4VGJyVDR0NWJ5MDhIQW0wcTR3WVF4REhEbVlJbzNXdDZ5MURmYU11OVMzDQpDYW5TMm9oazJzaE9TcGhhU2hFajI3WjBKY2hYdjhYWURvbU1BZmVsN3I5eDZjQ2FhTVdUNEdCMU5Zckp1NDhBDQprV2NteTkwWitPNTZQZkZJeTJXdXV6dFRxaFdZb0ZDSTBOZlU2bGw5SzhpSFl6VWx1MzZSSklweWx5OXFPKyt4DQpmTUZYcUovSkk0bVp6NW0raDBnbFMvN21VZ0EvUTRjbVJnRHJ3dkc3bEpBRjhWSDBEdW1uRWJkWkZvSi9XbU9JDQpSTi9lemhqczYrbU9hTnUwQWRsclpLU3QwRWZVYjl3QTFLQm5JMVVDU2w0Y1lidXVpL29jOWo1aGl6RGJvRWRyDQpJL1U5Y2FYUmZvb0pMNlUwOXN1VTdyTlFLbFRhMXM4NVhvY3htT0JMK1FLQmdRRHg5QzB5MjQ5SG1paXJ2WExIDQpBUXdUTjRyMjdhUTZMMFc2SHdDNHdzMUhleDRpeWRXT1lIcWdBSnY4VHZyeVpHOW1SaFh1U1ROTjYxV1UvTWFNDQphQVYwVjJ4Y0RrdDNFUnhNak1XRmhXUTh0cjN2RUtqWjFnOVJXOGhiTE9VYXVCcmJhMlI4RWNZYXFLZXlxR3N4DQpCa0VLZlRIUzNmUysraXNLZ2EzUU1mcjB6d0tCZ1FES3o2SGVKZ0tKRTVMM1ppbkhxaUFyVm5SZ2pYcFZrMWpvDQp6VXh5eTkwNEhmNGlmVXNIZklpdzVpN0VNR0U0RE5ob2MvZUJxcW1oM1N2ejJMUDNzOHUrL0hVZFllVzJIV1hhDQpKZlpMRE5BM0U3WDNkSVJ6MFg5UTh2OHcxaFpQeUxYOUlYeUVyUTNGZHFVdyt1Tko1VFZJell0RHppNnRKTjkvDQpGZGlxS0Q2ZFd3S0JnUURnQnE5bS9LWmdyTnRsa1FkYVBaejVtaDhBWGE4RzlNaEIrZnpJRmc3T1ZhL2tsQzg1DQpJaG5JVm1nWHFPVndWQkJWaVNVN09lbllCc042TE1hR01MYUVMNEkwaGtQWG5pOHVyZFVodVEzRHJZeVZjejUwDQpYR0JZZTN3Njk0bTJRS3NWYVExa1YyeXZPR1AxNXoxQTZrS0V2TURLTnhzclRTVlhHQlZneFRaUlB3S0JnUURBDQp1RFVVcUFIWXlDVHJ1c1VRMm5UZk9iUTAyN3ZYL2NDSzJDdEJHc0FJUjFmcTVpeVozSmozb0lQb0lpRC81aFR1DQpqT1F3N3o5cWRJVURublRGZUxDdnQ2NkNVVGk3cVl2VGxDZEtnYzZKeDgwdWJDWkErRjZIU2FGOWdyS0k5aTBaDQpjT3ltRnR2elBCOFZRQk1qY1E4Rk0yeVc3aUlrbmRsVEppdFE1aFU1NlFLQmdEZ1JIOXBEcGZwWlZ2V2g2MldGDQp5OGZzWUo1ODhzQmRMUlpTYTRuNi9XbjdUcUp1bWg2aWpFcDVyZFdnQkVtaDlJSk9jRUlhZ05mK0s5MXdoaThvDQpTeW01ajJpL1pjVVFYNFJSTDNxQ1RZZWVQVnZ3RHc3aWNLWVowTGQ2S1pFMmdEaDRPbEg4ejU0Zkl3a2tMSzRFDQpCcmtJNWppa05QSkJFR25zTm9zU3pWN2QNCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0NCg=="
+					filter="raw" />
 			</fieldset>
 		</fields>
 	</config>

source/packages/plg_system_mokowaas_monitor/src/Extension/Monitor.php

@@ -21,9 +21,9 @@ use Moko\Plugin\System\MokoWaaS\Helper\MokoWaaSHelper;
 /**
  * MokoWaaS Health Monitor Plugin
  *
- * Sends heartbeat data to a MokoWaaSBase control panel instance.
- * The heartbeat includes site identity, version info, and optionally
- * the full health check payload from the core plugin.
+ * Sends heartbeat data to a MokoWaaSHQ control panel instance.
+ * Each request is RSA-signed with a private key distributed via
+ * the package manifest, verified by Base using the matching public key.
  *
  * @since  02.32.00
  */
@@ -62,7 +62,6 @@ class Monitor extends CMSPlugin implements SubscriberInterface
 
 		$element = $table->element ?? '';
 
-		// Trigger heartbeat when core or monitor plugin is saved
 		if (!\in_array($element, ['mokowaas', 'mokowaas_monitor'], true))
 		{
 			return;
@@ -77,10 +76,10 @@ class Monitor extends CMSPlugin implements SubscriberInterface
 	}
 
 	/**
-	 * Send heartbeat to the MokoWaaSBase control panel.
+	 * Send heartbeat to the MokoWaaSHQ control panel.
 	 *
-	 * Posts site identity and version info to the MokoWaaSBase REST API.
-	 * The control panel looks up the site by domain and verifies the token.
+	 * The request is RSA-signed: the client signs domain|timestamp|token
+	 * with its private key. Base verifies with the matching public key.
 	 */
 	private function sendHeartbeat(): void
 	{
@@ -107,9 +106,9 @@ class Monitor extends CMSPlugin implements SubscriberInterface
 			return;
 		}
 
-		$app = $this->getApplication();
-
-		$config = Factory::getConfig();
+		$app       = $this->getApplication();
+		$config    = Factory::getConfig();
+		$timestamp = time();
 
 		$payload = [
 			'token'            => $healthToken,
@@ -119,13 +118,14 @@ class Monitor extends CMSPlugin implements SubscriberInterface
 			'joomla_version'   => (new Version())->getShortVersion(),
 			'php_version'      => PHP_VERSION,
 			'mokowaas_version' => $this->getMokoWaaSVersion(),
+			'timestamp'        => $timestamp,
 			'client_info'      => [
 				'company'  => $config->get('sitename', ''),
 				'email'    => $config->get('mailfrom', ''),
 			],
 		];
 
-		// Include live health data by calling the local health endpoint
+		// Include live health data
 		$healthData = $this->fetchLocalHealth($siteUrl, $healthToken);
 
 		if ($healthData !== null)
@@ -133,13 +133,23 @@ class Monitor extends CMSPlugin implements SubscriberInterface
 			$payload['health'] = $healthData;
 		}
 
-		$endpoint = $baseUrl . '/api/index.php/v1/mokowaasbase/heartbeat';
+		// RSA sign the request
+		$headers   = ['Content-Type: application/json'];
+		$signature = $this->signRequest($domain, $timestamp, $healthToken);
+
+		if ($signature !== null)
+		{
+			$headers[] = 'X-MokoWaaS-Signature: ' . $signature;
+			$headers[] = 'X-MokoWaaS-Timestamp: ' . $timestamp;
+		}
+
+		$endpoint = $baseUrl . '/api/index.php/v1/mokowaashq/heartbeat';
 		$json     = json_encode($payload, JSON_UNESCAPED_SLASHES);
 
 		$ch = curl_init($endpoint);
 		curl_setopt_array($ch, [
 			CURLOPT_POST           => true,
-			CURLOPT_HTTPHEADER     => ['Content-Type: application/json'],
+			CURLOPT_HTTPHEADER     => $headers,
 			CURLOPT_POSTFIELDS     => $json,
 			CURLOPT_RETURNTRANSFER => true,
 			CURLOPT_TIMEOUT        => 15,
@@ -160,7 +170,7 @@ class Monitor extends CMSPlugin implements SubscriberInterface
 		{
 			$body = json_decode($response, true);
 			$app->enqueueMessage(
-				'MokoWaaSBase heartbeat: ' . ($body['status'] ?? 'ok'),
+				'MokoWaaSHQ heartbeat: ' . ($body['status'] ?? 'ok'),
 				'message'
 			);
 		}
@@ -173,19 +183,77 @@ class Monitor extends CMSPlugin implements SubscriberInterface
 				'mokowaas'
 			);
 			$app->enqueueMessage(
-				'MokoWaaSBase heartbeat failed (HTTP ' . $code . ')',
+				'MokoWaaSHQ heartbeat failed (HTTP ' . $code . ')',
 				'warning'
 			);
 		}
 	}
 
+	/**
+	 * RSA-sign the request message.
+	 *
+	 * @param   string  $domain     Site domain.
+	 * @param   int     $timestamp  Unix timestamp.
+	 * @param   string  $token      Health API token.
+	 *
+	 * @return  string|null  Base64-encoded signature, or null if signing fails.
+	 */
+	private function signRequest(string $domain, int $timestamp, string $token): ?string
+	{
+		$signingKeyB64 = $this->params->get('signing_key', '');
+
+		// Fall back to manifest XML default if not yet saved in params
+		if (empty($signingKeyB64))
+		{
+			$manifestFile = JPATH_PLUGINS . '/system/mokowaas_monitor/mokowaas_monitor.xml';
+
+			if (is_file($manifestFile))
+			{
+				$xml = simplexml_load_file($manifestFile);
+
+				if ($xml)
+				{
+					foreach ($xml->xpath('//field[@name="signing_key"]') as $field)
+					{
+						$signingKeyB64 = (string) $field['default'];
+						break;
+					}
+				}
+			}
+		}
+
+		if (empty($signingKeyB64))
+		{
+			return null;
+		}
+
+		$privateKeyPem = base64_decode($signingKeyB64);
+
+		if (empty($privateKeyPem))
+		{
+			return null;
+		}
+
+		$message    = $domain . '|' . $timestamp . '|' . $token;
+		$privateKey = openssl_pkey_get_private($privateKeyPem);
+
+		if ($privateKey === false)
+		{
+			return null;
+		}
+
+		$signature = '';
+
+		if (openssl_sign($message, $signature, $privateKey, OPENSSL_ALGO_SHA256))
+		{
+			return base64_encode($signature);
+		}
+
+		return null;
+	}
+
 	/**
 	 * Fetch health data from the local site's health endpoint.
-	 *
-	 * @param   string  $siteUrl     Local site URL.
-	 * @param   string  $healthToken Health API token.
-	 *
-	 * @return  array|null  Parsed health data or null on failure.
 	 */
 	private function fetchLocalHealth(string $siteUrl, string $healthToken): ?array
 	{

source/packages/plg_system_mokowaas_offline/mokowaas_offline.xml

@@ -8,7 +8,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSOffline</namespace>
 

source/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml

@@ -8,7 +8,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>PLG_SYSTEM_MOKOWAAS_TENANT_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSTenant</namespace>
 

source/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml

@@ -8,7 +8,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions.</description>
 	<namespace path="src">Moko\Plugin\Task\MokoWaaSTickets</namespace>
 

source/packages/plg_task_mokowaasdemo/mokowaasdemo.xml

@@ -12,7 +12,7 @@
 	<license>GNU General Public License version 3 or later; see LICENSE</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>PLG_TASK_MOKOWAASDEMO_DESC</description>
 	<namespace path="src">Moko\Plugin\Task\MokoWaaSDemo</namespace>
 

source/packages/plg_task_mokowaasdemo/src/Service/DemoResetService.php

@@ -10,7 +10,7 @@
  * INGROUP: MokoWaaS
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
  * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php
- * VERSION: 02.34.08
+ * VERSION: 02.34.45
  * BRIEF: Content-only snapshot/restore for demo site reset
  */
 

source/packages/plg_task_mokowaassync/mokowaassync.xml

@@ -12,7 +12,7 @@
 	<license>GNU General Public License version 3 or later; see LICENSE</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>PLG_TASK_MOKOWAASSYNC_DESC</description>
 	<namespace path="src">Moko\Plugin\Task\MokoWaaSSync</namespace>
 

source/packages/plg_task_mokowaassync/src/Service/ContentSyncReceiver.php

@@ -10,7 +10,7 @@
  * INGROUP: MokoWaaS
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
  * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php
- * VERSION: 02.34.08
+ * VERSION: 02.34.45
  * BRIEF: Receiver-side content sync — applies incoming payload to local DB
  */
 

source/packages/plg_task_mokowaassync/src/Service/ContentSyncService.php

@@ -10,7 +10,7 @@
  * INGROUP: MokoWaaS
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
  * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php
- * VERSION: 02.34.08
+ * VERSION: 02.34.45
  * BRIEF: Sender-side content sync — builds payload and pushes to remote sites
  */
 

source/packages/plg_webservices_mokowaas/mokowaas.xml

@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<description>Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info.</description>
 	<namespace path="src">Moko\Plugin\WebServices\MokoWaaS</namespace>
 	<files>

source/packages/plg_webservices_perfectpublisher/perfectpublisher.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<extension type="plugin" group="webservices" method="upgrade">
-	<name>Web Services - Perfect Publisher</name>
-	<author>Moko Consulting</author>
-	<creationDate>2026-05-28</creationDate>
-	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
-	<license>GPL-3.0-or-later</license>
-	<authorEmail>hello@mokoconsulting.tech</authorEmail>
-	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.15</version>
-	<description>Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds.</description>
-	<namespace path="src">Moko\Plugin\WebServices\PerfectPublisher</namespace>
-	<files>
-		<folder plugin="perfectpublisher">services</folder>
-		<folder>src</folder>
-	</files>
-</extension>

source/packages/plg_webservices_perfectpublisher/services/provider.php

@@ -1,42 +0,0 @@
-<?php
-/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * FILE INFORMATION
- * DEFGROUP: Joomla.Plugin
- * INGROUP: MokoWaaS
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
- * PATH: /source/packages/plg_webservices_perfectpublisher/services/provider.php
- * VERSION: 02.34.16
- * BRIEF: DI service provider for Perfect Publisher Web Services plugin
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Extension\PluginInterface;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\DI\Container;
-use Joomla\DI\ServiceProviderInterface;
-use Joomla\Event\DispatcherInterface;
-use Moko\Plugin\WebServices\PerfectPublisher\Extension\PerfectPublisherApi;
-
-return new class implements ServiceProviderInterface
-{
-	public function register(Container $container): void
-	{
-		$container->set(
-			PluginInterface::class,
-			function (Container $container) {
-				$dispatcher = $container->get(DispatcherInterface::class);
-				$plugin = new PerfectPublisherApi(
-					$dispatcher,
-					(array) PluginHelper::getPlugin('webservices', 'perfectpublisher')
-				);
-				$plugin->setApplication(Factory::getApplication());
-				return $plugin;
-			}
-		);
-	}
-};

source/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php

@@ -1,539 +0,0 @@
-<?php
-/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * FILE INFORMATION
- * DEFGROUP: Joomla.Plugin
- * INGROUP: MokoWaaS
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
- * PATH: /source/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php
- * VERSION: 02.34.16
- * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet)
- */
-
-namespace Moko\Plugin\WebServices\PerfectPublisher\Extension;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Event\Application\BeforeApiRouteEvent;
-use Joomla\CMS\Router\ApiRouter;
-use Joomla\Event\SubscriberInterface;
-
-/**
- * Perfect Publisher Web Services API Plugin
- *
- * Registers REST API routes for Perfect Publisher (com_autotweet) data.
- * Provides read access to channels, posts, requests, rules, and feeds.
- * Provides write access to create publish requests.
- *
- * Routes:
- *   GET  /v1/perfectpublisher/channels      List social channels
- *   GET  /v1/perfectpublisher/channels/:id   Get channel detail
- *   GET  /v1/perfectpublisher/posts          List published posts
- *   GET  /v1/perfectpublisher/posts/:id      Get post detail
- *   GET  /v1/perfectpublisher/requests       List pending requests
- *   POST /v1/perfectpublisher/requests       Create a publish request
- *   GET  /v1/perfectpublisher/rules          List publishing rules
- *   GET  /v1/perfectpublisher/feeds          List RSS feeds
- *   GET  /v1/perfectpublisher/channeltypes   List channel type definitions
- *   GET  /v1/perfectpublisher/stats          Dashboard statistics
- *
- * @since  02.13.01
- */
-final class PerfectPublisherApi extends CMSPlugin implements SubscriberInterface
-{
-	/**
-	 * @return  array
-	 */
-	public static function getSubscribedEvents(): array
-	{
-		return [
-			'onBeforeApiRoute' => 'onBeforeApiRoute',
-		];
-	}
-
-	/**
-	 * Register API routes.
-	 *
-	 * @param   BeforeApiRouteEvent  $event  The API route event
-	 *
-	 * @return  void
-	 */
-	public function onBeforeApiRoute(BeforeApiRouteEvent $event): void
-	{
-		$router = $event->getRouter();
-
-		// All routes are handled by this plugin directly via custom callbacks
-		// because com_autotweet uses FOF, not standard Joomla MVC
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/channels',
-				[$this, 'getChannels']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/channels/:id',
-				[$this, 'getChannel']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/posts',
-				[$this, 'getPosts']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/posts/:id',
-				[$this, 'getPost']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/requests',
-				[$this, 'getRequests']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['POST'],
-				'v1/perfectpublisher/requests',
-				[$this, 'createRequest']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/rules',
-				[$this, 'getRules']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/feeds',
-				[$this, 'getFeeds']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/channeltypes',
-				[$this, 'getChannelTypes']
-			)
-		);
-
-		$router->addRoute(
-			new \Joomla\Router\Route(
-				['GET'],
-				'v1/perfectpublisher/stats',
-				[$this, 'getStats']
-			)
-		);
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/channels
-	 *
-	 * @return  void
-	 */
-	public function getChannels(): void
-	{
-		$db    = Factory::getDbo();
-		$app   = Factory::getApplication();
-		$limit = (int) $app->input->get('limit', 20);
-		$offset = (int) $app->input->get('offset', 0);
-
-		$query = $db->getQuery(true)
-			->select('c.*, ct.name AS channeltype_name, ct.max_chars')
-			->from($db->quoteName('#__autotweet_channels', 'c'))
-			->leftJoin(
-				$db->quoteName('#__autotweet_channeltypes', 'ct')
-				. ' ON ' . $db->quoteName('c.channeltype_id')
-				. ' = ' . $db->quoteName('ct.id')
-			)
-			->order($db->quoteName('c.ordering') . ' ASC');
-
-		$published = $app->input->get('published', null);
-		if ($published !== null) {
-			$query->where($db->quoteName('c.published') . ' = ' . (int) $published);
-		}
-
-		$db->setQuery($query, $offset, $limit);
-
-		$this->sendJsonResponse($db->loadObjectList());
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/channels/:id
-	 *
-	 * @return  void
-	 */
-	public function getChannel(): void
-	{
-		$id = (int) Factory::getApplication()->input->get('id', 0);
-		$db = Factory::getDbo();
-
-		$query = $db->getQuery(true)
-			->select('c.*, ct.name AS channeltype_name, ct.max_chars, ct.description AS channeltype_desc')
-			->from($db->quoteName('#__autotweet_channels', 'c'))
-			->leftJoin(
-				$db->quoteName('#__autotweet_channeltypes', 'ct')
-				. ' ON ' . $db->quoteName('c.channeltype_id')
-				. ' = ' . $db->quoteName('ct.id')
-			)
-			->where($db->quoteName('c.id') . ' = ' . $id);
-
-		$db->setQuery($query);
-		$result = $db->loadObject();
-
-		if (!$result) {
-			$this->sendJsonError('Channel not found', 404);
-			return;
-		}
-
-		// Strip sensitive OAuth params
-		if (isset($result->params)) {
-			$params = json_decode($result->params, true);
-			if (is_array($params)) {
-				foreach (['access_token', 'access_secret', 'client_secret', 'api_secret', 'password'] as $key) {
-					if (isset($params[$key])) {
-						$params[$key] = '***';
-					}
-				}
-				$result->params = json_encode($params);
-			}
-		}
-
-		$this->sendJsonResponse($result);
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/posts
-	 *
-	 * @return  void
-	 */
-	public function getPosts(): void
-	{
-		$db    = Factory::getDbo();
-		$app   = Factory::getApplication();
-		$limit = (int) $app->input->get('limit', 20);
-		$offset = (int) $app->input->get('offset', 0);
-
-		$query = $db->getQuery(true)
-			->select('p.*, c.name AS channel_name')
-			->from($db->quoteName('#__autotweet_posts', 'p'))
-			->leftJoin(
-				$db->quoteName('#__autotweet_channels', 'c')
-				. ' ON ' . $db->quoteName('p.channel_id')
-				. ' = ' . $db->quoteName('c.id')
-			)
-			->order($db->quoteName('p.postdate') . ' DESC');
-
-		$pubstate = $app->input->get('pubstate', '');
-		if ($pubstate !== '') {
-			$query->where($db->quoteName('p.pubstate') . ' = ' . $db->quote($pubstate));
-		}
-
-		$channel = (int) $app->input->get('channel_id', 0);
-		if ($channel > 0) {
-			$query->where($db->quoteName('p.channel_id') . ' = ' . $channel);
-		}
-
-		$db->setQuery($query, $offset, $limit);
-
-		$this->sendJsonResponse($db->loadObjectList());
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/posts/:id
-	 *
-	 * @return  void
-	 */
-	public function getPost(): void
-	{
-		$id = (int) Factory::getApplication()->input->get('id', 0);
-		$db = Factory::getDbo();
-
-		$query = $db->getQuery(true)
-			->select('p.*, c.name AS channel_name, ct.name AS channeltype_name')
-			->from($db->quoteName('#__autotweet_posts', 'p'))
-			->leftJoin(
-				$db->quoteName('#__autotweet_channels', 'c')
-				. ' ON ' . $db->quoteName('p.channel_id')
-				. ' = ' . $db->quoteName('c.id')
-			)
-			->leftJoin(
-				$db->quoteName('#__autotweet_channeltypes', 'ct')
-				. ' ON ' . $db->quoteName('c.channeltype_id')
-				. ' = ' . $db->quoteName('ct.id')
-			)
-			->where($db->quoteName('p.id') . ' = ' . $id);
-
-		$db->setQuery($query);
-		$result = $db->loadObject();
-
-		if (!$result) {
-			$this->sendJsonError('Post not found', 404);
-			return;
-		}
-
-		$this->sendJsonResponse($result);
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/requests
-	 *
-	 * @return  void
-	 */
-	public function getRequests(): void
-	{
-		$db    = Factory::getDbo();
-		$app   = Factory::getApplication();
-		$limit = (int) $app->input->get('limit', 20);
-		$offset = (int) $app->input->get('offset', 0);
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__autotweet_requests'))
-			->order($db->quoteName('publish_up') . ' ASC');
-
-		$published = $app->input->get('published', null);
-		if ($published !== null) {
-			$query->where($db->quoteName('published') . ' = ' . (int) $published);
-		}
-
-		$db->setQuery($query, $offset, $limit);
-
-		$this->sendJsonResponse($db->loadObjectList());
-	}
-
-	/**
-	 * POST /v1/perfectpublisher/requests
-	 *
-	 * Create a new publish request. Required fields: description.
-	 * Optional: url, image_url, publish_up, plugin, priority.
-	 *
-	 * @return  void
-	 */
-	public function createRequest(): void
-	{
-		$app  = Factory::getApplication();
-		$db   = Factory::getDbo();
-		$data = json_decode($app->input->json->getRaw(), true);
-
-		if (empty($data['description'])) {
-			$this->sendJsonError('Field "description" is required', 400);
-			return;
-		}
-
-		$now  = Factory::getDate()->toSql();
-		$user = Factory::getUser();
-
-		$row = (object) [
-			'ref_id'      => $data['ref_id'] ?? null,
-			'plugin'      => $data['plugin'] ?? 'manual-api',
-			'priority'    => (int) ($data['priority'] ?? 5),
-			'publish_up'  => $data['publish_up'] ?? $now,
-			'description' => $data['description'],
-			'typeinfo'    => (int) ($data['typeinfo'] ?? 0),
-			'url'         => $data['url'] ?? null,
-			'image_url'   => $data['image_url'] ?? null,
-			'created'     => $now,
-			'created_by'  => $user->id,
-			'params'      => json_encode($data['params'] ?? []),
-			'published'   => (int) ($data['published'] ?? 1),
-		];
-
-		$db->insertObject('#__autotweet_requests', $row, 'id');
-
-		$this->sendJsonResponse(
-			['id' => $row->id, 'status' => 'created'],
-			201
-		);
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/rules
-	 *
-	 * @return  void
-	 */
-	public function getRules(): void
-	{
-		$db = Factory::getDbo();
-
-		$query = $db->getQuery(true)
-			->select('r.*, rt.name AS ruletype_name, rt.description AS ruletype_desc, c.name AS channel_name')
-			->from($db->quoteName('#__autotweet_rules', 'r'))
-			->leftJoin(
-				$db->quoteName('#__autotweet_ruletypes', 'rt')
-				. ' ON ' . $db->quoteName('r.ruletype_id')
-				. ' = ' . $db->quoteName('rt.id')
-			)
-			->leftJoin(
-				$db->quoteName('#__autotweet_channels', 'c')
-				. ' ON ' . $db->quoteName('r.channel_id')
-				. ' = ' . $db->quoteName('c.id')
-			)
-			->order($db->quoteName('r.ordering') . ' ASC');
-
-		$db->setQuery($query);
-
-		$this->sendJsonResponse($db->loadObjectList());
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/feeds
-	 *
-	 * @return  void
-	 */
-	public function getFeeds(): void
-	{
-		$db = Factory::getDbo();
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__autotweet_feeds'))
-			->order($db->quoteName('ordering') . ' ASC');
-
-		$db->setQuery($query);
-
-		$this->sendJsonResponse($db->loadObjectList());
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/channeltypes
-	 *
-	 * @return  void
-	 */
-	public function getChannelTypes(): void
-	{
-		$db = Factory::getDbo();
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__autotweet_channeltypes'))
-			->order($db->quoteName('id') . ' ASC');
-
-		$db->setQuery($query);
-
-		$this->sendJsonResponse($db->loadObjectList());
-	}
-
-	/**
-	 * GET /v1/perfectpublisher/stats
-	 *
-	 * Dashboard statistics: post counts by status, channel counts, recent activity.
-	 *
-	 * @return  void
-	 */
-	public function getStats(): void
-	{
-		$db = Factory::getDbo();
-
-		// Posts by status
-		$db->setQuery(
-			$db->getQuery(true)
-				->select('pubstate, COUNT(*) AS total')
-				->from($db->quoteName('#__autotweet_posts'))
-				->group($db->quoteName('pubstate'))
-		);
-		$postsByStatus = $db->loadObjectList('pubstate');
-
-		// Active channels
-		$db->setQuery(
-			$db->getQuery(true)
-				->select('COUNT(*) AS total')
-				->from($db->quoteName('#__autotweet_channels'))
-				->where($db->quoteName('published') . ' = 1')
-		);
-		$activeChannels = (int) $db->loadResult();
-
-		// Pending requests
-		$db->setQuery(
-			$db->getQuery(true)
-				->select('COUNT(*) AS total')
-				->from($db->quoteName('#__autotweet_requests'))
-				->where($db->quoteName('published') . ' = 1')
-		);
-		$pendingRequests = (int) $db->loadResult();
-
-		// Posts last 24h
-		$db->setQuery(
-			$db->getQuery(true)
-				->select('COUNT(*) AS total')
-				->from($db->quoteName('#__autotweet_posts'))
-				->where($db->quoteName('postdate') . ' >= DATE_SUB(NOW(), INTERVAL 1 DAY)')
-		);
-		$posts24h = (int) $db->loadResult();
-
-		// Posts last 7d
-		$db->setQuery(
-			$db->getQuery(true)
-				->select('COUNT(*) AS total')
-				->from($db->quoteName('#__autotweet_posts'))
-				->where($db->quoteName('postdate') . ' >= DATE_SUB(NOW(), INTERVAL 7 DAY)')
-		);
-		$posts7d = (int) $db->loadResult();
-
-		$this->sendJsonResponse([
-			'posts_by_status'  => $postsByStatus,
-			'active_channels'  => $activeChannels,
-			'pending_requests' => $pendingRequests,
-			'posts_24h'        => $posts24h,
-			'posts_7d'         => $posts7d,
-		]);
-	}
-
-	/**
-	 * Send a JSON API response.
-	 *
-	 * @param   mixed  $data    Response data
-	 * @param   int    $status  HTTP status code
-	 *
-	 * @return  void
-	 */
-	private function sendJsonResponse($data, int $status = 200): void
-	{
-		$app = Factory::getApplication();
-		$app->setHeader('Content-Type', 'application/json; charset=utf-8');
-		$app->setHeader('Status', (string) $status);
-		echo json_encode(['data' => $data], JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
-		$app->close();
-	}
-
-	/**
-	 * Send a JSON error response.
-	 *
-	 * @param   string  $message  Error message
-	 * @param   int     $status   HTTP status code
-	 *
-	 * @return  void
-	 */
-	private function sendJsonError(string $message, int $status = 400): void
-	{
-		$app = Factory::getApplication();
-		$app->setHeader('Content-Type', 'application/json; charset=utf-8');
-		$app->setHeader('Status', (string) $status);
-		echo json_encode(['error' => $message], JSON_UNESCAPED_SLASHES);
-		$app->close();
-	}
-}

source/pkg_mokowaas.xml

@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>Package - MokoWaaS</name>
 	<packagename>mokowaas</packagename>
-	<version>02.34.15</version>
+	<version>02.34.45-dev</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -26,7 +26,6 @@
 		<file type="module" id="mod_mokowaas_cache" client="administrator">mod_mokowaas_cache.zip</file>
 		<file type="module" id="mod_mokowaas_categories" client="administrator">mod_mokowaas_categories.zip</file>
 		<file type="plugin" id="plg_webservices_mokowaas" group="webservices">plg_webservices_mokowaas.zip</file>
-		<file type="plugin" id="plg_webservices_perfectpublisher" group="webservices">plg_webservices_perfectpublisher.zip</file>
 		<file type="plugin" id="plg_task_mokowaasdemo" group="task">plg_task_mokowaasdemo.zip</file>
 		<file type="plugin" id="plg_task_mokowaassync" group="task">plg_task_mokowaassync.zip</file>
 		<file type="plugin" id="plg_task_mokowaas_tickets" group="task">plg_task_mokowaas_tickets.zip</file>

source/script.php

@@ -39,8 +39,13 @@ class Pkg_MokowaasInstallerScript
 	 * with no default, causing INSERT failures when Joomla's package installer
 	 * creates placeholder rows before processing sub-extension manifests.
 	 */
+	/** @var string|null Download key saved before Joomla wipes update sites */
+	private ?string $savedDownloadKey = null;
+
 	public function preflight($type, $parent)
 	{
+		$this->saveDownloadKey();
+
 		try
 		{
 			$db = Factory::getDbo();
@@ -101,6 +106,9 @@ class Pkg_MokowaasInstallerScript
 		// Clean up stale/duplicate update sites
 		$this->cleanupStaleUpdateSites();
 
+		// Restore download key saved in preflight
+		$this->restoreDownloadKey();
+
 		// Fix orphaned update records (extension_id=0)
 		$this->fixUpdateRecords();
 
@@ -490,8 +498,7 @@ class Pkg_MokowaasInstallerScript
 				$db->quote('mokowaasdemo'),
 				$db->quote('mokowaassync'),
 				$db->quote('mokowaas_tickets'),
-				$db->quote('perfectpublisher'),
-				$db->quote('mokoonyx'),
+								$db->quote('mokoonyx'),
 			];
 
 			$query = $db->getQuery(true)
@@ -586,14 +593,16 @@ class Pkg_MokowaasInstallerScript
 		try
 		{
 			$db = Factory::getDbo();
-			$dynamicUrl = 'https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/updates.xml';
+			$dynamicUrl = 'https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/updates.xml';
 
-			// Find all MokoWaaS update sites
+			// Find MokoWaaS update sites (exclude MokoWaaSHQ and other Moko extensions)
 			$query = $db->getQuery(true)
 				->select($db->quoteName(['update_site_id', 'location']))
 				->from($db->quoteName('#__update_sites'))
 				->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoWaaS%')
-					. ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoWaaS%') . ')');
+					. ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoWaaS%') . ')')
+				->where($db->quoteName('name') . ' NOT LIKE ' . $db->quote('%MokoWaaSHQ%'))
+				->where($db->quoteName('location') . ' NOT LIKE ' . $db->quote('%MokoWaaSHQ%'));
 			$db->setQuery($query);
 			$sites = $db->loadObjectList();
 
@@ -656,6 +665,69 @@ class Pkg_MokowaasInstallerScript
 		}
 	}
 
+	/**
+	 * Backup all non-empty extra_query values from update sites.
+	 *
+	 * @return  array  Map of update_site_id => extra_query
+	 */
+	private function saveDownloadKey(): void
+	{
+		try
+		{
+			$db = Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select($db->quoteName('us.extra_query'))
+					->from($db->quoteName('#__update_sites', 'us'))
+					->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON use.update_site_id = us.update_site_id')
+					->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+					->where($db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokowaas'))
+					->setLimit(1)
+			);
+			$key = $db->loadResult();
+
+			if (!empty($key))
+			{
+				$this->savedDownloadKey = $key;
+			}
+		}
+		catch (\Throwable $e) {}
+	}
+
+	private function restoreDownloadKey(): void
+	{
+		if ($this->savedDownloadKey === null)
+		{
+			return;
+		}
+
+		try
+		{
+			$db = Factory::getDbo();
+			$db->setQuery(
+				$db->getQuery(true)
+					->select($db->quoteName('us.update_site_id'))
+					->from($db->quoteName('#__update_sites', 'us'))
+					->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON use.update_site_id = us.update_site_id')
+					->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+					->where($db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokowaas'))
+					->setLimit(1)
+			);
+			$siteId = (int) $db->loadResult();
+
+			if ($siteId > 0)
+			{
+				$db->setQuery(
+					$db->getQuery(true)
+						->update($db->quoteName('#__update_sites'))
+						->set($db->quoteName('extra_query') . ' = ' . $db->quote($this->savedDownloadKey))
+						->where($db->quoteName('update_site_id') . ' = ' . $siteId)
+				)->execute();
+			}
+		}
+		catch (\Throwable $e) {}
+	}
+
 	/**
 	 * Ensure the MokoWaaS update server entry stays enabled and points
 	 * to the correct dynamic endpoint with the license key attached.
@@ -714,42 +786,125 @@ class Pkg_MokowaasInstallerScript
 		try
 		{
 			$db = Factory::getDbo();
+
+			// Get health token from core plugin
 			$query = $db->getQuery(true)
 				->select($db->quoteName('params'))
 				->from($db->quoteName('#__extensions'))
 				->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas'))
 				->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
 				->where($db->quoteName('folder') . ' = ' . $db->quote('system'));
-			$params = json_decode((string) $db->setQuery($query)->loadResult());
-
-			$healthToken = $params->health_api_token ?? '';
+			$coreParams = json_decode((string) $db->setQuery($query)->loadResult());
+			$healthToken = $coreParams->health_api_token ?? '';
 
 			if (empty($healthToken))
 			{
 				return;
 			}
 
-			$siteUrl  = rtrim(\Joomla\CMS\Uri\Uri::root(), '/');
-			$siteName = Factory::getConfig()->get('sitename', 'Joomla');
+			// Get base URL and signing key from monitor plugin
+			$query = $db->getQuery(true)
+				->select($db->quoteName('params'))
+				->from($db->quoteName('#__extensions'))
+				->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas_monitor'))
+				->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+				->where($db->quoteName('folder') . ' = ' . $db->quote('system'));
+			$monitorParams = json_decode((string) $db->setQuery($query)->loadResult());
+			$baseUrl = rtrim($monitorParams->base_url ?? '', '/');
+
+			// Fall back to manifest XML default if not yet saved in params
+			if (empty($baseUrl))
+			{
+				$manifestFile = JPATH_PLUGINS . '/system/mokowaas_monitor/mokowaas_monitor.xml';
+
+				if (is_file($manifestFile))
+				{
+					$xml = simplexml_load_file($manifestFile);
+
+					if ($xml)
+					{
+						foreach ($xml->xpath('//field[@name="base_url"]') as $field)
+						{
+							$baseUrl = rtrim((string) $field['default'], '/');
+							break;
+						}
+					}
+				}
+			}
+
+			if (empty($baseUrl))
+			{
+				return;
+			}
+
+			$siteUrl   = rtrim(\Joomla\CMS\Uri\Uri::root(), '/');
+			$domain    = parse_url($siteUrl, PHP_URL_HOST) ?: '';
+			$timestamp = time();
 
 			$payload = json_encode([
-				'site_url'     => $siteUrl,
-				'site_name'    => $siteName,
-				'health_token' => $healthToken,
-				'action'       => 'register',
+				'token'          => $healthToken,
+				'domain'         => $domain,
+				'site_name'      => Factory::getConfig()->get('sitename', 'Joomla'),
+				'site_url'       => $siteUrl,
+				'joomla_version' => (new \Joomla\CMS\Version())->getShortVersion(),
+				'php_version'    => PHP_VERSION,
+				'timestamp'      => $timestamp,
 			], JSON_UNESCAPED_SLASHES);
 
-			$ch = curl_init('https://bench.mokoconsulting.tech/api/waas-heartbeat/register');
-			curl_setopt($ch, CURLOPT_POST, true);
-			curl_setopt($ch, CURLOPT_HTTPHEADER, [
-				'Content-Type: application/json',
-				'X-MokoWaaS-Key: moko-waas-hb-2026-x9k4m',
+			$headers = ['Content-Type: application/json'];
+
+			// RSA sign the request — fall back to manifest XML default
+			$signingKeyB64 = $monitorParams->signing_key ?? '';
+
+			if (empty($signingKeyB64))
+			{
+				$manifestFile = JPATH_PLUGINS . '/system/mokowaas_monitor/mokowaas_monitor.xml';
+
+				if (is_file($manifestFile))
+				{
+					$xml = simplexml_load_file($manifestFile);
+
+					if ($xml)
+					{
+						foreach ($xml->xpath('//field[@name="signing_key"]') as $field)
+						{
+							$signingKeyB64 = (string) $field['default'];
+							break;
+						}
+					}
+				}
+			}
+
+			if (!empty($signingKeyB64))
+			{
+				$privateKeyPem = base64_decode($signingKeyB64);
+				$privateKey    = openssl_pkey_get_private($privateKeyPem);
+
+				if ($privateKey !== false)
+				{
+					$message   = $domain . '|' . $timestamp . '|' . $healthToken;
+					$signature = '';
+
+					if (openssl_sign($message, $signature, $privateKey, OPENSSL_ALGO_SHA256))
+					{
+						$headers[] = 'X-MokoWaaS-Signature: ' . base64_encode($signature);
+						$headers[] = 'X-MokoWaaS-Timestamp: ' . $timestamp;
+					}
+				}
+			}
+
+			$endpoint = $baseUrl . '/api/index.php/v1/mokowaashq/heartbeat';
+
+			$ch = curl_init($endpoint);
+			curl_setopt_array($ch, [
+				CURLOPT_POST           => true,
+				CURLOPT_HTTPHEADER     => $headers,
+				CURLOPT_POSTFIELDS     => $payload,
+				CURLOPT_RETURNTRANSFER => true,
+				CURLOPT_TIMEOUT        => 15,
+				CURLOPT_FOLLOWLOCATION => true,
+				CURLOPT_SSL_VERIFYPEER => false,
 			]);
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_TIMEOUT, 15);
-			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 
 			$response = curl_exec($ch);
 			$code     = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
@@ -757,7 +912,7 @@ class Pkg_MokowaasInstallerScript
 
 			if ($code >= 200 && $code < 300)
 			{
-				Factory::getApplication()->enqueueMessage('Grafana heartbeat: site registered', 'message');
+				Factory::getApplication()->enqueueMessage('MokoWaaSHQ heartbeat: site registered', 'message');
 			}
 		}
 		catch (\Throwable $e)