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

fix: rename migration to 02.34.28 so it runs on current dev version
refactor: remove database-backed download key table
2026-06-06 21:26:39 +00:00 · 2026-06-06 16:25:24 -05:00 · 2026-06-06 16:24:20 -05:00 · 2026-06-06 16:10:48 -05:00 · 2026-06-06 20:55:02 +00:00 · 2026-06-06 15:53:42 -05:00
251 changed files with 7154 additions and 8151 deletions
@@ -107,7 +107,7 @@ replit.md
 *.tar.gz
 *.tgz
 *.zip
-!src/payload/*.zip
+!source/payload/*.zip
 artifacts/
 release/
 releases/
@@ -122,7 +122,7 @@ build/
 dist/
 out/
 site/
-!src/packages/*/site/
+!source/packages/*/site/
 *.map
 *.css.map
 *.js.map
@@ -161,7 +161,7 @@ package-lock.json
 # PHP / Composer tooling
 # ============================================================
 vendor/
-!src/media/vendor/
+!source/media/vendor/
 composer.lock
 *.phar
 codeception.phar
@@ -1,4 +0,0 @@
-[submodule "src/packages/tpl_mokoonyx"]
-	path = src/packages/tpl_mokoonyx
-	url = https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx.git
-	branch = main
@@ -1,316 +1,82 @@
-<!--
-Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+# MokoWaaS

-This file is part of a Moko Consulting project.
+Joomla 5/6 admin tools suite — heartbeat health monitoring, extension management, security firewall, tenant restrictions, and site administration.

-SPDX-License-Identifier: GPL-3.0-or-later
+## Quick Reference

-# FILE INFORMATION
-DEFGROUP: MokoStandards.Templates.GitHub
-INGROUP: MokoStandards.Templates
-REPO: https://github.com/mokoconsulting-tech/MokoStandards
-PATH: /templates/github/copilot-instructions.joomla.md.template
-VERSION: XX.YY.ZZ
-BRIEF: GitHub Copilot custom instructions template for Joomla/MokoWaaS governed repositories
-NOTE: Synced to .github/copilot-instructions.md in all Joomla/WaaS repos via bulk sync.
-      Tokens replaced at sync time: MokoWaaS, https://github.com/mokoconsulting-tech/MokoWaaS, {{EXTENSION_NAME}},
-      {{EXTENSION_TYPE}}, {{EXTENSION_ELEMENT}}
-->
+| Field | Value |
+|---|---|
+| **Package** | `pkg_mokowaas` |
+| **Language** | PHP 8.1+ |
+| **Branch** | develop on `dev`, merge to `main` (protected) |
+| **Wiki** | [MokoWaaS Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/wiki) |

-> [!IMPORTANT]
-> **🔧 AI Self-Update Required on First Use**
->
-> This file may contain unfilled `{{TOKEN}}` placeholders. The MokoStandards bulk-sync system
-> replaces them automatically at sync time; if you can still see them, sync has not yet run for
-> this repository — or this is a brand-new repo.
->
-> **On your very first interaction in this repository, before answering any other question:**
->
-> 1. Check whether any `{{TOKEN}}` placeholders remain in this file.
-> 2. If they do, locate the values as described in the table below and replace every occurrence
->    in **both** `.github/copilot-instructions.md` and `.github/CLAUDE.md`.
-> 3. After replacing all tokens, **delete this entire notice block** (from `> [!IMPORTANT]`
->    through the closing `> ---` line) in both files.
-> 4. Tell the developer: *"I've self-updated the AI context files with this repository's
->    values — all set."*
->
-> | Placeholder | Where to find the value |
-> |---|---|
-> | `MokoWaaS` | The GitHub repository name (visible in the URL, `README.md` heading, or `git remote -v`) |
-> | `https://github.com/mokoconsulting-tech/MokoWaaS` | Full GitHub URL, e.g. `https://github.com/mokoconsulting-tech/<repo-name>` |
-> | `{{EXTENSION_NAME}}` | The `<name>` element in `manifest.xml` at the repository root |
-> | `{{EXTENSION_TYPE}}` | The `type` attribute of the `<extension>` tag in `manifest.xml` (`component`, `module`, `plugin`, or `template`) |
-> | `{{EXTENSION_ELEMENT}}` | The `<element>` tag in `manifest.xml`, or the filename prefix (e.g. `com_myextension`, `mod_mymodule`) |
->
-> ---
+## Commands

-# MokoWaaS — GitHub Copilot Custom Instructions
-
-## What This Repo Is
-
-This is a **Moko Consulting MokoWaaS** (Joomla) repository governed by [MokoStandards](https://github.com/mokoconsulting-tech/MokoStandards). All coding standards, workflows, and policies are defined there and enforced here via bulk sync.
-
-Repository URL: https://github.com/mokoconsulting-tech/MokoWaaS
-Extension name: **{{EXTENSION_NAME}}**
-Extension type: **{{EXTENSION_TYPE}}** (`{{EXTENSION_ELEMENT}}`)
-Platform: **Joomla 4.x / MokoWaaS**
-
---
-
-## Primary Language
-
-**PHP** (≥ 7.4) is the primary language for this Joomla extension. JavaScript may be used for frontend enhancements. YAML uses 2-space indentation. All other text files use tabs per `.editorconfig`.
-
---
-
-## File Header — Always Required on New Files
-
-Every new file needs a copyright header as its first content.
-
-**PHP:**
-```php
-<?php
-/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- *
- * This file is part of a Moko Consulting project.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * FILE INFORMATION
- * DEFGROUP: MokoWaaS.{{EXTENSION_TYPE}}
- * INGROUP: MokoWaaS
- * REPO: https://github.com/mokoconsulting-tech/MokoWaaS
- * PATH: /path/to/file.php
- * VERSION: XX.YY.ZZ
- * BRIEF: One-line description of purpose
- */
-
-defined('_JEXEC') or die;
+```bash
+composer install  # Install PHP dependencies
 ```

-**Markdown:**
-```markdown
-<!--
-Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+## Architecture

-This file is part of a Moko Consulting project.
+Joomla **package** (`pkg_mokowaas`) with 17 sub-extensions:

-SPDX-License-Identifier: GPL-3.0-or-later
+### Core Plugin (`plg_system_mokowaas`)
+- Heartbeat health endpoint (`/?mokowaas=health`) with 16 diagnostic checks
+- Grafana provisioning and heartbeat sender
+- Site alias / domain management
+- Extension cascade (enable/disable coordination)
+- Download key preservation across Joomla updates
+- Namespace: `Moko\Plugin\System\MokoWaaS`

-# FILE INFORMATION
-DEFGROUP: MokoWaaS.Documentation
-INGROUP: MokoWaaS
-REPO: https://github.com/mokoconsulting-tech/MokoWaaS
-PATH: /docs/file.md
-VERSION: XX.YY.ZZ
-BRIEF: One-line description
-->
-```
+### Feature Plugins
+- `plg_system_mokowaas_firewall` — WAF, IP blocklist, security headers, password policy
+- `plg_system_mokowaas_tenant` — admin restrictions for non-master users
+- `plg_system_mokowaas_devtools` — dev mode, hit reset, version cleanup, download key reset
+- `plg_system_mokowaas_offline` — offline mode bypass for legal pages
+- `plg_system_mokowaas_monitor` — Grafana heartbeat registration

-**YAML / Shell / XML:** Use the appropriate comment syntax with the same fields. JSON files are exempt.
+### Component (`com_mokowaas`)
+- Admin dashboard with plugin management, WAF charts, extension catalog
+- Helpdesk ticketing system
+- REST API controllers

---
+### Modules
+- `mod_mokowaas_cpanel` — admin dashboard widget
+- `mod_mokowaas_menu` — admin sidebar menu
+- `mod_mokowaas_cache` — status bar cache/temp cleaner
+- `mod_mokowaas_categories` — auto-category tree menu

-## Version Management
+### Task Plugins
+- `plg_task_mokowaasdemo` — scheduled demo site reset
+- `plg_task_mokowaassync` — scheduled content sync
+- `plg_task_mokowaas_tickets` — ticket automation

-**`README.md` is the single source of truth for the repository version.**
+### Update Server

- **Bump the patch version on every PR** — increment `XX.YY.ZZ` (e.g. `01.02.03` → `01.02.04`) in `README.md` before opening the PR; the `sync-version-on-merge` workflow propagates it automatically to all badges and `FILE INFORMATION` headers on merge to `main`.
- The `VERSION: XX.YY.ZZ` field in `README.md` governs all other version references.
- Version format is zero-padded semver: `XX.YY.ZZ` (e.g. `01.02.03`).
- Never hardcode a specific version in document body text — use the badge or FILE INFORMATION header only.
+MokoGitea generates update feeds dynamically from releases — no static `updates.xml` needed.

-### Joomla Version Alignment
+## Source Directory

-The version in `README.md` **must always match** the `<version>` tag in `manifest.xml` and the latest entry in `updates.xml`. The `make release` command / release workflow updates all three automatically.
+Source lives in `source/` (not `src/`):
+- `source/pkg_mokowaas.xml` — package manifest
+- `source/script.php` — install script
+- `source/packages/` — all sub-extensions

-```xml
-<!-- In manifest.xml — must match README.md version -->
-<version>01.02.04</version>
+## Rules

-<!-- In updates.xml — prepend a new <update> block for every release.
-     Note: the backslash in version="4\.[0-9]+" is a literal backslash character
-     in the XML attribute value. Joomla's update server treats the value as a
-     regular expression, so \. matches a literal dot. -->
-<updates>
-	<update>
-		<name>{{EXTENSION_NAME}}</name>
-		<version>01.02.04</version>
-		<downloads>
-			<downloadurl type="full" format="zip">
-				https://github.com/mokoconsulting-tech/MokoWaaS/releases/download/01.02.04/{{EXTENSION_ELEMENT}}-01.02.04.zip
-			</downloadurl>
-		</downloads>
-		<targetplatform name="joomla" version="4\.[0-9]+" />
-	</update>
-	<!-- … older entries preserved below … -->
-</updates>
-```
+- **Never commit** `.claude/`, `.mcp.json`, `TODO.md`, `*.min.css`/`*.min.js`
+- **Attribution**: `Authored-by: Moko Consulting`
+- **Workflow directory**: `.mokogitea/` (not `.gitea/` or `.github/`)
+- **Minification**: handled at build time (CI)
+- **Wiki**: documentation lives in the Gitea wiki, not `docs/` files
+- **Standards**: [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)

---
+## Coding Standards

-## Joomla Extension Structure
-
-```
-MokoWaaS/
-├── manifest.xml          # Joomla installer manifest (root — required)
-├── (no updates.xml)       # Update XML is generated dynamically by MokoGitea
-├── site/                 # Frontend (site) code
-│   ├── controller.php
-│   ├── controllers/
-│   ├── models/
-│   └── views/
-├── admin/                # Backend (admin) code
-│   ├── controller.php
-│   ├── controllers/
-│   ├── models/
-│   ├── views/
-│   └── sql/
-├── language/             # Language INI files
-├── media/                # CSS, JS, images (deployed to /media/{{EXTENSION_ELEMENT}}/)
-├── docs/                 # Technical documentation
-├── tests/                # Test suite
-├── .github/
-│   ├── workflows/
-│   ├── copilot-instructions.md  # This file
-│   └── CLAUDE.md
-├── README.md             # Version source of truth
-├── CHANGELOG.md
-├── CONTRIBUTING.md
-├── LICENSE               # GPL-3.0-or-later
-└── Makefile              # Build automation
-```
-
---
-
-## Update Server — MokoGitea Dynamic Endpoint
-
-`updates.xml` is **NOT** stored in the repo. MokoGitea generates the update XML dynamically from git releases at:
-
-```
-https://git.mokoconsulting.tech/{Owner}/{Repo}/updates.xml
-```
-
-The package manifest (`pkg_mokowaas.xml`) references it via:
-```xml
-<updateservers>
-	<server type="extension" priority="1" name="MokoWaaS Update Server">
-		https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/updates.xml
-	</server>
-</updateservers>
-```
-
-**License Key (Download Key):**
- MokoGitea's endpoint validates license keys passed as `?dlid=MOKO-XXXX-XXXX-XXXX-XXXX`
- The generated XML includes `<downloadkey prefix="dlid=" suffix="" />` to tell Joomla a key is required
- Users enter the download key via Joomla's native **System → Update Sites** interface
- Joomla stores the key in `#__update_sites.extra_query` and appends it to all update/download requests
- Invalid/expired keys receive an empty `<updates></updates>` response
-
-**Rules:**
- Do NOT create or commit a static `updates.xml` — MokoGitea generates it from releases
- The `<version>` in release tags must match `<version>` in the manifest and `README.md`
- Release assets (ZIPs) must be attached to git releases — MokoGitea uses them for `<downloadurl>`
- `<targetplatform name="joomla" version="(5|6)\..*">` — the backslash is a **literal backslash character** in the XML attribute value; Joomla's update-server parser treats the value as a regular expression
-
---
-
-## manifest.xml Rules
-
- Lives at the repo root as `manifest.xml` (not inside `site/` or `admin/`).
- `<version>` tag must be kept in sync with `README.md` version and `updates.xml`.
- Must include `<updateservers>` block pointing to this repo's `updates.xml`.
- Must include `<files folder="site">` and `<administration>` sections.
- Joomla 4.x requires `<namespace path="src">Moko\{{EXTENSION_NAME}}</namespace>` for namespaced extensions.
-
---
-
-## GitHub Actions — Token Usage
-
-Every workflow must use **`secrets.GH_TOKEN`** (the org-level Personal Access Token).
-
-```yaml
-# ✅ Correct
- uses: actions/checkout@v4
-  with:
-    token: ${{ secrets.GH_TOKEN }}
-
-env:
-  GH_TOKEN: ${{ secrets.GH_TOKEN }}
-```
-
-```yaml
-# ❌ Wrong — never use these in workflows
-token: ${{ github.token }}
-token: ${{ secrets.GITHUB_TOKEN }}
-```
-
---
-
-## MokoStandards Reference
-
-This repository is governed by [MokoStandards](https://github.com/mokoconsulting-tech/MokoStandards). Authoritative policies:
-
-| Document | Purpose |
-|----------|---------|
-| [file-header-standards.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/file-header-standards.md) | Copyright-header rules for every file type |
-| [coding-style-guide.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/coding-style-guide.md) | Naming and formatting conventions |
-| [branching-strategy.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/branching-strategy.md) | Branch naming, hierarchy, and release workflow |
-| [merge-strategy.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/merge-strategy.md) | Squash-merge policy and PR title/body conventions |
-| [changelog-standards.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/changelog-standards.md) | How and when to update CHANGELOG.md |
-| [joomla-development-guide.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/guide/waas/joomla-development-guide.md) | MokoWaaS Joomla extension development guide |
-
---
-
-## Naming Conventions
-
-| Context | Convention | Example |
-|---------|-----------|---------|
-| PHP class | `PascalCase` | `MyController` |
-| PHP method / function | `camelCase` | `getItems()` |
-| PHP variable | `$snake_case` | `$item_id` |
-| PHP constant | `UPPER_SNAKE_CASE` | `MAX_ITEMS` |
-| PHP class file | `PascalCase.php` | `ItemModel.php` |
-| YAML workflow | `kebab-case.yml` | `ci-joomla.yml` |
-| Markdown doc | `kebab-case.md` | `installation-guide.md` |
-
---
-
-## Commit Messages
-
-Format: `<type>(<scope>): <subject>` — imperative, lower-case subject, no trailing period.
-
-Valid types: `feat` · `fix` · `docs` · `chore` · `ci` · `refactor` · `style` · `test` · `perf` · `revert` · `build`
-
---
-
-## Branch Naming
-
-Format: `<prefix>/<MAJOR.MINOR.PATCH>[/description]`
-
-Approved prefixes: `dev/` · `rc/` · `version/` · `patch/` · `copilot/` · `dependabot/`
-
---
-
-## Keeping Documentation Current
-
-| Change type | Documentation to update |
-|-------------|------------------------|
-| New or renamed PHP class/method | PHPDoc block; `docs/api/` entry |
-| New or changed manifest.xml | Bump README.md version |
-| New release | Create git release with ZIP asset; update CHANGELOG.md; bump README.md version |
-| New or changed workflow | `docs/workflows/<workflow-name>.md` |
-| Any modified file | Update the `VERSION` field in that file's `FILE INFORMATION` block |
-| **Every PR** | **Bump the patch version** — increment `XX.YY.ZZ` in `README.md`; `sync-version-on-merge` propagates it |
-
---
-
-## Key Constraints
-
- Never commit directly to `main` — all changes go via PR, squash-merged
- Never skip the FILE INFORMATION block on a new file
- Never add `defined('_JEXEC') or die;` to CLI scripts or model tests — only to web-accessible PHP files
- Never hardcode version numbers in body text — update `README.md` and let automation propagate
- Never use `github.token` or `secrets.GITHUB_TOKEN` in workflows — always use `secrets.GH_TOKEN`
- Never let `manifest.xml` version and `README.md` version go out of sync
- Never commit a static `updates.xml` — the update feed is generated dynamically by MokoGitea
+- PHP 8.1+ minimum
+- Joomla 5/6 DI container pattern: `services/provider.php` → Extension class
+- `SubscriberInterface` for event subscription
+- Joomla 5/6 dual-compat for events: check `is_object($event)` with `getArgument()` fallback
+- SPDX license headers on all PHP files
+- `defined('_JEXEC') or die;` on all web-accessible PHP files
@@ -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.33.01</version>
+    <version>02.34.28</version>
    <license spdx="GPL-3.0-or-later">GNU General Public License v3</license>
  </identity>
  <governance>
@@ -21,6 +21,6 @@
  <build>
    <language>PHP</language>
    <package-type>package</package-type>
-    <entry-point>src/</entry-point>
+    <entry-point>source/</entry-point>
  </build>
 </moko-platform>
@@ -48,15 +48,12 @@ jobs:
          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
-          if [ -d "/opt/moko-platform/cli" ]; then
-            echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV"
-          else
-            git clone --depth 1 --branch main --quiet \
-              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/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
+          rm -rf /tmp/moko-platform-api
+          git clone --depth 1 --branch main --quiet \
+            "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/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: Bump version
        run: |
@@ -17,7 +17,7 @@
 # |  Reads manifest.xml (joomla|dolibarr|generic) to branch logic.       |
 # |                                                                        |
 # |  Platform-specific:                                                    |
-# |    joomla:   XML manifest, updates.xml, type-prefixed packages         |
+# |    joomla:   XML manifest, type-prefixed packages                      |
 # |    dolibarr: mod*.class.php, update.txt, dev version reset             |
 # |    generic:  README-only, no update stream                             |
 # |                                                                        |
@@ -71,20 +71,25 @@ jobs:
          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
+          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
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          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

      - name: Rename branch to rc
        run: |
-          php /tmp/moko-platform-api/cli/branch_rename.php \
+          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}" \
@@ -100,16 +105,15 @@ jobs:

      - name: Publish RC release
        run: |
-          php /tmp/moko-platform-api/cli/release_publish.php \
+          php ${MOKO_CLI}/release_publish.php \
            --path . --stability rc --bump minor --branch rc \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --skip-update-stream
+            --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 (updates.xml managed by Gitea Pages)" >> $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:
@@ -151,25 +155,27 @@ jobs:
          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_MIRROR_TOKEN }}"}}'
        run: |
-          # Ensure PHP + Composer are available
-          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
+          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
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          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
-

      - name: "Publish stable release"
        run: |
-          php /tmp/moko-platform-api/cli/release_publish.php \
+          php ${MOKO_CLI}/release_publish.php \
            --path . --stability stable --bump minor --branch main \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --skip-update-stream
+            --token "${{ secrets.MOKOGITEA_TOKEN }}"

      - name: Update release notes from CHANGELOG.md
        run: |
@@ -215,7 +221,7 @@ jobs:
          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 /tmp/moko-platform-api/cli/release_mirror.php \
+          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" \
@@ -289,7 +295,7 @@ jobs:
        continue-on-error: true
        run: |
          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php /tmp/moko-platform-api/cli/version_reset_dev.php \
+          php ${MOKO_CLI}/version_reset_dev.php \
            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "${API_BASE}" \
            --branch dev --path . 2>&1 || true

@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: moko-platform.Automation
-# VERSION: 02.33.01
+# VERSION: 02.34.28
 # BRIEF: Auto-create feature branch when an issue is opened

 name: "Universal: Issue Branch"
@@ -1,290 +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: |
-          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
-          # Always fetch latest CLI tools â€” never use stale cache from previous runs
-          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: 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
-
-          # Read current version (bump already handled by push workflow)
-          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null)
-          [ -z "$VERSION" ] && VERSION="00.00.01"
-
-          # Strip any existing suffix from version before applying stability
-          VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
-
-          # RC and stable consolidate dev patches into a clean minor bump
-          # e.g. 02.33.15 → 02.34.00 (not 02.33.15-rc)
-          case "$STABILITY" in
-            release-candidate)
-              MAJOR=$(echo "$VERSION" | cut -d. -f1)
-              MINOR=$(echo "$VERSION" | cut -d. -f2)
-              MINOR=$(printf "%02d" $((10#$MINOR + 1)))
-              VERSION="${MAJOR}.${MINOR}.00"
-              ;;
-          esac
-
-          php ${MOKO_CLI}/version_set_platform.php \
-            --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true
-
-          # Verify version consistency across all files
-          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
-
-          # Update VERSION variable with suffix
-          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
-
-      - name: Update updates.xml
-        if: steps.platform.outputs.platform == 'joomla'
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          STABILITY="${{ steps.meta.outputs.stability }}"
-          SHA256="${{ steps.package.outputs.sha256_zip }}"
-
-          if [ ! -f "updates.xml" ]; then
-            echo "No updates.xml -- skipping"
-            exit 0
-          fi
-
-          SHA_FLAG=""
-          [ -n "$SHA256" ] && SHA_FLAG="--sha ${SHA256}"
-
-          php ${MOKO_CLI}/updates_xml_build.php \
-            --path . --version "${VERSION}" --stability "${STABILITY}" \
-            --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}" \
-            ${SHA_FLAG}
-
-          # Commit and push
-          if ! git diff --quiet updates.xml 2>/dev/null; then
-            git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-            git config --local user.name "gitea-actions[bot]"
-            git add updates.xml
-            git commit -m "chore: update ${STABILITY} channel ${VERSION} [skip ci]"
-            git push origin HEAD 2>&1 || echo "WARNING: push failed"
-          fi
-
-      - name: "Sync updates.xml to all branches"
-        if: steps.platform.outputs.platform == 'joomla'
-        run: |
-          CURRENT_BRANCH="${{ github.ref_name }}"
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-
-          for BRANCH in main dev; do
-            [ "$BRANCH" = "$CURRENT_BRANCH" ] && continue
-            echo "Syncing updates.xml -> ${BRANCH}"
-            git fetch origin "${BRANCH}" 2>/dev/null || continue
-            git checkout "origin/${BRANCH}" -- updates.xml 2>/dev/null || continue
-            git checkout "${CURRENT_BRANCH}" -- updates.xml
-            if ! git diff --quiet updates.xml 2>/dev/null; then
-              git add updates.xml
-              git commit -m "chore: sync updates.xml from ${CURRENT_BRANCH} [skip ci]"
-              git push origin HEAD:refs/heads/${BRANCH} 2>&1 || echo "WARNING: push to ${BRANCH} failed"
-            fi
-            git checkout "${CURRENT_BRANCH}" 2>/dev/null
-          done
-
-      - 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
@@ -14,7 +14,7 @@
 INGROUP: MokoWaaS.Documentation
 REPO: https://github.com/mokoconsulting-tech/mokowaas
 PATH: ./CHANGELOG.md
- VERSION: 02.33.01
+ VERSION: 02.34.28
 BRIEF: Version history using `Keep a Changelog`
 -->

@@ -22,6 +22,39 @@

 ## [Unreleased]

+### 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 MokoWaaSBase 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 MokoWaaSBase
+- 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)
@@ -41,6 +74,7 @@


 ### Changed
+- Move security hardening methods (protectPlugin, ensureProtectedFlag, isOurExtension) from core plugin to firewall plugin (#155)
 - Admin menu module uses native Joomla MetisMenu CSS classes
 - Helpdesk icon changed to fa-handshake-angle, .htaccess to fa-solid fa-file-code
 - clearCache purges all cache files recursively (replaces Regular Labs Cache Cleaner behavior)
@@ -1,42 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code when working with this repository.
-
-## Project Overview
-
-**MokoWaaS** -- MokoWaaS is a Joomla 5.x / 6.x system plugin that provides a configurable white-label identity layer for the MokoWaaS platform.
-
-| Field | Value |
-|---|---|
-| **Platform** | joomla |
-| **Language** | PHP |
-| **Default branch** | main |
-| **License** | GPL-3.0-or-later |
-| **Wiki** | [MokoWaaS Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/wiki) |
-| **Standards** | [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home) |
-
-## Common Commands
-
-```bash
-composer install  # Install PHP dependencies
-```
-
-## Architecture
-
-This is a Joomla extension. Key directories:
- `src/` -- extension source (deployed to Joomla)
- `src/*.xml` -- manifest file (version, files, params)
- `src/src/` or `src/services/` -- PHP classes
- `src/language/` -- translation strings
- `src/media/` -- CSS/JS/images
-
-## Rules
-
- **Workflow directory**: `.mokogitea/` (not `.gitea/` or `.github/`)
-
- **Never commit** `.claude/`, `.mcp.json`, `TODO.md`, or `*.min.css`/`*.min.js`
- **Attribution**: use `Authored-by: Moko Consulting` in commits
- **Branch strategy**: develop on `dev`, merge to `main` for release
- **Minification**: handled at build time (CI) and runtime (MokoMinifyHelper for Joomla templates)
- **Wiki**: documentation lives in the Gitea wiki, not in `docs/` files
- **Standards**: this repo follows [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)
@@ -14,7 +14,7 @@
 	DEFGROUP: Joomla.Plugin
 	INGROUP: MokoWaaS.Documentation
 	REPO: https://github.com/mokoconsulting-tech/mokowaas
-	VERSION: 02.33.01
+	VERSION: 02.34.28
 	PATH: ./CODE_OF_CONDUCT.md
 	BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default
 -->
@@ -19,7 +19,7 @@
 DEFGROUP: mokoconsulting-tech.MokoWaaSBrand
 INGROUP: MokoStandards.Governance
 REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand
- VERSION: 02.33.01
+ VERSION: 02.34.28
 PATH: /GOVERNANCE.md
 BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand
 -->
@@ -15,7 +15,7 @@
 	INGROUP: MokoWaaS.Documentation
  REPO: https://github.com/mokoconsulting-tech/mokowaas
 	PATH: ./LICENSE.md
-	VERSION: 02.33.01
+	VERSION: 02.34.28
 	BRIEF: Project license (GPL-3.0-or-later)
 -->
 										GNU GENERAL PUBLIC LICENSE
@@ -9,7 +9,7 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS
 REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
- VERSION: 02.33.01
+ VERSION: 02.34.28
 PATH: /README.md
 BRIEF: MokoWaaS platform plugin for Joomla
 -->
@@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME]
 INGROUP: [PROJECT_NAME].Documentation
 REPO: [REPOSITORY_URL]
 PATH: /SECURITY.md
-VERSION: 02.33.01
+VERSION: 02.34.28
 BRIEF: Security vulnerability reporting and handling policy
 -->

@@ -11,13 +11,13 @@
 INGROUP: MokoWaaS.Build
 REPO: https://github.com/mokoconsulting-tech/mokowaas
 FILE: build-guide.md
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Build Guide (VERSION: 02.34.28)

 ## 1. Purpose

@@ -44,7 +44,7 @@ The repository should maintain a clean, predictable, and modular structure suita

 ```text
 mokowaas/
-  ├── src/
+  ├── source/
  │     ├── mokowaas.php        (main plugin file)
  │     ├── mokowaas.xml        (plugin manifest)
  │     ├── services/                (service providers for DI)
@@ -192,7 +192,7 @@ jobs:

      - name: Lint PHP and syntax check
        run: |
-          echo "[INFO] Run php -l over src/ and any additional linting as needed."
+          echo "[INFO] Run php -l over source/ and any additional linting as needed."

      - name: Create build artifact
        run: |
@@ -10,13 +10,13 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS.Guides
 REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Configuration Guide (VERSION: 02.34.28)

 ## 1. Objective

@@ -10,13 +10,13 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS.Guides
 REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Installation Guide (VERSION: 02.34.28)

 ## Introduction

@@ -10,13 +10,13 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS.Guides
 REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Operations Guide (VERSION: 02.34.28)

 ## Introduction

@@ -10,13 +10,13 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS.Guides
 REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.28)

 ## Introduction

@@ -7,13 +7,13 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS.Guides
 REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Testing Guide (VERSION: 02.34.28)

 ## 1. Prerequisites

@@ -27,7 +27,7 @@

 1. Clean Joomla 5.x installation OR existing site with custom language overrides.
 2. Admin account with Super User access.
-3. Build the plugin package: `make package` or zip the `src/` directory.
+3. Build the plugin package: `make package` or zip the `source/` directory.

 ## 2. Test Suites

@@ -278,19 +278,19 @@ Run from the project root:

 ```bash
 # Lint all PHP files
-php -l src/script.php
-php -l src/Extension/MokoWaaS.php
+php -l source/script.php
+php -l source/Extension/MokoWaaS.php

 # Verify all override files have placeholders (no hardcoded "MokoWaaS" in values)
-grep -r '"MokoWaaS' src/language/overrides/ src/administrator/language/overrides/
+grep -r '"MokoWaaS' source/language/overrides/ source/administrator/language/overrides/
 # Expected: no output (all values should use {{BRAND_NAME}})

 # Verify sentinel constants match
-grep -c 'BLOCK_START\|BLOCK_END' src/script.php
+grep -c 'BLOCK_START\|BLOCK_END' source/script.php
 # Expected: 6+ references

 # Verify all .ini files have version 02.01.08
-grep -r 'Version:' src/**/*.ini | grep -v '02.01.08'
+grep -r 'Version:' source/**/*.ini | grep -v '02.01.08'
 # Expected: no output
 ```

@@ -10,13 +10,13 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS.Guides
 REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Troubleshooting Guide (VERSION: 02.34.28)

 ## Introduction

@@ -10,13 +10,13 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS.Guides
 REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.28)

 ## Introduction

@@ -10,13 +10,13 @@
 DEFGROUP: Joomla.Plugin
 INGROUP: MokoWaaS.Documentation
 REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.33.01
+ VERSION: 02.34.28
 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.33.01)
+# MokoWaaS Documentation Index (VERSION: 02.34.28)

 ## Introduction

@@ -11,12 +11,12 @@
 INGROUP: MokoWaaS
 REPO: https://github.com/mokoconsulting-tech/mokowaas
 PATH: /docs/plugin-basic.md
- VERSION: 02.33.01
+ VERSION: 02.34.28
 BRIEF: Baseline documentation for the MokoWaaS system plugin
 NOTE: Foundational reference for internal and external stakeholders
 -->

-# MokoWaaS Plugin Overview (VERSION: 02.33.01)
+# MokoWaaS Plugin Overview (VERSION: 02.34.28)

 ## Introduction

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

@@ -84,7 +84,7 @@ Since Joomla sites read `updates.xml` from the `main` branch, the `update-server

 ### Metadata Source

-All metadata is extracted from the extension's XML manifest (`src/*.xml`) at build time:
+All metadata is extracted from the extension's XML manifest (`source/*.xml`) at build time:

 | XML Element | Source | Notes |
 |-------------|--------|-------|
@@ -136,7 +136,7 @@ The `repo_health.yml` workflow verifies on every commit:
 - `<version>`, `<name>`, `<author>`, `<namespace>` tags present
 - Extension `type` attribute is valid
 - Language `.ini` files exist
- `index.html` directory listing protection in `src/`, `src/admin/`, `src/site/`
+- `index.html` directory listing protection in `source/`, `source/admin/`, `source/site/`

 ---

@@ -0,0 +1,122 @@
+<?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, respecting
+ the site's configured update channel (dev/stable).
+
+ To add an extension: copy an <extension> block and fill in the fields.
+-->
+<catalog>
+	<extension>
+		<name>MokoWaaS</name>
+		<element>pkg_mokowaas</element>
+		<type>package</type>
+		<description>Admin dashboard, security firewall, tenant restrictions, health monitoring, and REST API.</description>
+		<icon>icon-shield-alt</icon>
+		<category>Platform</category>
+		<article>https://mokoconsulting.tech/support/products/mokowaas-platform</article>
+		<protected>true</protected>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+	<extension>
+		<name>MokoWaaSBase</name>
+		<element>pkg_mokowaasbase</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/MokoWaaSBase/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+	<extension>
+		<name>MokoOnyx</name>
+		<element>mokoonyx</element>
+		<type>template</type>
+		<description>Modern Joomla site template with dark mode, custom layouts, and MokoWaaS integration.</description>
+		<icon>icon-paint-brush</icon>
+		<category>Templates</category>
+		<article>https://mokoconsulting.tech/support/products/mokoonyx-template</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/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>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>
+		<element>mod_mokojoomhero</element>
+		<type>module</type>
+		<description>Random hero image module from a configurable folder.</description>
+		<icon>icon-image</icon>
+		<category>Modules</category>
+		<article>https://mokoconsulting.tech/support/products/mokojoomhero</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomHero/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+	<extension>
+		<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>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/mokojoomstorelocator</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomStoreLocator/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+	<extension>
+		<name>DPCalendar API</name>
+		<element>mokodpcalendarapi</element>
+		<type>plugin</type>
+		<description>Web Services plugin exposing DPCalendar events and calendars via REST API.</description>
+		<icon>icon-calendar</icon>
+		<category>Plugins</category>
+		<article>https://mokoconsulting.tech/support/products/mokodpcalendarapi</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoDPCalendarAPI/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+	<extension>
+		<name>Gallery Calendar</name>
+		<element>mokogallerycalendar</element>
+		<type>plugin</type>
+		<description>JoomGallery and DPCalendar integration — link galleries to events.</description>
+		<icon>icon-images</icon>
+		<category>Plugins</category>
+		<article>https://mokoconsulting.tech/support/products/mokogallerycalendar</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoGalleryCalendar/raw/branch/dev/updates.xml</updateserver>
+	</extension>
+</catalog>
@@ -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)');
+
@@ -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`;
@@ -0,0 +1,2 @@
+-- Remove download_keys table (feature reverted — preflight handles key preservation)
+DROP TABLE IF EXISTS `#__mokowaas_download_keys`;
@@ -96,6 +96,19 @@ class DisplayController extends BaseController
 		$this->jsonResponse($this->getModel('Dashboard')->clearCache());
 	}

+	public function clearTemp()
+	{
+		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+
+		if (!$this->checkAcl('mokowaas.cache'))
+		{
+			$this->jsonForbidden();
+			return;
+		}
+
+		$this->jsonResponse($this->getModel('Dashboard')->clearTemp());
+	}
+
 	// ==================================================================
 	// Extensions
 	// ==================================================================
@@ -580,12 +593,40 @@ class DisplayController extends BaseController
 		return;
 		}

-		$input = Factory::getApplication()->getInput();
-		$model = new \Moko\Component\MokoWaaS\Administrator\Model\PrivacyModel();
+		$input  = Factory::getApplication()->getInput();
+		$model  = new \Moko\Component\MokoWaaS\Administrator\Model\PrivacyModel();
+		$action = $input->getString('action', 'deny');
+
+		if ($action === 'create')
+		{
+			$result = $model->createRequest(
+				$input->getInt('user_id', 0),
+				$input->getString('type', 'export')
+			);
+			$this->jsonResponse($result);
+			return;
+		}
+
+		if ($action === 'approve' && !$input->getInt('request_id', 0) && $input->getInt('user_id', 0))
+		{
+			// Auto-process: create then immediately approve
+			$result = $model->createRequest(
+				$input->getInt('user_id', 0),
+				$input->getString('type', 'export')
+			);
+
+			if ($result['success'] && !empty($result['id']))
+			{
+				$result = $model->processRequest((int) $result['id'], 'approve');
+			}
+
+			$this->jsonResponse($result);
+			return;
+		}

 		$this->jsonResponse($model->processRequest(
 			$input->getInt('request_id', 0),
-			$input->getString('action', 'deny')
+			$action
 		));
 	}

@@ -24,8 +24,8 @@ class DashboardModel extends BaseDatabaseModel
 		'mokowaas' => [
 			'icon'           => 'icon-shield-alt',
 			'category'       => 'core',
-			'label'          => 'Core — Branding & Identity',
-			'description'    => 'White-label branding, master user enforcement, emergency access, and plugin protection.',
+			'label'          => 'Core',
+			'description'    => 'Heartbeat, health monitoring, site aliases, extension coordination, and download key preservation.',
 			'protected'      => true,
 			'configure_only' => false,
 		],
@@ -212,6 +212,54 @@ class DashboardModel extends BaseDatabaseModel
 		];
 	}

+	/**
+	 * Get installed MokoWaaS component and modules with versions.
+	 *
+	 * @return  array  Array of extension objects with name, element, type, version.
+	 */
+	public function getMokoExtensions(): array
+	{
+		$db    = $this->getDatabase();
+		$query = $db->getQuery(true)
+			->select([
+				$db->quoteName('element'),
+				$db->quoteName('name'),
+				$db->quoteName('type'),
+				$db->quoteName('enabled'),
+				$db->quoteName('manifest_cache'),
+			])
+			->from($db->quoteName('#__extensions'))
+			->where('('
+				// The component
+				. '(' . $db->quoteName('type') . ' = ' . $db->quote('component')
+				. ' AND ' . $db->quoteName('element') . ' = ' . $db->quote('com_mokowaas') . ')'
+				// Admin modules
+				. ' OR (' . $db->quoteName('type') . ' = ' . $db->quote('module')
+				. ' AND ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mod_mokowaas%') . ')'
+			. ')')
+			->order($db->quoteName('type') . ' ASC, ' . $db->quoteName('element') . ' ASC');
+
+		$db->setQuery($query);
+		$rows = $db->loadObjectList() ?: [];
+
+		$extensions = [];
+
+		foreach ($rows as $row)
+		{
+			$manifest = json_decode($row->manifest_cache ?? '{}');
+
+			$extensions[] = (object) [
+				'element' => $row->element,
+				'name'    => $manifest->name ?? $row->name,
+				'type'    => $row->type,
+				'version' => $manifest->version ?? '',
+				'enabled' => (int) $row->enabled,
+			];
+		}
+
+		return $extensions;
+	}
+
 	/**
 	 * Toggle a plugin's enabled state.
 	 *
@@ -267,48 +315,18 @@ class DashboardModel extends BaseDatabaseModel
 	{
 		try
 		{
-			// Purge all file-based cache directories
-			$root = JPATH_ROOT;
-			$dirs = [
-				$root . '/cache',
-				$root . '/administrator/cache',
+			// Use Joomla's native cache API — same as com_cache
+			$cache = Factory::getContainer()->get(\Joomla\CMS\Cache\CacheControllerFactoryInterface::class);
+			$cache->createCacheController('', ['defaultgroup' => ''])->cache->clean('');
+
+			// Also clean admin cache
+			$conf = Factory::getApplication()->get('cache_handler', 'file');
+			$options = [
+				'defaultgroup' => '',
+				'cachebase'    => JPATH_ADMINISTRATOR . '/cache',
+				'storage'      => $conf,
 			];
-
-			foreach ($dirs as $dir)
-			{
-				if (!is_dir($dir))
-				{
-					continue;
-				}
-
-				$it = new \RecursiveIteratorIterator(
-					new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-					\RecursiveIteratorIterator::CHILD_FIRST
-				);
-
-				foreach ($it as $file)
-				{
-					$name = $file->getFilename();
-
-					if ($name === 'index.html' || $name === '.htaccess')
-					{
-						continue;
-					}
-
-					if ($file->isDir())
-					{
-						@rmdir($file->getPathname());
-					}
-					else
-					{
-						@unlink($file->getPathname());
-					}
-				}
-			}
-
-			// Also run Joomla's built-in cache GC for non-file handlers
-			Factory::getCache('', '')->gc();
-			Factory::getCache('', '', 'administrator')->gc();
+			$cache->createCacheController('', $options)->cache->clean('');

 			// Clear opcache if available
 			if (\function_exists('opcache_reset'))
@@ -324,6 +342,62 @@ class DashboardModel extends BaseDatabaseModel
 		}
 	}

+	/**
+	 * Clear the Joomla tmp directory.
+	 *
+	 * Removes all files and subdirectories from the configured tmp_path,
+	 * preserving the directory itself and any .htaccess / web.config files.
+	 *
+	 * @return  array  Result with success and message keys.
+	 */
+	public function clearTemp(): array
+	{
+		try
+		{
+			$tmpPath = Factory::getApplication()->get('tmp_path', JPATH_ROOT . '/tmp');
+
+			if (!is_dir($tmpPath))
+			{
+				return ['success' => false, 'message' => 'Temp directory does not exist: ' . $tmpPath];
+			}
+
+			$count = 0;
+			$protected = ['.htaccess', 'web.config', 'index.html', '.gitkeep'];
+
+			$items = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($tmpPath, \RecursiveDirectoryIterator::SKIP_DOTS),
+				\RecursiveIteratorIterator::CHILD_FIRST
+			);
+
+			foreach ($items as $item)
+			{
+				$basename = $item->getBasename();
+
+				// Skip protected files in the root tmp directory
+				if ($item->getPath() === $tmpPath && \in_array($basename, $protected, true))
+				{
+					continue;
+				}
+
+				if ($item->isDir())
+				{
+					@rmdir($item->getPathname());
+				}
+				else
+				{
+					@unlink($item->getPathname());
+					$count++;
+				}
+			}
+
+			return ['success' => true, 'message' => sprintf('Temp directory cleaned (%d files removed).', $count)];
+		}
+		catch (\Throwable $e)
+		{
+			return ['success' => false, 'message' => 'Temp clear failed: ' . $e->getMessage()];
+		}
+	}
+
 	/**
 	 * Auto-generate dashboard metadata for plugins not in the static map.
 	 */
@@ -0,0 +1,391 @@
+<?php
+/**
+ * @package     MokoWaaS
+ * @subpackage  com_mokowaas
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ */
+
+namespace Moko\Component\MokoWaaS\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+/**
+ * Extension catalog model — reads catalog.xml, fetches each extension's
+ * updates.xml to resolve latest version and download URL, and checks
+ * local install status.
+ *
+ * @since  02.32.00
+ */
+class ExtensionsModel extends BaseDatabaseModel
+{
+	/**
+	 * Parsed catalog entries (cached per request).
+	 *
+	 * @var  array|null
+	 */
+	private ?array $catalogCache = null;
+
+	/**
+	 * Get the full catalog with install status and release info.
+	 *
+	 * @return  array  Array of catalog entry objects
+	 */
+	public function getCatalog(): array
+	{
+		$catalog   = $this->loadCatalog();
+		$installed = $this->getInstalledVersions($catalog);
+		$packages  = [];
+
+		foreach ($catalog as $entry)
+		{
+			$release = $this->fetchFromUpdateServer($entry['updateserver'] ?? '');
+
+			$localVersion  = $installed[$entry['element']] ?? null;
+			$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)
+			{
+				$status = 'installed';
+
+				if ($remoteVersion !== '' && version_compare($remoteVersion, $localVersion, '>'))
+				{
+					$status = 'update_available';
+				}
+			}
+
+			$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'],
+				'element'        => $entry['element'],
+				'type'           => $entry['type'],
+				'icon'           => $entry['icon'],
+				'category'       => $entry['category'],
+				'local_version'  => $localVersion ?? '',
+				'remote_version' => $remoteVersion,
+				'download_url'   => $downloadUrl,
+				'status'         => $status,
+				'article_url'    => $entry['article'] ?? '',
+				'protected'      => ($entry['protected'] ?? 'false') === 'true',
+				'extension_id'   => $extensionId,
+				'needs_dlid'     => $needsDlid,
+				'has_dlid'       => $hasDlid,
+				'has_stable'     => $release['has_stable'] ?? false,
+			];
+		}
+
+		return $packages;
+	}
+
+	/**
+	 * Install an extension from a remote ZIP URL.
+	 *
+	 * @param   string  $url  The download URL
+	 *
+	 * @return  array  Result with success, message, and extension info
+	 */
+	public function installFromUrl(string $url): array
+	{
+		$tmpPath = Factory::getConfig()->get('tmp_path', JPATH_ROOT . '/tmp');
+		$tmpFile = $tmpPath . '/mokowaas_install_' . md5($url) . '.zip';
+
+		try
+		{
+			$ch = curl_init($url);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+			curl_setopt($ch, CURLOPT_TIMEOUT, 120);
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+			$data  = curl_exec($ch);
+			$code  = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
+			$error = curl_error($ch);
+			curl_close($ch);
+
+			if ($error || $code !== 200 || empty($data))
+			{
+				return ['success' => false, 'message' => 'Download failed: ' . ($error ?: "HTTP {$code}")];
+			}
+
+			file_put_contents($tmpFile, $data);
+
+			$installer = new \Joomla\CMS\Installer\Installer();
+			$result    = $installer->install($tmpFile);
+
+			@unlink($tmpFile);
+
+			if (!$result)
+			{
+				return ['success' => false, 'message' => 'Installation failed.'];
+			}
+
+			return [
+				'success' => true,
+				'message' => 'Installed successfully.',
+			];
+		}
+		catch (\Throwable $e)
+		{
+			@unlink($tmpFile);
+
+			return ['success' => false, 'message' => 'Error: ' . $e->getMessage()];
+		}
+	}
+
+	/**
+	 * Load and parse the catalog.xml file.
+	 *
+	 * @return  array  Array of associative arrays, one per extension
+	 */
+	private function loadCatalog(): array
+	{
+		if ($this->catalogCache !== null)
+		{
+			return $this->catalogCache;
+		}
+
+		$catalogFile = JPATH_ADMINISTRATOR . '/components/com_mokowaas/catalog.xml';
+
+		if (!file_exists($catalogFile))
+		{
+			$this->catalogCache = [];
+
+			return [];
+		}
+
+		$xml = @simplexml_load_file($catalogFile);
+
+		if (!$xml)
+		{
+			$this->catalogCache = [];
+
+			return [];
+		}
+
+		$entries = [];
+
+		foreach ($xml->extension as $ext)
+		{
+			$entries[] = [
+				'name'         => (string) $ext->name,
+				'element'      => (string) $ext->element,
+				'type'         => (string) $ext->type,
+				'description'  => (string) $ext->description,
+				'icon'         => (string) $ext->icon,
+				'category'     => (string) $ext->category,
+				'article'      => (string) $ext->article,
+				'protected'    => (string) $ext->protected,
+				'updateserver' => (string) $ext->updateserver,
+			];
+		}
+
+		$this->catalogCache = $entries;
+
+		return $entries;
+	}
+
+	/**
+	 * Fetch the latest version and download URL from an extension's updates.xml.
+	 *
+	 * Parses the standard Joomla update server XML format and returns
+	 * the highest version entry with its download URL.
+	 *
+	 * @param   string  $updateServerUrl  URL to the updates.xml file
+	 *
+	 * @return  array  [version, download_url] or empty array
+	 */
+	private function fetchFromUpdateServer(string $updateServerUrl): array
+	{
+		if (empty($updateServerUrl))
+		{
+			return [];
+		}
+
+		$ch = curl_init($updateServerUrl);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		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);
+		curl_close($ch);
+
+		if ($code !== 200 || empty($response))
+		{
+			return [];
+		}
+
+		$xml = @simplexml_load_string($response);
+
+		if (!$xml)
+		{
+			return [];
+		}
+
+		// 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, '<='))
+			{
+				continue;
+			}
+
+			$bestVersion = $ver;
+
+			if (isset($update->downloads->downloadurl))
+			{
+				$downloadUrl = (string) $update->downloads->downloadurl;
+
+				// Check if download URL contains dlid placeholder
+				if (str_contains($downloadUrl, 'dlid='))
+				{
+					$needsDlid = true;
+				}
+			}
+		}
+
+		if ($bestVersion === '0.0.0')
+		{
+			return [];
+		}
+
+		return [
+			'version'      => $bestVersion,
+			'download_url' => $downloadUrl,
+			'has_stable'   => $hasStable,
+			'has_dev'      => $hasDev,
+			'needs_dlid'   => $needsDlid,
+		];
+	}
+
+	/**
+	 * Get installed versions of catalog extensions.
+	 *
+	 * @param   array  $catalog  The parsed catalog entries
+	 *
+	 * @return  array  element => version
+	 */
+	private function getInstalledVersions(array $catalog): array
+	{
+		if (empty($catalog))
+		{
+			return [];
+		}
+
+		$db       = $this->getDatabase();
+		$elements = [];
+
+		foreach ($catalog as $entry)
+		{
+			$elements[] = $db->quote($entry['element']);
+		}
+
+		$query = $db->getQuery(true)
+			->select([$db->quoteName('element'), $db->quoteName('manifest_cache')])
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('element') . ' IN (' . implode(',', $elements) . ')');
+		$db->setQuery($query);
+		$rows = $db->loadObjectList() ?: [];
+
+		$versions = [];
+
+		foreach ($rows as $row)
+		{
+			$mc = json_decode($row->manifest_cache ?? '{}');
+			$versions[$row->element] = $mc->version ?? '0.0.0';
+		}
+
+		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).
+	 *
+	 * @param   string  $element  Extension element name
+	 *
+	 * @return  int
+	 */
+	private function getExtensionId(string $element): int
+	{
+		$db    = $this->getDatabase();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('element') . ' = ' . $db->quote($element))
+			->setLimit(1);
+		$db->setQuery($query);
+
+		return (int) $db->loadResult();
+	}
+}
@@ -25,6 +25,7 @@ class HtmlView extends BaseHtmlView
 	protected $wafBlocks = [];
 	protected $wafChartData = [];
 	protected $loginChartData = [];
+	protected $mokoExtensions = [];

 	public function display($tpl = null)
 	{
@@ -38,6 +39,7 @@ class HtmlView extends BaseHtmlView
 		$this->wafBlocks       = $model->getRecentWafBlocks(5);
 		$this->wafChartData    = $model->getWafBlocksByDay(14);
 		$this->loginChartData  = $model->getLoginsByDay(14);
+		$this->mokoExtensions  = $model->getMokoExtensions();

 		// Check for importable Akeeba data
 		try
@@ -19,6 +19,7 @@ $siteInfo       = $this->siteInfo;
 $plugins        = $this->plugins;
 $recentLogins   = $this->recentLogins;
 $pendingUpdates = $this->pendingUpdates;
+$mokoExts       = $this->mokoExtensions;
 $adminToolsAvail = $this->adminToolsAvailable ?? null;
 $atsAvail        = $this->atsAvailable ?? null;
 $checkedOut     = $this->checkedOutItems;
@@ -72,6 +73,31 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
 		</div>
 	</div>

+	<?php if (!empty($mokoExts)): ?>
+	<!-- Moko Component & Module Versions -->
+	<div class="d-flex flex-wrap gap-2 mb-4">
+		<?php
+		$extIcons = [
+			'com_mokowaas'           => 'icon-cogs',
+			'mod_mokowaas_cpanel'    => 'icon-tachometer-alt',
+			'mod_mokowaas_menu'      => 'icon-bars',
+			'mod_mokowaas_cache'     => 'icon-bolt',
+			'mod_mokowaas_categories' => 'icon-folder',
+		];
+		foreach ($mokoExts as $ext):
+			$icon = $extIcons[$ext->element] ?? 'icon-puzzle-piece';
+			$label = str_replace(['mod_mokowaas_', 'com_mokowaas'], ['', 'Component'], $ext->element);
+			$label = ucfirst($label ?: 'Component');
+		?>
+		<div class="d-flex align-items-center gap-2 px-3 py-2 rounded border bg-white" style="font-size:0.85rem;">
+			<span class="<?php echo $icon; ?>" aria-hidden="true" style="color:#1a2744;"></span>
+			<span><?php echo $this->escape($label); ?></span>
+			<span class="badge bg-light text-dark"><?php echo $this->escape($ext->version); ?></span>
+		</div>
+		<?php endforeach; ?>
+	</div>
+	<?php endif; ?>
+
 	<?php if ($adminToolsAvail || $atsAvail): ?>
 	<!-- Akeeba Import Banner -->
 	<div class="alert alert-info d-flex flex-wrap align-items-center gap-3 mb-4">
@@ -25,8 +25,9 @@ foreach ($packages as $pkg)
 }

 $statusBadge = [
-	'installed'     => ['bg-success', 'Installed'],
-	'not_installed' => ['bg-secondary', 'Not Installed'],
+	'installed'        => ['bg-success', 'Installed'],
+	'update_available' => ['bg-warning text-dark', 'Update Available'],
+	'not_installed'    => ['bg-secondary', 'Not Installed'],
 ];
 ?>

@@ -43,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">
@@ -59,10 +60,21 @@ $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): ?>
 								v<?php echo htmlspecialchars($pkg->local_version); ?>
+								<?php if ($pkg->remote_version && $pkg->status === 'update_available'): ?>
+									&rarr; <?php echo htmlspecialchars($pkg->remote_version); ?>
+								<?php endif; ?>
 							<?php elseif ($pkg->remote_version): ?>
 								Latest: <?php echo htmlspecialchars($pkg->remote_version); ?>
 							<?php endif; ?>
@@ -73,16 +85,49 @@ $statusBadge = [
 								<span class="icon-book" aria-hidden="true"></span>
 							</a>
 							<?php endif; ?>
-							<?php if ($pkg->download_url && $pkg->status === 'not_installed'): ?>
+							<?php if ($pkg->download_url && $pkg->status === 'update_available'): ?>
+						<button type="button" class="btn btn-sm btn-warning mokowaas-install-btn"
+							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-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>
+						<?php elseif ($pkg->download_url && $pkg->status === 'not_installed'): ?>
 							<button type="button" class="btn btn-sm btn-primary mokowaas-install-btn"
 								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>
 							<?php elseif ($pkg->status === 'installed'): ?>
+							<?php
+								$dashLink = '';
+								if ($pkg->type === 'component')
+								{
+									$dashLink = 'index.php?option=' . $pkg->element;
+								}
+								elseif ($pkg->type === 'package' && strpos($pkg->element, 'pkg_') === 0)
+								{
+									$comElement = 'com_' . substr($pkg->element, 4);
+									if (is_dir(JPATH_ADMINISTRATOR . '/components/' . $comElement))
+									{
+										$dashLink = 'index.php?option=' . $comElement;
+									}
+								}
+							?>
+							<?php if ($dashLink): ?>
+							<a href="<?php echo Route::_($dashLink); ?>" class="btn btn-sm btn-outline-primary" title="Open">
+								<span class="icon-arrow-right" aria-hidden="true"></span> Open
+							</a>
+							<?php endif; ?>
 							<span class="btn btn-sm btn-outline-success disabled">
 								<span class="icon-check" aria-hidden="true"></span> Installed
 							</span>
@@ -117,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',
@@ -53,6 +53,63 @@ $typeBadge = [
 		</div>
 	</div>

+	<!-- New Request Form -->
+	<div class="card mb-4">
+		<div class="card-header d-flex justify-content-between align-items-center">
+			<strong><span class="icon-plus"></span> Create Data Request</strong>
+			<button class="btn btn-sm btn-outline-primary" type="button" data-bs-toggle="collapse" data-bs-target="#newRequestForm" aria-expanded="false">
+				<span class="icon-plus"></span> New Request
+			</button>
+		</div>
+		<div class="collapse" id="newRequestForm">
+			<div class="card-body">
+				<form id="formNewRequest" class="row g-3">
+					<div class="col-12 col-md-5">
+						<label for="req_user_id" class="form-label">User</label>
+						<select id="req_user_id" class="form-select" required>
+							<option value="">Select a user...</option>
+							<?php
+								$db = Factory::getDbo();
+								$db->setQuery(
+									$db->getQuery(true)
+										->select([$db->quoteName('id'), $db->quoteName('name'), $db->quoteName('email')])
+										->from($db->quoteName('#__users'))
+										->where($db->quoteName('block') . ' = 0')
+										->order($db->quoteName('name'))
+								);
+								foreach ($db->loadObjectList() as $u):
+							?>
+							<option value="<?php echo (int) $u->id; ?>"><?php echo $this->escape($u->name); ?> (<?php echo $this->escape($u->email); ?>)</option>
+							<?php endforeach; ?>
+						</select>
+					</div>
+					<div class="col-12 col-md-3">
+						<label for="req_type" class="form-label">Request Type</label>
+						<select id="req_type" class="form-select" required>
+							<option value="export">Export Data</option>
+							<option value="delete">Delete Data</option>
+							<option value="anonymize">Anonymize Data</option>
+						</select>
+					</div>
+					<div class="col-12 col-md-2">
+						<label for="req_auto" class="form-label">Auto-process</label>
+						<select id="req_auto" class="form-select">
+							<option value="0">No (pending)</option>
+							<option value="1">Yes (immediate)</option>
+						</select>
+					</div>
+					<div class="col-12 col-md-2 d-flex align-items-end">
+						<button type="submit" class="btn btn-primary w-100" id="btnCreateRequest"
+							data-url="<?php echo Route::_('index.php?option=com_mokowaas&task=display.processDataRequest&format=json'); ?>"
+							data-token="<?php echo $token; ?>">
+							<span class="icon-check"></span> Submit
+						</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+
 	<div class="row">
 		<!-- Data Requests -->
 		<div class="col-12 col-xl-8">
@@ -158,6 +215,32 @@ document.addEventListener('DOMContentLoaded', function() {
 		});
 	});

+	// Create new request
+	var form = document.getElementById('formNewRequest');
+	if (form) {
+		form.addEventListener('submit', function(e) {
+			e.preventDefault();
+			var btn = document.getElementById('btnCreateRequest');
+			var userId = document.getElementById('req_user_id').value;
+			var type = document.getElementById('req_type').value;
+			var auto = document.getElementById('req_auto').value;
+			if (!userId) { Joomla.renderMessages({warning:['Please select a user.']}); return; }
+			btn.disabled = true;
+			var fd = new FormData();
+			fd.append('user_id', userId);
+			fd.append('type', type);
+			fd.append('action', auto === '1' ? 'approve' : 'create');
+			fd.append(btn.dataset.token, '1');
+			fetch(btn.dataset.url, {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
+				.then(function(r){return r.json()})
+				.then(function(d){
+					if (d.success) { Joomla.renderMessages({message:[d.message || 'Request created.']}); location.reload(); }
+					else { Joomla.renderMessages({error:[d.message || 'Failed.']}); btn.disabled = false; }
+				})
+				.catch(function(){ btn.disabled = false; });
+		});
+	}
+
 	// Export download
 	document.querySelectorAll('.btn-export-download').forEach(function(btn) {
 		btn.addEventListener('click', function() {
@@ -29,7 +29,7 @@ class CacheController extends BaseController
 	 *
 	 * @since   1.0.0
 	 */
-	public function execute(): void
+	public function execute($task = 'cache'): void
 	{
 		$app = Factory::getApplication();

@@ -42,7 +42,7 @@ class InstallController extends BaseController
 	 *
 	 * @since   02.21.00
 	 */
-	public function execute(): void
+	public function execute($task = 'install'): void
 	{
 		$app = Factory::getApplication();

@@ -104,7 +104,7 @@ class PluginsController extends BaseController
 	 *
 	 * @return  void
 	 */
-	public function execute(): void
+	public function execute($task = 'plugins'): void
 	{
 		$app  = Factory::getApplication();
 		$user = $app->getIdentity();
@@ -0,0 +1,236 @@
+<?php
+/**
+ * @package     MokoWaaS
+ * @subpackage  com_mokowaas
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ */
+
+namespace Moko\Component\MokoWaaS\Api\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\BaseController;
+
+/**
+ * Provision reset API controller.
+ *
+ * POST /api/index.php/v1/mokowaas/provision-reset
+ *
+ * Resets a site for new client provisioning: clears hits, versions,
+ * download keys, and flags the site for fresh client info collection.
+ * Used after copying a demo site to create a new client install.
+ *
+ * @since  02.35.00
+ */
+class ProvisionController extends BaseController
+{
+	/**
+	 * Reset the site for new client provisioning.
+	 *
+	 * @return  void
+	 */
+	public function execute($task = 'provision'): void
+	{
+		$app  = Factory::getApplication();
+		$user = $app->getIdentity();
+
+		if (!$user->authorise('core.manage', 'com_mokowaas'))
+		{
+			$this->sendJson(403, ['error' => 'Not authorized']);
+
+			return;
+		}
+
+		if ($app->input->getMethod() !== 'POST')
+		{
+			$this->sendJson(405, ['error' => 'POST required']);
+
+			return;
+		}
+
+		$db      = Factory::getDbo();
+		$results = [];
+
+		// 1. Reset article hit counters
+		try
+		{
+			$db->setQuery(
+				$db->getQuery(true)
+					->update($db->quoteName('#__content'))
+					->set($db->quoteName('hits') . ' = 0')
+			)->execute();
+			$results['hits_reset'] = $db->getAffectedRows();
+		}
+		catch (\Throwable $e)
+		{
+			$results['hits_reset'] = 'error: ' . $e->getMessage();
+		}
+
+		// 2. Delete content version history
+		try
+		{
+			$db->setQuery(
+				$db->getQuery(true)->delete($db->quoteName('#__history'))
+			)->execute();
+			$results['versions_deleted'] = $db->getAffectedRows();
+		}
+		catch (\Throwable $e)
+		{
+			$results['versions_deleted'] = 'error: ' . $e->getMessage();
+		}
+
+		// 3. Regenerate heartbeat token if requested
+		$input       = $app->getInput()->json;
+		$resetToken  = (bool) ($input->get('reset_token', false, 'BOOLEAN'));
+
+		if ($resetToken)
+		{
+			try
+			{
+				$newToken = bin2hex(random_bytes(32));
+
+				$plugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokowaas');
+
+				if ($plugin)
+				{
+					$pluginParams = new \Joomla\Registry\Registry($plugin->params);
+					$pluginParams->set('health_api_token', $newToken);
+
+					$db->setQuery(
+						$db->getQuery(true)
+							->update($db->quoteName('#__extensions'))
+							->set($db->quoteName('params') . ' = ' . $db->quote($pluginParams->toString()))
+							->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas'))
+							->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
+							->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
+					)->execute();
+
+					$results['token_regenerated'] = true;
+					$results['new_token']         = $newToken;
+				}
+			}
+			catch (\Throwable $e)
+			{
+				$results['token_regenerated'] = 'error: ' . $e->getMessage();
+			}
+		}
+
+		// 4. Reset all user API tokens if requested
+		$resetApiTokens = (bool) ($input->get('reset_api_tokens', false, 'BOOLEAN'));
+
+		if ($resetApiTokens)
+		{
+			try
+			{
+				// Get users who have API tokens before deleting
+				$db->setQuery(
+					$db->getQuery(true)
+						->select('DISTINCT ' . $db->quoteName('user_id'))
+						->from($db->quoteName('#__user_keys'))
+						->where($db->quoteName('series') . ' LIKE ' . $db->quote('api-%'))
+				);
+				$affectedUserIds = $db->loadColumn() ?: [];
+
+				$db->setQuery(
+					$db->getQuery(true)->delete($db->quoteName('#__user_keys'))
+						->where($db->quoteName('series') . ' LIKE ' . $db->quote('api-%'))
+				)->execute();
+				$results['api_tokens_revoked'] = $db->getAffectedRows();
+
+				// Notify affected users
+				if (!empty($affectedUserIds))
+				{
+					$this->notifyTokenReset($db, $affectedUserIds);
+					$results['users_notified'] = \count($affectedUserIds);
+				}
+			}
+			catch (\Throwable $e)
+			{
+				$results['api_tokens_revoked'] = 'error: ' . $e->getMessage();
+			}
+		}
+
+		// 5. Flag site for fresh client info setup
+		try
+		{
+			// Write a flag file that the core plugin checks on next admin load
+			$flagFile = JPATH_ADMINISTRATOR . '/cache/mokowaas_setup_required.flag';
+			file_put_contents($flagFile, json_encode([
+				'created'  => gmdate('Y-m-d\TH:i:s\Z'),
+				'reason'   => 'provision-reset',
+				'remote_ip' => $_SERVER['REMOTE_ADDR'] ?? '',
+			]));
+			$results['setup_flag'] = true;
+		}
+		catch (\Throwable $e)
+		{
+			$results['setup_flag'] = 'error: ' . $e->getMessage();
+		}
+
+		$this->sendJson(200, [
+			'status'  => 'ok',
+			'message' => 'Site provisioned for new client.',
+			'results' => $results,
+		]);
+	}
+
+	/**
+	 * Notify users that their API tokens have been revoked.
+	 */
+	private function notifyTokenReset($db, array $userIds): void
+	{
+		try
+		{
+			$db->setQuery(
+				$db->getQuery(true)
+					->select([$db->quoteName('name'), $db->quoteName('email')])
+					->from($db->quoteName('#__users'))
+					->whereIn($db->quoteName('id'), $userIds)
+					->where($db->quoteName('block') . ' = 0')
+			);
+			$users = $db->loadObjectList() ?: [];
+
+			$config   = Factory::getConfig();
+			$siteName = $config->get('sitename', 'Joomla');
+			$siteUrl  = rtrim(\Joomla\CMS\Uri\Uri::root(), '/');
+
+			$mailer = Factory::getMailer();
+
+			foreach ($users as $u)
+			{
+				try
+				{
+					$mailer->clearAllRecipients();
+					$mailer->addRecipient($u->email, $u->name);
+					$mailer->setSubject($siteName . ' — API tokens have been reset');
+					$mailer->setBody(
+						"Hello {$u->name},\n\n"
+						. "Your API access tokens on {$siteName} have been revoked by an administrator.\n\n"
+						. "If you use API integrations, please log in and generate a new token:\n"
+						. "{$siteUrl}/administrator/\n\n"
+						. "— {$siteName}"
+					);
+					$mailer->send();
+				}
+				catch (\Throwable $e)
+				{
+					// Non-critical
+				}
+			}
+		}
+		catch (\Throwable $e)
+		{
+			// Non-critical
+		}
+	}
+
+	private function sendJson(int $code, array $data): void
+	{
+		http_response_code($code);
+		header('Content-Type: application/json; charset=utf-8');
+		echo json_encode($data, JSON_UNESCAPED_SLASHES);
+		Factory::getApplication()->close();
+	}
+}
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @package     MokoWaaS
+ * @subpackage  com_mokowaas
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ */
+
+namespace Moko\Component\MokoWaaS\Api\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Uri\Uri;
+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"}
+ *
+ * Validates the health API token, generates a one-time login token
+ * for the master user, and returns a URL that auto-authenticates.
+ *
+ * @since  02.35.00
+ */
+class RemoteLoginController extends BaseController
+{
+	/**
+	 * One-time token validity in seconds.
+	 */
+	private const OTL_TTL = 60;
+
+	/**
+	 * Generate a one-time login URL for the master user.
+	 *
+	 * @return  void
+	 */
+	public function execute($task = 'remoteLogin'): void
+	{
+		$app   = Factory::getApplication();
+		$input = $app->getInput()->json;
+
+		$token  = $input->get('token', '', 'RAW');
+		$origin = $input->get('origin', '', 'STRING');
+
+		if (empty($token))
+		{
+			$this->sendJson(401, ['error' => 'Missing token']);
+
+			return;
+		}
+
+		// Validate against the core plugin's health_api_token
+		$plugin = PluginHelper::getPlugin('system', 'mokowaas');
+
+		if (!$plugin)
+		{
+			$this->sendJson(503, ['error' => 'MokoWaaS core plugin not found']);
+
+			return;
+		}
+
+		$params      = new Registry($plugin->params);
+		$healthToken = $params->get('health_api_token', '');
+
+		if (empty($healthToken) || !hash_equals($healthToken, $token))
+		{
+			$this->sendJson(401, ['error' => 'Invalid token']);
+
+			return;
+		}
+
+		// Find the master user
+		$masterUsernames = $this->getMasterUsernames($params);
+
+		if (empty($masterUsernames))
+		{
+			$this->sendJson(403, ['error' => 'No master user configured']);
+
+			return;
+		}
+
+		// Use the first master username
+		$masterUsername = $masterUsernames[0];
+
+		// Look up the user
+		$db = Factory::getDbo();
+		$db->setQuery(
+			$db->getQuery(true)
+				->select([$db->quoteName('id'), $db->quoteName('username')])
+				->from($db->quoteName('#__users'))
+				->where($db->quoteName('username') . ' = ' . $db->quote($masterUsername))
+				->where($db->quoteName('block') . ' = 0')
+		);
+		$user = $db->loadObject();
+
+		if (!$user)
+		{
+			$this->sendJson(403, ['error' => 'Master user not found or blocked']);
+
+			return;
+		}
+
+		// Generate one-time login token
+		$otlToken = bin2hex(random_bytes(32));
+		$expires  = time() + self::OTL_TTL;
+
+		// Store in a temp file (avoids DB schema changes)
+		$otlFile = JPATH_ADMINISTRATOR . '/cache/mokowaas_otl_' . md5($otlToken) . '.json';
+		file_put_contents($otlFile, json_encode([
+			'token'    => $otlToken,
+			'user_id'  => (int) $user->id,
+			'username' => $user->username,
+			'expires'  => $expires,
+			'origin'   => substr($origin, 0, 100),
+		]));
+
+		// Build login URL
+		$loginUrl = rtrim(Uri::root(), '/') . '/administrator/index.php?mokowaas_otl=' . $otlToken;
+
+		$this->sendJson(200, [
+			'status'    => 'ok',
+			'login_url' => $loginUrl,
+			'expires'   => $expires,
+			'user'      => $user->username,
+		]);
+	}
+
+	/**
+	 * Decode master usernames from plugin params.
+	 *
+	 * @param   Registry  $params  Plugin params.
+	 *
+	 * @return  array
+	 */
+	private function getMasterUsernames(Registry $params): array
+	{
+		// Use MokoWaaSHelper if available
+		$helperFile = JPATH_PLUGINS . '/system/mokowaas/Helper/MokoWaaSHelper.php';
+
+		if (file_exists($helperFile))
+		{
+			require_once $helperFile;
+
+			if (method_exists(\Moko\Plugin\System\MokoWaaS\Helper\MokoWaaSHelper::class, 'getMasterUsernames'))
+			{
+				return \Moko\Plugin\System\MokoWaaS\Helper\MokoWaaSHelper::getMasterUsernames();
+			}
+		}
+
+		return [];
+	}
+
+	/**
+	 * Send JSON response and terminate.
+	 *
+	 * @param   int    $code  HTTP status code.
+	 * @param   array  $data  Response data.
+	 *
+	 * @return  void
+	 */
+	private function sendJson(int $code, array $data): void
+	{
+		http_response_code($code);
+		header('Content-Type: application/json; charset=utf-8');
+		echo json_encode($data, JSON_UNESCAPED_SLASHES);
+		Factory::getApplication()->close();
+	}
+}
@@ -35,7 +35,7 @@ class ResetController extends BaseController
 	 *
 	 * @since   02.21.00
 	 */
-	public function execute(): void
+	public function execute($task = 'reset'): void
 	{
 		$app = Factory::getApplication();

@@ -90,18 +90,18 @@ class ResetController extends BaseController
 	 */
 	private function createService(Registry $params)
 	{
-		$serviceFile = JPATH_PLUGINS . '/system/mokowaas/Service/DemoResetService.php';
+		$serviceFile = JPATH_PLUGINS . '/task/mokowaasdemo/src/Service/DemoResetService.php';

 		if (!file_exists($serviceFile))
 		{
-			throw new \RuntimeException('DemoResetService not found — is the MokoWaaS plugin installed?');
+			throw new \RuntimeException('DemoResetService not found — is the demo reset plugin installed?');
 		}

 		require_once $serviceFile;

 		$media = (bool) $params->get('demo_snapshot_include_media', 1);

-		return new \Moko\Plugin\System\MokoWaaS\Service\DemoResetService($media);
+		return new \Moko\Plugin\Task\MokoWaaSDemo\Service\DemoResetService($media);
 	}

 	/**
@@ -68,7 +68,7 @@ class SnapshotController extends BaseController
 	 *
 	 * @since   02.21.00
 	 */
-	public function execute(): void
+	public function execute($task = 'snapshot'): void
 	{
 		$app = Factory::getApplication();

@@ -118,11 +118,11 @@ class SnapshotController extends BaseController
 	 */
 	private function createService()
 	{
-		$serviceFile = JPATH_PLUGINS . '/system/mokowaas/Service/DemoResetService.php';
+		$serviceFile = JPATH_PLUGINS . '/task/mokowaasdemo/src/Service/DemoResetService.php';

 		if (!file_exists($serviceFile))
 		{
-			throw new \RuntimeException('DemoResetService not found');
+			throw new \RuntimeException('DemoResetService not found — is the demo reset plugin installed?');
 		}

 		require_once $serviceFile;
@@ -132,7 +132,7 @@ class SnapshotController extends BaseController

 		$media = (bool) $params->get('demo_snapshot_include_media', 1);

-		return new \Moko\Plugin\System\MokoWaaS\Service\DemoResetService($media);
+		return new \Moko\Plugin\Task\MokoWaaSDemo\Service\DemoResetService($media);
 	}

 	/**
@@ -26,7 +26,7 @@ use Joomla\Registry\Registry;
 */
 class SyncController extends BaseController
 {
-	public function execute(): void
+	public function execute($task = 'sync'): void
 	{
 		$app = Factory::getApplication();

@@ -57,10 +57,10 @@ class SyncController extends BaseController
 			$params = new Registry($plugin->params);
 			$targets = json_decode($params->get('sync_targets', '[]'), true) ?: [];

-			$serviceFile = JPATH_PLUGINS . '/system/mokowaas/Service/ContentSyncService.php';
+			$serviceFile = JPATH_PLUGINS . '/task/mokowaassync/src/Service/ContentSyncService.php';
 			require_once $serviceFile;

-			$service = new \Moko\Plugin\System\MokoWaaS\Service\ContentSyncService();
+			$service = new \Moko\Plugin\Task\MokoWaaSSync\Service\ContentSyncService();
 			$result  = $service->syncAllTargets($targets);

 			$this->sendJson(200, $result);
@@ -24,7 +24,7 @@ use Joomla\CMS\MVC\Controller\BaseController;
 */
 class SyncReceiveController extends BaseController
 {
-	public function execute(): void
+	public function execute($task = 'syncReceive'): void
 	{
 		$app = Factory::getApplication();

@@ -52,10 +52,10 @@ class SyncReceiveController extends BaseController
 				return;
 			}

-			$serviceFile = JPATH_PLUGINS . '/system/mokowaas/Service/ContentSyncReceiver.php';
+			$serviceFile = JPATH_PLUGINS . '/task/mokowaassync/src/Service/ContentSyncReceiver.php';
 			require_once $serviceFile;

-			$receiver = new \Moko\Plugin\System\MokoWaaS\Service\ContentSyncReceiver();
+			$receiver = new \Moko\Plugin\Task\MokoWaaSSync\Service\ContentSyncReceiver();
 			$result   = $receiver->receive($payload);

 			$this->sendJson(200, $result);
@@ -29,7 +29,7 @@ class UpdateController extends BaseController
 	 *
 	 * @since   1.0.0
 	 */
-	public function execute(): void
+	public function execute($task = 'update'): void
 	{
 		$app = Factory::getApplication();

@@ -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);
+}
@@ -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);
+			});
+		});
+	}
+});
@@ -8,7 +8,7 @@
 DEFGROUP: Joomla.Component
 INGROUP: MokoWaaS
 REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
- VERSION: 02.32.04
+ VERSION: 02.34.16
 PATH: /mokowaas.xml
 BRIEF: Component manifest for MokoWaaS admin dashboard and REST API
 -->
@@ -20,11 +20,23 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.33.01-dev</version>
+	<version>02.34.28-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>
@@ -43,6 +55,7 @@
 		</submenu>
 		<files folder="admin">
 			<filename>access.xml</filename>
+			<filename>catalog.xml</filename>
 			<filename>config.xml</filename>
 			<folder>language</folder>
 			<folder>services</folder>
@@ -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;
+	}
+}
@@ -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);
+	}
+}
@@ -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);
+	}
+}
@@ -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);
+	}
+}
@@ -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);
+	}
+}
@@ -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);
+	}
+}
@@ -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);
+	}
+}
@@ -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);
+	}
+}
@@ -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);
+	}
+}
--- a/Show More
+++ b/Show More