chore(version): auto-bump patch 01.12.02-dev [skip ci]

.mokogitea/CLAUDE.md

@@ -7,7 +7,7 @@ Cross-posting Joomla content to social media, email marketing, and chat platform
 | Field | Value |
 |---|---|
 | **Package** | `pkg_mokosuitecross` |
-| **Language** | PHP 8.3+ |
+| **Language** | PHP 8.1+ |
 | **Branch** | develop on `dev`, merge to `main` (protected) |
 | **Wiki** | [MokoSuiteCross Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteCross/wiki) |
 
@@ -28,7 +28,7 @@ Joomla **package** with core extensions + pluggable service plugins:
 
 ### com_mokosuitecross (Component)
 - Admin backend: dashboard, services, post queue, templates, logs
-- Joomla 6 MVC: Dashboard, Services, Posts, Logs (list/edit each)
+- Joomla 5/6 MVC: Dashboard, Services, Posts, Logs (list/edit each)
 - Namespace: `Joomla\Component\MokoSuiteCross\Administrator`
 
 ### plg_system_mokosuitecross (System Plugin)
@@ -67,14 +67,14 @@ Each platform is a separate plugin implementing `MokoSuiteCrossServiceInterface`
 - **Attribution**: `Authored-by: Moko Consulting`
 - **Workflow directory**: `.mokogitea/` (not `.gitea/` or `.github/`)
 - **Minification**: handled at build time (CI)
-- **Wiki**: documentation lives in the MokoGitea wiki, not `docs/` files
+- **Wiki**: documentation lives in the Gitea wiki, not `docs/` files
-- **Standards**: [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki)
+- **Standards**: [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/mokoplatform/wiki/Home)
 - **UX**: service credentials as individual form fields, not JSON blobs; dashboard link in toolbar
 
 ## Coding Standards
 
-- PHP 8.3+ minimum
+- PHP 8.1+ minimum
-- Joomla 6 DI container pattern: `services/provider.php` → Extension class
+- Joomla 5/6 DI container pattern: `services/provider.php` → Extension class
 - Legacy stub `.php` file required for plugin loader but empty
 - `SubscriberInterface` for event subscription (not `on*` method naming)
 - `bind() → check() → store()` for Table operations (not `save()`)

.mokogitea/ISSUE_TEMPLATE/config.yml

@@ -8,7 +8,7 @@ contact_links:
     url: https://mokoconsulting.tech/
     about: Get help or ask questions through our website
   - name: 📚 MokoStandards Documentation
-    url: https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki
+    url: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
     about: View our coding standards and best practices
   - name: 🔒 Report a Security Vulnerability
     url: https://git.mokoconsulting.tech/mokoconsulting-tech/.github-private/security/advisories/new

.mokogitea/ISSUE_TEMPLATE/feature_request.md

@@ -37,7 +37,7 @@ If you have ideas about how this could be implemented, share them here:
 Add any other context, mockups, or screenshots about the feature request here.
 
 ## Relevant Standards
-Does this relate to any standards in [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki)?
+Does this relate to any standards in [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards)?
 - [ ] Accessibility (WCAG 2.1 AA)
 - [ ] Localization (en_US/en_GB)
 - [ ] Security best practices

.mokogitea/ISSUE_TEMPLATE/security.md

@@ -35,7 +35,7 @@ Use this template only for:
 <!-- Describe how this could be addressed -->
 
 ## Standards Reference
-Does this relate to security standards in [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki)?
+Does this relate to security standards in [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards)?
 - [ ] SPDX license identifiers
 - [ ] Secret management
 - [ ] Dependency security

.mokogitea/workflows/auto-bump.yml

@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /.mokogitea/workflows/auto-bump.yml
 # VERSION: 09.02.00
 # BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
@@ -34,8 +34,7 @@ jobs:
     if: >-
       !contains(github.event.head_commit.message, '[skip ci]') &&
       !contains(github.event.head_commit.message, '[skip bump]') &&
-      !startsWith(github.event.head_commit.message, 'Merge pull request') &&
+      !startsWith(github.event.head_commit.message, 'Merge pull request')
-      !startsWith(github.event.repository.name, 'Template-')
 
     steps:
       - name: Checkout
@@ -53,7 +52,7 @@ jobs:
             echo "MOKO_CLI=/opt/mokocli/cli" >> "$GITHUB_ENV"
           else
             git clone --depth 1 --branch main --quiet \
-              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/MokoCLI.git" \
+              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/mokocli.git" \
               /tmp/mokocli
             cd /tmp/mokocli && composer install --no-dev --no-interaction --quiet
             echo "MOKO_CLI=/tmp/mokocli/cli" >> "$GITHUB_ENV"

.mokogitea/workflows/auto-release.yml

@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
-# PATH: /.mokogitea/workflows/auto-release.yml
+# PATH: /templates/workflows/universal/auto-release.yml.template
-# VERSION: 05.01.00
+# VERSION: 05.00.00
 # BRIEF: Universal build & release � detects platform from manifest.xml
 #
 # +=======================================================================+
@@ -64,14 +64,10 @@ jobs:
   promote-rc:
     name: Promote to RC
     runs-on: release
-    # Skip on template repos (Template-*) — they scaffold other repos and do not release.
     if: >-
-      !startsWith(github.event.repository.name, 'Template-') &&
+      (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
-      (
+      (github.event.action == 'synchronize' && github.event.pull_request.merged != true) ||
-        (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
+      (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc')
-        (github.event.action == 'synchronize' && github.event.pull_request.merged != true) ||
-        (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc')
-      )
 
     steps:
       - name: Checkout repository
@@ -79,7 +75,6 @@ jobs:
         with:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 1
-          submodules: recursive
 
       - name: Setup mokocli tools
         env:
@@ -95,7 +90,7 @@ jobs:
               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/mokocli
-            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoCLI.git
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/mokocli.git
             git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/mokocli
             cd /tmp/mokocli
             composer install --no-dev --no-interaction --quiet
@@ -104,46 +99,18 @@ jobs:
 
       - name: Rename branch to rc
         run: |
-          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          php ${MOKO_CLI}/branch_rename.php \
-          AUTH="Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}"
+            --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
-          FROM="${{ github.event.pull_request.head.ref || 'dev' }}"
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-          PR="${{ github.event.pull_request.number }}"
+            --api-base "${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
-
+            --pr "${{ github.event.pull_request.number }}"
-          # Resolve the source branch HEAD commit.
-          SRC_JSON=$(curl -sf -H "$AUTH" "${API_BASE}/branches/${FROM}") \
-            || { echo "::error::Source branch ${FROM} not found"; exit 1; }
-          SRC_SHA=$(printf '%s' "$SRC_JSON" | python3 -c "import sys, json; print(json.load(sys.stdin)['commit']['id'])" 2>/dev/null || true)
-          [ -n "$SRC_SHA" ] || { echo "::error::Could not resolve HEAD of ${FROM}"; exit 1; }
-
-          # Point rc at the source commit. If rc already exists (a protected branch that
-          # cannot be deleted), force-update its ref in place instead of delete+recreate:
-          # deleting a protected branch fails, which then makes the recreate return HTTP 409.
-          if curl -sf -o /dev/null -H "$AUTH" "${API_BASE}/branches/rc"; then
-            echo "rc exists - force-updating to ${FROM} (${SRC_SHA})"
-            curl -sf -X PATCH -H "$AUTH" -H "Content-Type: application/json" \
-              "${API_BASE}/git/refs/heads/rc" -d "{\"sha\":\"${SRC_SHA}\",\"force\":true}" \
-              || { echo "::error::Failed to force-update rc (CI token needs force-push on the protected rc branch)"; exit 1; }
-          else
-            echo "Creating rc from ${FROM}"
-            curl -sf -X POST -H "$AUTH" -H "Content-Type: application/json" \
-              "${API_BASE}/branches" -d "{\"new_branch_name\":\"rc\",\"old_branch_name\":\"${FROM}\"}" \
-              || { echo "::error::Failed to create rc from ${FROM}"; exit 1; }
-          fi
-
-          # Repoint the PR at rc, then delete the old source branch (non-fatal).
-          if [ -n "$PR" ]; then
-            curl -s -X PATCH -H "$AUTH" -H "Content-Type: application/json" \
-              "${API_BASE}/pulls/${PR}" -d '{"head":"rc"}' >/dev/null || true
-          fi
-          curl -s -X DELETE -H "$AUTH" "${API_BASE}/branches/${FROM}" >/dev/null || true
-          echo "Renamed ${FROM} -> rc"
 
       - name: Checkout rc and configure git
         run: |
           git fetch origin rc
           git checkout rc
-          git config --local user.email "mokogitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "mokogitea-actions[bot]"
+          git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
 
       - name: Publish RC release
@@ -196,13 +163,9 @@ jobs:
   release:
     name: Build & Release Pipeline
     runs-on: release
-    # Skip on template repos (Template-*) — they scaffold other repos and do not release.
     if: >-
-      !startsWith(github.event.repository.name, 'Template-') &&
+      github.event.pull_request.merged == true ||
-      (
+      (github.event_name == 'workflow_dispatch' && inputs.action != 'promote-rc')
-        github.event.pull_request.merged == true ||
-        (github.event_name == 'workflow_dispatch' && inputs.action != 'promote-rc')
-      )
 
     steps:
       - name: Checkout repository
@@ -210,12 +173,11 @@ jobs:
         with:
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           fetch-depth: 0
-          submodules: recursive
 
       - name: Configure git for bot pushes
         run: |
-          git config --local user.email "mokogitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "mokogitea-actions[bot]"
+          git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
 
       - name: Check for merge conflict markers
@@ -246,7 +208,7 @@ jobs:
               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/mokocli
-            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoCLI.git
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/mokocli.git
             git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/mokocli
             cd /tmp/mokocli
             composer install --no-dev --no-interaction --quiet
@@ -382,7 +344,7 @@ jobs:
           content = open('CHANGELOG.md').read()
           old = '## [Unreleased]'
           new = f'## [Unreleased]\n\n## [{version}] --- {date}'
-          content = content if ('## [' + version + ']') in content else content.replace(old, new, 1)
+          content = content.replace(old, new, 1)
           open('CHANGELOG.md', 'w').write(content)
           " "$VERSION" "$DATE"
             git add CHANGELOG.md
@@ -426,7 +388,7 @@ jobs:
             && echo "main branch pushed to GitHub mirror" \
             || echo "WARNING: GitHub mirror push failed"
 
-      - name: "Step 11: Delete rc branch (dev reset moved to cascade-dev.yml)"
+      - name: "Step 11: Delete rc branch and recreate dev from main"
         if: steps.version.outputs.skip != 'true'
         continue-on-error: true
         run: |
@@ -438,9 +400,17 @@ jobs:
             "${API_BASE}/branches/rc" 2>/dev/null \
             && echo "Deleted rc branch" || echo "rc branch not found"
 
-          # dev is reset from main by the dedicated "Cascade Main -> Dev" workflow
+          # Delete dev branch
-          # (cascade-dev.yml), which runs after this release completes.
+          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
-          echo "rc cleaned; dev reset handled by cascade-dev.yml" >> $GITHUB_STEP_SUMMARY
+            "${API_BASE}/branches/dev" 2>/dev/null && echo "Deleted dev branch"
+
+          # Recreate dev from main (now includes version bump + changelog promotion)
+          curl -sf -X POST -H "Authorization: token ${TOKEN}" \
+            -H "Content-Type: application/json" \
+            "${API_BASE}/branches" \
+            -d '{"new_branch_name":"dev","old_branch_name":"main"}' 2>/dev/null && echo "Recreated dev from main"
+
+          echo "Pre-release branches cleaned, dev reset from main" >> $GITHUB_STEP_SUMMARY
 
       - name: "Step 12: Create version branch from main"
         if: steps.version.outputs.skip != 'true'

.mokogitea/workflows/branch-cleanup.yml

@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: MokoStandards.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /.mokogitea/workflows/branch-cleanup.yml
 # VERSION: 01.00.00
 # BRIEF: Delete feature branches after PR merge
@@ -33,8 +33,7 @@ jobs:
         run: |
           BRANCH="${{ github.event.pull_request.head.ref }}"
           API="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}/api/v1/repos/${{ github.repository }}/branches"
-          # URL-encode the branch name's slashes (no PHP dependency on the runner)
+          ENCODED=$(php -r "echo rawurlencode('${BRANCH}');")
-          ENCODED=$(printf '%s' "${BRANCH}" | sed 's|/|%2F|g')
 
           STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X DELETE \
             -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \

.mokogitea/workflows/cascade-dev.yml

@@ -1,106 +1,10 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+# DISABLED — auto-release Step 11 recreates dev from main after every release.
-#
+# Cascade-dev is redundant and causes version conflicts when both main and dev
-# SPDX-License-Identifier: GPL-3.0-or-later
+# have different version numbers in templateDetails.xml / manifest.xml.
-#
+name: "Cascade Main → Dev (DISABLED)"
-# FILE INFORMATION
+on: workflow_dispatch
-# DEFGROUP: MokoGitea.Workflow
-# INGROUP: MokoStandards.Cascade
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /.mokogitea/workflows/cascade-dev.yml
-# VERSION: 02.00.00
-# BRIEF: Cascade main -> dev via PR; auto-merge only if conflict-free, else notify
-
-name: "Cascade Main -> Dev"
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-env:
-  MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-  # ntfy destination is configured via repo or org variables (org vars are inherited).
-  NTFY_URL: ${{ vars.NTFY_URL || 'https://ntfy.mokoconsulting.tech' }}
-  NTFY_TOPIC: ${{ vars.CASCADE_NTFY_TOPIC || vars.NTFY_TOPIC || 'gitea-releases' }}
-
 jobs:
-  cascade:
+  noop:
-    name: Cascade main -> dev
     runs-on: ubuntu-latest
     steps:
-      - name: Open main -> dev PR (auto-merge if clean, else notify)
+      - run: echo "Cascade disabled — auto-release handles dev recreation"
-        env:
-          TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          REPO: ${{ github.repository }}
-        run: |
-          set -uo pipefail
-          API="${MOKOGITEA_URL}/api/v1/repos/${REPO}"
-          AUTH="Authorization: token ${TOKEN}"
-          jqnum() { python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('$1',''))" 2>/dev/null; }
-
-          # 0. dev must exist
-          if ! curl -sf -H "$AUTH" "${API}/branches/dev" >/dev/null 2>&1; then
-            echo "No dev branch - nothing to cascade."; exit 0
-          fi
-
-          # 1. is main ahead of dev?
-          AHEAD=$(curl -sf -H "$AUTH" "${API}/compare/dev...main" \
-            | python3 -c "import sys,json; print(json.load(sys.stdin).get('total_commits',0))" 2>/dev/null || echo 0)
-          if [ "${AHEAD:-0}" -eq 0 ]; then
-            echo "dev already up to date with main."; exit 0
-          fi
-          echo "main is ${AHEAD} commit(s) ahead of dev."
-
-          # 2. reuse an open main->dev PR, else create one
-          PR=$(curl -sf -H "$AUTH" "${API}/pulls?state=open&base=dev" \
-            | python3 -c "import sys,json; d=json.load(sys.stdin); print(next((str(p['number']) for p in d if p.get('head',{}).get('ref')=='main'), ''))" 2>/dev/null || echo "")
-          if [ -z "$PR" ]; then
-            RESP=$(curl -s -H "$AUTH" -H "Content-Type: application/json" -X POST "${API}/pulls" \
-              -d '{"head":"main","base":"dev","title":"chore(sync): cascade main -> dev","body":"Automated cascade of main into dev. Auto-merges only if conflict-free; otherwise left open for manual resolution."}')
-            PR=$(printf '%s' "$RESP" | jqnum number)
-            if [ -z "$PR" ]; then
-              echo "::warning::Could not open cascade PR: $RESP"; exit 0
-            fi
-            echo "Opened cascade PR #${PR}"
-          else
-            echo "Reusing open cascade PR #${PR}"
-          fi
-
-          # 3. wait for MokoGitea to compute mergeability (conflict detection)
-          MERGEABLE=""
-          for _ in 1 2 3 4 5 6; do
-            MERGEABLE=$(curl -sf -H "$AUTH" "${API}/pulls/${PR}" | jqnum mergeable)
-            case "$MERGEABLE" in True|False) break ;; esac
-            sleep 3
-          done
-          echo "mergeable=${MERGEABLE}"
-
-          notify() {
-            curl -sS \
-              -H "Title: ${REPO}: dev cascade needs manual merge" \
-              -H "Tags: warning,twisted_rightwards_arrows" \
-              -H "Priority: high" \
-              -H "Click: ${MOKOGITEA_URL}/${REPO}/pulls/${PR}" \
-              -d "main -> dev cascade PR #${PR} $1 It was NOT auto-merged; resolve it manually." \
-              "${NTFY_URL}/${NTFY_TOPIC}" || true
-          }
-
-          # 4. auto-merge only if conflict-free; otherwise notify
-          if [ "$MERGEABLE" = "True" ]; then
-            CODE=$(curl -s -o /tmp/merge.json -w "%{http_code}" -H "$AUTH" -H "Content-Type: application/json" \
-              -X POST "${API}/pulls/${PR}/merge" -d '{"Do":"merge","merge_when_checks_succeed":true}')
-            if [ "$CODE" -ge 200 ] && [ "$CODE" -lt 300 ]; then
-              echo "Cascade PR #${PR} merged (or scheduled to merge when checks pass)."
-            else
-              echo "::warning::Auto-merge returned HTTP ${CODE}: $(cat /tmp/merge.json)"
-              notify "could not be auto-merged (HTTP ${CODE})."
-            fi
-          else
-            echo "::warning::Cascade PR #${PR} has conflicts (mergeable=${MERGEABLE}); sending notification."
-            notify "has conflicts and cannot be merged automatically."
-          fi

.mokogitea/workflows/ci-generic.yml

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: MokoStandards.CI
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /.mokogitea/workflows/ci-generic.yml
+# PATH: /.gitea/workflows/ci-generic.yml
 # VERSION: 01.00.00
 # BRIEF: CI pipeline — lint, validate, and test for generic projects (PHP + Node.js)
 
@@ -32,8 +32,6 @@ jobs:
   lint:
     name: Lint & Validate
     runs-on: ubuntu-latest
-    # Skip on template repos (Template-*) — they hold placeholder scaffolding, not buildable source.
-    if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
 
     steps:
       - name: Checkout
@@ -131,11 +129,7 @@ jobs:
   test:
     name: Tests
     runs-on: ubuntu-latest
-    # Independent job (no `needs: lint`): the Gitea Actions scheduler does not
+    needs: lint
-    # offer the dependent 2nd job of a needs-chain to runners, so it stalls in
-    # "waiting" and is reaped by ABANDONED_JOB_TIMEOUT. Guard template repos
-    # directly (same condition lint uses) instead of gating on lint's result.
-    if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
 
     steps:
       - name: Checkout

.mokogitea/workflows/ci-issue-reporter.yml

@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /.mokogitea/workflows/ci-issue-reporter.yml
 # VERSION: 01.00.00
-# BRIEF: Reusable workflow — creates/updates a MokoGitea issue when a CI gate fails.
+# BRIEF: Reusable workflow — creates/updates a Gitea issue when a CI gate fails.
 #        Clones MokoCLI and runs cli/ci_issue_reporter.sh.
 
 name: "Universal: CI Issue Reporter"

.mokogitea/workflows/cleanup.yml

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: MokoStandards.Maintenance
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
-# PATH: /.mokogitea/workflows/cleanup.yml
+# PATH: /.gitea/workflows/cleanup.yml
 # VERSION: 01.00.00
 # BRIEF: Scheduled cleanup — delete merged branches and old workflow runs
 
@@ -50,7 +50,7 @@ jobs:
           for BRANCH in $BRANCHES; do
             # Skip protected branches
             case "$BRANCH" in
-              main|master|dev|develop|rc|beta|alpha|release|release/*|production|stable|staging|hotfix/*|version/*) continue ;;
+              main|master|develop|release/*|hotfix/*) continue ;;
             esac
 
             # Check if branch is merged into main

.mokogitea/workflows/deploy-manual.yml

@@ -0,0 +1,126 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: MokoStandards.Deploy
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
+# PATH: /templates/workflows/joomla/deploy-manual.yml.template
+# VERSION: 04.07.00
+# BRIEF: Manual SFTP deploy to dev server for Joomla repos
+
+name: "Universal: Deploy to Dev (Manual)"
+
+on:
+  workflow_dispatch:
+    inputs:
+      clear_remote:
+        description: 'Delete all remote files before uploading'
+        required: false
+        default: 'false'
+        type: boolean
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    name: SFTP Deploy to Dev
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Setup PHP
+        run: |
+          php -v && composer --version
+
+      - name: Setup MokoStandards tools
+        env:
+          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
+          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
+          MOKO_CLONE_HOST: ${{ secrets.MOKOGITEA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
+          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.MOKOGITEA_TOKEN || github.token }}"}}'
+        run: |
+          git clone --depth 1 --branch main --quiet \
+            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \
+            /tmp/mokostandards-api 2>/dev/null || true
+          if [ -d "/tmp/mokostandards-api" ] && [ -f "/tmp/mokostandards-api/composer.json" ]; then
+            cd /tmp/mokostandards-api && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
+          fi
+
+      - name: Check FTP configuration
+        id: check
+        env:
+          HOST: ${{ vars.DEV_FTP_HOST }}
+          PATH_VAR: ${{ vars.DEV_FTP_PATH }}
+          PORT: ${{ vars.DEV_FTP_PORT }}
+        run: |
+          if [ -z "$HOST" ] || [ -z "$PATH_VAR" ]; then
+            echo "DEV_FTP_HOST or DEV_FTP_PATH not configured -- cannot deploy"
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          echo "skip=false" >> "$GITHUB_OUTPUT"
+          echo "host=$HOST" >> "$GITHUB_OUTPUT"
+
+          REMOTE="${PATH_VAR%/}"
+          echo "remote=$REMOTE" >> "$GITHUB_OUTPUT"
+
+          [ -z "$PORT" ] && PORT="22"
+          echo "port=$PORT" >> "$GITHUB_OUTPUT"
+
+      - name: Deploy via SFTP
+        if: steps.check.outputs.skip != 'true'
+        env:
+          SFTP_KEY: ${{ secrets.DEV_FTP_KEY }}
+          SFTP_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
+          SFTP_USER: ${{ vars.DEV_FTP_USERNAME }}
+        run: |
+          SOURCE_DIR="src"
+          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
+          [ ! -d "$SOURCE_DIR" ] && { echo "No src/ or htdocs/ -- nothing to deploy"; exit 0; }
+
+          printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
+            "${{ steps.check.outputs.host }}" "${{ steps.check.outputs.port }}" "$SFTP_USER" "${{ steps.check.outputs.remote }}" \
+            > /tmp/sftp-config.json
+
+          if [ -n "$SFTP_KEY" ]; then
+            echo "$SFTP_KEY" > /tmp/deploy_key
+            chmod 600 /tmp/deploy_key
+            printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
+          else
+            printf ',"password":"%s"}' "$SFTP_PASS" >> /tmp/sftp-config.json
+          fi
+
+          DEPLOY_ARGS=(--path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json)
+          [ "${{ inputs.clear_remote }}" = "true" ] && DEPLOY_ARGS+=(--clear-remote)
+
+          PLATFORM=$(php /tmp/mokostandards-api/cli/platform_detect.php --path . 2>/dev/null || true)
+          if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/mokostandards-api/deploy/deploy-joomla.php" ]; then
+            php /tmp/mokostandards-api/deploy/deploy-joomla.php "${DEPLOY_ARGS[@]}"
+          else
+            php /tmp/mokostandards-api/deploy/deploy-sftp.php "${DEPLOY_ARGS[@]}"
+          fi
+
+          rm -f /tmp/deploy_key /tmp/sftp-config.json
+
+      - name: Summary
+        if: always()
+        run: |
+          if [ "${{ steps.check.outputs.skip }}" = "true" ]; then
+            echo "### Deploy Skipped -- FTP not configured" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "### Manual Dev Deploy Complete" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
+            echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
+            echo "| Host | \`${{ steps.check.outputs.host }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Remote | \`${{ steps.check.outputs.remote }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Clear | ${{ inputs.clear_remote }} |" >> $GITHUB_STEP_SUMMARY
+          fi

.mokogitea/workflows/gitleaks.yml

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: MokoStandards.Security
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/MokoStandards-API
-# PATH: /.mokogitea/workflows/gitleaks.yml
+# PATH: /templates/workflows/gitleaks.yml.template
 # VERSION: 01.00.00
 # BRIEF: Secret scanning — detect leaked credentials, API keys, and tokens
 #

.mokogitea/workflows/issue-branch.yml

@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 01.14.01
+# VERSION: 01.12.02
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

.mokogitea/workflows/notify.yml

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: MokoStandards.Notifications
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
-# PATH: /.mokogitea/workflows/notify.yml
+# PATH: /.gitea/workflows/notify.yml
 # VERSION: 01.00.00
 # BRIEF: Push notifications via ntfy on release success or workflow failure
 
@@ -15,9 +15,9 @@ name: "Universal: Notifications"
 on:
   workflow_run:
     workflows:
-      - "Universal: Build & Release"
+      - "Joomla Build & Release"
-      - "Joomla: Extension CI"
+      - "Joomla Extension CI"
-      - "Generic: Project CI"
+      - "Deploy"
     types:
       - completed
 
@@ -46,13 +46,13 @@ jobs:
           WORKFLOW="${{ github.event.workflow_run.name }}"
           URL="${{ github.event.workflow_run.html_url }}"
 
-          curl -sS --retry 3 --retry-connrefused --retry-delay 2 --max-time 20 \
+          curl -sS \
             -H "Title: ${REPO} released" \
             -H "Tags: white_check_mark,package" \
             -H "Priority: default" \
             -H "Click: ${URL}" \
             -d "${WORKFLOW} completed successfully." \
-            "${NTFY_URL}/${NTFY_TOPIC}" || echo "::warning::ntfy notification could not be delivered (non-fatal)"
+            "${NTFY_URL}/${NTFY_TOPIC}"
 
       - name: Notify on failure
         if: github.event.workflow_run.conclusion == 'failure'
@@ -61,10 +61,10 @@ jobs:
           WORKFLOW="${{ github.event.workflow_run.name }}"
           URL="${{ github.event.workflow_run.html_url }}"
 
-          curl -sS --retry 3 --retry-connrefused --retry-delay 2 --max-time 20 \
+          curl -sS \
             -H "Title: ${REPO} workflow failed" \
             -H "Tags: x,warning" \
             -H "Priority: high" \
             -H "Click: ${URL}" \
             -d "${WORKFLOW} failed. Check the run for details." \
-            "${NTFY_URL}/${NTFY_TOPIC}" || echo "::warning::ntfy notification could not be delivered (non-fatal)"
+            "${NTFY_URL}/${NTFY_TOPIC}"

.mokogitea/workflows/pr-check.yml

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
-# INGROUP: mokocli.CI
+# INGROUP: moko-platform.CI
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
-# PATH: /.mokogitea/workflows/pr-check.yml
+# PATH: /templates/workflows/universal/pr-check.yml.template
 # VERSION: 09.23.00
 # BRIEF: PR gate — branch policy + code validation before merge
 
@@ -47,15 +47,15 @@ jobs:
               fi
               ;;
             fix/*|bugfix/*)
-              if [ "$BASE" != "dev" ] && [ "$BASE" != "main" ]; then
+              if [ "$BASE" != "dev" ]; then
                 ALLOWED=false
-                REASON="Fix branches must target 'dev' or 'main', not '${BASE}'"
+                REASON="Fix branches must target 'dev', not '${BASE}'"
               fi
               ;;
             patch/*)
-              if [ "$BASE" != "dev" ] && [ "$BASE" != "rc" ] && [ "$BASE" != "main" ]; then
+              if [ "$BASE" != "dev" ] && [ "$BASE" != "rc" ]; then
                 ALLOWED=false
-                REASON="Patch branches must target 'dev', 'rc', or 'main', not '${BASE}'"
+                REASON="Patch branches must target 'dev' or 'rc', not '${BASE}'"
               fi
               ;;
             hotfix/*)
@@ -86,8 +86,7 @@ jobs:
             echo "" >> $GITHUB_STEP_SUMMARY
             echo "### Allowed merge paths:" >> $GITHUB_STEP_SUMMARY
             echo "- \`feature/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY
-            echo "- \`fix/*\` → \`dev\` or \`main\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`fix/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY
-            echo "- \`patch/*\` → \`dev\`, \`rc\`, or \`main\`" >> $GITHUB_STEP_SUMMARY
             echo "- \`hotfix/*\` → \`dev\` or \`main\`" >> $GITHUB_STEP_SUMMARY
             echo "- \`dev\` → \`main\`" >> $GITHUB_STEP_SUMMARY
             echo "- \`rc/*\` → \`main\`" >> $GITHUB_STEP_SUMMARY
@@ -97,80 +96,6 @@ jobs:
           echo "Branch policy: OK (${HEAD} → ${BASE})"
           echo "## Branch Policy: Passed" >> $GITHUB_STEP_SUMMARY
 
-  # ── Docs Update Gate (main PRs) ─────────────────────────────────────────
-  require-docs:
-    name: Require Docs Update
-    runs-on: ubuntu-latest
-    # Enforce only on PRs merging into main: README.md + CHANGELOG.md must both be updated.
-    if: ${{ github.base_ref == 'main' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Require README.md and CHANGELOG.md in the PR diff
-        run: |
-          BASE="${{ github.event.pull_request.base.sha }}"
-          HEAD="${{ github.event.pull_request.head.sha }}"
-          CHANGED="$(git diff --name-only "$BASE" "$HEAD" 2>/dev/null || true)"
-          if [ -z "$CHANGED" ]; then
-            git fetch -q origin "${{ github.base_ref }}" 2>/dev/null || true
-            CHANGED="$(git diff --name-only "origin/${{ github.base_ref }}...HEAD" 2>/dev/null || true)"
-          fi
-          echo "Changed files in PR:"
-          echo "$CHANGED"
-          MISSING=""
-          echo "$CHANGED" | grep -qxE 'README\.md' || MISSING="README.md"
-          echo "$CHANGED" | grep -qxE 'CHANGELOG\.md' || MISSING="${MISSING:+$MISSING, }CHANGELOG.md"
-          if [ -n "$MISSING" ]; then
-            echo "::error::PRs into main must update: ${MISSING}"
-            {
-              echo "## Docs Update Required"
-              echo ""
-              echo "PRs merging into \`main\` must update both **README.md** and **CHANGELOG.md**."
-              echo ""
-              echo "Not updated in this PR: **${MISSING}**"
-            } >> "$GITHUB_STEP_SUMMARY"
-            exit 1
-          fi
-          echo "Docs update present (README.md + CHANGELOG.md)"
-          echo "## Docs Update: Passed" >> "$GITHUB_STEP_SUMMARY"
-
-  # ── Wiki Update Reminder (main PRs, non-blocking) ───────────────────────
-  wiki-reminder:
-    name: Wiki Update Reminder
-    runs-on: ubuntu-latest
-    if: ${{ github.base_ref == 'main' }}
-    steps:
-      - name: Remind to update the wiki
-        env:
-          TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          SERVER: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-          REPO: ${{ github.repository }}
-          PR: ${{ github.event.pull_request.number }}
-        run: |
-          set -uo pipefail
-          {
-            echo "## Wiki Update Reminder"
-            echo ""
-            echo "Docs are **wiki-first** at MokoConsulting. If this change affects behavior, usage, configuration, or standards, update the repo wiki:"
-            echo ""
-            echo "- ${SERVER}/${REPO}/wiki"
-            echo ""
-            echo "_Non-blocking reminder._"
-          } >> "$GITHUB_STEP_SUMMARY"
-          # Post a single PR comment (idempotent via hidden marker); best-effort, never fails.
-          API="${SERVER}/api/v1/repos/${REPO}/issues/${PR}/comments"
-          if [ -n "${TOKEN:-}" ] && [ -n "${PR:-}" ]; then
-            existing="$(curl -sf -H "Authorization: token ${TOKEN}" "$API" 2>/dev/null | grep -c 'wiki-reminder' || true)"
-            if [ "${existing:-0}" -eq 0 ]; then
-              curl -sf -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" -X POST "$API" \
-                -d '{"body":"<!-- wiki-reminder -->\n\n**Wiki reminder:** docs are wiki-first -- if this PR changes behavior, usage, config, or standards, please update the repo wiki before/after merge. _(non-blocking)_"}' >/dev/null 2>&1 || true
-            fi
-          fi
-          echo "Wiki reminder emitted (non-blocking)."
-
   # ── Secret Scanning ──────────────────────────────────────────────────
   gitleaks:
     name: Secret Scan
@@ -201,8 +126,6 @@ jobs:
   validate:
     name: Validate PR
     runs-on: ubuntu-latest
-    # Skip on template repos (Template-*) — no real manifest/source/changelog to validate.
-    if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
 
     steps:
       - name: Checkout
@@ -210,7 +133,7 @@ jobs:
 
       - name: Check for merge conflict markers
         run: |
-          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --exclude-dir='.git' --exclude-dir='.mokogitea' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
+          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
           if [ -n "$CONFLICTS" ]; then
             echo "::error::Merge conflict markers found in source files"
             echo "## Conflict Markers Found" >> $GITHUB_STEP_SUMMARY
@@ -224,12 +147,11 @@ jobs:
       - name: Detect platform
         id: platform
         run: |
-          # Platform comes from the MokoGitea metadata API (public GET); manifest.xml is no longer used.
+          # Read platform from XML manifest (<platform> tag) or plain text fallback
-          API="${GITHUB_SERVER_URL:-https://git.mokoconsulting.tech}/api/v1/repos/${GITHUB_REPOSITORY}/metadata"
+          PLATFORM=$(sed -n 's/.*<platform>\([^<]*\)<\/platform>.*/\1/p' .mokogitea/manifest.xml 2>/dev/null | head -1)
-          PLATFORM="$(curl -sf "$API" 2>/dev/null | python3 -c "import sys, json; print(json.load(sys.stdin).get('platform') or '')" 2>/dev/null || true)"
+          [ -z "$PLATFORM" ] && PLATFORM=$(cat .mokogitea/manifest.xml 2>/dev/null | tr -d '[:space:]')
           [ -z "$PLATFORM" ] && PLATFORM="generic"
           echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT"
-          echo "Detected platform: $PLATFORM"
 
       - name: Setup PHP
         if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr'
@@ -258,9 +180,8 @@ jobs:
           while IFS= read -r -d '' file; do
             # Skip vendor, node_modules, and index.html stub files
             case "$file" in ./vendor/*|./node_modules/*) continue ;; esac
-            # Scan the whole file for the JEXEC/JPATH guard: it is placed after
+            # Check first 10 lines for JEXEC or JPATH guard
-            # the SPDX/file-header docblock, which commonly runs past 20 lines.
+            if ! head -20 "$file" | grep -qE "defined\s*\(\s*['\"](_JEXEC|JPATH_BASE|\\\\JPATH_PLATFORM)['\"]"; then
-            if ! grep -qE "defined\s*\(\s*['\"](_JEXEC|JPATH_BASE|\\\\JPATH_PLATFORM)['\"]" "$file"; then
               echo "::error file=${file}::Missing JEXEC guard: ${file}"
               ERRORS=$((ERRORS + 1))
             fi
@@ -351,7 +272,7 @@ jobs:
             joomla)
               MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" -exec grep -l '<extension' {} \; 2>/dev/null | head -1)
               if [ -z "$MANIFEST" ]; then
-                echo "::warning::No Joomla manifest found (MokoSuite site)"
+                echo "::warning::No Joomla manifest found (WaaS site)"
                 exit 0
               fi
               echo "Manifest: ${MANIFEST}"
@@ -364,7 +285,7 @@ jobs:
               # Block legacy raw/branch update server URLs on MokoGitea
               RAW_URLS=$(grep -n 'raw/branch' "$MANIFEST" | grep -i 'mokoconsulting\|mokogitea\|git\.mokoconsulting\.tech' || true)
               if [ -n "$RAW_URLS" ]; then
-                echo "::error::Manifest contains legacy raw/branch update server URL on MokoGitea. Use the MokoGitea Pages URL instead (e.g. /{REPO}/updates.xml not /{REPO}/raw/branch/main/updates.xml)"
+                echo "::error::Manifest contains legacy raw/branch update server URL on MokoGitea. Use the Gitea Pages URL instead (e.g. /{REPO}/updates.xml not /{REPO}/raw/branch/main/updates.xml)"
                 echo "$RAW_URLS"
                 exit 1
               fi
@@ -571,9 +492,6 @@ jobs:
     name: Build RC Package
     runs-on: ubuntu-latest
     needs: [branch-policy, validate]
-    # Run only when both gates succeeded; always() forces evaluation so a skipped
-    # validate (e.g. template repos) skips this job cleanly instead of hanging.
-    if: ${{ always() && needs.branch-policy.result == 'success' && needs.validate.result == 'success' }}
 
     steps:
       - name: Trigger RC pre-release

.mokogitea/workflows/pre-release.yml

@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
-# PATH: /.mokogitea/workflows/pre-release.yml
+# PATH: /templates/workflows/universal/pre-release.yml.template
-# VERSION: 05.02.01
+# VERSION: 05.02.00
 # BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
 
 name: "Universal: Pre-Release"
@@ -48,13 +48,9 @@ jobs:
   build:
     name: "Build Pre-Release (${{ inputs.stability || github.ref_name }})"
     runs-on: release
-    # Skip on template repos (Template-*) — they scaffold other repos and do not release.
     if: >-
-      !startsWith(github.event.repository.name, 'Template-') &&
+      github.event_name == 'workflow_dispatch' ||
-      (
+      github.event_name == 'push'
-        github.event_name == 'workflow_dispatch' ||
-        github.event_name == 'push'
-      )
 
     steps:
       - name: Checkout
@@ -84,7 +80,7 @@ jobs:
               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/mokocli
-            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoCLI.git
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/mokocli.git
             git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/mokocli
             cd /tmp/mokocli && composer install --no-dev --no-interaction --quiet
             echo MOKO_CLI=/tmp/mokocli/cli >> $GITHUB_ENV
@@ -156,19 +152,13 @@ jobs:
           fi
 
           # Commit version bump
-          git config --local user.email "mokogitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "mokogitea-actions[bot]"
+          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]"
-            # Push the bump commit, but do NOT fail the release if the target branch
+            git push origin HEAD 2>&1
-            # is protected and the release identity is not on the push allowlist.
-            # The build proceeds from the in-tree bumped version regardless; if the
-            # push is rejected, the next run simply re-bumps from the same base.
-            if ! git push origin HEAD 2>&1; then
-              echo "::warning::Version-bump commit could not be pushed (protected branch?). Building from in-tree version ${VERSION} anyway."
-            fi
           }
 
           # Auto-detect element via manifest_element.php
@@ -280,4 +270,4 @@ jobs:
           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
+          echo "| SHA-256 | \`${SHA256:-n/a}\` |" >> $GITHUB_STEP_SUMMARY

.mokogitea/workflows/rc-revert.yml

@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /.mokogitea/workflows/rc-revert.yml
 # VERSION: 09.23.00
 # BRIEF: Rename rc/ branch back to dev/ when PR is closed without merge
@@ -25,8 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     if: >-
       github.event.pull_request.merged == false &&
-      startsWith(github.event.pull_request.head.ref, 'rc/') &&
+      startsWith(github.event.pull_request.head.ref, 'rc/')
-      !startsWith(github.event.repository.name, 'Template-')
 
     steps:
       - name: Rename branch

.mokogitea/workflows/repo-health.yml

@@ -6,10 +6,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Validation
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
-# PATH: /.mokogitea/workflows/repo-health.yml
+# PATH: /templates/workflows/joomla/repo_health.yml.template
 # VERSION: 09.23.00
 # BRIEF: Enforces repository guardrails by validating scripts governance, tooling availability, and core repository health artifacts.
 # ============================================================================
@@ -88,7 +88,7 @@ jobs:
 
           # Hardcoded authorized users — always allowed
           case "$ACTOR" in
-            jmiller|mokogitea-actions[bot])
+            jmiller|gitea-actions[bot])
               ALLOWED=true
               PERMISSION=admin
               METHOD="hardcoded allowlist"

.mokogitea/workflows/sync-on-merge.yml

@@ -1,32 +0,0 @@
-name: Sync Workflows to Repos
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.mokogitea/workflows/**'
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    if: ${{ startsWith(github.event.repository.name, 'Template-') }}
-    steps:
-      - name: Checkout mokocli
-        uses: actions/checkout@v4
-        with:
-          repository: MokoConsulting/MokoCLI
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
-
-      - name: Setup PHP
-        uses: https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/raw/branch/main/actions/setup-php@v1
-        with:
-          php-version: '8.1'
-
-      - name: Install dependencies
-        run: composer install --no-dev --no-interaction
-
-      - name: Sync workflows to generic repos
-        run: php automation/bulk_sync.php --platform generic --org MokoConsulting --workflows-only --auto-merge --token "${{ secrets.MOKOGITEA_TOKEN }}"
-        env:
-          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}

.mokogitea/workflows/version-set.yml

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow.Template
+# DEFGROUP: Gitea.Workflow.Template
 # INGROUP: MokoStandards.CI
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
 # PATH: /.mokogitea/workflows/version-set.yml
@@ -34,7 +34,6 @@ jobs:
   set-version:
     name: Set Version to ${{ inputs.version }}
     runs-on: ubuntu-latest
-    if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
 
     steps:
       - name: Validate version format

.mokogitea/workflows/workflow-sync-trigger.yml

@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
+# DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /.mokogitea/workflows/workflow-sync-trigger.yml
 # VERSION: 01.01.00
 # BRIEF: Trigger workflow sync to live repos when a PR is merged to main
@@ -27,10 +27,9 @@ jobs:
     name: Sync workflows to live repos
     runs-on: ubuntu-latest
     if: >-
-      startsWith(github.event.repository.name, 'Template-') &&
+      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'workflow_dispatch' ||
       (github.event.pull_request.merged == true &&
-      !contains(github.event.pull_request.title, '[skip sync]')))
+      !contains(github.event.pull_request.title, '[skip sync]'))
 
     steps:
       - name: Determine platform from repo name
@@ -53,7 +52,7 @@ jobs:
           MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
         run: |
           MOKOGITEA_URL="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}"
-          git clone --depth 1 "${MOKOGITEA_URL}/MokoConsulting/MokoCLI.git" /tmp/mokocli
+          git clone --depth 1 "${MOKOGITEA_URL}/MokoConsulting/mokocli.git" /tmp/mokocli
 
       - name: Install PHP
         run: |

CHANGELOG.md

@@ -1,15 +1,6 @@
 # Changelog
 ## [Unreleased]
 
-## [01.14.00] --- 2026-07-13
-
-### Added
-- **Admin menu short-name constant** — the Administrator → Components menu now shows a compact label via `COM_MOKOSUITECROSS_SHORT` ("Cross"); defined in the admin sys.ini (#255)
-
-## [01.13.00] --- 2026-06-29
-
-## [01.13.00] --- 2026-06-29
-
 ## [01.12.00] --- 2026-06-28
 
 ## [01.12.00] --- 2026-06-28
@@ -59,3 +50,52 @@
 - **Content plugin**: Remove Joomla 5 typed event hints -- Joomla 6 dispatches `Model\AfterSaveEvent` instead of `Content\AfterSaveEvent`, causing fatal TypeError on article save
 - **PreviewController**: Add ACL check and parameterized query to prevent unauthorized article access (IDOR)
 - Webservices plugin Joomla 6 compatibility -- `onBeforeApiRoute` receives `BeforeApiRouteEvent` object, extract router via `$event->getRouter()`
+
+## [01.07.00] --- 2026-06-23
+
+## [01.07.00] --- 2026-06-23
+
+### Added
+- **Full ACL system**: 12 granular permissions in access.xml with permissions fieldset in config.xml
+- **ACL enforcement**: All controllers and views check permissions before allowing actions
+- **MokoSuiteCrossHelper::getActions()**: Centralized ACL helper for toolbar and view logic
+
+### Fixed
+- **License warning**: Removed duplicate from system plugin (install script already shows it)
+- **Content plugin**: Fixed func_get_arg crash when non-article content is saved (e.g. update sites, installer)
+
+## [01.05.00] --- 2026-06-23
+
+## [01.05.00] --- 2026-06-23
+
+### Added
+- **Instagram plugin**: Cross-post to Instagram via Meta Content Publishing API (2-step container flow)
+- **YouTube plugin**: Cross-post to YouTube via Data API v3 channel bulletins
+- **Share Content panel**: Per-article editor panel with platform-specific share text fields
+- **New placeholders**: {social}, {short}, {chat}, {email_subject}, {email_body} for platform-optimized templates
+- **Share image control**: Choose intro image, fulltext image, custom image, or no image per article
+- **Mailchimp templates**: Support Mailchimp saved templates with section injection, plus responsive email wrapper fallback
+- **Delete from platforms**: New MokoSuiteCrossDeleteInterface for removing cross-posted content from remote platforms
+- **Delete support**: Twitter, Mastodon, Bluesky, Facebook, LinkedIn, Telegram, Discord (7 of 38 plugins)
+- **Auto-delete on unpublish**: Component config option to delete from platforms when articles are unpublished or trashed
+- **UTM auto-tagging**: Append utm_source, utm_medium, utm_campaign to shared URLs with {platform} token support
+- **Caption rotation**: {random:opt1|opt2|opt3} placeholder picks a random option per post
+- **{url_raw} placeholder**: Clean article URL without UTM parameters
+- **Mastodon enhancements**: Visibility levels, content warnings, scheduled posts, polls, language tags
+- **Bluesky threads**: Auto-split long messages into reply chains at sentence boundaries
+- **Bluesky link cards**: External link card embeds with article title and description
+- **Ntfy default server**: Default server changed to ntfy.mokoconsulting.tech with configurable plugin params
+
+### Changed
+- **Default templates**: Updated to use platform-specific placeholders (social/short/chat/email) with graceful fallback
+
+### Fixed
+- **Mailchimp**: Fixed broken namespace placeholder in XML manifest
+- **ConvertKit**: Removed duplicate curl_setopt_array with undefined $token
+- **Brevo**: Removed duplicate curl_setopt_array with undefined $token and wrong auth header
+- **Constant Contact**: Removed duplicate curl_setopt_array
+- **Mailchimp**: Fixed campaign creation checking HTTP 200 instead of 2xx range
+- **Medium**: Fixed getUserId() returning array instead of string on error
+- **Bluesky**: Replaced md5() with hash('sha256', ...) for cache key
+- **ServiceController**: Exception details no longer exposed to client
+- **License warning**: Removed duplicate from system plugin -- install script already shows it with direct edit link

CLAUDE.md

@@ -13,7 +13,7 @@ This file provides guidance to Claude Code when working with this repository.
 | **Default branch** | main |
 | **License** | GPL-3.0-or-later |
 | **Wiki** | [MokoSuiteCross Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteCross/wiki) |
-| **Standards** | [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki) |
+| **Standards** | [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home) |
 
 ## Common Commands
 
@@ -36,7 +36,7 @@ This is a Joomla **package** extension (`pkg_mokosuitecross`) containing sub-ext
 
 ### com_mokosuitecross (Component)
 - Admin backend for managing services, post queue, templates, and logs
-- Joomla 6 MVC: Dashboard, Services, Posts, Logs (list/edit each)
+- Joomla 5/6 MVC: Dashboard, Services, Posts, Logs (list/edit each)
 - Namespace: `Joomla\Component\MokoSuiteCross\Administrator`
 - Database tables: `#__mokosuitecross_services`, `#__mokosuitecross_posts`, `#__mokosuitecross_templates`, `#__mokosuitecross_logs`
 
@@ -97,13 +97,13 @@ Four tables:
 - **Attribution**: use `Authored-by: Moko Consulting` in commits
 - **Branch strategy**: develop on `dev`, merge to `main` for release
 - **Minification**: handled at build time (CI)
-- **Wiki**: documentation lives in the MokoGitea wiki, not in `docs/` files
+- **Wiki**: documentation lives in the Gitea wiki, not in `docs/` files
-- **Standards**: this repo follows [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki)
+- **Standards**: this repo follows [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)
 
 ## Coding Standards
 
-- PHP 8.3+ minimum
+- PHP 8.1+ minimum
-- Joomla 6 DI container pattern: `services/provider.php` → Extension class
+- Joomla 5/6 DI container pattern: `services/provider.php` → Extension class
 - Legacy stub `.php` file required for plugin loader but empty
 - `SubscriberInterface` for event subscription (not `on*` method naming)
 - `bind() → check() → store()` for Table operations (not `save()`)

CODE_OF_CONDUCT.md

@@ -14,7 +14,7 @@
 	DEFGROUP: Template-Joomla
 	INGROUP: Template-Joomla.Documentation
 	REPO: https://github.com/mokoconsulting-tech/Template-Joomla/
-  VERSION: 01.14.01
+  VERSION: 01.12.02
   PATH: ./CODE_OF_CONDUCT.md
   BRIEF: Community expectations and enforcement guidelines
   NOTE: Adapted with attribution from the Contributor Covenant v2.1

CONTRIBUTING.md

@@ -34,7 +34,7 @@ feature/* ──PR──> dev ──draft PR──> (renamed to rc) ──merge
 7. **Merging to main** triggers the stable release pipeline:
    - Minor version bump (e.g., `02.09.xx` → `02.10.00`)
    - Stability suffix stripped (clean version)
-   - MokoGitea release created with ZIP/tar.gz packages
+   - Gitea release created with ZIP/tar.gz packages
    - `updates.xml` updated (Joomla extensions)
    - `dev` branch recreated from `main`
 

GOVERNANCE.md

@@ -19,12 +19,12 @@
  DEFGROUP: mokoconsulting-tech.Template-Joomla
  INGROUP: MokoStandards.Governance
  REPO: https://github.com/mokoconsulting-tech/Template-Joomla
- VERSION: 01.14.01
+ VERSION: 01.12.02
  PATH: /GOVERNANCE.md
  BRIEF: Project governance rules, roles, and decision process for Template-Joomla
 -->
 
-[![MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki)](https://github.com/mokoconsulting-tech/MokoStandards)
+[![MokoStandards](https://img.shields.io/badge/MokoStandards-04.00.04-blue)](https://github.com/mokoconsulting-tech/MokoStandards)
 
 # Project Governance
 
@@ -32,7 +32,7 @@
 
 This document defines the governance model for the `Template-Joomla` repository within the
 `mokoconsulting-tech` organization. It is automatically maintained by
-[MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki) v04.00.04.
+[MokoStandards](https://github.com/mokoconsulting-tech/MokoStandards) v04.00.04.
 
 Full governance policy is defined in the MokoStandards source repository:
 [docs/policy/GOVERNANCE.md](https://github.com/mokoconsulting-tech/MokoStandards/blob/main/docs/policy/GOVERNANCE.md)

README.md

@@ -1,6 +1,6 @@
 # MokoSuiteCross
 
-<!-- VERSION: 01.14.01 -->
+<!-- VERSION: 01.12.02 -->
 
 Cross-posting Joomla content to social media, email marketing, and chat platforms for Joomla 6.
 

SECURITY.md

@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
 INGROUP: Template-Joomla.Documentation
 REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
 PATH: /SECURITY.md
-VERSION: 01.14.01
+VERSION: 01.12.02
 BRIEF: Security vulnerability reporting and handling policy
 -->
 

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": ">=8.3"
+        "php": ">=8.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.5",

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

@@ -570,22 +570,65 @@ COM_MOKOSUITECROSS_AI_GENERATE_DESC="Generate platform-optimized captions from t
 COM_MOKOSUITECROSS_AI_GENERATING="Generating captions..."
 COM_MOKOSUITECROSS_AI_GENERATED="AI captions generated successfully."
 COM_MOKOSUITECROSS_AI_ERROR="AI generation failed: %s"
-COM_MOKOSUITECROSS_AI_NOT_CONFIGURED="AI is not configured. Go to Options to set up a provider and API key."
 
+; Social Image Generator
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE="Social Image Generator"
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_ENABLED="Enable Social Images"
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_ENABLED_DESC="Generate branded OG images with article title overlay for social sharing."
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_BG_COLOR="Background Color"
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_BG_COLOR_DESC="Hex color for the image background (e.g. #1a1a2e)."
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_TEXT_COLOR="Text Color"
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_TEXT_COLOR_DESC="Hex color for the title text overlay."
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_FONT_SIZE="Font Size"
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_FONT_SIZE_DESC="Font size in pixels for the title text (24-96)."
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_SHOW_SITE_NAME="Show Site Name"
+COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_SHOW_SITE_NAME_DESC="Display the site name in the bottom-right corner of generated images."
+COM_MOKOSUITECROSS_SOCIAL_IMAGE_GENERATE="Generate Social Image"
+COM_MOKOSUITECROSS_SOCIAL_IMAGE_GENERATING="Generating image..."
+COM_MOKOSUITECROSS_SOCIAL_IMAGE_GENERATED="Social image generated."
+COM_MOKOSUITECROSS_SOCIAL_IMAGE_ERROR="Image generation failed: %s"
+COM_MOKOSUITECROSS_SOCIAL_IMAGE_NOT_CONFIGURED="Social image generator is not enabled. Go to Options to enable it."
+
+; Analytics
+COM_MOKOSUITECROSS_SUBMENU_ANALYTICS="Analytics"
+COM_MOKOSUITECROSS_ANALYTICS_PERIOD="Time Period"
+COM_MOKOSUITECROSS_ANALYTICS_SERVICE_FILTER="Service"
+COM_MOKOSUITECROSS_ANALYTICS_ALL_SERVICES="All Services"
+COM_MOKOSUITECROSS_ANALYTICS_BEST_TIMES="Best Times to Post"
+COM_MOKOSUITECROSS_ANALYTICS_HEATMAP="Engagement Heatmap"
+COM_MOKOSUITECROSS_ANALYTICS_HOURLY="Hourly Distribution"
+COM_MOKOSUITECROSS_ANALYTICS_DAILY="Day of Week Distribution"
+COM_MOKOSUITECROSS_ANALYTICS_NO_DATA="Not enough posting data to generate recommendations. Post at least 3 times per time slot over the selected period."
+COM_MOKOSUITECROSS_ANALYTICS_POSTS_SUCCESS="%d of %d successful"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_SUN="Sun"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_MON="Mon"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_TUE="Tue"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_WED="Wed"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_THU="Thu"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_FRI="Fri"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_SAT="Sat"
+COM_MOKOSUITECROSS_ANALYTICS_LEGEND_HIGH="High success rate"
+COM_MOKOSUITECROSS_ANALYTICS_LEGEND_MEDIUM="Medium success rate"
+COM_MOKOSUITECROSS_ANALYTICS_LEGEND_LOW="Low success rate"
+COM_MOKOSUITECROSS_ANALYTICS_LEGEND_NONE="No data"
+COM_MOKOSUITECROSS_PERIOD_180_DAYS="Last 180 days"
+COM_MOKOSUITECROSS_PERIOD_365_DAYS="Last 365 days"
+
+
+; Analytics
+COM_MOKOSUITECROSS_ANALYTICS="Analytics"
+COM_MOKOSUITECROSS_ANALYTICS_BEST_TIMES="Best Times to Post"
+COM_MOKOSUITECROSS_ANALYTICS_HEATMAP="Engagement Heatmap"
+COM_MOKOSUITECROSS_ANALYTICS_NO_DATA="Not enough data yet. Analytics will appear after posts collect engagement metrics."
+COM_MOKOSUITECROSS_ANALYTICS_ENGAGEMENT_RATE="Engagement Rate"
+COM_MOKOSUITECROSS_ANALYTICS_ALL_PLATFORMS="All Platforms"
 ; Category Rules
 COM_MOKOSUITECROSS_CONFIG_CATEGORY_RULES="Category Rules"
 COM_MOKOSUITECROSS_CONFIG_CATEGORY_RULES_NOTE="Category Routing"
 COM_MOKOSUITECROSS_CONFIG_CATEGORY_RULES_NOTE_DESC="Category routing rules let you map Joomla categories to specific cross-post services. When rules exist for a category, only those services receive posts. When no rules exist, all services are used (default behaviour). Rules are managed in the database table #__mokosuitecross_category_rules. A full admin UI will be added in a future release."
 
-; Post Calendar
+; Calendar View
-COM_MOKOSUITECROSS_CALENDAR="Post Calendar"
+COM_MOKOSUITECROSS_CALENDAR_PREV_MONTH="Previous"
-COM_MOKOSUITECROSS_CALENDAR_DESC="Visual calendar of scheduled and posted content"
+COM_MOKOSUITECROSS_CALENDAR_NEXT_MONTH="Next"
-COM_MOKOSUITECROSS_SUBMENU_CALENDAR="Calendar"
 COM_MOKOSUITECROSS_CALENDAR_TODAY="Today"
-COM_MOKOSUITECROSS_CALENDAR_MONTH="Month"
+COM_MOKOSUITECROSS_SUBMENU_CALENDAR="Post Calendar"
-COM_MOKOSUITECROSS_CALENDAR_WEEK="Week"
-COM_MOKOSUITECROSS_CALENDAR_LIST="List"
-COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_SUCCESS="Post rescheduled successfully"
-COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR="Failed to reschedule post"
-COM_MOKOSUITECROSS_CALENDAR_CANNOT_RESCHEDULE="Only scheduled or queued posts can be rescheduled"
-COM_MOKOSUITECROSS_CALENDAR_LOAD_ERROR="Failed to load calendar events"

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

@@ -3,7 +3,6 @@
 ; License: GPL-3.0-or-later
 
 COM_MOKOSUITECROSS="MokoSuiteCross"
-COM_MOKOSUITECROSS_SHORT="Cross"
 COM_MOKOSUITECROSS_DESCRIPTION="Cross-posting Joomla content to social media, email marketing, and chat platforms"
 COM_MOKOSUITECROSS_SUBMENU_DASHBOARD="Dashboard"
 COM_MOKOSUITECROSS_SUBMENU_POSTS="Post Queue"

source/packages/com_mokosuitecross/mokosuitecross.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="component" method="upgrade">
     <name>com_mokosuitecross</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -43,7 +43,7 @@
     </languages>
 
     <administration>
-        <menu img="class:share-alt">COM_MOKOSUITECROSS_SHORT</menu>
+        <menu img="class:share-alt">COM_MOKOSUITECROSS</menu>
         <submenu>
             <menu link="option=com_mokosuitecross&amp;view=dashboard">COM_MOKOSUITECROSS_SUBMENU_DASHBOARD</menu>
             <menu link="option=com_mokosuitecross&amp;view=posts">COM_MOKOSUITECROSS_SUBMENU_POSTS</menu>

source/packages/com_mokosuitecross/script.php

@@ -11,7 +11,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\InstallerAdapter;
 
 class Com_MokoSuiteCrossInstallerScript
@@ -23,77 +22,5 @@ class Com_MokoSuiteCrossInstallerScript
 
     public function postflight(string $type, InstallerAdapter $parent): void
     {
-        if ($type !== 'install') {
-            return;
-        }
-
-        // Be smart: verify EVERY table the component's own install SQL declares is
-        // actually present. If any are missing the install did not complete — say
-        // so instead of implying "installed successfully".
-        $missing = $this->missingTables();
-
-        if ($missing !== []) {
-            $detail = count($missing) > 6
-                ? count($missing) . ' expected database tables are missing'
-                : 'missing tables: ' . htmlspecialchars(implode(', ', $missing), ENT_QUOTES, 'UTF-8');
-
-            Factory::getApplication()->enqueueMessage(
-                '<strong>MokoSuiteCross did not install correctly.</strong> ' . $detail
-                . ' — review the errors above, then reinstall.',
-                'error'
-            );
-
-            return;
-        }
-
-        // Success path: schema installed correctly.
-        Factory::getApplication()->enqueueMessage(
-            '<h4>MokoSuiteCross installed successfully!</h4>'
-            . '<p>To enable automatic updates, enter your license key in the '
-            . '<a href="index.php?option=com_config&view=component&component=com_mokosuitecross">component configuration</a>.</p>',
-            'info'
-        );
-    }
-
-    /**
-     * Smart schema check: parse the component's own installed install SQL for every
-     * CREATE TABLE, then return the ones missing from the database. An empty array
-     * means the full schema installed. Fails open (returns []) if the SQL can't be
-     * read, so a good install is never flagged as failed.
-     *
-     * @return  string[]  Names (without the #__ prefix) of missing tables.
-     */
-    private function missingTables(): array
-    {
-        try {
-            $sqlFile = JPATH_ADMINISTRATOR . '/components/com_mokosuitecross/sql/install.mysql.sql';
-
-            if (!is_file($sqlFile)) {
-                return [];
-            }
-
-            $sql = file_get_contents($sqlFile);
-
-            if ($sql === false
-                || !preg_match_all('/CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?[`"\']?(#__[A-Za-z0-9_]+)/i', $sql, $m)) {
-                return [];
-            }
-
-            $db      = Factory::getDbo();
-            $prefix  = strtolower($db->getPrefix());
-            $have    = array_map('strtolower', $db->getTableList());
-            $missing = [];
-
-            foreach (array_unique($m[1]) as $decl) {
-                $bare = substr($decl, 3);                    // strip "#__"
-                if (!in_array($prefix . strtolower($bare), $have, true)) {
-                    $missing[] = $bare;
-                }
-            }
-
-            return $missing;
-        } catch (\Throwable $e) {
-            return [];
-        }
     }
 }

source/packages/com_mokosuitecross/sql/uninstall.mysql.sql

@@ -1,7 +1,5 @@
--- MokoSuiteCross -- Uninstall
+-- MokoSuiteCross — Uninstall
 DROP TABLE IF EXISTS `#__mokosuitecross_logs`;
-DROP TABLE IF EXISTS `#__mokosuitecross_analytics`;
-DROP TABLE IF EXISTS `#__mokosuitecross_category_rules`;
 DROP TABLE IF EXISTS `#__mokosuitecross_posts`;
 DROP TABLE IF EXISTS `#__mokosuitecross_templates`;
 DROP TABLE IF EXISTS `#__mokosuitecross_services`;

source/packages/com_mokosuitecross/sql/updates/mysql/01.08.59.sql

@@ -1 +0,0 @@
-/* 01.08.59 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.12.02.sql

@@ -0,0 +1 @@
+/* 01.12.02 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.12.03.sql

@@ -1 +0,0 @@
-/* 01.12.03 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.12.04.sql

@@ -1 +0,0 @@
-/* 01.12.04 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.12.05.sql

@@ -1 +0,0 @@
-/* 01.12.05 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.12.06.sql

@@ -1 +0,0 @@
-/* 01.12.06 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.00.sql

@@ -1 +0,0 @@
-/* 01.13.00 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.01.sql

@@ -1 +0,0 @@
-/* 01.13.01 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.02.sql

@@ -1 +0,0 @@
-/* 01.13.02 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.03.sql

@@ -1 +0,0 @@
-/* 01.13.03 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.04.sql

@@ -1 +0,0 @@
-/* 01.13.04 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.06.sql

@@ -1 +0,0 @@
-/* 01.13.06 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.08.sql

@@ -1 +0,0 @@
-/* 01.13.08 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.09.sql

@@ -1 +0,0 @@
-/* 01.13.09 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.10.sql

@@ -1 +0,0 @@
-/* 01.13.10 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.11.sql

@@ -1 +0,0 @@
-/* 01.13.11 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.12.sql

@@ -1 +0,0 @@
-/* 01.13.12 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.13.sql

@@ -1 +0,0 @@
-/* 01.13.13 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.14.sql

@@ -1 +0,0 @@
-/* 01.13.14 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.15.sql

@@ -1 +0,0 @@
-/* 01.13.15 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.16.sql

@@ -1 +0,0 @@
-/* 01.13.16 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.17.sql

@@ -1 +0,0 @@
-/* 01.13.17 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.18.sql

@@ -1 +0,0 @@
-/* 01.13.18 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.19.sql

@@ -1 +0,0 @@
-/* 01.13.19 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.20.sql

@@ -1 +0,0 @@
-/* 01.13.20 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.13.21.sql

@@ -1 +0,0 @@
-/* 01.13.21 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.14.00.sql

@@ -1 +0,0 @@
-/* 01.14.00 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.14.01.sql

@@ -1 +0,0 @@
-/* 01.14.01 — no schema changes */

source/packages/com_mokosuitecross/src/Controller/CalendarController.php

@@ -13,256 +13,12 @@ namespace Joomla\Component\MokoSuiteCross\Administrator\Controller;
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
-use Joomla\Component\MokoSuiteCross\Administrator\Table\PostTable;
 
-/**
- * Calendar controller -- provides AJAX endpoints for the visual post calendar.
- *
- * Endpoints:
- *   task=calendar.events     -- GET  JSON feed for FullCalendar (filtered by start/end)
- *   task=calendar.reschedule -- POST reschedule a post to a new date/time
- */
 class CalendarController extends BaseController
 {
-    /**
+    public function display($cachable = false, $urlparams = []): static
-     * Return posts as FullCalendar-compatible JSON events.
-     *
-     * Query params: start, end (ISO 8601 date range from FullCalendar).
-     *
-     * @return  void
-     */
-    public function events(): void
     {
-        $app = $this->app;
+        return parent::display($cachable, $urlparams);
-        $db  = Factory::getDbo();
-
-        // ACL check
-        if (!$app->getIdentity()->authorise('core.manage', 'com_mokosuitecross')) {
-            $this->sendJsonResponse(['error' => 'Forbidden'], 403);
-
-            return;
-        }
-
-        // FullCalendar sends start/end as ISO date strings
-        $start = $this->input->getString('start', '');
-        $end   = $this->input->getString('end', '');
-
-        $query = $db->getQuery(true)
-            ->select([
-                'p.' . $db->quoteName('id'),
-                'p.' . $db->quoteName('article_id'),
-                'p.' . $db->quoteName('service_id'),
-                'p.' . $db->quoteName('status'),
-                'p.' . $db->quoteName('scheduled_at'),
-                'p.' . $db->quoteName('posted_at'),
-                'p.' . $db->quoteName('created'),
-                'p.' . $db->quoteName('message'),
-                'a.' . $db->quoteName('title', 'article_title'),
-                's.' . $db->quoteName('title', 'service_title'),
-                's.' . $db->quoteName('service_type'),
-            ])
-            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
-            ->leftJoin(
-                $db->quoteName('#__content', 'a')
-                . ' ON ' . $db->quoteName('a.id') . ' = ' . $db->quoteName('p.article_id')
-            )
-            ->leftJoin(
-                $db->quoteName('#__mokosuitecross_services', 's')
-                . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id')
-            )
-            ->order($db->quoteName('p.created') . ' DESC');
-
-        // Filter by date range when provided
-        if ($start !== '') {
-            $dateExpr = 'COALESCE(p.scheduled_at, p.posted_at, p.created)';
-            $query->where($dateExpr . ' >= ' . $db->quote($start));
-        }
-
-        if ($end !== '') {
-            $dateExpr = 'COALESCE(p.scheduled_at, p.posted_at, p.created)';
-            $query->where($dateExpr . ' <= ' . $db->quote($end));
-        }
-
-        $db->setQuery($query);
-        $rows = $db->loadObjectList() ?: [];
-
-        // Map status to colour
-        $statusColors = [
-            'posted'    => '#28a745',
-            'scheduled' => '#007bff',
-            'queued'    => '#ffc107',
-            'failed'    => '#dc3545',
-            'posting'   => '#17a2b8',
-        ];
-
-        $events = [];
-
-        foreach ($rows as $row) {
-            // Pick the best date for the calendar event
-            $eventDate = $row->scheduled_at ?: ($row->posted_at ?: $row->created);
-
-            // Skip rows with no usable date
-            if (empty($eventDate) || $eventDate === '0000-00-00 00:00:00') {
-                continue;
-            }
-
-            $title = ($row->article_title ?: 'Post #' . $row->id);
-
-            if ($row->service_title) {
-                $title .= ' - ' . $row->service_title;
-            }
-
-            $events[] = [
-                'id'    => (int) $row->id,
-                'title' => $title,
-                'start' => $eventDate,
-                'color' => $statusColors[$row->status] ?? '#6c757d',
-                'url'   => 'index.php?option=com_mokosuitecross&task=post.edit&id=' . (int) $row->id,
-                'extendedProps' => [
-                    'status'       => $row->status,
-                    'service_type' => $row->service_type ?? '',
-                    'article_id'   => (int) $row->article_id,
-                    'service_id'   => (int) $row->service_id,
-                    'message'      => mb_substr($row->message ?? '', 0, 200),
-                ],
-            ];
-        }
-
-        $this->sendJsonResponse($events, 200);
-    }
-
-    /**
-     * Reschedule a post to a new date/time via drag-drop.
-     *
-     * POST params: post_id (int), new_date (ISO 8601 datetime string).
-     *
-     * @return  void
-     */
-    public function reschedule(): void
-    {
-        $app = $this->app;
-
-        // CSRF check
-        if (!Session::checkToken('post')) {
-            $this->sendJsonResponse(['error' => Text::_('JINVALID_TOKEN')], 403);
-
-            return;
-        }
-
-        // ACL check
-        if (!$app->getIdentity()->authorise('core.edit', 'com_mokosuitecross')) {
-            $this->sendJsonResponse(['error' => 'Forbidden'], 403);
-
-            return;
-        }
-
-        $postId  = $this->input->getInt('post_id', 0);
-        $newDate = $this->input->getString('new_date', '');
-
-        if ($postId < 1 || $newDate === '') {
-            $this->sendJsonResponse(
-                ['error' => Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR')],
-                400
-            );
-
-            return;
-        }
-
-        // Validate the date format
-        try {
-            $dateObj = Factory::getDate($newDate);
-        } catch (\Exception $e) {
-            $this->sendJsonResponse(
-                ['error' => Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR')],
-                400
-            );
-
-            return;
-        }
-
-        // Load the post using Table bind/check/store pattern
-        $db    = Factory::getDbo();
-        $table = new PostTable($db);
-
-        if (!$table->load($postId)) {
-            $this->sendJsonResponse(
-                ['error' => Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR')],
-                404
-            );
-
-            return;
-        }
-
-        // Only allow rescheduling of scheduled or queued posts
-        $allowedStatuses = ['scheduled', 'queued'];
-
-        if (!in_array($table->status, $allowedStatuses, true)) {
-            $this->sendJsonResponse(
-                ['error' => Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR')],
-                400
-            );
-
-            return;
-        }
-
-        // Update the post
-        $data = [
-            'scheduled_at' => $dateObj->toSql(),
-            'status'       => 'scheduled',
-            'modified'     => Factory::getDate()->toSql(),
-        ];
-
-        if (!$table->bind($data) || !$table->check() || !$table->store()) {
-            $this->sendJsonResponse(
-                ['error' => Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR')],
-                500
-            );
-
-            return;
-        }
-
-        // Log the reschedule
-        $log = (object) [
-            'post_id'    => $postId,
-            'service_id' => (int) $table->service_id,
-            'level'      => 'info',
-            'message'    => sprintf('Post rescheduled to %s via calendar drag-drop', $dateObj->toSql()),
-            'context'    => '{}',
-            'created'    => Factory::getDate()->toSql(),
-        ];
-
-        $db->insertObject('#__mokosuitecross_logs', $log);
-
-        $this->sendJsonResponse(
-            [
-                'success' => true,
-                'message' => Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_SUCCESS'),
-            ],
-            200
-        );
-    }
-
-    /**
-     * Send a JSON response and close the application.
-     *
-     * @param   array  $data      Response data
-     * @param   int    $httpCode  HTTP status code
-     *
-     * @return  void
-     */
-    private function sendJsonResponse(array $data, int $httpCode): void
-    {
-        $app = $this->app;
-
-        $app->setHeader('Content-Type', 'application/json; charset=utf-8');
-        $app->setHeader('Status', (string) $httpCode);
-
-        echo json_encode($data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-
-        $app->close();
     }
 }

source/packages/com_mokosuitecross/src/Controller/PostsController.php

@@ -130,10 +130,6 @@ class PostsController extends AdminController
     {
         $this->checkToken();
 
-        if (!$this->app->getIdentity()->authorise('mokosuitecross.queue.manage', 'com_mokosuitecross')) {
-            throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
-        }
-
         $db = Factory::getDbo();
 
         $query = $db->getQuery(true)
@@ -242,10 +238,6 @@ class PostsController extends AdminController
     {
         $this->checkToken();
 
-        if (!$this->app->getIdentity()->authorise('mokosuitecross.queue.manage', 'com_mokosuitecross')) {
-            throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
-        }
-
         $db = Factory::getDbo();
 
         $query = $db->getQuery(true)

source/packages/com_mokosuitecross/src/Helper/AnalyticsHelper.php

@@ -19,6 +19,13 @@ class AnalyticsHelper
 {
     /**
      * Record or update engagement metrics for a post.
+     *
+     * @param   int     $postId       The post ID
+     * @param   int     $serviceId    The service ID
+     * @param   string  $serviceType  The service type (e.g. twitter, facebook)
+     * @param   array   $metrics      Engagement metrics: impressions, engagements, clicks, shares, posted_at
+     *
+     * @return  bool  True on success
      */
     public static function recordEngagement(int $postId, int $serviceId, string $serviceType, array $metrics): bool
     {
@@ -44,6 +51,7 @@ class AnalyticsHelper
             ? round(($engagements / $impressions) * 100, 2)
             : 0.00;
 
+        // Check if a row already exists for this post
         $query = $db->getQuery(true)
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__mokosuitecross_analytics'))
@@ -88,7 +96,12 @@ class AnalyticsHelper
     }
 
     /**
-     * Get heatmap data as a 7x24 grid derived from actual post success data.
+     * Get heatmap data as a 7x24 grid of average engagement rates.
+     *
+     * @param   string  $serviceType  Optional service type filter
+     * @param   int     $days         Number of days to look back (0 = all time)
+     *
+     * @return  array  7x24 grid: [ day_of_week => [ hour_of_day => avg_engagement_rate ] ]
      */
     public static function getHeatmapData(string $serviceType = '', int $days = 90): array
     {
@@ -96,40 +109,30 @@ class AnalyticsHelper
 
         $query = $db->getQuery(true)
             ->select([
-                'DAYOFWEEK(' . $db->quoteName('p.posted_at') . ') - 1 AS day_of_week',
+                $db->quoteName('day_of_week'),
-                'HOUR(' . $db->quoteName('p.posted_at') . ') AS hour_of_day',
+                $db->quoteName('hour_of_day'),
+                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_rate',
                 'COUNT(*) AS post_count',
             ])
-            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
+            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->join('INNER', $db->quoteName('#__mokosuitecross_services', 's')
+            ->group($db->quoteName('day_of_week'))
-                . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+            ->group($db->quoteName('hour_of_day'))
-            ->where($db->quoteName('p.status') . ' = ' . $db->quote('posted'))
+            ->order($db->quoteName('day_of_week') . ' ASC')
-            ->where($db->quoteName('p.posted_at') . ' IS NOT NULL')
+            ->order($db->quoteName('hour_of_day') . ' ASC');
-            ->group('day_of_week')
-            ->group('hour_of_day')
-            ->order('day_of_week ASC')
-            ->order('hour_of_day ASC');
 
         if ($serviceType !== '') {
-            $query->where($db->quoteName('s.service_type') . ' = ' . $db->quote($serviceType));
+            $query->where($db->quoteName('service_type') . ' = ' . $db->quote($serviceType));
         }
 
         if ($days > 0) {
             $cutoff = Factory::getDate('-' . $days . ' days')->toSql();
-            $query->where($db->quoteName('p.posted_at') . ' >= ' . $db->quote($cutoff));
+            $query->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff));
         }
 
         $db->setQuery($query);
         $rows = $db->loadObjectList();
 
-        $maxCount = 1;
+        // Build 7x24 grid initialised to zero
-
-        foreach ($rows as $row) {
-            if ((int) $row->post_count > $maxCount) {
-                $maxCount = (int) $row->post_count;
-            }
-        }
-
         $grid = [];
 
         for ($d = 0; $d < 7; $d++) {
@@ -139,10 +142,9 @@ class AnalyticsHelper
         }
 
         foreach ($rows as $row) {
-            $count = (int) $row->post_count;
             $grid[(int) $row->day_of_week][(int) $row->hour_of_day] = [
-                'avg_rate'   => round(($count / $maxCount) * 100, 2),
+                'avg_rate'   => round((float) $row->avg_rate, 2),
-                'post_count' => $count,
+                'post_count' => (int) $row->post_count,
             ];
         }
 
@@ -150,7 +152,12 @@ class AnalyticsHelper
     }
 
     /**
-     * Get the best times to post ranked by post success frequency.
+     * Get the best times to post ranked by average engagement rate.
+     *
+     * @param   string  $serviceType  Optional service type filter
+     * @param   int     $limit        Number of results to return
+     *
+     * @return  array  List of [day_of_week, hour_of_day, avg_rate, post_count]
      */
     public static function getBestTimes(string $serviceType = '', int $limit = 5): array
     {
@@ -158,22 +165,19 @@ class AnalyticsHelper
 
         $query = $db->getQuery(true)
             ->select([
-                'DAYOFWEEK(' . $db->quoteName('p.posted_at') . ') - 1 AS day_of_week',
+                $db->quoteName('day_of_week'),
-                'HOUR(' . $db->quoteName('p.posted_at') . ') AS hour_of_day',
+                $db->quoteName('hour_of_day'),
+                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_rate',
                 'COUNT(*) AS post_count',
             ])
-            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
+            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->join('INNER', $db->quoteName('#__mokosuitecross_services', 's')
+            ->group($db->quoteName('day_of_week'))
-                . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+            ->group($db->quoteName('hour_of_day'))
-            ->where($db->quoteName('p.status') . ' = ' . $db->quote('posted'))
-            ->where($db->quoteName('p.posted_at') . ' IS NOT NULL')
-            ->group('day_of_week')
-            ->group('hour_of_day')
             ->having('COUNT(*) >= 1')
-            ->order('post_count DESC');
+            ->order('avg_rate DESC');
 
         if ($serviceType !== '') {
-            $query->where($db->quoteName('s.service_type') . ' = ' . $db->quote($serviceType));
+            $query->where($db->quoteName('service_type') . ' = ' . $db->quote($serviceType));
         }
 
         $db->setQuery($query, 0, $limit);
@@ -184,16 +188,16 @@ class AnalyticsHelper
         $results = [];
 
         foreach ($rows as $row) {
-            $hour   = (int) $row['hour_of_day'];
+            $hour     = (int) $row['hour_of_day'];
-            $ampm   = $hour < 12 ? 'AM' : 'PM';
+            $ampm     = $hour < 12 ? 'AM' : 'PM';
-            $hour12 = $hour % 12 ?: 12;
+            $hour12   = $hour % 12 ?: 12;
 
             $results[] = [
                 'day_of_week' => (int) $row['day_of_week'],
                 'day_name'    => $dayNames[(int) $row['day_of_week']],
                 'hour_of_day' => $hour,
                 'hour_label'  => $hour12 . ':00 ' . $ampm,
-                'avg_rate'    => round((float) $row['post_count'], 2),
+                'avg_rate'    => round((float) $row['avg_rate'], 2),
                 'post_count'  => (int) $row['post_count'],
             ];
         }
@@ -202,7 +206,11 @@ class AnalyticsHelper
     }
 
     /**
-     * Get stats grouped by service type from actual post data.
+     * Get engagement stats grouped by service type.
+     *
+     * @param   int  $days  Number of days to look back (0 = all time)
+     *
+     * @return  array  List of [service_type, total_posts, avg_engagement_rate, total_impressions, total_engagements]
      */
     public static function getServiceBreakdown(int $days = 30): array
     {
@@ -210,41 +218,35 @@ class AnalyticsHelper
 
         $query = $db->getQuery(true)
             ->select([
-                $db->quoteName('s.service_type'),
+                $db->quoteName('service_type'),
                 'COUNT(*) AS total_posts',
-                'SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS total_succeeded',
+                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_engagement_rate',
-                'SUM(CASE WHEN ' . $db->quoteName('p.status') . ' IN ('
+                'SUM(' . $db->quoteName('impressions') . ') AS total_impressions',
-                    . $db->quote('failed') . ',' . $db->quote('permanently_failed')
+                'SUM(' . $db->quoteName('engagements') . ') AS total_engagements',
-                    . ') THEN 1 ELSE 0 END) AS total_failed',
+                'SUM(' . $db->quoteName('clicks') . ') AS total_clicks',
+                'SUM(' . $db->quoteName('shares') . ') AS total_shares',
             ])
-            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
+            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->join('INNER', $db->quoteName('#__mokosuitecross_services', 's')
+            ->group($db->quoteName('service_type'))
-                . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+            ->order('avg_engagement_rate DESC');
-            ->group($db->quoteName('s.service_type'))
-            ->order('total_posts DESC');
 
         if ($days > 0) {
             $cutoff = Factory::getDate('-' . $days . ' days')->toSql();
-            $query->where($db->quoteName('p.created') . ' >= ' . $db->quote($cutoff));
+            $query->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff));
         }
 
         $db->setQuery($query);
         $rows = $db->loadAssocList();
 
         foreach ($rows as &$row) {
-            $total     = (int) $row['total_posts'];
+            $row['avg_engagement_rate'] = round((float) $row['avg_engagement_rate'], 2);
-            $succeeded = (int) $row['total_succeeded'];
+            $row['total_posts']         = (int) $row['total_posts'];
-
+            $row['total_impressions']   = (int) $row['total_impressions'];
-            $row['total_posts']           = $total;
+            $row['total_engagements']   = (int) $row['total_engagements'];
-            $row['total_succeeded']       = $succeeded;
+            $row['total_clicks']        = (int) $row['total_clicks'];
-            $row['total_failed']          = (int) $row['total_failed'];
+            $row['total_shares']        = (int) $row['total_shares'];
-            $row['avg_engagement_rate']   = $total > 0 ? round(($succeeded / $total) * 100, 2) : 0;
-            $row['total_impressions']     = 0;
-            $row['total_engagements']     = 0;
-            $row['total_clicks']          = 0;
-            $row['total_shares']          = 0;
         }
 
         return $rows;
     }
-}
+}

source/packages/com_mokosuitecross/src/Helper/CrossPostDispatcher.php

@@ -594,26 +594,13 @@ class CrossPostDispatcher
             return;
         }
 
-        // Load service plugins using Joomla 5/6-compatible dispatcher pattern
+        // Load service plugins
         PluginHelper::importPlugin('mokosuitecross');
-        $servicePlugins = [];
+        $plugins = [];
-        $event = new \Joomla\Event\Event('onMokoSuiteCrossGetServices', [$servicePlugins]);
+        Factory::getApplication()->triggerEvent('onMokoSuiteCrossGetServices', [&$plugins]);
-
-        try {
-            Factory::getApplication()->getDispatcher()->dispatch('onMokoSuiteCrossGetServices', $event);
-        } catch (\Throwable $e) {
-            // Dispatcher may not be available
-        }
-
-        $idx = 1;
-
-        while (isset($event[$idx])) {
-            $servicePlugins[] = $event[$idx];
-            $idx++;
-        }
 
         $pluginMap = [];
-        foreach ($servicePlugins as $plugin) {
+        foreach ($plugins as $plugin) {
             $pluginMap[$plugin->getServiceType()] = $plugin;
         }
 
@@ -626,7 +613,7 @@ class CrossPostDispatcher
                 continue;
             }
 
-            $credentials = CredentialHelper::decrypt($post->credentials ?: '');
+            $credentials = json_decode($post->credentials, true) ?: [];
 
             try {
                 $result = $plugin->deletePost($post->platform_post_id, $credentials);

source/packages/com_mokosuitecross/src/Helper/MokoSuiteCrossHelper.php

@@ -40,9 +40,9 @@ class MokoSuiteCrossHelper
             'posts'     => 'COM_MOKOSUITECROSS_SUBMENU_POSTS',
             'services'  => 'COM_MOKOSUITECROSS_SUBMENU_SERVICES',
             'templates' => 'COM_MOKOSUITECROSS_SUBMENU_TEMPLATES',
+            'logs'      => 'COM_MOKOSUITECROSS_SUBMENU_LOGS',
             'calendar'  => 'COM_MOKOSUITECROSS_SUBMENU_CALENDAR',
             'analytics' => 'COM_MOKOSUITECROSS_SUBMENU_ANALYTICS',
-            'logs'      => 'COM_MOKOSUITECROSS_SUBMENU_LOGS',
         ];
 
         // Joomla 5+ toolbar submenu

source/packages/com_mokosuitecross/src/Helper/QueueProcessor.php

@@ -91,16 +91,6 @@ class QueueProcessor
             $db->setQuery($query);
             $retryPosts = $db->loadObjectList() ?: [];
 
-            // 3. Recover stale "posting" entries (stuck > 10 minutes)
-            $staleQuery = $db->getQuery(true)
-                ->update($db->quoteName('#__mokosuitecross_posts'))
-                ->set($db->quoteName('status') . ' = ' . $db->quote('queued'))
-                ->set($db->quoteName('modified') . ' = ' . $db->quote($now))
-                ->where($db->quoteName('status') . ' = ' . $db->quote('posting'))
-                ->where($db->quoteName('modified') . ' < DATE_SUB(NOW(), INTERVAL 600 SECOND)');
-            $db->setQuery($staleQuery);
-            $db->execute();
-
             $allPosts = array_merge($queuedPosts, $retryPosts);
 
             foreach ($allPosts as $post) {

source/packages/com_mokosuitecross/src/View/Calendar/HtmlView.php

@@ -14,47 +14,52 @@ namespace Joomla\Component\MokoSuiteCross\Administrator\View\Calendar;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Router\Route;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\MokoSuiteCross\Administrator\Helper\MokoSuiteCrossHelper;
 
 class HtmlView extends BaseHtmlView
 {
-
+    public int $year;
-    public $ajaxUrl;
+    public int $month;
+    public array $events;
+    public $sidebar;
 
     public function display($tpl = null): void
     {
-        // ACL check
+        $input = Factory::getApplication()->input;
-        $canDo = MokoSuiteCrossHelper::getActions();
 
-        if (!$canDo->get('core.manage')) {
+        $this->year  = $input->getInt('year', (int) date('Y'));
-            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        $this->month = $input->getInt('month', (int) date('n'));
+
+        if ($this->month < 1 || $this->month > 12) {
+            $this->month = (int) date('n');
         }
 
-        // Build AJAX URL for FullCalendar event source
+        if ($this->year < 2000 || $this->year > 2100) {
-        $this->ajaxUrl = Route::_('index.php?option=com_mokosuitecross&task=calendar.events&format=json', false);
+            $this->year = (int) date('Y');
+        }
+
+        $model        = $this->getModel();
+        $this->events = $model->getEvents($this->year, $this->month);
 
         $this->addToolbar();
 
         MokoSuiteCrossHelper::addSubmenu('calendar');
-
+        $this->sidebar = \Joomla\CMS\HTML\Sidebar::render();
-        // Set document title
-        Factory::getApplication()->getDocument()->setTitle(
-            Text::_('COM_MOKOSUITECROSS_CALENDAR') . ' - ' . Text::_('COM_MOKOSUITECROSS')
-        );
 
         parent::display($tpl);
     }
 
     protected function addToolbar(): void
     {
-        ToolbarHelper::title(
+        $canDo = MokoSuiteCrossHelper::getActions();
-            Text::_('COM_MOKOSUITECROSS') . ' - ' . Text::_('COM_MOKOSUITECROSS_CALENDAR'),
+
-            'calendar'
+        ToolbarHelper::title('MokoSuiteCross -- Post Calendar', 'calendar');
-        );
+        ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuitecross&view=dashboard');
-        ToolbarHelper::back('JTOOLBAR_BACK', Route::_('index.php?option=com_mokosuitecross&view=dashboard', false));
+
+        if ($canDo->get('core.admin')) {
+            ToolbarHelper::preferences('com_mokosuitecross');
+        }
     }
 }

source/packages/com_mokosuitecross/src/View/Dashboard/HtmlView.php

@@ -26,7 +26,7 @@ class HtmlView extends BaseHtmlView
     protected $serviceBreakdown;
     protected $dailyTrend;
     protected $topArticles;
-
+    public $sidebar;
     public $period;
 
     public function display($tpl = null): void
@@ -58,6 +58,7 @@ class HtmlView extends BaseHtmlView
         $this->addToolbar();
 
         MokoSuiteCrossHelper::addSubmenu('dashboard');
+        $this->sidebar = \Joomla\CMS\HTML\Sidebar::render();
 
         parent::display($tpl);
     }

source/packages/com_mokosuitecross/tmpl/calendar/default.php

@@ -12,150 +12,118 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Session\Session;
+use Joomla\CMS\Router\Route;
 
 /** @var \Joomla\Component\MokoSuiteCross\Administrator\View\Calendar\HtmlView $this */
 
-$token    = Session::getFormToken();
+$year   = $this->year;
-$ajaxUrl  = $this->ajaxUrl;
+$month  = $this->month;
+$events = $this->events;
+$today  = date('Y-m-d');
+
+$prevMonth = $month - 1;
+$prevYear  = $year;
+
+if ($prevMonth < 1) {
+    $prevMonth = 12;
+    $prevYear--;
+}
+
+$nextMonth = $month + 1;
+$nextYear  = $year;
+
+if ($nextMonth > 12) {
+    $nextMonth = 1;
+    $nextYear++;
+}
+
+$monthName    = date('F', mktime(0, 0, 0, $month, 1, $year));
+$daysInMonth  = (int) date('t', mktime(0, 0, 0, $month, 1, $year));
+$firstWeekday = ((int) date('N', mktime(0, 0, 0, $month, 1, $year))) - 1;
+
+$statusClass = static function (string $status): string {
+    return match ($status) {
+        'posted'    => 'bg-success',
+        'failed'    => 'bg-danger',
+        default     => 'bg-warning text-dark',
+    };
+};
 ?>
 
-<style>
+<div class="d-flex justify-content-between align-items-center mb-3">
-    #mokosuitecross-calendar {
+    <a href="<?php echo Route::_('index.php?option=com_mokosuitecross&view=calendar&year=' . $prevYear . '&month=' . $prevMonth); ?>"
-        max-width: 1100px;
+       class="btn btn-outline-secondary btn-sm">
-        margin: 0 auto;
+        <span class="icon-chevron-left" aria-hidden="true"></span>
-    }
+        <?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_PREV_MONTH'); ?>
-    .fc .fc-toolbar-title {
+    </a>
-        font-size: 1.4em;
+    <h3 class="mb-0"><?php echo htmlspecialchars($monthName . ' ' . $year); ?></h3>
-    }
+    <a href="<?php echo Route::_('index.php?option=com_mokosuitecross&view=calendar&year=' . $nextYear . '&month=' . $nextMonth); ?>"
-    .mokosuitecross-calendar-legend {
+       class="btn btn-outline-secondary btn-sm">
-        display: flex;
+        <?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_NEXT_MONTH'); ?>
-        gap: 1.5rem;
+        <span class="icon-chevron-right" aria-hidden="true"></span>
-        flex-wrap: wrap;
+    </a>
-        margin-bottom: 1rem;
-    }
-    .mokosuitecross-calendar-legend span {
-        display: inline-flex;
-        align-items: center;
-        gap: 0.35rem;
-        font-size: 0.875rem;
-    }
-    .mokosuitecross-calendar-legend .swatch {
-        display: inline-block;
-        width: 14px;
-        height: 14px;
-        border-radius: 3px;
-    }
-</style>
-
-<div class="mokosuitecross-calendar-legend">
-    <span><span class="swatch" style="background:#28a745;"></span> <?php echo Text::_('COM_MOKOSUITECROSS_STATUS_POSTED'); ?></span>
-    <span><span class="swatch" style="background:#007bff;"></span> <?php echo Text::_('COM_MOKOSUITECROSS_STATUS_SCHEDULED'); ?></span>
-    <span><span class="swatch" style="background:#ffc107;"></span> <?php echo Text::_('COM_MOKOSUITECROSS_STATUS_QUEUED'); ?></span>
-    <span><span class="swatch" style="background:#dc3545;"></span> <?php echo Text::_('COM_MOKOSUITECROSS_STATUS_FAILED'); ?></span>
 </div>
 
-<div id="mokosuitecross-calendar"></div>
+<div class="table-responsive">
+<table class="table table-bordered">
+    <thead class="table-light">
+        <tr>
+            <th style="width:14.28%"><?php echo Text::_('MON'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('TUE'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('WED'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('THU'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('FRI'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('SAT'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('SUN'); ?></th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php
+        $day = 1;
+        $started = false;
 
-<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.js" integrity="sha384-B1OFx8Gy9GjPu8UbUyXbGQpzll9ubAUQ9agInFJ8NnD7nYG1u/CLR+Sqr5yifl4q" crossorigin="anonymous"></script>
+        while ($day <= $daysInMonth) : ?>
-<script>
+        <tr>
-document.addEventListener('DOMContentLoaded', function() {
+            <?php for ($col = 0; $col < 7; $col++) :
-    var calendarEl = document.getElementById('mokosuitecross-calendar');
+                if (!$started && $col < $firstWeekday) : ?>
-    var token = '<?php echo $token; ?>';
+                    <td class="text-muted bg-light">&nbsp;</td>
+                <?php
+                    continue;
+                endif;
 
-    var calendar = new FullCalendar.Calendar(calendarEl, {
+                $started = true;
-        initialView: 'dayGridMonth',
-        headerToolbar: {
-            left: 'prev,next today',
-            center: 'title',
-            right: 'dayGridMonth,timeGridWeek,listWeek'
-        },
-        buttonText: {
-            today: '<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_TODAY', true); ?>',
-            month: '<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_MONTH', true); ?>',
-            week:  '<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_WEEK', true); ?>',
-            list:  '<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_LIST', true); ?>'
-        },
-        editable: true,
-        droppable: false,
-        navLinks: true,
-        dayMaxEvents: true,
-        eventSources: [{
-            url: '<?php echo $ajaxUrl; ?>',
-            method: 'GET',
-            failure: function() {
-                Joomla.renderMessages({
-                    error: ['<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_LOAD_ERROR', true); ?>']
-                });
-            }
-        }],
-        eventClick: function(info) {
-            info.jsEvent.preventDefault();
-            if (info.event.url) {
-                window.location.href = info.event.url;
-            }
-        },
-        eventDrop: function(info) {
-            var postId = info.event.id;
-            var status = info.event.extendedProps.status;
 
-            // Only allow rescheduling of scheduled or queued posts
+                if ($day > $daysInMonth) : ?>
-            if (status !== 'scheduled' && status !== 'queued') {
+                    <td class="text-muted bg-light">&nbsp;</td>
-                info.revert();
+                <?php
-                Joomla.renderMessages({
+                    continue;
-                    warning: ['<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_CANNOT_RESCHEDULE', true); ?>']
+                endif;
-                });
-                return;
-            }
 
-            var newDate = info.event.start.toISOString();
+                $dateKey   = sprintf('%04d-%02d-%02d', $year, $month, $day);
-
+                $isToday   = ($dateKey === $today);
-            var formData = new FormData();
+                $cellClass = $isToday ? 'border border-primary border-2 bg-primary bg-opacity-10' : '';
-            formData.append('post_id', postId);
+                $dayEvents = $events[$dateKey] ?? [];
-            formData.append('new_date', newDate);
+            ?>
-            formData.append(token, '1');
+                <td class="<?php echo $cellClass; ?>" style="vertical-align: top; min-height: 80px;">
-
+                    <div class="fw-bold mb-1<?php echo $isToday ? ' text-primary' : ''; ?>">
-            fetch('index.php?option=com_mokosuitecross&task=calendar.reschedule&format=json', {
+                        <?php echo $day; ?>
-                method: 'POST',
+                        <?php if ($isToday) : ?>
-                body: formData
+                            <small class="text-primary"><?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_TODAY'); ?></small>
-            })
+                        <?php endif; ?>
-            .then(function(response) { return response.json(); })
+                    </div>
-            .then(function(data) {
+                    <?php foreach ($dayEvents as $event) : ?>
-                if (data.success) {
+                        <span class="badge <?php echo $statusClass($event->status); ?> mb-1 d-block text-truncate" style="max-width: 100%;"
-                    // Update the event colour to scheduled
+                              title="<?php echo htmlspecialchars(ucfirst($event->service_type) . ': ' . $event->article_title . ' (' . $event->status . ')'); ?>">
-                    info.event.setProp('color', '#007bff');
+                            <?php echo htmlspecialchars(ucfirst($event->service_type)); ?>:
-                    info.event.setExtendedProp('status', 'scheduled');
+                            <?php echo htmlspecialchars(mb_substr($event->article_title, 0, 20)); ?>
-                    Joomla.renderMessages({
+                        </span>
-                        message: ['<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_SUCCESS', true); ?>']
+                    <?php endforeach; ?>
-                    });
+                </td>
-                } else {
+            <?php
-                    info.revert();
+                $day++;
-                    Joomla.renderMessages({
+            endfor; ?>
-                        error: [data.error || '<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR', true); ?>']
+        </tr>
-                    });
+        <?php endwhile; ?>
-                }
+    </tbody>
-            })
+</table>
-            .catch(function() {
+</div>
-                info.revert();
-                Joomla.renderMessages({
-                    error: ['<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR', true); ?>']
-                });
-            });
-        },
-        eventDidMount: function(info) {
-            // Add tooltip with post details
-            var props = info.event.extendedProps;
-            var tip = info.event.title;
-            if (props.status) {
-                tip += ' [' + props.status + ']';
-            }
-            if (props.message) {
-                tip += '\n' + props.message;
-            }
-            info.el.setAttribute('title', tip);
-        }
-    });
-
-    calendar.render();
-});
-</script>

source/packages/com_mokosuitecross/tmpl/dashboard/default.php

@@ -220,6 +220,175 @@ $queueProcessing = $componentParams->get('queue_processing', 'scheduler');
         </div>
         <?php endif; ?>
 
+        <!-- Analytics: Best Times to Post Heatmap -->
+        <div class="card mt-3">
+            <div class="card-header d-flex justify-content-between align-items-center">
+                <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_BEST_TIMES'); ?></h5>
+                <select id="heatmapServiceFilter" class="form-select form-select-sm" style="width: auto;">
+                    <option value=""><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_ALL_PLATFORMS'); ?></option>
+                    <?php
+                    $db = \Joomla\CMS\Factory::getDbo();
+                    $stQuery = $db->getQuery(true)
+                        ->select('DISTINCT ' . $db->quoteName('service_type'))
+                        ->from($db->quoteName('#__mokosuitecross_services'))
+                        ->where($db->quoteName('published') . ' = 1')
+                        ->order($db->quoteName('service_type') . ' ASC');
+                    $db->setQuery($stQuery);
+                    $serviceTypes = $db->loadColumn();
+                    foreach ($serviceTypes as $st) :
+                    ?>
+                        <option value="<?php echo htmlspecialchars($st); ?>"><?php echo htmlspecialchars(ucfirst($st)); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div class="card-body">
+                <div id="heatmapContainer">
+                    <p class="text-muted" id="heatmapLoading"><?php echo Text::_('JLIB_HTML_BEHAVIOR_LOADING'); ?></p>
+                    <div id="heatmapNoData" style="display:none;">
+                        <p class="text-muted mb-0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_NO_DATA'); ?></p>
+                    </div>
+                    <div id="heatmapGrid" style="display:none;">
+                        <style>
+                            .msc-heatmap { border-collapse: collapse; width: 100%; font-size: 11px; }
+                            .msc-heatmap th, .msc-heatmap td { text-align: center; padding: 3px 2px; min-width: 28px; }
+                            .msc-heatmap th { font-weight: 600; color: #666; font-size: 10px; }
+                            .msc-heatmap td.msc-hm-cell { border-radius: 3px; cursor: default; position: relative; }
+                            .msc-heatmap td.msc-hm-cell:hover { outline: 2px solid #333; z-index: 1; }
+                            .msc-heatmap .msc-hm-day { text-align: right; padding-right: 8px; font-weight: 600; color: #555; white-space: nowrap; }
+                        </style>
+                        <table class="msc-heatmap" id="heatmapTable">
+                            <thead>
+                                <tr>
+                                    <th></th>
+                                    <?php for ($h = 0; $h < 24; $h++) :
+                                        $label = $h % 12 ?: 12;
+                                        $suffix = $h < 12 ? 'a' : 'p';
+                                    ?>
+                                        <th><?php echo $label . $suffix; ?></th>
+                                    <?php endfor; ?>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                $dayLabels = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+                                for ($d = 0; $d < 7; $d++) :
+                                ?>
+                                <tr>
+                                    <td class="msc-hm-day"><?php echo $dayLabels[$d]; ?></td>
+                                    <?php for ($h = 0; $h < 24; $h++) : ?>
+                                        <td class="msc-hm-cell" id="hm-<?php echo $d; ?>-<?php echo $h; ?>" title="<?php echo $dayLabels[$d] . ' ' . ($h % 12 ?: 12) . ':00 ' . ($h < 12 ? 'AM' : 'PM'); ?>"></td>
+                                    <?php endfor; ?>
+                                </tr>
+                                <?php endfor; ?>
+                            </tbody>
+                        </table>
+                        <div class="d-flex align-items-center justify-content-end mt-2" style="font-size:11px;color:#666;">
+                            <span class="me-1"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_ENGAGEMENT_RATE'); ?>:</span>
+                            <span style="display:inline-block;width:14px;height:14px;background:#ebedf0;border-radius:2px;margin:0 1px;" title="0%"></span>
+                            <span style="display:inline-block;width:14px;height:14px;background:#9be9a8;border-radius:2px;margin:0 1px;" title="Low"></span>
+                            <span style="display:inline-block;width:14px;height:14px;background:#40c463;border-radius:2px;margin:0 1px;" title="Medium"></span>
+                            <span style="display:inline-block;width:14px;height:14px;background:#30a14e;border-radius:2px;margin:0 1px;" title="High"></span>
+                            <span style="display:inline-block;width:14px;height:14px;background:#216e39;border-radius:2px;margin:0 1px;" title="Very High"></span>
+                        </div>
+                    </div>
+                    <div id="heatmapBestTimes" style="display:none;" class="mt-3 pt-3 border-top">
+                        <strong><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_BEST_TIMES'); ?>:</strong>
+                        <ul id="bestTimesList" class="mb-0 mt-1"></ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            var token = '<?php echo \Joomla\CMS\Session\Session::getFormToken(); ?>';
+
+            function loadHeatmap(serviceType) {
+                var url = 'index.php?option=com_mokosuitecross&task=analytics.heatmap&format=json'
+                    + '&service_type=' + encodeURIComponent(serviceType || '')
+                    + '&days=90&' + token + '=1';
+
+                document.getElementById('heatmapLoading').style.display = '';
+                document.getElementById('heatmapGrid').style.display = 'none';
+                document.getElementById('heatmapNoData').style.display = 'none';
+                document.getElementById('heatmapBestTimes').style.display = 'none';
+
+                fetch(url)
+                    .then(function(r) { return r.json(); })
+                    .then(function(data) {
+                        document.getElementById('heatmapLoading').style.display = 'none';
+
+                        if (!data.success) {
+                            document.getElementById('heatmapNoData').style.display = '';
+                            return;
+                        }
+
+                        var grid = data.grid;
+                        var maxRate = 0;
+                        var hasData = false;
+
+                        for (var d = 0; d < 7; d++) {
+                            for (var h = 0; h < 24; h++) {
+                                var rate = grid[d] && grid[d][h] ? parseFloat(grid[d][h].avg_rate) : 0;
+                                if (rate > maxRate) maxRate = rate;
+                                if (rate > 0) hasData = true;
+                            }
+                        }
+
+                        if (!hasData) {
+                            document.getElementById('heatmapNoData').style.display = '';
+                            return;
+                        }
+
+                        document.getElementById('heatmapGrid').style.display = '';
+
+                        var colors = ['#ebedf0', '#9be9a8', '#40c463', '#30a14e', '#216e39'];
+                        for (var d = 0; d < 7; d++) {
+                            for (var h = 0; h < 24; h++) {
+                                var cell = document.getElementById('hm-' + d + '-' + h);
+                                if (!cell) continue;
+                                var val = grid[d] && grid[d][h] ? grid[d][h] : {avg_rate: 0, post_count: 0};
+                                var rate = parseFloat(val.avg_rate);
+                                var count = parseInt(val.post_count, 10);
+                                var level = 0;
+                                if (maxRate > 0 && rate > 0) {
+                                    var pct = rate / maxRate;
+                                    if (pct <= 0.25) level = 1;
+                                    else if (pct <= 0.50) level = 2;
+                                    else if (pct <= 0.75) level = 3;
+                                    else level = 4;
+                                }
+                                cell.style.backgroundColor = colors[level];
+                                cell.title = cell.title.split(' - ')[0] + ' - ' + rate.toFixed(1) + '% (' + count + ' posts)';
+                            }
+                        }
+
+                        // Show best times
+                        if (data.best_times && data.best_times.length > 0) {
+                            document.getElementById('heatmapBestTimes').style.display = '';
+                            var list = document.getElementById('bestTimesList');
+                            list.innerHTML = '';
+                            var top = data.best_times.slice(0, 3);
+                            for (var i = 0; i < top.length; i++) {
+                                var bt = top[i];
+                                var li = document.createElement('li');
+                                li.textContent = bt.day_name + ' at ' + bt.hour_label + ' (' + bt.avg_rate.toFixed(1) + '% avg engagement)';
+                                list.appendChild(li);
+                            }
+                        }
+                    })
+                    .catch(function() {
+                        document.getElementById('heatmapLoading').style.display = 'none';
+                        document.getElementById('heatmapNoData').style.display = '';
+                    });
+            }
+
+            document.getElementById('heatmapServiceFilter').addEventListener('change', function() {
+                loadHeatmap(this.value);
+            });
+
+            loadHeatmap('');
+        });
+        </script>
         <!-- Recent Activity -->
         <div class="card mt-3">
             <div class="card-header">
@@ -282,9 +451,9 @@ $queueProcessing = $componentParams->get('queue_processing', 'scheduler');
                        class="list-group-item list-group-item-action">
                         <?php echo Text::_('COM_MOKOSUITECROSS_SUBMENU_LOGS'); ?>
                     </a>
-                    <a href="<?php echo Route::_('index.php?option=com_mokosuitecross&view=calendar'); ?>"
+                    <a href="<?php echo Route::_('index.php?option=com_mokosuitecross&view=analytics'); ?>"
                        class="list-group-item list-group-item-action">
-                        <?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR'); ?>
+                        <?php echo Text::_('COM_MOKOSUITECROSS_SUBMENU_ANALYTICS'); ?>
                     </a>
                 </div>
             </div>

source/packages/plg_content_mokosuitecross/mokosuitecross.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="content" method="upgrade">
     <name>Content - MokoSuiteCross</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_content_mokosuitecross/src/Extension/MokoSuiteCrossContent.php

@@ -535,19 +535,6 @@ XML;
                 continue;
             }
 
-            // Respect first-publish-only: skip if article was previously posted
-            if ($params->get('post_on_first_publish_only', 0)) {
-                $existsQuery = $db->getQuery(true)
-                    ->select('COUNT(*)')
-                    ->from($db->quoteName('#__mokosuitecross_posts'))
-                    ->where($db->quoteName('article_id') . ' = ' . (int) $pk);
-                $db->setQuery($existsQuery);
-
-                if ((int) $db->loadResult() > 0) {
-                    continue;
-                }
-            }
-
             $url = Uri::root() . 'index.php?option=com_content&view=article&id=' . $article->id;
 
             if (!empty($article->catid)) {

source/packages/plg_mokosuitecross_activitypub/activitypub.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - ActivityPub (Fediverse)</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_blogger/blogger.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Google Blogger</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_bluesky/bluesky.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Bluesky</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_brevo/brevo.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Brevo (Sendinblue)</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_constantcontact/constantcontact.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Constant Contact</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_convertkit/convertkit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - ConvertKit</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_devto/devto.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Dev.to</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_discord/discord.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Discord</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_facebook/facebook.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Facebook / Meta</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_ghost/ghost.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Ghost</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_googlebusiness/googlebusiness.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Google Business Profile</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_googlechat/googlechat.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Google Chat</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_hashnode/hashnode.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Hashnode</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_instagram/instagram.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Instagram</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-06-23</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_linkedin/linkedin.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - LinkedIn</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_mailchimp/mailchimp.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Mailchimp</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_mastodon/mastodon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Mastodon</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_matrix/matrix.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Matrix / Element</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_medium/medium.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Medium</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_mokosuitecalendar/mokosuitecalendar.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - MokoSuiteCalendar Events</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_mokosuitegallery/mokosuitegallery.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - MokoSuiteGallery</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_nostr/nostr.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Nostr</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_ntfy/ntfy.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Ntfy Push Notifications</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_pinterest/pinterest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Pinterest</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_reddit/reddit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Reddit</name>
-    <version>01.14.01</version>
+    <version>01.12.02</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>