Revert "Merge branch 'dev' into main"

This reverts commit 537d8bcf36, reversing changes made to 876299be85.
Merge branch 'dev' into main
2026-07-10 16:24:37 -05:00 · 2026-07-10 11:41:05 -05:00 · 2026-07-06 17:06:19 +00:00 · 2026-07-06 03:52:28 +00:00 · 2026-07-06 03:52:26 +00:00 · 2026-07-06 03:52:25 +00:00
17 changed files with 361 additions and 103 deletions
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
 # PATH: /.mokogitea/workflows/auto-bump.yml
 # VERSION: 09.02.00
 # BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
@@ -34,7 +34,8 @@ jobs:
    if: >-
      !contains(github.event.head_commit.message, '[skip ci]') &&
      !contains(github.event.head_commit.message, '[skip bump]') &&
-      !startsWith(github.event.head_commit.message, 'Merge pull request')
+      !startsWith(github.event.head_commit.message, 'Merge pull request') &&
      !startsWith(github.event.repository.name, 'Template-')
    steps:
      - name: Checkout
@@ -52,7 +53,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"
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Release
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /templates/workflows/universal/auto-release.yml.template
+# PATH: /.mokogitea/workflows/auto-release.yml
 # VERSION: 05.01.00
 # BRIEF: Universal build & release � detects platform from manifest.xml
 #
@@ -64,10 +64,14 @@ jobs:
  promote-rc:
    name: Promote to RC
    runs-on: release
    # Skip on template repos (Template-*) — they scaffold other repos and do not release.
    if: >-
-      (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
+      !startsWith(github.event.repository.name, 'Template-') &&
-      (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
@@ -91,7 +95,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
@@ -100,18 +104,46 @@ jobs:
      - name: Rename branch to rc
        run: |
-          php ${MOKO_CLI}/branch_rename.php \
+          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-            --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
+          AUTH="Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}"
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+          FROM="${{ github.event.pull_request.head.ref || 'dev' }}"
-            --api-base "${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
+          PR="${{ github.event.pull_request.number }}"
-            --pr "${{ github.event.pull_request.number }}"
+
          # Resolve the source branch HEAD commit.
          SRC_JSON=$(curl -sf -H "$AUTH" "${API_BASE}/branches/${FROM}") \
            || { echo "::error::Source branch ${FROM} not found"; exit 1; }
          SRC_SHA=$(printf '%s' "$SRC_JSON" | python3 -c "import sys, json; print(json.load(sys.stdin)['commit']['id'])" 2>/dev/null || true)
          [ -n "$SRC_SHA" ] || { echo "::error::Could not resolve HEAD of ${FROM}"; exit 1; }
          # Point rc at the source commit. If rc already exists (a protected branch that
          # cannot be deleted), force-update its ref in place instead of delete+recreate:
          # deleting a protected branch fails, which then makes the recreate return HTTP 409.
          if curl -sf -o /dev/null -H "$AUTH" "${API_BASE}/branches/rc"; then
            echo "rc exists - force-updating to ${FROM} (${SRC_SHA})"
            curl -sf -X PATCH -H "$AUTH" -H "Content-Type: application/json" \
              "${API_BASE}/git/refs/heads/rc" -d "{\"sha\":\"${SRC_SHA}\",\"force\":true}" \
              || { echo "::error::Failed to force-update rc (CI token needs force-push on the protected rc branch)"; exit 1; }
          else
            echo "Creating rc from ${FROM}"
            curl -sf -X POST -H "$AUTH" -H "Content-Type: application/json" \
              "${API_BASE}/branches" -d "{\"new_branch_name\":\"rc\",\"old_branch_name\":\"${FROM}\"}" \
              || { echo "::error::Failed to create rc from ${FROM}"; exit 1; }
          fi
          # Repoint the PR at rc, then delete the old source branch (non-fatal).
          if [ -n "$PR" ]; then
            curl -s -X PATCH -H "$AUTH" -H "Content-Type: application/json" \
              "${API_BASE}/pulls/${PR}" -d '{"head":"rc"}' >/dev/null || true
          fi
          curl -s -X DELETE -H "$AUTH" "${API_BASE}/branches/${FROM}" >/dev/null || true
          echo "Renamed ${FROM} -> rc"
      - name: Checkout rc and configure git
        run: |
          git fetch origin rc
          git checkout rc
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.email "mokogitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
+          git config --local user.name "mokogitea-actions[bot]"
          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
      - name: Publish RC release
@@ -164,9 +196,13 @@ jobs:
  release:
    name: Build & Release Pipeline
    runs-on: release
    # Skip on template repos (Template-*) — they scaffold other repos and do not release.
    if: >-
-      github.event.pull_request.merged == true ||
+      !startsWith(github.event.repository.name, 'Template-') &&
-      (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
@@ -178,8 +214,8 @@ jobs:
      - name: Configure git for bot pushes
        run: |
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.email "mokogitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
+          git config --local user.name "mokogitea-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
@@ -210,7 +246,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
@@ -346,7 +382,7 @@ jobs:
          content = open('CHANGELOG.md').read()
          old = '## [Unreleased]'
          new = f'## [Unreleased]\n\n## [{version}] --- {date}'
-          content = content.replace(old, new, 1)
+          content = content if ('## [' + version + ']') in content else content.replace(old, new, 1)
          open('CHANGELOG.md', 'w').write(content)
          " "$VERSION" "$DATE"
            git add CHANGELOG.md
@@ -390,7 +426,7 @@ jobs:
            && echo "main branch pushed to GitHub mirror" \
            || echo "WARNING: GitHub mirror push failed"
-      - name: "Step 11: Delete rc branch and recreate dev from main"
+      - name: "Step 11: Delete rc branch (dev reset moved to cascade-dev.yml)"
        if: steps.version.outputs.skip != 'true'
        continue-on-error: true
        run: |
@@ -402,17 +438,9 @@ jobs:
            "${API_BASE}/branches/rc" 2>/dev/null \
            && echo "Deleted rc branch" || echo "rc branch not found"
-          # Delete dev branch
+          # dev is reset from main by the dedicated "Cascade Main -> Dev" workflow
-          curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
+          # (cascade-dev.yml), which runs after this release completes.
-            "${API_BASE}/branches/dev" 2>/dev/null && echo "Deleted dev branch"
+          echo "rc cleaned; dev reset handled by cascade-dev.yml" >> $GITHUB_STEP_SUMMARY
          # 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'
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: MokoStandards.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
 # PATH: /.mokogitea/workflows/branch-cleanup.yml
 # VERSION: 01.00.00
 # BRIEF: Delete feature branches after PR merge
@@ -33,7 +33,8 @@ jobs:
        run: |
          BRANCH="${{ github.event.pull_request.head.ref }}"
          API="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}/api/v1/repos/${{ github.repository }}/branches"
-          ENCODED=$(php -r "echo rawurlencode('${BRANCH}');")
+          # URL-encode the branch name's slashes (no PHP dependency on the runner)
          ENCODED=$(printf '%s' "${BRANCH}" | sed 's|/|%2F|g')
          STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X DELETE \
            -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
@@ -1,10 +1,106 @@
-# DISABLED — auto-release Step 11 recreates dev from main after every release.
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-# Cascade-dev is redundant and causes version conflicts when both main and dev
+#
-# have different version numbers in templateDetails.xml / manifest.xml.
+# SPDX-License-Identifier: GPL-3.0-or-later
-name: "Cascade Main → Dev (DISABLED)"
+#
-on: workflow_dispatch
+# 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' }}
 jobs:
-  noop:
+  cascade:
    name: Cascade main -> dev
    runs-on: ubuntu-latest
    steps:
-      - run: echo "Cascade disabled — auto-release handles dev recreation"
+      - 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
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: MokoStandards.CI
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /.gitea/workflows/ci-generic.yml
+# PATH: /.mokogitea/workflows/ci-generic.yml
 # VERSION: 01.00.00
 # BRIEF: CI pipeline — lint, validate, and test for generic projects (PHP + Node.js)
@@ -32,6 +32,8 @@ 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
@@ -129,7 +131,11 @@ jobs:
  test:
    name: Tests
    runs-on: ubuntu-latest
-    needs: lint
+    # Independent job (no `needs: lint`): the Gitea Actions scheduler does not
    # offer the dependent 2nd job of a needs-chain to runners, so it stalls in
    # "waiting" and is reaped by ABANDONED_JOB_TIMEOUT. Guard template repos
    # directly (same condition lint uses) instead of gating on lint's result.
    if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
    steps:
      - name: Checkout
@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
 # PATH: /.mokogitea/workflows/ci-issue-reporter.yml
 # VERSION: 01.00.00
-# BRIEF: Reusable workflow — creates/updates a Gitea issue when a CI gate fails.
+# BRIEF: Reusable workflow — creates/updates a MokoGitea issue when a CI gate fails.
 #        Clones MokoCLI and runs cli/ci_issue_reporter.sh.
 name: "Universal: CI Issue Reporter"
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: MokoStandards.Maintenance
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
-# PATH: /.gitea/workflows/cleanup.yml
+# PATH: /.mokogitea/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|develop|release/*|hotfix/*) continue ;;
+              main|master|dev|develop|rc|beta|alpha|release|release/*|production|stable|staging|hotfix/*|version/*) continue ;;
            esac
            # Check if branch is merged into main
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: MokoStandards.Security
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/MokoStandards-API
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
-# PATH: /templates/workflows/gitleaks.yml.template
+# PATH: /.mokogitea/workflows/gitleaks.yml
 # VERSION: 01.00.00
 # BRIEF: Secret scanning — detect leaked credentials, API keys, and tokens
 #
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Automation
 # VERSION: 01.00.00
 # BRIEF: Auto-create feature branch when an issue is opened
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: MokoStandards.Notifications
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
-# PATH: /.gitea/workflows/notify.yml
+# PATH: /.mokogitea/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:
-      - "Joomla Build & Release"
+      - "Universal: Build & Release"
-      - "Joomla Extension CI"
+      - "Joomla: Extension CI"
-      - "Deploy"
+      - "Generic: Project CI"
    types:
      - completed
@@ -3,10 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
-# INGROUP: moko-platform.CI
+# INGROUP: mokocli.CI
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /templates/workflows/universal/pr-check.yml.template
+# PATH: /.mokogitea/workflows/pr-check.yml
 # VERSION: 09.23.00
 # BRIEF: PR gate — branch policy + code validation before merge
@@ -47,15 +47,15 @@ jobs:
              fi
              ;;
            fix/*|bugfix/*)
-              if [ "$BASE" != "dev" ]; then
+              if [ "$BASE" != "dev" ] && [ "$BASE" != "main" ]; then
                ALLOWED=false
-                REASON="Fix branches must target 'dev', not '${BASE}'"
+                REASON="Fix branches must target 'dev' or 'main', not '${BASE}'"
              fi
              ;;
            patch/*)
-              if [ "$BASE" != "dev" ] && [ "$BASE" != "rc" ]; then
+              if [ "$BASE" != "dev" ] && [ "$BASE" != "rc" ] && [ "$BASE" != "main" ]; then
                ALLOWED=false
-                REASON="Patch branches must target 'dev' or 'rc', not '${BASE}'"
+                REASON="Patch branches must target 'dev', 'rc', or 'main', not '${BASE}'"
              fi
              ;;
            hotfix/*)
@@ -86,7 +86,8 @@ jobs:
            echo "" >> $GITHUB_STEP_SUMMARY
            echo "### Allowed merge paths:" >> $GITHUB_STEP_SUMMARY
            echo "- \`feature/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY
-            echo "- \`fix/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`fix/*\` → \`dev\` or \`main\`" >> $GITHUB_STEP_SUMMARY
            echo "- \`patch/*\` → \`dev\`, \`rc\`, or \`main\`" >> $GITHUB_STEP_SUMMARY
            echo "- \`hotfix/*\` → \`dev\` or \`main\`" >> $GITHUB_STEP_SUMMARY
            echo "- \`dev\` → \`main\`" >> $GITHUB_STEP_SUMMARY
            echo "- \`rc/*\` → \`main\`" >> $GITHUB_STEP_SUMMARY
@@ -96,6 +97,80 @@ 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
@@ -126,6 +201,8 @@ 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
@@ -133,7 +210,7 @@ jobs:
      - name: Check for merge conflict markers
        run: |
-          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
+          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --exclude-dir='.git' --exclude-dir='.mokogitea' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
          if [ -n "$CONFLICTS" ]; then
            echo "::error::Merge conflict markers found in source files"
            echo "## Conflict Markers Found" >> $GITHUB_STEP_SUMMARY
@@ -147,11 +224,12 @@ jobs:
      - name: Detect platform
        id: platform
        run: |
-          # Read platform from XML manifest (<platform> tag) or plain text fallback
+          # Platform comes from the MokoGitea metadata API (public GET); manifest.xml is no longer used.
-          PLATFORM=$(sed -n 's/.*<platform>\([^<]*\)<\/platform>.*/\1/p' .mokogitea/manifest.xml 2>/dev/null | head -1)
+          API="${GITHUB_SERVER_URL:-https://git.mokoconsulting.tech}/api/v1/repos/${GITHUB_REPOSITORY}/metadata"
-          [ -z "$PLATFORM" ] && PLATFORM=$(cat .mokogitea/manifest.xml 2>/dev/null | tr -d '[:space:]')
+          PLATFORM="$(curl -sf "$API" 2>/dev/null | python3 -c "import sys, json; print(json.load(sys.stdin).get('platform') or '')" 2>/dev/null || true)"
          [ -z "$PLATFORM" ] && PLATFORM="generic"
          echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT"
          echo "Detected platform: $PLATFORM"
      - name: Setup PHP
        if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr'
@@ -272,7 +350,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 (WaaS site)"
+                echo "::warning::No Joomla manifest found (MokoSuite site)"
                exit 0
              fi
              echo "Manifest: ${MANIFEST}"
@@ -285,7 +363,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 Gitea 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 MokoGitea Pages URL instead (e.g. /{REPO}/updates.xml not /{REPO}/raw/branch/main/updates.xml)"
                echo "$RAW_URLS"
                exit 1
              fi
@@ -492,6 +570,9 @@ 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
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /templates/workflows/universal/pre-release.yml.template
+# PATH: /.mokogitea/workflows/pre-release.yml
-# VERSION: 05.02.00
+# VERSION: 05.02.01
 # BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
 name: "Universal: Pre-Release"
@@ -48,9 +48,13 @@ 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: >-
-      github.event_name == 'workflow_dispatch' ||
+      !startsWith(github.event.repository.name, 'Template-') &&
-      github.event_name == 'push'
+      (
        github.event_name == 'workflow_dispatch' ||
        github.event_name == 'push'
      )
    steps:
      - name: Checkout
@@ -80,7 +84,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
@@ -152,13 +156,19 @@ jobs:
          fi
          # Commit version bump
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.email "mokogitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
+          git config --local user.name "mokogitea-actions[bot]"
          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
          git add -A
          git diff --cached --quiet || {
            git commit -m "chore(version): pre-release bump to ${VERSION} [skip ci]"
-            git push origin HEAD 2>&1
+            # Push the bump commit, but do NOT fail the release if the target branch
            # is protected and the release identity is not on the push allowlist.
            # The build proceeds from the in-tree bumped version regardless; if the
            # push is rejected, the next run simply re-bumps from the same base.
            if ! git push origin HEAD 2>&1; then
              echo "::warning::Version-bump commit could not be pushed (protected branch?). Building from in-tree version ${VERSION} anyway."
            fi
          }
          # Auto-detect element via manifest_element.php
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
 # PATH: /.mokogitea/workflows/rc-revert.yml
 # VERSION: 09.23.00
 # BRIEF: Rename rc/ branch back to dev/ when PR is closed without merge
@@ -25,7 +25,8 @@ jobs:
    runs-on: ubuntu-latest
    if: >-
      github.event.pull_request.merged == false &&
-      startsWith(github.event.pull_request.head.ref, 'rc/')
+      startsWith(github.event.pull_request.head.ref, 'rc/') &&
      !startsWith(github.event.repository.name, 'Template-')
    steps:
      - name: Rename branch
@@ -6,10 +6,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Validation
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
-# PATH: /templates/workflows/joomla/repo_health.yml.template
+# PATH: /.mokogitea/workflows/repo-health.yml
 # 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|gitea-actions[bot])
+            jmiller|mokogitea-actions[bot])
              ALLOWED=true
              PERMISSION=admin
              METHOD="hardcoded allowlist"
@@ -0,0 +1,32 @@
 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 }}
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow.Template
+# DEFGROUP: MokoGitea.Workflow.Template
 # INGROUP: MokoStandards.CI
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
 # PATH: /.mokogitea/workflows/version-set.yml
@@ -34,6 +34,7 @@ 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
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
 # 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,9 +27,10 @@ jobs:
    name: Sync workflows to live repos
    runs-on: ubuntu-latest
    if: >-
-      github.event_name == 'workflow_dispatch' ||
+      startsWith(github.event.repository.name, 'Template-') &&
      (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
@@ -52,7 +53,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: |