chore(release): build 01.10.00-rc [skip ci]

.mokogitea/CLAUDE.md

@@ -67,8 +67,8 @@ 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
-- **Standards**: [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki)
+- **Wiki**: documentation lives in the Gitea wiki, not `docs/` files
+- **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

.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.repository.name, 'Template-')
+      !startsWith(github.event.head_commit.message, 'Merge pull request')
 
     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
-# PATH: /.mokogitea/workflows/auto-release.yml
-# VERSION: 05.01.00
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
+# PATH: /templates/workflows/universal/auto-release.yml.template
+# 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_name == 'workflow_dispatch' && inputs.action == 'promote-rc')
-      )
+      (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
+      (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}"
-          AUTH="Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}"
-          FROM="${{ github.event.pull_request.head.ref || 'dev' }}"
-          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"
+          php ${MOKO_CLI}/branch_rename.php \
+            --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --api-base "${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
+            --pr "${{ github.event.pull_request.number }}"
 
       - name: Checkout rc and configure git
         run: |
           git fetch origin rc
           git checkout rc
-          git config --local user.email "mokogitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "mokogitea-actions[bot]"
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
 
       - name: Publish RC release
@@ -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.name "mokogitea-actions[bot]"
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
 
       - name: Check for merge conflict markers
@@ -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
@@ -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
-          # (cascade-dev.yml), which runs after this release completes.
-          echo "rc cleaned; dev reset handled by cascade-dev.yml" >> $GITHUB_STEP_SUMMARY
+          # Delete dev branch
+          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
+            "${API_BASE}/branches/dev" 2>/dev/null && echo "Deleted dev branch"
+
+          # Recreate dev from main (now includes version bump + changelog promotion)
+          curl -sf -X POST -H "Authorization: token ${TOKEN}" \
+            -H "Content-Type: application/json" \
+            "${API_BASE}/branches" \
+            -d '{"new_branch_name":"dev","old_branch_name":"main"}' 2>/dev/null && echo "Recreated dev from main"
+
+          echo "Pre-release branches cleaned, dev reset from main" >> $GITHUB_STEP_SUMMARY
 
       - name: "Step 12: Create version branch from main"
         if: steps.version.outputs.skip != 'true'

.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=$(printf '%s' "${BRANCH}" | sed 's|/|%2F|g')
+          ENCODED=$(php -r "echo rawurlencode('${BRANCH}');")
 
           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>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# 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' }}
-
+# 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
+# have different version numbers in templateDetails.xml / manifest.xml.
+name: "Cascade Main → Dev (DISABLED)"
+on: workflow_dispatch
 jobs:
-  cascade:
-    name: Cascade main -> dev
+  noop:
     runs-on: ubuntu-latest
     steps:
-      - name: Open main -> dev PR (auto-merge if clean, else notify)
-        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
+      - run: echo "Cascade disabled — auto-release handles dev recreation"

.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
@@ -132,9 +130,6 @@ jobs:
     name: Tests
     runs-on: ubuntu-latest
     needs: lint
-    # Run only when lint succeeded; always() forces evaluation so a skipped
-    # lint (e.g. template repos) skips this job cleanly instead of hanging.
-    if: ${{ always() && needs.lint.result == 'success' }}
 
     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
-# PATH: /.mokogitea/workflows/gitleaks.yml
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/MokoStandards-API
+# 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.13.05
+# VERSION: 01.10.00
 # 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: Extension CI"
-      - "Generic: Project CI"
+      - "Joomla Build & Release"
+      - "Joomla Extension CI"
+      - "Deploy"
     types:
       - completed
 

.mokogitea/workflows/pr-check.yml

@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: MokoGitea.Workflow
-# INGROUP: mokocli.CI
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /.mokogitea/workflows/pr-check.yml
+# DEFGROUP: Gitea.Workflow
+# INGROUP: moko-platform.CI
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# 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 "- \`patch/*\` → \`dev\`, \`rc\`, or \`main\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`fix/*\` → \`dev\`" >> $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
@@ -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.
-          API="${GITHUB_SERVER_URL:-https://git.mokoconsulting.tech}/api/v1/repos/${GITHUB_REPOSITORY}/metadata"
-          PLATFORM="$(curl -sf "$API" 2>/dev/null | python3 -c "import sys, json; print(json.load(sys.stdin).get('platform') or '')" 2>/dev/null || true)"
+          # Read platform from XML manifest (<platform> tag) or plain text fallback
+          PLATFORM=$(sed -n 's/.*<platform>\([^<]*\)<\/platform>.*/\1/p' .mokogitea/manifest.xml 2>/dev/null | head -1)
+          [ -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'
@@ -350,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}"
@@ -363,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
@@ -570,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,10 +3,10 @@
 # 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
-# PATH: /.mokogitea/workflows/pre-release.yml
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /templates/workflows/universal/pre-release.yml.template
 # VERSION: 05.02.00
 # BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
 
@@ -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,8 +152,8 @@ jobs:
           fi
 
           # Commit version bump
-          git config --local user.email "mokogitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "mokogitea-actions[bot]"
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
           git add -A
           git diff --cached --quiet || {

.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.repository.name, 'Template-')
+      startsWith(github.event.pull_request.head.ref, 'rc/')
 
     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
-# PATH: /.mokogitea/workflows/repo-health.yml
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
+# 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,13 +1,7 @@
 # Changelog
 ## [Unreleased]
 
-## [01.13.00] --- 2026-06-29
-
-## [01.13.00] --- 2026-06-29
-
-## [01.12.00] --- 2026-06-28
-
-## [01.12.00] --- 2026-06-28
+## [01.10.00] --- 2026-06-28
 
 ### Added
 - **Visual post calendar**: Monthly calendar grid view showing scheduled, queued, and posted cross-posts with status badges (#160)
@@ -16,9 +10,8 @@
 - **Analytics service filter**: Filter heatmap and stats by service type with configurable date range
 - **Analytics service breakdown**: Per-service success rate, failure count, and average posts per day
 - **Analytics AJAX endpoint**: JSON heatmap data for dynamic filtering without page reload
-- **Social image generator**: Generate branded 1200x630 OG images with article title overlay using PHP GD (#157)
-- **Social image config**: Background color, text color, font size, and site name branding options (#157)
-- **Generate Social Image button**: One-click image generation in the Share Content panel (#157)
+- **Social image generator**: Generate Open Graph images with article title overlay using PHP GD library (#157)
+- **Social image config**: Background color, text color, overlay style, and site name override in component options (#157)
 - **AI caption generation**: Generate platform-optimized cross-post captions from article content using Claude or OpenAI (#161)
 - **AI provider config**: New "AI Caption Generation" fieldset in component options with provider, API key, model, and tone settings
 - **AI Generate button**: One-click AI generation button in the Share Content panel that fills all caption fields
@@ -51,9 +44,8 @@
 - **PHPUnit test suite**: Unit tests for models, helpers, and service plugins (#132)
 
 ### Fixed
-- **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()`
+- Webservices plugin Joomla 6 compatibility — `onBeforeApiRoute` receives `BeforeApiRouteEvent` object, extract router via `$event->getRouter()`
 
 ## [01.07.00] --- 2026-06-23
 
@@ -67,3 +59,39 @@
 ### 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
 
@@ -97,8 +97,8 @@ 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
-- **Standards**: this repo follows [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki)
+- **Wiki**: documentation lives in the Gitea wiki, not in `docs/` files
+- **Standards**: this repo follows [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)
 
 ## Coding Standards
 

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.13.05
+  VERSION: 01.10.00
   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.13.05
+ VERSION: 01.10.00
  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,8 +1,8 @@
 # MokoSuiteCross
 
-<!-- VERSION: 01.13.05 -->
+<!-- VERSION: 01.10.00 -->
 
-Cross-posting Joomla content to social media, email marketing, and chat platforms for Joomla 6.
+Cross-posting Joomla content to social media, email marketing, and chat platforms for Joomla 5/6.
 
 ## Overview
 

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.13.05
+VERSION: 01.10.00
 BRIEF: Security vulnerability reporting and handling policy
 -->
 

source/packages/com_mokosuitecross/config.xml

@@ -266,7 +266,7 @@
         </field>
     </fieldset>
 
-        <fieldset name="social_image" label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE">
+    <fieldset name="social_image" label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE">
         <field
             name="social_image_enabled"
             type="radio"

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

@@ -572,20 +572,38 @@ 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."
 
+; 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"
+
 ; 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
-COM_MOKOSUITECROSS_CALENDAR="Post Calendar"
-COM_MOKOSUITECROSS_CALENDAR_DESC="Visual calendar of scheduled and posted content"
-COM_MOKOSUITECROSS_SUBMENU_CALENDAR="Calendar"
+; Calendar View
+COM_MOKOSUITECROSS_CALENDAR_PREV_MONTH="Previous"
+COM_MOKOSUITECROSS_CALENDAR_NEXT_MONTH="Next"
 COM_MOKOSUITECROSS_CALENDAR_TODAY="Today"
-COM_MOKOSUITECROSS_CALENDAR_MONTH="Month"
-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"
+COM_MOKOSUITECROSS_SUBMENU_CALENDAR="Post Calendar"

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.13.05</version>
+    <version>01.10.00</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/com_mokosuitecross/sql/install.mysql.sql

@@ -96,27 +96,6 @@ INSERT INTO `#__mokosuitecross_templates` (`service_type`, `title`, `template_bo
 ('instagram', 'Instagram Default', '{social}\n\n{hashtags}', 1, 21, NOW()),
 ('youtube', 'YouTube Default', '{social}\n\n{url}', 1, 22, NOW());
 
-
-CREATE TABLE IF NOT EXISTS `#__mokosuitecross_analytics` (
-    `id` int unsigned NOT NULL AUTO_INCREMENT,
-    `post_id` int unsigned NOT NULL,
-    `service_id` int unsigned NOT NULL,
-    `service_type` varchar(50) NOT NULL DEFAULT '',
-    `posted_at` datetime DEFAULT NULL,
-    `day_of_week` tinyint unsigned NOT NULL DEFAULT 0,
-    `hour_of_day` tinyint unsigned NOT NULL DEFAULT 0,
-    `impressions` int unsigned NOT NULL DEFAULT 0,
-    `engagements` int unsigned NOT NULL DEFAULT 0,
-    `clicks` int unsigned NOT NULL DEFAULT 0,
-    `shares` int unsigned NOT NULL DEFAULT 0,
-    `engagement_rate` decimal(5,2) NOT NULL DEFAULT 0.00,
-    `created` datetime NOT NULL,
-    PRIMARY KEY (`id`),
-    KEY `idx_service_type` (`service_type`),
-    KEY `idx_day_hour` (`day_of_week`, `hour_of_day`),
-    KEY `idx_post` (`post_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
 CREATE TABLE IF NOT EXISTS `#__mokosuitecross_category_rules` (
     `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
     `category_id` int(10) unsigned NOT NULL,

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

@@ -1,23 +1 @@
--- MokoSuiteCross 01.08.54 -- Best time to post analytics
--- Copyright (C) 2026 Moko Consulting. All rights reserved.
--- SPDX-License-Identifier: GPL-3.0-or-later
-
-CREATE TABLE IF NOT EXISTS `#__mokosuitecross_analytics` (
-    `id` int unsigned NOT NULL AUTO_INCREMENT,
-    `post_id` int unsigned NOT NULL,
-    `service_id` int unsigned NOT NULL,
-    `service_type` varchar(50) NOT NULL DEFAULT '',
-    `posted_at` datetime DEFAULT NULL,
-    `day_of_week` tinyint unsigned NOT NULL DEFAULT 0,
-    `hour_of_day` tinyint unsigned NOT NULL DEFAULT 0,
-    `impressions` int unsigned NOT NULL DEFAULT 0,
-    `engagements` int unsigned NOT NULL DEFAULT 0,
-    `clicks` int unsigned NOT NULL DEFAULT 0,
-    `shares` int unsigned NOT NULL DEFAULT 0,
-    `engagement_rate` decimal(5,2) NOT NULL DEFAULT 0.00,
-    `created` datetime NOT NULL,
-    PRIMARY KEY (`id`),
-    KEY `idx_service_type` (`service_type`),
-    KEY `idx_day_hour` (`day_of_week`, `hour_of_day`),
-    KEY `idx_post` (`post_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/* 01.08.54 — no schema changes */

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.08.62.sql

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-/* 01.12.01 — 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.05.sql

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

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

@@ -14,84 +14,11 @@ namespace Joomla\Component\MokoSuiteCross\Administrator\Controller;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
-use Joomla\Component\MokoSuiteCross\Administrator\Helper\AnalyticsHelper;
 
 class AnalyticsController extends BaseController
 {
-    /**
-     * Return heatmap grid data as JSON.
-     *
-     * Query params: service_type (string), days (int, default 90)
-     */
-    public function heatmap(): void
+    public function display($cachable = false, $urlparams = []): static
     {
-        if (!Session::checkToken('get')) {
-            echo json_encode(['success' => false, 'error' => 'Invalid token']);
-            $this->app->close();
-
-            return;
-        }
-
-        $user = $this->app->getIdentity();
-
-        if (!$user->authorise('core.manage', 'com_mokosuitecross')) {
-            echo json_encode(['success' => false, 'error' => 'Permission denied']);
-            $this->app->close();
-
-            return;
-        }
-
-        $serviceType = $this->input->getCmd('service_type', '');
-        $days        = $this->input->getInt('days', 90);
-
-        $grid      = AnalyticsHelper::getHeatmapData($serviceType, $days);
-        $bestTimes = AnalyticsHelper::getBestTimes($serviceType, 3);
-
-        $this->app->setHeader('Content-Type', 'application/json; charset=utf-8');
-        echo json_encode([
-            'success'    => true,
-            'grid'       => $grid,
-            'best_times' => $bestTimes,
-        ]);
-        $this->app->close();
-    }
-
-    /**
-     * Return the top posting times as JSON.
-     *
-     * Query params: service_type (string), limit (int, default 5)
-     */
-    public function besttimes(): void
-    {
-        if (!Session::checkToken('get')) {
-            echo json_encode(['success' => false, 'error' => 'Invalid token']);
-            $this->app->close();
-
-            return;
-        }
-
-        $user = $this->app->getIdentity();
-
-        if (!$user->authorise('core.manage', 'com_mokosuitecross')) {
-            echo json_encode(['success' => false, 'error' => 'Permission denied']);
-            $this->app->close();
-
-            return;
-        }
-
-        $serviceType = $this->input->getCmd('service_type', '');
-        $limit       = $this->input->getInt('limit', 5);
-
-        $bestTimes        = AnalyticsHelper::getBestTimes($serviceType, $limit);
-        $serviceBreakdown = AnalyticsHelper::getServiceBreakdown();
-
-        $this->app->setHeader('Content-Type', 'application/json; charset=utf-8');
-        echo json_encode([
-            'success'           => true,
-            'best_times'        => $bestTimes,
-            'service_breakdown' => $serviceBreakdown,
-        ]);
-        $this->app->close();
+        return parent::display($cachable, $urlparams);
     }
 }

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
 {
-    /**
-     * Return posts as FullCalendar-compatible JSON events.
-     *
-     * Query params: start, end (ISO 8601 date range from FullCalendar).
-     *
-     * @return  void
-     */
-    public function events(): void
+    public function display($cachable = false, $urlparams = []): static
     {
-        $app = $this->app;
-        $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();
+        return parent::display($cachable, $urlparams);
     }
 }

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

@@ -17,6 +17,7 @@ use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
 use Joomla\Component\MokoSuiteCross\Administrator\Helper\SocialImageHelper;
 
 class SocialImageController extends BaseController
@@ -32,7 +33,7 @@ class SocialImageController extends BaseController
 
         $user = $this->app->getIdentity();
 
-        if (!$user->authorise('core.edit', 'com_mokosuitecross')) {
+        if (!$user->authorise('core.manage', 'com_mokosuitecross')) {
             echo json_encode(['success' => false, 'error' => 'Permission denied']);
             $this->app->close();
 
@@ -48,40 +49,47 @@ class SocialImageController extends BaseController
             return;
         }
 
-        $params = ComponentHelper::getParams('com_mokosuitecross');
-
-        if (!(int) $params->get('social_image_enabled', 0)) {
-            echo json_encode(['success' => false, 'error' => 'Social image generator is not enabled']);
-            $this->app->close();
-
-            return;
-        }
-
         $db    = Factory::getDbo();
         $query = $db->getQuery(true)
-            ->select($db->quoteName('title'))
+            ->select($db->quoteName(['id', 'title', 'images']))
             ->from($db->quoteName('#__content'))
             ->where($db->quoteName('id') . ' = ' . $articleId);
         $db->setQuery($query);
-        $title = $db->loadResult();
+        $article = $db->loadObject();
 
-        if (!$title) {
+        if (!$article) {
             echo json_encode(['success' => false, 'error' => 'Article not found']);
             $this->app->close();
 
             return;
         }
 
-        $siteName = $this->app->get('sitename', '');
+        $params   = ComponentHelper::getParams('com_mokosuitecross');
+        $siteName = $params->get('social_image_site_name', '') ?: Factory::getApplication()->get('sitename', '');
 
-        $config = [
-            'bg_color'       => $params->get('social_image_bg_color', '#1a1a2e'),
-            'text_color'     => $params->get('social_image_text_color', '#ffffff'),
-            'font_size'      => $params->get('social_image_font_size', 48),
-            'show_site_name' => (bool) $params->get('social_image_show_site_name', 1),
+        $options = [
+            'bg_color'  => $params->get('social_image_bg_color', '#1a1a2e'),
+            'text_color' => $params->get('social_image_text_color', '#ffffff'),
+            'overlay'   => $params->get('social_image_overlay', 'dark'),
         ];
 
-        $result = SocialImageHelper::generate($title, $siteName, $config);
+        $backgroundPath = null;
+        $images = json_decode($article->images ?? '{}', true);
+
+        if (!empty($images['image_intro'])) {
+            $backgroundPath = JPATH_ROOT . '/' . ltrim($images['image_intro'], '/');
+        } elseif (!empty($images['image_fulltext'])) {
+            $backgroundPath = JPATH_ROOT . '/' . ltrim($images['image_fulltext'], '/');
+        }
+
+        try {
+            $imagePath = SocialImageHelper::generate($article->title, $siteName, $backgroundPath, $options);
+            $imageUrl  = str_replace(JPATH_ROOT, Uri::root(true), str_replace('\\', '/', $imagePath));
+
+            $result = ['success' => true, 'image_url' => $imageUrl, 'image_path' => $imagePath];
+        } catch (\Throwable $e) {
+            $result = ['success' => false, 'error' => $e->getMessage()];
+        }
 
         $this->app->setHeader('Content-Type', 'application/json; charset=utf-8');
         echo json_encode($result);

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

@@ -17,236 +17,144 @@ use Joomla\CMS\Factory;
 
 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
-    {
-        $db = Factory::getDbo();
+    private static array $dayNames = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
 
-        $postedAt = $metrics['posted_at'] ?? null;
-
-        if ($postedAt) {
-            $timestamp  = strtotime($postedAt);
-            $dayOfWeek  = (int) date('w', $timestamp);
-            $hourOfDay  = (int) date('G', $timestamp);
-        } else {
-            $dayOfWeek  = 0;
-            $hourOfDay  = 0;
-        }
-
-        $impressions = (int) ($metrics['impressions'] ?? 0);
-        $engagements = (int) ($metrics['engagements'] ?? 0);
-        $clicks      = (int) ($metrics['clicks'] ?? 0);
-        $shares      = (int) ($metrics['shares'] ?? 0);
-
-        $engagementRate = $impressions > 0
-            ? 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'))
-            ->where($db->quoteName('post_id') . ' = ' . $postId)
-            ->where($db->quoteName('service_id') . ' = ' . $serviceId);
-        $db->setQuery($query);
-        $existingId = $db->loadResult();
-
-        if ($existingId) {
-            $query = $db->getQuery(true)
-                ->update($db->quoteName('#__mokosuitecross_analytics'))
-                ->set($db->quoteName('impressions') . ' = ' . $impressions)
-                ->set($db->quoteName('engagements') . ' = ' . $engagements)
-                ->set($db->quoteName('clicks') . ' = ' . $clicks)
-                ->set($db->quoteName('shares') . ' = ' . $shares)
-                ->set($db->quoteName('engagement_rate') . ' = ' . $engagementRate)
-                ->where($db->quoteName('id') . ' = ' . (int) $existingId);
-            $db->setQuery($query);
-            $db->execute();
-
-            return true;
-        }
-
-        $record = (object) [
-            'post_id'         => $postId,
-            'service_id'      => $serviceId,
-            'service_type'    => $serviceType,
-            'posted_at'       => $postedAt,
-            'day_of_week'     => $dayOfWeek,
-            'hour_of_day'     => $hourOfDay,
-            'impressions'     => $impressions,
-            'engagements'     => $engagements,
-            'clicks'          => $clicks,
-            'shares'          => $shares,
-            'engagement_rate' => $engagementRate,
-            'created'         => Factory::getDate()->toSql(),
-        ];
-
-        $db->insertObject('#__mokosuitecross_analytics', $record);
-
-        return true;
-    }
-
-    /**
-     * 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
+    public static function getPostingHeatmap(string $serviceType = '', int $days = 90): array
     {
         $db = Factory::getDbo();
 
         $query = $db->getQuery(true)
-            ->select([
-                $db->quoteName('day_of_week'),
-                $db->quoteName('hour_of_day'),
-                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_rate',
-                'COUNT(*) AS post_count',
-            ])
-            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->group($db->quoteName('day_of_week'))
-            ->group($db->quoteName('hour_of_day'))
-            ->order($db->quoteName('day_of_week') . ' ASC')
-            ->order($db->quoteName('hour_of_day') . ' ASC');
-
-        if ($serviceType !== '') {
-            $query->where($db->quoteName('service_type') . ' = ' . $db->quote($serviceType));
-        }
+            ->select('DAYOFWEEK(' . $db->quoteName('p.posted_at') . ') - 1 AS dow')
+            ->select('HOUR(' . $db->quoteName('p.posted_at') . ') AS hr')
+            ->select('COUNT(*) AS cnt')
+            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
+            ->where($db->quoteName('p.status') . ' = ' . $db->quote('posted'))
+            ->where($db->quoteName('p.posted_at') . ' IS NOT NULL');
 
         if ($days > 0) {
-            $cutoff = Factory::getDate('-' . $days . ' days')->toSql();
-            $query->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff));
+            $since = Factory::getDate('now - ' . $days . ' days')->toSql();
+            $query->where($db->quoteName('p.posted_at') . ' >= ' . $db->quote($since));
         }
 
+        if ($serviceType !== '') {
+            $query->join('INNER', $db->quoteName('#__mokosuitecross_services', 's') . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+                ->where($db->quoteName('s.service_type') . ' = ' . $db->quote($serviceType));
+        }
+
+        $query->group('dow, hr')
+            ->order('dow ASC, hr ASC');
+
         $db->setQuery($query);
         $rows = $db->loadObjectList();
 
-        // Build 7x24 grid initialised to zero
         $grid = [];
 
         for ($d = 0; $d < 7; $d++) {
-            for ($h = 0; $h < 24; $h++) {
-                $grid[$d][$h] = ['avg_rate' => 0.00, 'post_count' => 0];
-            }
+            $grid[$d] = array_fill(0, 24, 0);
         }
 
         foreach ($rows as $row) {
-            $grid[(int) $row->day_of_week][(int) $row->hour_of_day] = [
-                'avg_rate'   => round((float) $row->avg_rate, 2),
-                'post_count' => (int) $row->post_count,
-            ];
+            $grid[(int) $row->dow][(int) $row->hr] = (int) $row->cnt;
         }
 
         return $grid;
     }
 
-    /**
-     * 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
+    public static function getBestTimes(string $serviceType = '', int $days = 90, int $limit = 5): array
     {
-        $db = Factory::getDbo();
+        $grid  = self::getPostingHeatmap($serviceType, $days);
+        $slots = [];
 
-        $query = $db->getQuery(true)
-            ->select([
-                $db->quoteName('day_of_week'),
-                $db->quoteName('hour_of_day'),
-                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_rate',
-                'COUNT(*) AS post_count',
-            ])
-            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->group($db->quoteName('day_of_week'))
-            ->group($db->quoteName('hour_of_day'))
-            ->having('COUNT(*) >= 1')
-            ->order('avg_rate DESC');
-
-        if ($serviceType !== '') {
-            $query->where($db->quoteName('service_type') . ' = ' . $db->quote($serviceType));
+        foreach ($grid as $dow => $hours) {
+            foreach ($hours as $hour => $count) {
+                if ($count > 0) {
+                    $slots[] = [
+                        'day'   => self::$dayNames[$dow],
+                        'hour'  => $hour,
+                        'count' => $count,
+                        'label' => self::$dayNames[$dow] . ' ' . self::formatHour($hour),
+                    ];
+                }
+            }
         }
 
-        $db->setQuery($query, 0, $limit);
-        $rows = $db->loadAssocList();
+        usort($slots, static fn($a, $b) => $b['count'] <=> $a['count']);
 
-        $dayNames = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-
-        $results = [];
-
-        foreach ($rows as $row) {
-            $hour     = (int) $row['hour_of_day'];
-            $ampm     = $hour < 12 ? 'AM' : 'PM';
-            $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['avg_rate'], 2),
-                'post_count'  => (int) $row['post_count'],
-            ];
-        }
-
-        return $results;
+        return \array_slice($slots, 0, $limit);
     }
 
-    /**
-     * 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
     {
         $db = Factory::getDbo();
 
         $query = $db->getQuery(true)
-            ->select([
-                $db->quoteName('service_type'),
-                'COUNT(*) AS total_posts',
-                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_engagement_rate',
-                'SUM(' . $db->quoteName('impressions') . ') AS total_impressions',
-                'SUM(' . $db->quoteName('engagements') . ') AS total_engagements',
-                'SUM(' . $db->quoteName('clicks') . ') AS total_clicks',
-                'SUM(' . $db->quoteName('shares') . ') AS total_shares',
-            ])
-            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->group($db->quoteName('service_type'))
-            ->order('avg_engagement_rate DESC');
+            ->select($db->quoteName('s.service_type'))
+            ->select($db->quoteName('s.title', 'service_title'))
+            ->select('COUNT(*) AS total')
+            ->select('SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS success')
+            ->select('SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('failed') . ' THEN 1 ELSE 0 END) AS failed')
+            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
+            ->join('INNER', $db->quoteName('#__mokosuitecross_services', 's') . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'));
 
         if ($days > 0) {
-            $cutoff = Factory::getDate('-' . $days . ' days')->toSql();
-            $query->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff));
+            $since = Factory::getDate('now - ' . $days . ' days')->toSql();
+            $query->where($db->quoteName('p.created') . ' >= ' . $db->quote($since));
         }
 
+        $query->group($db->quoteName(['s.service_type', 's.title']))
+            ->order('total DESC');
+
         $db->setQuery($query);
-        $rows = $db->loadAssocList();
+        $rows = $db->loadObjectList();
 
-        foreach ($rows as &$row) {
-            $row['avg_engagement_rate'] = round((float) $row['avg_engagement_rate'], 2);
-            $row['total_posts']         = (int) $row['total_posts'];
-            $row['total_impressions']   = (int) $row['total_impressions'];
-            $row['total_engagements']   = (int) $row['total_engagements'];
-            $row['total_clicks']        = (int) $row['total_clicks'];
-            $row['total_shares']        = (int) $row['total_shares'];
+        $result = [];
+
+        foreach ($rows as $row) {
+            $total   = (int) $row->total;
+            $success = (int) $row->success;
+            $result[] = [
+                'service_type'  => $row->service_type,
+                'service_title' => $row->service_title,
+                'total'         => $total,
+                'success'       => $success,
+                'failed'        => (int) $row->failed,
+                'success_rate'  => $total > 0 ? round(($success / $total) * 100, 1) : 0.0,
+                'avg_per_day'   => $days > 0 ? round($total / $days, 1) : 0.0,
+            ];
         }
 
-        return $rows;
+        return $result;
     }
-}
+
+    public static function getServiceTypes(): array
+    {
+        $db = Factory::getDbo();
+
+        $query = $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($query);
+
+        return $db->loadColumn() ?: [];
+    }
+
+    private static function formatHour(int $hour): string
+    {
+        if ($hour === 0) {
+            return '12:00 AM';
+        }
+
+        if ($hour < 12) {
+            return $hour . ':00 AM';
+        }
+
+        if ($hour === 12) {
+            return '12:00 PM';
+        }
+
+        return ($hour - 12) . ':00 PM';
+    }
+}

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

@@ -40,7 +40,6 @@ class MokoSuiteCrossHelper
             'posts'     => 'COM_MOKOSUITECROSS_SUBMENU_POSTS',
             'services'  => 'COM_MOKOSUITECROSS_SUBMENU_SERVICES',
             'templates' => 'COM_MOKOSUITECROSS_SUBMENU_TEMPLATES',
-            'calendar'  => 'COM_MOKOSUITECROSS_SUBMENU_CALENDAR',
             'logs'      => 'COM_MOKOSUITECROSS_SUBMENU_LOGS',
             'calendar'  => 'COM_MOKOSUITECROSS_SUBMENU_CALENDAR',
             'analytics' => 'COM_MOKOSUITECROSS_SUBMENU_ANALYTICS',

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

@@ -14,48 +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 int $month;
+    public array $events;
     public $sidebar;
-    public $ajaxUrl;
 
     public function display($tpl = null): void
     {
-        // ACL check
-        $canDo = MokoSuiteCrossHelper::getActions();
+        $input = Factory::getApplication()->input;
 
-        if (!$canDo->get('core.manage')) {
-            throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
+        $this->year  = $input->getInt('year', (int) date('Y'));
+        $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
-        $this->ajaxUrl = Route::_('index.php?option=com_mokosuitecross&task=calendar.events&format=json', false);
+        if ($this->year < 2000 || $this->year > 2100) {
+            $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(
-            Text::_('COM_MOKOSUITECROSS') . ' - ' . Text::_('COM_MOKOSUITECROSS_CALENDAR'),
-            'calendar'
-        );
-        ToolbarHelper::back('JTOOLBAR_BACK', Route::_('index.php?option=com_mokosuitecross&view=dashboard', false));
+        $canDo = MokoSuiteCrossHelper::getActions();
+
+        ToolbarHelper::title('MokoSuiteCross -- Post Calendar', 'calendar');
+        ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuitecross&view=dashboard');
+
+        if ($canDo->get('core.admin')) {
+            ToolbarHelper::preferences('com_mokosuitecross');
+        }
     }
 }

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();
-$ajaxUrl  = $this->ajaxUrl;
+$year   = $this->year;
+$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>
-    #mokosuitecross-calendar {
-        max-width: 1100px;
-        margin: 0 auto;
-    }
-    .fc .fc-toolbar-title {
-        font-size: 1.4em;
-    }
-    .mokosuitecross-calendar-legend {
-        display: flex;
-        gap: 1.5rem;
-        flex-wrap: wrap;
-        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 class="d-flex justify-content-between align-items-center mb-3">
+    <a href="<?php echo Route::_('index.php?option=com_mokosuitecross&view=calendar&year=' . $prevYear . '&month=' . $prevMonth); ?>"
+       class="btn btn-outline-secondary btn-sm">
+        <span class="icon-chevron-left" aria-hidden="true"></span>
+        <?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_PREV_MONTH'); ?>
+    </a>
+    <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); ?>"
+       class="btn btn-outline-secondary btn-sm">
+        <?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_NEXT_MONTH'); ?>
+        <span class="icon-chevron-right" aria-hidden="true"></span>
+    </a>
 </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>
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    var calendarEl = document.getElementById('mokosuitecross-calendar');
-    var token = '<?php echo $token; ?>';
+        while ($day <= $daysInMonth) : ?>
+        <tr>
+            <?php for ($col = 0; $col < 7; $col++) :
+                if (!$started && $col < $firstWeekday) : ?>
+                    <td class="text-muted bg-light">&nbsp;</td>
+                <?php
+                    continue;
+                endif;
 
-    var calendar = new FullCalendar.Calendar(calendarEl, {
-        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;
+                $started = true;
 
-            // Only allow rescheduling of scheduled or queued posts
-            if (status !== 'scheduled' && status !== 'queued') {
-                info.revert();
-                Joomla.renderMessages({
-                    warning: ['<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_CANNOT_RESCHEDULE', true); ?>']
-                });
-                return;
-            }
+                if ($day > $daysInMonth) : ?>
+                    <td class="text-muted bg-light">&nbsp;</td>
+                <?php
+                    continue;
+                endif;
 
-            var newDate = info.event.start.toISOString();
-
-            var formData = new FormData();
-            formData.append('post_id', postId);
-            formData.append('new_date', newDate);
-            formData.append(token, '1');
-
-            fetch('index.php?option=com_mokosuitecross&task=calendar.reschedule&format=json', {
-                method: 'POST',
-                body: formData
-            })
-            .then(function(response) { return response.json(); })
-            .then(function(data) {
-                if (data.success) {
-                    // Update the event colour to scheduled
-                    info.event.setProp('color', '#007bff');
-                    info.event.setExtendedProp('status', 'scheduled');
-                    Joomla.renderMessages({
-                        message: ['<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_SUCCESS', true); ?>']
-                    });
-                } else {
-                    info.revert();
-                    Joomla.renderMessages({
-                        error: [data.error || '<?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_RESCHEDULE_ERROR', true); ?>']
-                    });
-                }
-            })
-            .catch(function() {
-                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>
+                $dateKey   = sprintf('%04d-%02d-%02d', $year, $month, $day);
+                $isToday   = ($dateKey === $today);
+                $cellClass = $isToday ? 'border border-primary border-2 bg-primary bg-opacity-10' : '';
+                $dayEvents = $events[$dateKey] ?? [];
+            ?>
+                <td class="<?php echo $cellClass; ?>" style="vertical-align: top; min-height: 80px;">
+                    <div class="fw-bold mb-1<?php echo $isToday ? ' text-primary' : ''; ?>">
+                        <?php echo $day; ?>
+                        <?php if ($isToday) : ?>
+                            <small class="text-primary"><?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_TODAY'); ?></small>
+                        <?php endif; ?>
+                    </div>
+                    <?php foreach ($dayEvents as $event) : ?>
+                        <span class="badge <?php echo $statusClass($event->status); ?> mb-1 d-block text-truncate" style="max-width: 100%;"
+                              title="<?php echo htmlspecialchars(ucfirst($event->service_type) . ': ' . $event->article_title . ' (' . $event->status . ')'); ?>">
+                            <?php echo htmlspecialchars(ucfirst($event->service_type)); ?>:
+                            <?php echo htmlspecialchars(mb_substr($event->article_title, 0, 20)); ?>
+                        </span>
+                    <?php endforeach; ?>
+                </td>
+            <?php
+                $day++;
+            endfor; ?>
+        </tr>
+        <?php endwhile; ?>
+    </tbody>
+</table>
+</div>

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

@@ -282,9 +282,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.13.05</version>
+    <version>01.10.00</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

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

@@ -257,53 +257,6 @@ XML;
             $form->load($aiXml);
             $form->setFieldAttribute('mokosuitecross_ai_generate', 'description', $aiButtonHtml, 'attribs');
         }
-        // Social Image Generator button (#157)
-        $siParams  = ComponentHelper::getParams('com_mokosuitecross');
-        $siEnabled = (bool) $siParams->get('social_image_enabled', 0);
-
-        if ($siEnabled && $articleId > 0) {
-            $siToken = Session::getFormToken();
-            $siUrl   = Uri::base() . 'index.php?option=com_mokosuitecross&task=socialimage.generate&format=raw&article_id=' . $articleId . '&' . $siToken . '=1';
-
-            $siButtonHtml = '<div class="mb-3">'
-                . '<button type="button" id="mokosuitecross-si-btn" class="btn btn-sm btn-outline-success" onclick="mokosuitecrossSiGenerate()">'
-                . '<span class="icon-image" aria-hidden="true"></span> '
-                . \Joomla\CMS\Language\Text::_('COM_MOKOSUITECROSS_SOCIAL_IMAGE_GENERATE')
-                . '</button>'
-                . '<span id="mokosuitecross-si-status" class="ms-2 small"></span>'
-                . '<div id="mokosuitecross-si-preview" class="mt-2" style="display:none;">'
-                . '<img id="mokosuitecross-si-thumb" src="" alt="Social image preview" style="max-width:300px;border:1px solid #ccc;border-radius:4px;" />'
-                . '</div>'
-                . '</div>'
-                . '<script>'
-                . 'function mokosuitecrossSiGenerate(){'
-                . 'var btn=document.getElementById("mokosuitecross-si-btn");'
-                . 'var st=document.getElementById("mokosuitecross-si-status");'
-                . 'var pv=document.getElementById("mokosuitecross-si-preview");'
-                . 'var img=document.getElementById("mokosuitecross-si-thumb");'
-                . 'btn.disabled=true;st.textContent="' . \Joomla\CMS\Language\Text::_('COM_MOKOSUITECROSS_SOCIAL_IMAGE_GENERATING', true) . '";'
-                . 'pv.style.display="none";'
-                . 'fetch("' . $siUrl . '")'
-                . '.then(function(r){return r.json();})'
-                . '.then(function(d){'
-                . 'btn.disabled=false;'
-                . 'if(!d.success){st.textContent=d.error||"Error";return;}'
-                . 'st.textContent="' . \Joomla\CMS\Language\Text::_('COM_MOKOSUITECROSS_SOCIAL_IMAGE_GENERATED', true) . '";'
-                . 'img.src="' . Uri::root() . '"+d.image_url+"?t="+Date.now();'
-                . 'pv.style.display="block";'
-                . '})'
-                . '.catch(function(){btn.disabled=false;st.textContent="Request failed";});'
-                . '}'
-                . '</script>';
-
-            $siXml = '<?xml version="1.0"?>
-<form><fields name="attribs"><fieldset name="mokosuitecross_share">
-    <field name="mokosuitecross_si_generate" type="note"
-        label="" description="" />
-</fieldset></fields></form>';
-            $form->load($siXml);
-            $form->setFieldAttribute('mokosuitecross_si_generate', 'description', $siButtonHtml, 'attribs');
-        }
 
         // Cross-post history panel for existing articles
 
@@ -451,7 +404,7 @@ XML;
     /**
      * Dispatch cross-post when an article is saved and published.
      */
-    public function onContentAfterSave($event): void
+    public function onContentAfterSave(\Joomla\CMS\Event\Content\AfterSaveEvent $event): void
     {
         $context = $event->getContext();
 
@@ -488,7 +441,7 @@ XML;
     /**
      * Dispatch cross-post when article state changes to published.
      */
-    public function onContentChangeState($event): void
+    public function onContentChangeState(\Joomla\CMS\Event\Content\ContentChangeStateEvent $event): void
     {
         $context = $event->getContext();
 

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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</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.13.05</version>
+    <version>01.10.00</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_rssfeed/rssfeed.xml

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

source/packages/plg_mokosuitecross_sendgrid/sendgrid.xml

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

source/packages/plg_mokosuitecross_slack/slack.xml

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

source/packages/plg_mokosuitecross_teams/teams.xml

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

source/packages/plg_mokosuitecross_telegram/telegram.xml

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

source/packages/plg_mokosuitecross_threads/threads.xml

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

source/packages/plg_mokosuitecross_tiktok/tiktok.xml

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

source/packages/plg_mokosuitecross_tumblr/tumblr.xml

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

source/packages/plg_mokosuitecross_twitter/twitter.xml

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

source/packages/plg_mokosuitecross_webhook/webhook.xml

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

source/packages/plg_mokosuitecross_whatsapp/whatsapp.xml

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

source/packages/plg_mokosuitecross_wordpress/wordpress.xml

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

source/packages/plg_mokosuitecross_youtube/youtube.xml

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

source/packages/plg_system_mokosuitecross/mokosuitecross.xml

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

source/packages/plg_system_mokosuitecross_events/mokosuitecross_events.xml

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