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

Merge pull request 'chore(sync): cascade main -> dev' (#225 ) from main into dev
chore(release): build 02.58.00 [skip ci]
2026-07-06 00:33:03 +00:00 · 2026-07-06 00:32:12 +00:00 · 2026-07-06 00:32:07 +00:00 · 2026-07-06 00:30:29 +00:00 · 2026-07-06 00:17:00 +00:00 · 2026-07-06 00:16:33 +00:00
83 changed files with 1159 additions and 1305 deletions
@@ -59,8 +59,8 @@ Joomla **package** with four sub-extensions:
 - **Attribution**: `Authored-by: Moko Consulting`
 - **Workflow directory**: `.mokogitea/` (not `.gitea/` or `.github/`)
 - **Minification**: handled at build time (CI)
- **Wiki**: documentation lives in the Gitea wiki, not `docs/` files
+- **Wiki**: documentation lives in the MokoGitea wiki, not `docs/` files
- **Standards**: [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/mokoplatform/wiki/Home)
+- **Standards**: [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/.mokogitea/wiki)
 ## Coding Standards
@@ -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
 #
@@ -95,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
@@ -104,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
@@ -186,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
@@ -218,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
@@ -352,10 +380,13 @@ jobs:
          import sys
          version, date = sys.argv[1], sys.argv[2]
          content = open('CHANGELOG.md').read()
-          old = '## [Unreleased]'
+          marker = f'## [{version}]'
-          new = f'## [Unreleased]\n\n## [{version}] --- {date}'
+          # Idempotent: only promote when this version header isn't already present,
-          content = content.replace(old, new, 1)
+          # otherwise re-runs (or same-version builds) create empty duplicate headers.
-          open('CHANGELOG.md', 'w').write(content)
+          if marker not in content:
              new = f'## [Unreleased]\n\n{marker} --- {date}'
              content = content.replace('## [Unreleased]', new, 1)
              open('CHANGELOG.md', 'w').write(content)
          " "$VERSION" "$DATE"
            git add CHANGELOG.md
            git commit -m "chore: promote changelog [Unreleased] → [${VERSION}]" || true
@@ -398,7 +429,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: |
@@ -410,17 +441,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
@@ -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,7 +3,7 @@
 # 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: /.mokogitea/workflows/ci-generic.yml
@@ -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,7 +3,7 @@
 # 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: /.mokogitea/workflows/cleanup.yml
@@ -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,9 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 # FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: MokoGitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 02.54.00
+# VERSION: 02.58.01
 # BRIEF: Auto-create feature branch when an issue is opened
 name: "Universal: Issue Branch"
@@ -3,7 +3,7 @@
 # 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: /.mokogitea/workflows/notify.yml
@@ -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: mokocli.CI
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokocli
+# 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
@@ -149,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'
@@ -274,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}"
@@ -287,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
@@ -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/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
 # BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
@@ -84,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
@@ -156,8 +156,8 @@ 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 || {
@@ -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"
@@ -10,11 +10,12 @@ on:
 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
+          repository: MokoConsulting/MokoCLI
          token: ${{ secrets.MOKOGITEA_TOKEN }}
      - name: Setup PHP
@@ -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: |
@@ -1,13 +1,57 @@
 # Changelog
 ## [Unreleased]
 ## [02.54.00] --- 2026-07-04
-## [02.53.00] --- 2026-07-04
+## [02.58.00] --- 2026-07-06
-## [02.53.00] --- 2026-07-04
+### Added
 - SFTP destinations: **upload an SSH private key file** in the Add/Edit Destination modal instead of pasting it (reads the file into the key field client-side; pasting still works).
-## [02.52.24] --- 2026-06-30
+### Changed
 - Add/Edit Destination modal: wrap the content in a Bootstrap `.container-fluid` and give it a 1rem padding frame via the WAM stylesheet (Bootstrap's `.modal-content` has no padding of its own).
 ### Fixed
 - Pre-update backup now shows an admin notification on **every** outcome (success / warning / failure) — previously a *successful* pre-update backup fired nothing, so it looked like the notification wasn't working. (#192)
-## [02.52.24] --- 2026-06-30
+### Changed
 - Component admin CSS now loads via the Joomla **Web Asset Manager** (`media/com_mokosuitebackup/` + `joomla.asset.json`) instead of an inline `<style>` block.
 - "Keep local copy" is configured **per remote destination** (in the Add/Edit Destination modal); the redundant profile-level field and its "Remote" tab are removed.
 - Add/Edit Destination modal: cleaned up the cramped padding/margins.
 ### Fixed
 - Admin menu / duplicate-component fallout: (a) the orphaned `com_component-mokosuitebackup` is now removed in **preflight** too, so its "Backup" menu no longer collides on install ("The alias backup is already being used"); (b) `ensureSubmenuItems()` **recreates the top-level "Backup" menu** if it was deleted, instead of giving up — so Backup no longer disappears from the admin menu (and the cPanel module / MokoSuiteClient can find it again); (c) the component menu label now uses the short constant `COM_MOKOJOOMBACKUP_SHORT`. (#213 fallout)
 - Installer no longer aborts on MySQL 8 with "This command is not supported in the prepared statement protocol yet" (error 1295). The legacy remote-column purge migration (`02.56.01.sql`) used `PREPARE`/`EXECUTE`/`DEALLOCATE`, which Joomla's installer rejects; the drop now runs in the package installer script via an INFORMATION_SCHEMA-gated plain `ALTER` (portable across MariaDB and MySQL 8). (#213 update path)
 ## [02.57.00] --- 2026-07-05
 ### Added
 - `BackupRunner` service — a single synchronous entry point for backups that unifies final status and notification gating across the pre-update, web-cron, pre-install, scheduled-task and CLI triggers (delegates to `BackupEngine`; no double-notify). Returns a normalized result including the real complete/warning/fail status. Dashboard "Backup Now" (AJAX) unchanged; installer progress popup deferred to #196. (#214)
 ### Fixed
 - Release automation: the changelog-promote step is now idempotent — it only inserts a `## [version]` header when that version isn't already present, preventing the empty, duplicated version headers that repeated/same-version builds were producing. (workflow)
 ## [02.56.11] --- 2026-07-05
 ### Fixed
 - Package `postflight` now removes the orphaned `com_component-mokosuitebackup` registration (stray extension record, admin menu items, schema rows, and `administrator/` folder) left behind by the old "Type - Name" component `<name>` — self-healing on update so affected sites reconcile to the real `com_mokosuitebackup`. (#213 follow-up)
 ## [02.56.08] --- 2026-07-05
 ### Fixed
 - Component manifest `<name>` reverted to the element-safe `MokoSuiteBackup`. The "Type - Name" convention derived element `com_component-mokosuitebackup`, registering a duplicate component and leaving the real `com_mokosuitebackup` orphaned on the old version. (#213)
 ## [02.56.07] --- 2026-07-05
 ### Security
 - Mask the FTP password in `AjaxController::maskSecrets()`/`mergeExistingSecrets()` — stored FTP remotes no longer leak their password via `listRemotes`. (#169)
 - Stop the API single-item view (`Backups/JsonapiView`) leaking the server `absolute_path`. (#187)
 - SFTP uploader uses `StrictHostKeyChecking=accept-new` instead of `no`. (#182)
 ### Fixed
 - `DatabaseDumper` writes a real newline after `DROP TABLE` (was a literal `\n`). (#179)
 - Profile-picker forms order by `id` instead of the dropped `ordering` column. (#180)
 - `uninstall.mysql.sql` now drops the snapshots table. (#181)
 - CLI snapshot delete uses the `data_file` column (was non-existent `file_path`). (#184)
 - Remove the duplicate pre-update backup (content plugin no longer subscribes to `onExtensionBeforeUpdate`). (#186)
 - `DatabaseImporter` collects non-fatal statement errors (`getErrors()`/`hasErrors()`). (#188)
@@ -4,7 +4,7 @@ Thank you for your interest in contributing to MokoSuiteBackup.
 ## Getting Started
-1. Fork the repository on Gitea
+1. Fork the repository on MokoGitea
 2. Create a feature branch from `dev` (`feature/your-feature`)
 3. Make your changes following the coding standards below
 4. Submit a pull request targeting `dev`
@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
 INGROUP: Template-Joomla.Documentation
 REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
 PATH: /SECURITY.md
-VERSION: 02.54.00
+VERSION: 02.58.01
 BRIEF: Security vulnerability reporting and handling policy
 -->
@@ -1,37 +0,0 @@
 <?php
 /**
 * @package     MokoSuiteBackup
 * @subpackage  plg_webservices_mokosuitebackup
 * @author      Moko Consulting <hello@mokoconsulting.tech>
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 */
 defined('_JEXEC') or die;
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\WebServices\MokoSuiteBackup\Extension\MokoSuiteBackupWebServices;
 return new class () implements ServiceProviderInterface {
 	public function register(Container $container): void
 	{
 		$container->set(
 			PluginInterface::class,
 			function (Container $container) {
 				$plugin = new MokoSuiteBackupWebServices(
 					$container->get(DispatcherInterface::class),
 					(array) PluginHelper::getPlugin('webservices', 'mokosuitebackup')
 				);
 				$plugin->setApplication(Factory::getApplication());
 				return $plugin;
 			}
 		);
 	}
 };
@@ -24,7 +24,6 @@ class JsonapiView extends BaseApiView
 		'origin',
 		'backup_type',
 		'archivename',
 		'absolute_path',
 		'total_size',
 		'db_size',
 		'files_count',
@@ -205,113 +205,9 @@
 		/>
 	</fieldset>
-	<fieldset name="remote" label="COM_MOKOJOOMBACKUP_FIELDSET_REMOTE">
+	<!-- The "Keep local copy" setting is now configured per remote destination
-		<field
+	     (in the Add/Edit Destination modal), so the profile-level field and its
-			name="remote_legacy_note"
+	     "Remote" tab have been removed. -->
 			type="note"
 			label=""
 			description="COM_MOKOJOOMBACKUP_REMOTE_LEGACY_NOTE"
 			class="alert alert-info small"
 		/>
 		<field
 			name="remote_storage"
 			type="list"
 			label="COM_MOKOJOOMBACKUP_FIELD_REMOTE_STORAGE"
 			description="COM_MOKOJOOMBACKUP_FIELD_REMOTE_STORAGE_DESC"
 			default="none"
 		>
 			<option value="none">COM_MOKOJOOMBACKUP_REMOTE_NONE</option>
 			<option value="sftp">COM_MOKOJOOMBACKUP_REMOTE_SFTP</option>
 			<option value="google_drive">COM_MOKOJOOMBACKUP_REMOTE_GDRIVE</option>
 			<option value="s3">COM_MOKOJOOMBACKUP_REMOTE_S3</option>
 		</field>
 		<field
 			name="remote_keep_local"
 			type="radio"
 			label="COM_MOKOJOOMBACKUP_FIELD_KEEP_LOCAL"
 			description="COM_MOKOJOOMBACKUP_FIELD_KEEP_LOCAL_DESC"
 			default="1"
 			class="btn-group"
 		>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 		<!-- SFTP fields (shown when remote_storage = sftp) -->
 		<field
 			name="sftp_host"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_SFTP_HOST"
 			description="COM_MOKOJOOMBACKUP_FIELD_SFTP_HOST_DESC"
 			maxlength="255"
 			showon="remote_storage:sftp"
 		/>
 		<field
 			name="sftp_port"
 			type="number"
 			label="COM_MOKOJOOMBACKUP_FIELD_SFTP_PORT"
 			description="COM_MOKOJOOMBACKUP_FIELD_SFTP_PORT_DESC"
 			default="22"
 			min="1"
 			max="65535"
 			showon="remote_storage:sftp"
 		/>
 		<field
 			name="sftp_username"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_SFTP_USERNAME"
 			description="COM_MOKOJOOMBACKUP_FIELD_SFTP_USERNAME_DESC"
 			maxlength="255"
 			showon="remote_storage:sftp"
 		/>
 		<field
 			name="sftp_auth_type"
 			type="list"
 			label="COM_MOKOJOOMBACKUP_FIELD_SFTP_AUTH_TYPE"
 			description="COM_MOKOJOOMBACKUP_FIELD_SFTP_AUTH_TYPE_DESC"
 			default="key"
 			showon="remote_storage:sftp"
 		>
 			<option value="password">COM_MOKOJOOMBACKUP_SFTP_AUTH_PASSWORD</option>
 			<option value="key">COM_MOKOJOOMBACKUP_SFTP_AUTH_KEY</option>
 			<option value="key_passphrase">COM_MOKOJOOMBACKUP_SFTP_AUTH_KEY_PASSPHRASE</option>
 		</field>
 		<field
 			name="sftp_password"
 			type="password"
 			label="COM_MOKOJOOMBACKUP_FIELD_SFTP_PASSWORD"
 			description="COM_MOKOJOOMBACKUP_FIELD_SFTP_PASSWORD_DESC"
 			maxlength="255"
 			showon="remote_storage:sftp[AND]sftp_auth_type:password"
 		/>
 		<field
 			name="sftp_key_data"
 			type="SshKey"
 			label="COM_MOKOJOOMBACKUP_FIELD_SFTP_KEY"
 			description="COM_MOKOJOOMBACKUP_FIELD_SFTP_KEY_DESC"
 			filter="raw"
 			showon="remote_storage:sftp[AND]sftp_auth_type:key,key_passphrase"
 			addfieldprefix="Joomla\Component\MokoSuiteBackup\Administrator\Field"
 		/>
 		<field
 			name="sftp_passphrase"
 			type="password"
 			label="COM_MOKOJOOMBACKUP_FIELD_SFTP_PASSPHRASE"
 			description="COM_MOKOJOOMBACKUP_FIELD_SFTP_PASSPHRASE_DESC"
 			maxlength="255"
 			showon="remote_storage:sftp[AND]sftp_auth_type:key_passphrase"
 		/>
 		<field
 			name="sftp_path"
 			type="SftpPath"
 			label="COM_MOKOJOOMBACKUP_FIELD_SFTP_PATH"
 			description="COM_MOKOJOOMBACKUP_FIELD_SFTP_PATH_DESC"
 			default="/backups"
 			maxlength="512"
 			showon="remote_storage:sftp"
 			addfieldprefix="Joomla\Component\MokoSuiteBackup\Administrator\Field"
 		/>
 	</fieldset>
 	<fieldset name="retention" label="COM_MOKOJOOMBACKUP_FIELDSET_RETENTION">
 		<field
@@ -408,157 +304,4 @@
 		/>
 	</fieldset>
 	<fieldset name="ftp" label="COM_MOKOJOOMBACKUP_FIELDSET_FTP">
 		<field
 			name="ftp_host"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_FTP_HOST"
 			description="COM_MOKOJOOMBACKUP_FIELD_FTP_HOST_DESC"
 			maxlength="255"
 			showon="remote_storage:ftp"
 		/>
 		<field
 			name="ftp_port"
 			type="number"
 			label="COM_MOKOJOOMBACKUP_FIELD_FTP_PORT"
 			description="COM_MOKOJOOMBACKUP_FIELD_FTP_PORT_DESC"
 			default="21"
 			min="1"
 			max="65535"
 			showon="remote_storage:ftp"
 		/>
 		<field
 			name="ftp_username"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_FTP_USERNAME"
 			maxlength="255"
 			showon="remote_storage:ftp"
 		/>
 		<field
 			name="ftp_password"
 			type="password"
 			label="COM_MOKOJOOMBACKUP_FIELD_FTP_PASSWORD"
 			maxlength="255"
 			showon="remote_storage:ftp"
 		/>
 		<field
 			name="ftp_path"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_FTP_PATH"
 			description="COM_MOKOJOOMBACKUP_FIELD_FTP_PATH_DESC"
 			default="/backups"
 			maxlength="512"
 			showon="remote_storage:ftp"
 		/>
 		<field
 			name="ftp_passive"
 			type="radio"
 			label="COM_MOKOJOOMBACKUP_FIELD_FTP_PASSIVE"
 			description="COM_MOKOJOOMBACKUP_FIELD_FTP_PASSIVE_DESC"
 			default="1"
 			class="btn-group"
 			showon="remote_storage:ftp"
 		>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 		<field
 			name="ftp_ssl"
 			type="radio"
 			label="COM_MOKOJOOMBACKUP_FIELD_FTP_SSL"
 			description="COM_MOKOJOOMBACKUP_FIELD_FTP_SSL_DESC"
 			default="0"
 			class="btn-group"
 			showon="remote_storage:ftp"
 		>
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
 	</fieldset>
 	<fieldset name="google_drive" label="COM_MOKOJOOMBACKUP_FIELDSET_GDRIVE">
 		<field
 			name="gdrive_client_id"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_GDRIVE_CLIENT_ID"
 			description="COM_MOKOJOOMBACKUP_FIELD_GDRIVE_CLIENT_ID_DESC"
 			maxlength="255"
 			showon="remote_storage:google_drive"
 		/>
 		<field
 			name="gdrive_client_secret"
 			type="password"
 			label="COM_MOKOJOOMBACKUP_FIELD_GDRIVE_CLIENT_SECRET"
 			maxlength="255"
 			showon="remote_storage:google_drive"
 		/>
 		<field
 			name="gdrive_refresh_token"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_GDRIVE_REFRESH_TOKEN"
 			description="COM_MOKOJOOMBACKUP_FIELD_GDRIVE_REFRESH_TOKEN_DESC"
 			maxlength="512"
 			showon="remote_storage:google_drive"
 		/>
 		<field
 			name="gdrive_folder_id"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_GDRIVE_FOLDER_ID"
 			description="COM_MOKOJOOMBACKUP_FIELD_GDRIVE_FOLDER_ID_DESC"
 			maxlength="255"
 			showon="remote_storage:google_drive"
 		/>
 	</fieldset>
 	<fieldset name="s3" label="COM_MOKOJOOMBACKUP_FIELDSET_S3">
 		<field
 			name="s3_endpoint"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_S3_ENDPOINT"
 			description="COM_MOKOJOOMBACKUP_FIELD_S3_ENDPOINT_DESC"
 			maxlength="512"
 			hint="https://s3.amazonaws.com"
 			showon="remote_storage:s3"
 		/>
 		<field
 			name="s3_region"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_S3_REGION"
 			description="COM_MOKOJOOMBACKUP_FIELD_S3_REGION_DESC"
 			default="us-east-1"
 			maxlength="50"
 			showon="remote_storage:s3"
 		/>
 		<field
 			name="s3_access_key"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_S3_ACCESS_KEY"
 			maxlength="255"
 			showon="remote_storage:s3"
 		/>
 		<field
 			name="s3_secret_key"
 			type="password"
 			label="COM_MOKOJOOMBACKUP_FIELD_S3_SECRET_KEY"
 			maxlength="255"
 			showon="remote_storage:s3"
 		/>
 		<field
 			name="s3_bucket"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_S3_BUCKET"
 			description="COM_MOKOJOOMBACKUP_FIELD_S3_BUCKET_DESC"
 			maxlength="255"
 			showon="remote_storage:s3"
 		/>
 		<field
 			name="s3_path"
 			type="text"
 			label="COM_MOKOJOOMBACKUP_FIELD_S3_PATH"
 			description="COM_MOKOJOOMBACKUP_FIELD_S3_PATH_DESC"
 			default="/backups"
 			maxlength="512"
 			showon="remote_storage:s3"
 		/>
 	</fieldset>
 </form>
@@ -127,6 +127,10 @@ COM_MOKOJOOMBACKUP_CANCEL_SUCCESS="%d stalled backup(s) cancelled."
 ; Backup status
 COM_MOKOJOOMBACKUP_STATUS_WARNING="Warning"
 ; Delete feedback
 COM_MOKOJOOMBACKUP_BACKUPS_N_ITEMS_DELETED="%d backup records deleted."
 COM_MOKOJOOMBACKUP_BACKUPS_N_ITEMS_DELETED_1="%d backup record deleted."
 ; ACL - Cancel
 COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL="Cancel Stalled Backup"
 COM_MOKOSUITEBACKUP_ACTION_BACKUP_CANCEL_DESC="Allows users to cancel backup records stuck in running status and clean up partial archive files."
@@ -0,0 +1,33 @@
 /**
 * MokoSuiteBackup — admin styles (loaded via the Joomla Web Asset Manager).
 */
 /* Add/Edit Destination modal.
 * The modal content is wrapped in a Bootstrap .container-fluid because
 * Bootstrap's .modal-content has no padding of its own. Give that container a
 * single, comfortable 1rem frame and drop the inner sections' horizontal padding
 * so it isn't doubled. */
 #remoteModal .modal-content > .container-fluid {
 	padding: 1rem;
 }
 #remoteModal .modal-header,
 #remoteModal .modal-body,
 #remoteModal .modal-footer {
 	padding-left: 0;
 	padding-right: 0;
 }
 #remoteModal .modal-body .row + .row,
 #remoteModal .remote-type-fields {
 	margin-top: 0.25rem;
 }
 #remoteModal hr {
 	margin: 1rem 0;
 	opacity: 0.12;
 }
 #remoteModal .form-label {
 	margin-bottom: 0.35rem;
 }
@@ -0,0 +1,14 @@
 {
 	"$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
 	"name": "com_mokosuitebackup",
 	"version": "1.0.0",
 	"description": "MokoSuiteBackup web assets",
 	"license": "GPL-3.0-or-later",
 	"assets": [
 		{
 			"name": "com_mokosuitebackup.admin",
 			"type": "style",
 			"uri": "com_mokosuitebackup/css/admin.css"
 		}
 	]
 }
@@ -6,8 +6,18 @@
 * @license     GNU General Public License version 3 or later; see LICENSE
 -->
 <extension type="component" method="upgrade">
-	<name>Component - MokoSuiteBackup</name>
+	<!--
-	<version>02.54.00</version>
+		IMPORTANT: a component's <name> drives the Joomla-derived extension
 		element (com_ + sanitized name), so it MUST stay element-safe:
 		"MokoSuiteBackup" -> com_mokosuitebackup. Do NOT apply the "Type - Name"
 		display convention here — "Component - MokoSuiteBackup" derives
 		com_component-mokosuitebackup, which registers a duplicate component and
 		orphans the real one. Packages are exempt because they set the element
 		via <packagename>; plugins/modules are exempt because <name> is only a
 		display label there.
 	-->
 	<name>MokoSuiteBackup</name>
 	<version>02.58.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -37,7 +47,7 @@
 	</update>
 	<administration>
-		<menu img="class:archive">Backup</menu>
+		<menu img="class:archive">COM_MOKOJOOMBACKUP_SHORT</menu>
 		<submenu>
 			<menu link="option=com_mokosuitebackup&amp;view=dashboard"
 				  img="class:home"
@@ -68,6 +78,11 @@
 		</languages>
 	</administration>
 	<media destination="com_mokosuitebackup" folder="media">
 		<folder>css</folder>
 		<filename>joomla.asset.json</filename>
 	</media>
 	<api>
 		<files folder="api">
 			<folder>src</folder>
@@ -11,32 +11,6 @@ CREATE TABLE IF NOT EXISTS `#__mokosuitebackup_profiles` (
 	`exclude_dirs`      TEXT NOT NULL COMMENT 'Newline-separated directory paths to exclude',
 	`exclude_files`     TEXT NOT NULL COMMENT 'Newline-separated filename patterns to exclude',
 	`exclude_tables`    TEXT NOT NULL COMMENT 'Newline-separated table names to exclude',
 	`remote_storage`    VARCHAR(20) NOT NULL DEFAULT 'none' COMMENT 'none, ftp, google_drive, s3',
 	`ftp_host`          VARCHAR(255) NOT NULL DEFAULT '',
 	`ftp_port`          INT(5) UNSIGNED NOT NULL DEFAULT 21,
 	`ftp_username`      VARCHAR(255) NOT NULL DEFAULT '',
 	`ftp_password`      VARCHAR(255) NOT NULL DEFAULT '',
 	`ftp_path`          VARCHAR(512) NOT NULL DEFAULT '/backups',
 	`ftp_passive`       TINYINT(1) NOT NULL DEFAULT 1,
 	`ftp_ssl`           TINYINT(1) NOT NULL DEFAULT 0,
 	`sftp_host`         VARCHAR(255) NOT NULL DEFAULT '',
 	`sftp_port`         INT(5) UNSIGNED NOT NULL DEFAULT 22,
 	`sftp_username`     VARCHAR(255) NOT NULL DEFAULT '',
 	`sftp_auth_type`    VARCHAR(20) NOT NULL DEFAULT 'key',
 	`sftp_password`     VARCHAR(255) NOT NULL DEFAULT '',
 	`sftp_key_data`     MEDIUMTEXT,
 	`sftp_passphrase`   VARCHAR(255) NOT NULL DEFAULT '',
 	`sftp_path`         VARCHAR(512) NOT NULL DEFAULT '/backups',
 	`gdrive_client_id`     VARCHAR(255) NOT NULL DEFAULT '',
 	`gdrive_client_secret` VARCHAR(255) NOT NULL DEFAULT '',
 	`gdrive_refresh_token` VARCHAR(512) NOT NULL DEFAULT '',
 	`gdrive_folder_id`     VARCHAR(255) NOT NULL DEFAULT '',
 	`s3_endpoint`          VARCHAR(512) NOT NULL DEFAULT '' COMMENT 'S3 endpoint URL (blank = AWS default)',
 	`s3_region`            VARCHAR(50) NOT NULL DEFAULT 'us-east-1',
 	`s3_access_key`        VARCHAR(255) NOT NULL DEFAULT '',
 	`s3_secret_key`        VARCHAR(255) NOT NULL DEFAULT '',
 	`s3_bucket`            VARCHAR(255) NOT NULL DEFAULT '',
 	`s3_path`              VARCHAR(512) NOT NULL DEFAULT '/backups',
 	`remote_keep_local`    TINYINT(1) NOT NULL DEFAULT 1 COMMENT 'Keep local copy after upload',
 	`encryption_password`  VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'AES-256 archive encryption password (blank = no encryption)',
 	`include_mokorestore`    VARCHAR(20) NOT NULL DEFAULT '0' COMMENT 'MokoRestore mode: 0=none, 1=wrapped, standalone',
@@ -1,3 +1,4 @@
 DROP TABLE IF EXISTS `#__mokosuitebackup_remotes`;
 DROP TABLE IF EXISTS `#__mokosuitebackup_records`;
 DROP TABLE IF EXISTS `#__mokosuitebackup_snapshots`;
 DROP TABLE IF EXISTS `#__mokosuitebackup_profiles`;
@@ -0,0 +1,31 @@
 -- Remove legacy single-remote storage columns (superseded by #__mokosuitebackup_remotes).
 -- Plain DROP COLUMN (no IF EXISTS): all columns are created by install.mysql.sql and
 -- earlier updates, so they always exist here. `DROP COLUMN IF EXISTS` is a MariaDB-only
 -- extension and errors on Oracle MySQL 8.x, which Joomla also supports.
 ALTER TABLE `#__mokosuitebackup_profiles`
  DROP COLUMN `remote_storage`,
  DROP COLUMN `ftp_host`,
  DROP COLUMN `ftp_port`,
  DROP COLUMN `ftp_username`,
  DROP COLUMN `ftp_password`,
  DROP COLUMN `ftp_path`,
  DROP COLUMN `ftp_passive`,
  DROP COLUMN `ftp_ssl`,
  DROP COLUMN `sftp_host`,
  DROP COLUMN `sftp_port`,
  DROP COLUMN `sftp_username`,
  DROP COLUMN `sftp_auth_type`,
  DROP COLUMN `sftp_password`,
  DROP COLUMN `sftp_key_data`,
  DROP COLUMN `sftp_passphrase`,
  DROP COLUMN `sftp_path`,
  DROP COLUMN `gdrive_client_id`,
  DROP COLUMN `gdrive_client_secret`,
  DROP COLUMN `gdrive_refresh_token`,
  DROP COLUMN `gdrive_folder_id`,
  DROP COLUMN `s3_endpoint`,
  DROP COLUMN `s3_region`,
  DROP COLUMN `s3_access_key`,
  DROP COLUMN `s3_secret_key`,
  DROP COLUMN `s3_bucket`,
  DROP COLUMN `s3_path`;
@@ -0,0 +1 @@
 /* 02.55.00 — no schema changes */
@@ -0,0 +1 @@
 /* 02.55.03 — no schema changes */
@@ -0,0 +1 @@
 /* 02.56.00 — no schema changes */
@@ -0,0 +1,13 @@
 -- Legacy single-remote storage columns are now purged by the package installer
 -- script (Pkg_MokoSuiteBackupInstallerScript::dropLegacyRemoteColumns()), NOT here.
 --
 -- The 26 legacy remote_storage/ftp_*/sftp_*/gdrive_*/s3_* columns must be removed
 -- portably across MariaDB and MySQL 8. `DROP COLUMN IF EXISTS` is MariaDB-only
 -- (errors on MySQL 8); plain `DROP COLUMN` errors when a column is absent. The
 -- previous version gated the ALTER on INFORMATION_SCHEMA and ran it via
 -- PREPARE/EXECUTE/DEALLOCATE — but those statements are rejected by Joomla's
 -- installer SQL path (MySQL error 1295: "This command is not supported in the
 -- prepared statement protocol yet"), which ABORTED the whole component install.
 --
 -- The drop is now done in PHP (INFORMATION_SCHEMA gate + a plain ALTER for only the
 -- columns that still exist), so this migration is intentionally a no-op.
@@ -0,0 +1 @@
 /* 02.56.05 — no schema changes */
@@ -0,0 +1 @@
 /* 02.56.07 — no schema changes */
@@ -0,0 +1 @@
 /* 02.56.08 — no schema changes */
@@ -0,0 +1 @@
 /* 02.56.11 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.00 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.01 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.02 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.04 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.05 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.06 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.07 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.08 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.09 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.10 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.11 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.12 — no schema changes */
@@ -0,0 +1 @@
 /* 02.57.13 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.00 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.01 — no schema changes */
@@ -1201,6 +1201,7 @@ class AjaxController extends BaseController
 	private function maskSecrets(array $config, string $type): array
 	{
 		$secrets = [
 			'ftp'          => ['password'],
 			'sftp'         => ['password', 'passphrase', 'key_data'],
 			's3'           => ['secret_key'],
 			'google_drive' => ['client_secret', 'refresh_token'],
@@ -1223,6 +1224,7 @@ class AjaxController extends BaseController
 	private function mergeExistingSecrets(int $id, array $config, string $type): array
 	{
 		$secrets = [
 			'ftp'          => ['password'],
 			'sftp'         => ['password', 'passphrase', 'key_data'],
 			's3'           => ['secret_key'],
 			'google_drive' => ['client_secret', 'refresh_token'],
@@ -1265,184 +1267,6 @@ class AjaxController extends BaseController
 		return $config;
 	}
 	/**
 	 * Browse directories on a remote SFTP server for the path picker.
 	 * POST: task=ajax.browseSftpDir&profile_id=1&path=/some/path
 	 */
 	public function browseSftpDir(): void
 	{
 		if (!Session::checkToken('get') && !Session::checkToken('post')) {
 			$this->sendJson(['error' => true, 'message' => 'Invalid token'], 403);
 			return;
 		}
 		if (!$this->app->getIdentity()->authorise('core.manage', 'com_mokosuitebackup')) {
 			$this->sendJson(['error' => true, 'message' => 'Access denied'], 403);
 			return;
 		}
 		$profileId = $this->input->getInt('profile_id', 0);
 		if (!$profileId) {
 			$this->sendJson(['error' => true, 'message' => 'Missing profile_id']);
 			return;
 		}
 		/* Load the profile to get SFTP credentials */
 		try {
 			$db    = Factory::getDbo();
 			$query = $db->getQuery(true)
 				->select('*')
 				->from($db->quoteName('#__mokosuitebackup_profiles'))
 				->where($db->quoteName('id') . ' = ' . $profileId);
 			$db->setQuery($query);
 			$profile = $db->loadObject();
 		} catch (\Exception $e) {
 			$this->sendJson(['error' => true, 'message' => 'Failed to load profile'], 500);
 			return;
 		}
 		if (!$profile) {
 			$this->sendJson(['error' => true, 'message' => 'Profile not found'], 404);
 			return;
 		}
 		$host     = $profile->sftp_host ?? '';
 		$port     = (int) ($profile->sftp_port ?? 22);
 		$username = $profile->sftp_username ?? '';
 		$keyData  = $profile->sftp_key_data ?? '';
 		$password = $profile->sftp_password ?? '';
 		if (empty($host) || empty($username)) {
 			$this->sendJson(['error' => true, 'message' => 'SFTP host and username must be configured and saved before browsing']);
 			return;
 		}
 		if (empty($keyData) && empty($password)) {
 			$this->sendJson(['error' => true, 'message' => 'SFTP credentials (key or password) must be configured and saved before browsing']);
 			return;
 		}
 		$requestPath = $this->input->getString('path', '/');
 		/* Sanitize: must start with / and not contain shell meta-characters */
 		$requestPath = '/' . ltrim($requestPath, '/');
 		if (preg_match('/[;&|`$<>]/', $requestPath)) {
 			$this->sendJson(['error' => true, 'message' => 'Invalid path characters']);
 			return;
 		}
 		$keyFile = null;
 		try {
 			/* Write temp key if using key auth (same pattern as SftpUploader) */
 			if (!empty($keyData)) {
 				$keyContent = base64_decode($keyData, true);
 				if ($keyContent === false) {
 					$keyContent = $keyData;
 				}
 				$keyFile = sys_get_temp_dir() . '/mokobackup-sftp-browse-' . bin2hex(random_bytes(8)) . '.key';
 				if (file_put_contents($keyFile, $keyContent) === false) {
 					throw new \RuntimeException('Cannot write temporary SSH key file');
 				}
 				chmod($keyFile, 0600);
 			}
 			/* Build SSH command to list directories */
 			$escapedPath = escapeshellarg($requestPath);
 			$remoteCmd   = 'ls -1pa ' . $escapedPath . ' 2>/dev/null | grep "/$"';
 			$parts = ['ssh', '-o', 'StrictHostKeyChecking=no', '-o', 'BatchMode=yes', '-o', 'ConnectTimeout=10'];
 			if ($port !== 22) {
 				$parts[] = '-p';
 				$parts[] = (string) $port;
 			}
 			if ($keyFile !== null) {
 				$parts[] = '-i';
 				$parts[] = escapeshellarg($keyFile);
 			}
 			$parts[] = escapeshellarg($username . '@' . $host);
 			$parts[] = escapeshellarg($remoteCmd);
 			$cmd = implode(' ', $parts);
 			$output   = [];
 			$exitCode = 0;
 			exec($cmd . ' 2>&1', $output, $exitCode);
 			/* exitCode 1 from grep means no matches (empty dir), which is OK */
 			if ($exitCode !== 0 && $exitCode !== 1) {
 				throw new \RuntimeException('SSH command failed (exit ' . $exitCode . '): ' . implode(' ', $output));
 			}
 			/* Parse output: each line is a directory name ending with / */
 			$dirs = [];
 			foreach ($output as $line) {
 				$line = trim($line);
 				if ($line === '' || $line === './' || $line === '../') {
 					continue;
 				}
 				$dirName = rtrim($line, '/');
 				if ($dirName === '' || $dirName === '.' || $dirName === '..') {
 					continue;
 				}
 				$fullPath = rtrim($requestPath, '/') . '/' . $dirName;
 				$dirs[] = [
 					'name' => $dirName,
 					'path' => $fullPath,
 				];
 			}
 			usort($dirs, fn($a, $b) => strcasecmp($a['name'], $b['name']));
 			/* Parent path */
 			$parent = null;
 			if ($requestPath !== '/') {
 				$parent = \dirname($requestPath);
 				if ($parent === '') {
 					$parent = '/';
 				}
 			}
 			$this->sendJson([
 				'error'   => false,
 				'current' => $requestPath,
 				'parent'  => $parent,
 				'dirs'    => $dirs,
 			]);
 		} catch (\Throwable $e) {
 			$this->sendJson(['error' => true, 'message' => 'SFTP browse failed: ' . $e->getMessage()]);
 		} finally {
 			if ($keyFile !== null && is_file($keyFile)) {
 				unlink($keyFile);
 			}
 		}
 	}
 	/**
 	 * Send a JSON response and close the application.
 	 */
@@ -228,24 +228,9 @@ class AkeebaImporter
 			'exclude_dirs'      => implode("\n", $filters['exclude_dirs']),
 			'exclude_files'     => implode("\n", $filters['exclude_files']),
 			'exclude_tables'    => implode("\n", $filters['exclude_tables']),
-			'remote_storage'    => $this->mapRemoteStorage($config),
+			// Remote storage is no longer stored on the profile — it lives in
-			'ftp_host'          => $config['engine.postproc.ftp.host'] ?? '',
+			// #__mokosuitebackup_remotes. Akeeba remote settings are not imported;
-			'ftp_port'          => (int) ($config['engine.postproc.ftp.port'] ?? 21),
+			// re-add remote destinations on the profile's Remote tab after import.
 			'ftp_username'      => $config['engine.postproc.ftp.user'] ?? '',
 			'ftp_password'      => $config['engine.postproc.ftp.pass'] ?? '',
 			'ftp_path'          => $config['engine.postproc.ftp.initial_directory'] ?? '/backups',
 			'ftp_passive'       => (int) ($config['engine.postproc.ftp.passive_mode'] ?? 1),
 			'ftp_ssl'           => (int) ($config['engine.postproc.ftp.ftps'] ?? 0),
 			'gdrive_client_id'     => $config['engine.postproc.googledrive.client_id'] ?? '',
 			'gdrive_client_secret' => $config['engine.postproc.googledrive.client_secret'] ?? '',
 			'gdrive_refresh_token' => $config['engine.postproc.googledrive.refresh_token'] ?? '',
 			'gdrive_folder_id'     => $config['engine.postproc.googledrive.directory'] ?? '',
 			's3_endpoint'          => $config['engine.postproc.s3.custom_endpoint'] ?? '',
 			's3_region'            => $config['engine.postproc.s3.region'] ?? 'us-east-1',
 			's3_access_key'        => $config['engine.postproc.s3.access_key'] ?? ($config['engine.postproc.s3.accesskey'] ?? ''),
 			's3_secret_key'        => $config['engine.postproc.s3.secret_key'] ?? ($config['engine.postproc.s3.secretkey'] ?? ''),
 			's3_bucket'            => $config['engine.postproc.s3.bucket'] ?? '',
 			's3_path'              => $config['engine.postproc.s3.directory'] ?? '/backups',
 			'remote_keep_local'    => 1,
 			'include_mokorestore'    => (int) (($config['akeeba.advanced.embedded_installer'] ?? 'none') !== 'none'),
 			'published'         => 1,
@@ -321,48 +321,6 @@ class BackupEngine
 					@unlink($archivePath);
 					$this->log('Local copy removed (remote_keep_local = off)');
 				}
 			} else {
 				/* Backward-compat: fall back to legacy single-remote column */
 				$remoteStorage = $profile->remote_storage ?? 'none';
 				if ($remoteStorage !== 'none') {
 					try {
 						$this->log('Starting remote upload (' . $remoteStorage . ')...');
 						$uploader     = $this->createUploader($remoteStorage, $profile);
 						$uploadResult = $uploader->upload($archivePath, $archiveName);
 						if ($uploadResult['success']) {
 							$remoteFilename = $uploadResult['remote_path'] ?? $archiveName;
 							$this->log('Remote upload complete: ' . $uploadResult['message']);
 							if (!empty($restoreScriptPath) && is_file($restoreScriptPath)) {
 								$restoreBasename = basename($restoreScriptPath);
 								$this->log('Uploading standalone ' . $restoreBasename . '...');
 								$restoreUpload = $uploader->upload($restoreScriptPath, $restoreBasename);
 								if ($restoreUpload['success']) {
 									$this->log('Standalone ' . $restoreBasename . ' uploaded');
 								} else {
 									$this->log('WARNING: ' . $restoreBasename . ' upload failed: ' . $restoreUpload['message']);
 								}
 							}
 							// Delete local copy if configured
 							if (empty($profile->remote_keep_local) && is_file($archivePath)) {
 								@unlink($archivePath);
 								$this->log('Local copy removed (remote_keep_local = off)');
 							}
 						} else {
 							$uploadFailed = true;
 							$this->log('WARNING: Remote upload failed: ' . $uploadResult['message']);
 							$this->log('Local backup is preserved.');
 						}
 					} catch (\Throwable $e) {
 						$uploadFailed = true;
 						$this->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
 						$this->log('Local backup is preserved.');
 					}
 				}
 			}
 			// Write log file alongside the archive
@@ -530,23 +488,7 @@ class BackupEngine
 	}
 	/**
-	 * Create the appropriate remote uploader based on the storage type.
+	 * Create a remote uploader from JSON params.
 	 * Legacy method — used by backward-compat fallback when remotes table
 	 * does not exist.
 	 */
 	private function createUploader(string $type, object $profile): RemoteUploaderInterface
 	{
 		return match ($type) {
 			'ftp'          => new FtpUploader($profile),
 			'sftp'         => new SftpUploader($profile),
 			'google_drive' => new GoogleDriveUploader($profile),
 			's3'           => new S3Uploader($profile),
 			default        => throw new \InvalidArgumentException('Unknown remote storage type: ' . $type),
 		};
 	}
 	/**
 	 * Create a remote uploader from JSON params (multi-remote destinations).
 	 *
 	 * Builds a fake profile-like object from the params array so the existing
 	 * uploader constructors work without modification.
@@ -580,31 +522,18 @@ class BackupEngine
 	/**
 	 * Load enabled remote destinations for a profile from the remotes table.
 	 *
 	 * Returns an empty array when the table does not exist (pre-migration)
 	 * so the caller can fall back to the legacy single-remote column.
 	 *
 	 * @param   object  $db         Database driver
 	 * @param   int     $profileId  Profile ID
 	 *
 	 * @return  object[]  Array of remote destination rows
 	 */
 	private function loadRemoteDestinations(object $db, int $profileId): array
 	{
-		try {
+		$query = $db->getQuery(true)
-			$query = $db->getQuery(true)
+			->select('*')
-				->select('*')
+			->from($db->quoteName('#__mokosuitebackup_remotes'))
-				->from($db->quoteName('#__mokosuitebackup_remotes'))
+			->where($db->quoteName('profile_id') . ' = ' . (int) $profileId)
-				->where($db->quoteName('profile_id') . ' = ' . (int) $profileId)
+			->where($db->quoteName('enabled') . ' = 1')
-				->where($db->quoteName('enabled') . ' = 1')
+			->order($db->quoteName('ordering') . ' ASC');
-				->order($db->quoteName('ordering') . ' ASC');
+		$db->setQuery($query);
 			$db->setQuery($query);
-			return $db->loadObjectList() ?: [];
+		return $db->loadObjectList() ?: [];
 		} catch (\Throwable $e) {
 			// Table does not exist yet (pre-migration) — fall back to legacy
 			return [];
 		}
 	}
 	/**
@@ -326,7 +326,7 @@ class DatabaseDumper
 				}
 				$createSql = str_replace('`' . $prefix, '`#__', $createRow[1]);
-				fwrite($fp, 'DROP TABLE IF EXISTS `' . $abstractName . "`;\\n");
+				fwrite($fp, 'DROP TABLE IF EXISTS `' . $abstractName . "`;\n");
 				fwrite($fp, $createSql . ";\n\n");
 			}
@@ -20,6 +20,13 @@ use Joomla\CMS\Factory;
 class DatabaseImporter
 {
 	/**
 	 * Non-fatal per-statement errors collected during the last import().
 	 *
 	 * @var  string[]
 	 */
 	private array $errors = [];
 	/**
 	 * Import a SQL dump file into the database.
 	 *
@@ -31,6 +38,8 @@ class DatabaseImporter
 	 */
 	public function import(string $sqlFile): int
 	{
 		$this->errors = [];
 		if (!is_file($sqlFile) || !is_readable($sqlFile)) {
 			throw new \RuntimeException('SQL file not readable: ' . $sqlFile);
 		}
@@ -97,8 +106,10 @@ class DatabaseImporter
 					} catch (\Exception $e) {
 						// Log but don't abort — some statements may fail on
 						// different MySQL versions (e.g. charset differences)
-						// but the overall restore should continue.
+						// but the overall restore should continue. Errors are
 						// collected so the caller can surface a warning status.
 						error_log('MokoSuiteBackup SQL import warning: ' . $e->getMessage());
 						$this->errors[] = $e->getMessage();
 					}
 				}
 			}
@@ -115,6 +126,7 @@ class DatabaseImporter
 					$statementsExecuted++;
 				} catch (\Exception $e) {
 					error_log('MokoSuiteBackup SQL import warning (final): ' . $e->getMessage());
 					$this->errors[] = $e->getMessage();
 				}
 			}
 		} finally {
@@ -123,4 +135,24 @@ class DatabaseImporter
 		return $statementsExecuted;
 	}
 	/**
 	 * Non-fatal errors from the last import(), if any. A non-empty result
 	 * means the restore completed with problems and should be treated as a
 	 * warning rather than a clean success.
 	 *
 	 * @return  string[]
 	 */
 	public function getErrors(): array
 	{
 		return $this->errors;
 	}
 	/**
 	 * Whether the last import() had any non-fatal statement errors.
 	 */
 	public function hasErrors(): bool
 	{
 		return $this->errors !== [];
 	}
 }
@@ -77,7 +77,7 @@ class PreflightCheck
 		$this->checkDiskSpace($profile, $db);
 		$this->checkRunningBackup($profile, $db);
 		$this->checkExcludedTables($profile, $db);
-		$this->checkRemoteCredentials($profile);
+		$this->checkRemoteCredentials($profile, $db);
 		return $this->result();
 	}
@@ -102,12 +102,8 @@ class PreflightCheck
 			}
 		}
-		// curl is only needed for remote upload and ntfy notifications
+		if (!empty($profile->ntfy_topic) && !extension_loaded('curl')) {
-		$needsCurl = ($profile->remote_storage ?? 'none') !== 'none'
+			$this->warnings[] = 'ext-curl is not loaded — ntfy notifications will not work';
 			|| !empty($profile->ntfy_topic);
 		if ($needsCurl && !extension_loaded('curl')) {
 			$this->warnings[] = 'ext-curl is not loaded — remote upload and ntfy notifications will not work';
 		}
 	}
@@ -280,65 +276,76 @@ class PreflightCheck
 	}
 	/**
-	 * Check that remote storage credentials are minimally configured.
+	 * Check that remote destination credentials are minimally configured.
 	 * Does not test the actual connection (too slow for preflight).
 	 */
-	private function checkRemoteCredentials(object $profile): void
+	private function checkRemoteCredentials(object $profile, object $db): void
 	{
-		$remote = $profile->remote_storage ?? 'none';
+		$query = $db->getQuery(true)
 			->select('*')
 			->from($db->quoteName('#__mokosuitebackup_remotes'))
 			->where($db->quoteName('profile_id') . ' = ' . (int) $profile->id)
 			->where($db->quoteName('enabled') . ' = 1');
 		$db->setQuery($query);
 		$remotes = $db->loadObjectList();
-		if ($remote === 'none') {
+		if (empty($remotes)) {
 			return;
 		}
-		switch ($remote) {
+		foreach ($remotes as $remote) {
-			case 'ftp':
+			$params = json_decode($remote->params, true) ?: [];
-				if (empty($profile->ftp_host)) {
+			$label  = $remote->title ?: ('Remote #' . $remote->id);
 					$this->warnings[] = 'FTP host is not configured — remote upload will fail';
 				}
-				if (empty($profile->ftp_username)) {
+			switch ($remote->type) {
-					$this->warnings[] = 'FTP username is not configured — remote upload will fail';
+				case 'ftp':
-				}
+					if (empty($params['host'])) {
 						$this->warnings[] = $label . ': FTP host is not configured — upload will fail';
 					}
-				break;
+					if (empty($params['username'])) {
 						$this->warnings[] = $label . ': FTP username is not configured — upload will fail';
 					}
-			case 's3':
+					break;
 				if (empty($profile->s3_bucket)) {
 					$this->warnings[] = 'S3 bucket is not configured — remote upload will fail';
 				}
-				if (empty($profile->s3_access_key) || empty($profile->s3_secret_key)) {
+				case 's3':
-					$this->warnings[] = 'S3 credentials are not configured — remote upload will fail';
+					if (empty($params['bucket'])) {
-				}
+						$this->warnings[] = $label . ': S3 bucket is not configured — upload will fail';
 					}
-				break;
+					if (empty($params['access_key']) || empty($params['secret_key'])) {
 						$this->warnings[] = $label . ': S3 credentials are not configured — upload will fail';
 					}
-			case 'sftp':
+					break;
 				if (empty($profile->sftp_host)) {
 					$this->warnings[] = 'SFTP host is not configured — remote upload will fail';
 				}
-				if (empty($profile->sftp_username)) {
+				case 'sftp':
-					$this->warnings[] = 'SFTP username is not configured — remote upload will fail';
+					if (empty($params['host'])) {
-				}
+						$this->warnings[] = $label . ': SFTP host is not configured — upload will fail';
 					}
-				if (empty($profile->sftp_key_data) && empty($profile->sftp_password)) {
+					if (empty($params['username'])) {
-					$this->warnings[] = 'SFTP requires either a private key or password — remote upload will fail';
+						$this->warnings[] = $label . ': SFTP username is not configured — upload will fail';
-				}
+					}
-				break;
+					if (empty($params['key_data']) && empty($params['password'])) {
 						$this->warnings[] = $label . ': SFTP requires either a private key or password — upload will fail';
 					}
-			case 'google_drive':
+					break;
 				if (empty($profile->gdrive_client_id) || empty($profile->gdrive_client_secret)) {
 					$this->warnings[] = 'Google Drive OAuth credentials are not configured — remote upload will fail';
 				}
-				if (empty($profile->gdrive_refresh_token)) {
+				case 'google_drive':
-					$this->warnings[] = 'Google Drive refresh token is missing — remote upload will fail';
+					if (empty($params['client_id']) || empty($params['client_secret'])) {
-				}
+						$this->warnings[] = $label . ': Google Drive OAuth credentials are not configured — upload will fail';
 					}
-				break;
+					if (empty($params['refresh_token'])) {
 						$this->warnings[] = $label . ': Google Drive refresh token is missing — upload will fail';
 					}
 					break;
 			}
 		}
 	}
@@ -207,7 +207,7 @@ class SftpUploader implements RemoteUploaderInterface
 	 */
 	private function buildScpCommand(string $localPath, string $remoteTarget, ?string $keyFile): string
 	{
-		$parts = ['scp', '-o', 'StrictHostKeyChecking=no', '-o', 'BatchMode=yes'];
+		$parts = ['scp', '-o', 'StrictHostKeyChecking=accept-new', '-o', 'BatchMode=yes'];
 		if ($this->port !== 22) {
 			$parts[] = '-P';
@@ -235,7 +235,7 @@ class SftpUploader implements RemoteUploaderInterface
 	 */
 	private function buildSshCommand(string $remoteCmd, ?string $keyFile): string
 	{
-		$parts = ['ssh', '-o', 'StrictHostKeyChecking=no', '-o', 'BatchMode=yes'];
+		$parts = ['ssh', '-o', 'StrictHostKeyChecking=accept-new', '-o', 'BatchMode=yes'];
 		if ($this->port !== 22) {
 			$parts[] = '-p';
@@ -69,7 +69,6 @@ class SteppedBackupEngine
 		$session->excludeFiles  = BackupDirectory::parseNewlineList($profile->exclude_files ?? '');
 		$session->excludeTables = BackupDirectory::parseNewlineList($profile->exclude_tables ?? '');
 		$session->backupDir     = $profile->backup_dir ?: BackupDirectory::PLACEHOLDER;
 		$session->remoteStorage = $profile->remote_storage ?? 'none';
 		$session->includeMokoRestore = $profile->include_mokorestore ?? '0';
 		$session->restoreScriptName = $profile->restore_script_name ?? 'restore.php';
 		$session->remoteKeepLocal  = (bool) ($profile->remote_keep_local ?? true);
@@ -153,15 +152,8 @@ class SteppedBackupEngine
 		$totalSteps += 1; // finalize step
 		// Determine upload step count: one step per remote destination,
 		// or one step for legacy single-remote, or zero if no remotes.
 		$remoteCount = count($session->remoteDestinations);
-
+		$totalSteps += $remoteCount;
 		if ($remoteCount > 0) {
 			$totalSteps += $remoteCount;
 		} elseif ($session->remoteStorage !== 'none') {
 			$totalSteps += 1;
 		}
 		$session->totalSteps = $totalSteps;
 		$session->currentStep = 1;
@@ -421,11 +413,7 @@ class SteppedBackupEngine
 		$session->currentStep++;
-		// Determine next phase: multi-remote, legacy single-remote, or complete
+		if (!empty($session->remoteDestinations)) {
 		$hasMultiRemote  = !empty($session->remoteDestinations);
 		$hasLegacyRemote = $session->remoteStorage !== 'none';
 		if ($hasMultiRemote || $hasLegacyRemote) {
 			$session->phase = 'upload';
 		} else {
 			$session->phase = 'complete';
@@ -440,11 +428,7 @@ class SteppedBackupEngine
 	}
 	/**
-	 * Upload phase: send archive to remote storage.
+	 * Upload phase: send archive to one remote destination per call.
 	 *
 	 * When multi-remote destinations are configured, each call uploads to
 	 * one destination (one step per remote). When only the legacy
 	 * single-remote column is set, uploads in a single step.
 	 */
 	private function stepUpload(SteppedSession $session): void
 	{
@@ -452,133 +436,65 @@ class SteppedBackupEngine
 		$remoteFilename = '';
 		$uploadFailed   = false;
-		if (!empty($session->remoteDestinations)) {
+		$index = $session->remoteIndex;
 			// ── Multi-remote path ──────────────────────────────────
 			$index = $session->remoteIndex;
-			if ($index >= count($session->remoteDestinations)) {
+		if ($index >= count($session->remoteDestinations)) {
-				// All remotes processed — move to complete
+			$session->phase = 'complete';
-				$session->phase = 'complete';
+			$session->statusMessage = 'All remote uploads finished';
-				$session->statusMessage = 'All remote uploads finished';
+			$this->completeRecord($session);
 				$this->completeRecord($session);
-				return;
+			return;
-			}
+		}
-			$remote = (object) $session->remoteDestinations[$index];
+		$remote = (object) $session->remoteDestinations[$index];
-			try {
+		try {
-				$title  = $remote->title ?? ('Remote #' . ($index + 1));
+			$title  = $remote->title ?? ('Remote #' . ($index + 1));
-				$type   = $remote->type ?? 'unknown';
+			$type   = $remote->type ?? 'unknown';
-				$params = json_decode($remote->params ?? '{}', true) ?: [];
+			$params = json_decode($remote->params ?? '{}', true) ?: [];
-				$session->log('Uploading to: ' . $title . ' (' . $type . ')...');
+			$session->log('Uploading to: ' . $title . ' (' . $type . ')...');
-				$uploader = $this->createUploaderFromParams($type, $params);
+			$uploader = $this->createUploaderFromParams($type, $params);
-				$result   = $uploader->upload($session->archivePath, $session->archiveName);
+			$result   = $uploader->upload($session->archivePath, $session->archiveName);
-				if ($result['success']) {
+			if ($result['success']) {
-					$remoteFilename = $result['remote_path'] ?? $session->archiveName;
+				$remoteFilename = $result['remote_path'] ?? $session->archiveName;
-					$session->log('  Upload complete: ' . $result['message']);
+				$session->log('  Upload complete: ' . $result['message']);
-					if (!empty($session->restoreScriptPath) && is_file($session->restoreScriptPath)) {
+				if (!empty($session->restoreScriptPath) && is_file($session->restoreScriptPath)) {
-						$uploader->upload($session->restoreScriptPath, basename($session->restoreScriptPath));
+					$uploader->upload($session->restoreScriptPath, basename($session->restoreScriptPath));
 					}
 				} else {
 					$uploadFailed = true;
 					$session->log('  WARNING: Upload failed: ' . $result['message']);
 				}
-			} catch (\Throwable $e) {
+			} else {
 				$uploadFailed = true;
-				$session->log('  WARNING: Upload exception: ' . $e->getMessage());
+				$session->log('  WARNING: Upload failed: ' . $result['message']);
 			}
 		} catch (\Throwable $e) {
 			$uploadFailed = true;
 			$session->log('  WARNING: Upload exception: ' . $e->getMessage());
 		}
 		$session->remoteIndex++;
 		$session->currentStep++;
 		$remaining = count($session->remoteDestinations) - $session->remoteIndex;
 		$session->statusMessage = 'Uploaded to ' . ($remote->title ?? 'remote') . ($remaining > 0 ? ' (' . $remaining . ' remaining)' : '');
 		if ($session->remoteIndex >= count($session->remoteDestinations)) {
 			if (!$uploadFailed && !$session->remoteKeepLocal && is_file($session->archivePath)) {
 				@unlink($session->archivePath);
 				$session->log('Local copy removed (remote_keep_local = off)');
 			}
 			$session->remoteIndex++;
 			$session->currentStep++;
 			$remaining = count($session->remoteDestinations) - $session->remoteIndex;
 			$session->statusMessage = 'Uploaded to ' . ($remote->title ?? 'remote') . ($remaining > 0 ? ' (' . $remaining . ' remaining)' : '');
 			if ($session->remoteIndex >= count($session->remoteDestinations)) {
 				// All remotes done — delete local if configured and no failures
 				if (!$uploadFailed && !$session->remoteKeepLocal && is_file($session->archivePath)) {
 					@unlink($session->archivePath);
 					$session->log('Local copy removed (remote_keep_local = off)');
 				}
 				// Update record with remote filename
 				$update = (object) [
 					'id'              => $session->recordId,
 					'remote_filename' => $remoteFilename,
 					'filesexist'      => is_file($session->archivePath) ? 1 : 0,
 				];
 				$db->updateObject('#__mokosuitebackup_records', $update, 'id');
 				$session->phase = 'complete';
 				$session->statusMessage = $uploadFailed
 					? 'Backup complete (some remote uploads failed — local archive preserved)'
 					: 'Backup complete';
 				$this->completeRecord($session, $uploadFailed);
 			}
 		} else {
 			// ── Legacy single-remote fallback ──────────────────────
 			try {
 				// Reload profile for remote settings
 				$query = $db->getQuery(true)
 					->select('*')
 					->from($db->quoteName('#__mokosuitebackup_profiles'))
 					->where($db->quoteName('id') . ' = ' . $session->profileId);
 				$db->setQuery($query);
 				$profile = $db->loadObject();
 				$uploader = match ($session->remoteStorage) {
 					'ftp'          => new FtpUploader($profile),
 					'sftp'         => new SftpUploader($profile),
 					'google_drive' => new GoogleDriveUploader($profile),
 					's3'           => new S3Uploader($profile),
 					default        => throw new \InvalidArgumentException('Unknown storage: ' . $session->remoteStorage),
 				};
 				$session->log('Starting remote upload (' . $session->remoteStorage . ')...');
 				$result = $uploader->upload($session->archivePath, $session->archiveName);
 				if ($result['success']) {
 					$remoteFilename = $result['remote_path'] ?? $session->archiveName;
 					$session->log('Remote upload complete: ' . $result['message']);
 					if (!empty($session->restoreScriptPath) && is_file($session->restoreScriptPath)) {
 						$restoreBasename = basename($session->restoreScriptPath);
 						$session->log('Uploading standalone ' . $restoreBasename . '...');
 						$uploader->upload($session->restoreScriptPath, $restoreBasename);
 					}
 					if (!$session->remoteKeepLocal && is_file($session->archivePath)) {
 						@unlink($session->archivePath);
 						$session->log('Local copy removed');
 					}
 				} else {
 					$uploadFailed = true;
 					$session->log('WARNING: Remote upload failed: ' . $result['message']);
 					$session->log('Local backup is preserved.');
 				}
 			} catch (\Throwable $e) {
 				$uploadFailed = true;
 				$session->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
 				$session->log('Local backup is preserved.');
 			}
 			// Update record with remote filename
 			$update = (object) [
 				'id'              => $session->recordId,
 				'remote_filename' => $remoteFilename,
 				'filesexist'      => is_file($session->archivePath) ? 1 : 0,
 			];
 			$db->updateObject('#__mokosuitebackup_records', $update, 'id');
 			$session->currentStep++;
 			$session->phase = 'complete';
 			$session->statusMessage = $uploadFailed
-				? 'Backup complete (remote upload failed — local archive preserved)'
+				? 'Backup complete (some remote uploads failed — local archive preserved)'
 				: 'Backup complete';
 			$this->completeRecord($session, $uploadFailed);
 		}
@@ -866,21 +782,15 @@ class SteppedBackupEngine
 	 */
 	private function loadRemoteDestinations(object $db, int $profileId): array
 	{
-		try {
+		$query = $db->getQuery(true)
-			$query = $db->getQuery(true)
+			->select('*')
-				->select('*')
+			->from($db->quoteName('#__mokosuitebackup_remotes'))
-				->from($db->quoteName('#__mokosuitebackup_remotes'))
+			->where($db->quoteName('profile_id') . ' = ' . (int) $profileId)
-				->where($db->quoteName('profile_id') . ' = ' . (int) $profileId)
+			->where($db->quoteName('enabled') . ' = 1')
-				->where($db->quoteName('enabled') . ' = 1')
+			->order($db->quoteName('ordering') . ' ASC');
-				->order($db->quoteName('ordering') . ' ASC');
+		$db->setQuery($query);
 			$db->setQuery($query);
-			// Use loadAssocList so the data survives JSON serialization in SteppedSession
+		return $db->loadAssocList() ?: [];
 			return $db->loadAssocList() ?: [];
 		} catch (\Throwable $e) {
 			// Table does not exist yet (pre-migration) — fall back to legacy
 			return [];
 		}
 	}
 	/**
@@ -50,7 +50,6 @@ class SteppedSession
 	public array $excludeDirs = [];
 	public array $excludeFiles = [];
 	public array $excludeTables = [];
 	public string $remoteStorage = 'none';
 	public string $includeMokoRestore = '0';
 	public string $restoreScriptName = 'restore.php';
 	public string $restoreScriptPath = '';
@@ -1,253 +0,0 @@
 <?php
 /**
 * @package     MokoSuiteBackup
 * @subpackage  com_mokosuitebackup
 * @author      Moko Consulting <hello@mokoconsulting.tech>
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 *
 * SFTP remote path field with Browse Remote button and modal directory browser.
 */
 namespace Joomla\Component\MokoSuiteBackup\Administrator\Field;
 defined('_JEXEC') or die;
 use Joomla\CMS\Form\FormField;
 class SftpPathField extends FormField
 {
 	protected $type = 'SftpPath';
 	protected function getInput(): string
 	{
 		$value = htmlspecialchars($this->value ?: $this->default, ENT_QUOTES, 'UTF-8');
 		$id    = htmlspecialchars($this->id, ENT_QUOTES, 'UTF-8');
 		$name  = htmlspecialchars($this->name, ENT_QUOTES, 'UTF-8');
 		return <<<HTML
 <div class="input-group">
 	<input type="text" name="{$name}" id="{$id}" value="{$value}"
 		class="form-control" maxlength="512"
 		placeholder="/backups" />
 	<button type="button" class="btn btn-outline-secondary" id="{$id}_browseBtn"
 		title="Browse directories on the remote SFTP server">
 		<span class="icon-folder-open" aria-hidden="true"></span>
 		Browse Remote
 	</button>
 </div>
 <div class="modal fade" id="{$id}_sftpModal" tabindex="-1" aria-labelledby="{$id}_sftpModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h5 class="modal-title" id="{$id}_sftpModalLabel">
 					<span class="icon-folder-open" aria-hidden="true"></span>
 					Browse Remote SFTP Directory
 				</h5>
 				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 			</div>
 			<div class="modal-body">
 				<div id="{$id}_sftpStatus" class="mb-2">
 					<small class="text-muted">Click "Browse Remote" to connect...</small>
 				</div>
 				<div id="{$id}_sftpCurrent" class="mb-2 p-2 bg-light border rounded" style="font-family:monospace; font-size:0.85rem;">
 					/
 				</div>
 				<div id="{$id}_sftpTree" class="border rounded" style="max-height:350px; overflow-y:auto;">
 				</div>
 				<div class="mt-2">
 					<small class="text-muted">
 						Click a directory to navigate into it. Click "Select This Directory" to use the current path.
 						<br>SFTP credentials must be saved in the profile before browsing.
 					</small>
 				</div>
 			</div>
 			<div class="modal-footer">
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
 				<button type="button" class="btn btn-primary" id="{$id}_sftpSelect">
 					<span class="icon-checkmark" aria-hidden="true"></span>
 					Select This Directory
 				</button>
 			</div>
 		</div>
 	</div>
 </div>
 <script>
 (function() {
 	var fieldId   = '{$id}';
 	var input     = document.getElementById(fieldId);
 	var browseBtn = document.getElementById(fieldId + '_browseBtn');
 	var modalEl   = document.getElementById(fieldId + '_sftpModal');
 	var treeEl    = document.getElementById(fieldId + '_sftpTree');
 	var statusEl  = document.getElementById(fieldId + '_sftpStatus');
 	var currentEl = document.getElementById(fieldId + '_sftpCurrent');
 	var selectBtn = document.getElementById(fieldId + '_sftpSelect');
 	var currentPath = '/';
 	function getProfileId() {
 		var el = document.getElementById('jform_id');
 		return el ? parseInt(el.value, 10) || 0 : 0;
 	}
 	function showModal() {
 		if (typeof bootstrap !== 'undefined' && bootstrap.Modal) {
 			var modal = bootstrap.Modal.getOrCreateInstance(modalEl);
 			modal.show();
 		}
 	}
 	function hideModal() {
 		if (typeof bootstrap !== 'undefined' && bootstrap.Modal) {
 			var modal = bootstrap.Modal.getInstance(modalEl);
 			if (modal) modal.hide();
 		}
 	}
 	/**
 	 * Set the status message using safe DOM methods (no innerHTML).
 	 * @param {string} cssClass  - CSS class for the small element
 	 * @param {string} iconClass - Icon CSS class (e.g. 'icon-spinner icon-spin'), or empty
 	 * @param {string} text      - Plain text message
 	 */
 	function setStatus(cssClass, iconClass, text) {
 		while (statusEl.firstChild) statusEl.removeChild(statusEl.firstChild);
 		var small = document.createElement('small');
 		small.className = cssClass;
 		if (iconClass) {
 			var icon = document.createElement('span');
 			icon.className = iconClass;
 			icon.setAttribute('aria-hidden', 'true');
 			small.appendChild(icon);
 			small.appendChild(document.createTextNode(' '));
 		}
 		small.appendChild(document.createTextNode(text));
 		statusEl.appendChild(small);
 	}
 	function loadSftpDir(path) {
 		currentPath = path;
 		currentEl.textContent = path;
 		while (treeEl.firstChild) treeEl.removeChild(treeEl.firstChild);
 		setStatus('text-muted', 'icon-spinner icon-spin', 'Connecting to remote server...');
 		var profileId = getProfileId();
 		if (!profileId) {
 			setStatus('text-danger', '', 'Please save the profile first so SFTP credentials are available.');
 			return;
 		}
 		var form = new URLSearchParams();
 		form.append('task', 'ajax.browseSftpDir');
 		form.append('profile_id', profileId);
 		form.append('path', path);
 		var tokenName = Joomla.getOptions('csrf.token') || '';
 		if (tokenName) form.append(tokenName, '1');
 		fetch('index.php?option=com_mokosuitebackup&format=json', {
 			method: 'POST',
 			body: form,
 			headers: { 'X-Requested-With': 'XMLHttpRequest' }
 		})
 		.then(function(r) {
 			if (!r.ok) throw new Error('Server error (HTTP ' + r.status + ')');
 			return r.json();
 		})
 		.then(function(data) {
 			if (data.error) {
 				setStatus('text-danger', 'icon-warning', data.message || 'Error');
 				return;
 			}
 			var count = data.dirs ? data.dirs.length : 0;
 			setStatus('text-success', 'icon-publish', 'Connected \u2014 ' + count + ' subdirectories');
 			currentPath = data.current || path;
 			currentEl.textContent = currentPath;
 			renderSftpTree(data);
 		})
 		.catch(function(err) {
 			setStatus('text-danger', 'icon-warning', err.message);
 		});
 	}
 	function renderSftpTree(data) {
 		while (treeEl.firstChild) treeEl.removeChild(treeEl.firstChild);
 		var list = document.createElement('div');
 		list.className = 'list-group list-group-flush';
 		/* Parent / back button */
 		if (data.parent !== null && data.parent !== undefined) {
 			var up = document.createElement('a');
 			up.href = '#';
 			up.className = 'list-group-item list-group-item-action py-1';
 			var upIcon = document.createElement('span');
 			upIcon.className = 'icon-arrow-up-4';
 			upIcon.setAttribute('aria-hidden', 'true');
 			up.appendChild(upIcon);
 			up.appendChild(document.createTextNode(' .. (parent directory)'));
 			up.addEventListener('click', function(e) {
 				e.preventDefault();
 				loadSftpDir(data.parent);
 			});
 			list.appendChild(up);
 		}
 		/* Directory entries */
 		var dirs = data.dirs || [];
 		dirs.forEach(function(dir) {
 			var item = document.createElement('a');
 			item.href = '#';
 			item.className = 'list-group-item list-group-item-action py-1';
 			var folderIcon = document.createElement('span');
 			folderIcon.className = 'icon-folder';
 			folderIcon.setAttribute('aria-hidden', 'true');
 			item.appendChild(folderIcon);
 			item.appendChild(document.createTextNode(' ' + dir.name));
 			item.addEventListener('click', function(e) {
 				e.preventDefault();
 				loadSftpDir(dir.path);
 			});
 			/* Double-click to select and close */
 			item.addEventListener('dblclick', function(e) {
 				e.preventDefault();
 				input.value = dir.path;
 				input.dispatchEvent(new Event('change', { bubbles: true }));
 				hideModal();
 			});
 			list.appendChild(item);
 		});
 		if (dirs.length === 0) {
 			var empty = document.createElement('div');
 			empty.className = 'list-group-item text-muted py-2';
 			empty.textContent = '(no subdirectories)';
 			list.appendChild(empty);
 		}
 		treeEl.appendChild(list);
 	}
 	/* Browse button click */
 	browseBtn.addEventListener('click', function(e) {
 		e.preventDefault();
 		var startPath = input.value.trim() || '/';
 		showModal();
 		loadSftpDir(startPath);
 	});
 	/* Select button — use the current directory */
 	selectBtn.addEventListener('click', function(e) {
 		e.preventDefault();
 		input.value = currentPath;
 		input.dispatchEvent(new Event('change', { bubbles: true }));
 		hideModal();
 	});
 })();
 </script>
 HTML;
 	}
 }
@@ -0,0 +1,109 @@
 <?php
 /**
 * @package     MokoSuiteBackup
 * @subpackage  com_mokosuitebackup
 * @author      Moko Consulting <hello@mokoconsulting.tech>
 * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
 * @license     GNU General Public License version 3 or later; see LICENSE
 *
 * Single synchronous entry point for running a backup.
 *
 * Every non-interactive trigger — the web-cron handler, the pre-install /
 * pre-update / pre-uninstall hooks, the scheduled task plugin and the CLI
 * command — runs through here, so the final status, notification gating and
 * retention are applied identically regardless of what started the backup.
 * (The dashboard's AJAX "Backup Now" is the interactive equivalent, driven by
 * SteppedBackupEngine.)
 *
 * BackupEngine::run() already sends notifications (gated by the profile's
 * notify_on_success / notify_on_failure) and applies retention, so this class
 * DELEGATES rather than reimplementing that logic — there is exactly one
 * notification layer. Its value is being the documented seam where origin-aware
 * behaviour can live and normalising the result, including the real
 * complete / warning / fail status that the engine records but does not return.
 */
 namespace Joomla\Component\MokoSuiteBackup\Administrator\Service;
 defined('_JEXEC') or die;
 use Joomla\CMS\Factory;
 use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
 final class BackupRunner
 {
 	/**
 	 * Run a full backup synchronously and return a normalised result.
 	 *
 	 * @param   int     $profileId    Profile to back up.
 	 * @param   string  $description  Human-readable description stored on the record.
 	 * @param   string  $origin       Trigger origin (webcron|preaction|scheduled|cli|backend…).
 	 *
 	 * @return  array{success:bool,status:string,message:string,record_id:int,warnings:array}
 	 */
 	public function run(int $profileId, string $description, string $origin = 'backend'): array
 	{
 		// TODO(#196): an interactive progress popup for installer-triggered runs
 		// (onExtensionBeforeUpdate) is a separate follow-up — the installer
 		// request cannot drive the AJAX/stepped progress modal.
 		try {
 			if (!class_exists(BackupEngine::class)) {
 				require_once __DIR__ . '/../Engine/BackupEngine.php';
 			}
 			$result = (new BackupEngine())->run($profileId, $description, $origin);
 		} catch (\Throwable $e) {
 			error_log('MokoSuiteBackup: backup run failed (' . $origin . '): ' . $e->getMessage());
 			return [
 				'success'   => false,
 				'status'    => 'fail',
 				'message'   => 'Backup failed: ' . $e->getMessage(),
 				'record_id' => 0,
 				'warnings'  => [],
 			];
 		}
 		$success  = (bool) ($result['success'] ?? false);
 		$recordId = (int) ($result['record_id'] ?? 0);
 		return [
 			'success'   => $success,
 			'status'    => $this->resolveStatus($success, $recordId),
 			'message'   => (string) ($result['message'] ?? ''),
 			'record_id' => $recordId,
 			'warnings'  => $result['warnings'] ?? [],
 		];
 	}
 	/**
 	 * Read the status BackupEngine wrote to the record (complete/warning/fail)
 	 * but does not return, so callers can distinguish a warning (archive created,
 	 * remote upload failed) from a clean success.
 	 */
 	private function resolveStatus(bool $success, int $recordId): string
 	{
 		if (!$success) {
 			return 'fail';
 		}
 		if ($recordId <= 0) {
 			return 'complete';
 		}
 		try {
 			$db    = Factory::getDbo();
 			$query = $db->getQuery(true)
 				->select($db->quoteName('status'))
 				->from($db->quoteName('#__mokosuitebackup_records'))
 				->where($db->quoteName('id') . ' = ' . (int) $recordId);
 			$db->setQuery($query);
 			$status = (string) $db->loadResult();
 			return $status !== '' ? $status : 'complete';
 		} catch (\Throwable $e) {
 			return 'complete';
 		}
 	}
 }
@@ -17,6 +17,10 @@ use Joomla\CMS\Session\Session;
 HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('behavior.keepalive');
 HTMLHelper::_('bootstrap.modal');
 /* Component CSS via the Web Asset Manager (declared in media/joomla.asset.json) */
 $this->getDocument()->getWebAssetManager()->useStyle('com_mokosuitebackup.admin');
 $profileId = (int) $this->item->id;
 $token     = Session::getFormToken();
@@ -66,7 +70,6 @@ $token     = Session::getFormToken();
 		<?php echo HTMLHelper::_('uitab.addTab', 'profileTab', 'remote', Text::_('COM_MOKOJOOMBACKUP_TAB_REMOTE')); ?>
 		<div class="row">
 			<div class="col-lg-12">
 				<?php // ---- Remote Destinations (multi-remote) ---- ?>
 				<?php if ($profileId): ?>
 				<div id="mokoRemoteDestinations" class="mb-4">
 					<div class="d-flex justify-content-between align-items-center mb-3">
@@ -98,20 +101,13 @@ $token     = Session::getFormToken();
 						<?php echo Text::_('COM_MOKOJOOMBACKUP_REMOTE_NONE_CONFIGURED'); ?>
 					</p>
 				</div>
-				<hr>
+				<?php else: ?>
 				<div class="alert alert-info">
 					<?php echo Text::_('COM_MOKOJOOMBACKUP_REMOTE_SAVE_FIRST'); ?>
 				</div>
 				<?php endif; ?>
-				<?php // ---- Legacy single-remote fields ---- ?>
+				<?php echo $this->form->renderFieldset('remote'); ?>
 				<div id="legacyRemoteFields">
 					<div class="alert alert-info small" id="legacyRemoteNote" style="display:none;">
 						<span class="icon-info-circle" aria-hidden="true"></span>
 						<?php echo Text::_('COM_MOKOJOOMBACKUP_REMOTE_LEGACY_NOTE'); ?>
 					</div>
 					<?php echo $this->form->renderFieldset('remote'); ?>
 					<?php echo $this->form->renderFieldset('ftp'); ?>
 					<?php echo $this->form->renderFieldset('google_drive'); ?>
 					<?php echo $this->form->renderFieldset('s3'); ?>
 				</div>
 			</div>
 		</div>
 		<?php echo HTMLHelper::_('uitab.endTab'); ?>
@@ -128,6 +124,7 @@ $token     = Session::getFormToken();
 <div class="modal fade" id="remoteModal" tabindex="-1" aria-labelledby="remoteModalLabel" aria-hidden="true">
 	<div class="modal-dialog modal-lg">
 		<div class="modal-content">
 			<div class="container-fluid">
 			<div class="modal-header">
 				<h5 class="modal-title" id="remoteModalLabel"><?php echo Text::_('COM_MOKOJOOMBACKUP_REMOTE_ADD'); ?></h5>
 				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="<?php echo Text::_('JCLOSE'); ?>"></button>
@@ -197,7 +194,9 @@ $token     = Session::getFormToken();
 					</div>
 					<div class="mb-3" id="remoteSftpKeyWrap">
 						<label for="remoteCfg_sftp_key_data" class="form-label"><?php echo Text::_('COM_MOKOJOOMBACKUP_FIELD_SFTP_KEY'); ?></label>
-						<textarea class="form-control" id="remoteCfg_sftp_key_data" rows="4" placeholder="Paste SSH private key or leave as-is to keep existing"></textarea>
+						<input type="file" class="form-control mb-2" id="remoteSftpKeyFile" accept=".pem,.key,.ppk,.openssh,.rsa,.ed25519,text/plain">
 						<textarea class="form-control" id="remoteCfg_sftp_key_data" rows="4" placeholder="Upload a key file above, or paste the SSH private key here (leave as-is to keep existing)"></textarea>
 						<div class="form-text" id="remoteSftpKeyFileMsg"></div>
 					</div>
 					<div class="mb-3" id="remoteSftpPassphraseWrap">
 						<label for="remoteCfg_sftp_passphrase" class="form-label"><?php echo Text::_('COM_MOKOJOOMBACKUP_FIELD_SFTP_PASSPHRASE'); ?></label>
@@ -264,6 +263,7 @@ $token     = Session::getFormToken();
 					<?php echo Text::_('JAPPLY'); ?>
 				</button>
 			</div>
 			</div>
 		</div>
 	</div>
 </div>
@@ -281,9 +281,12 @@ document.addEventListener('DOMContentLoaded', function() {
 	const tbody     = document.getElementById('remoteDestBody');
 	const emptyMsg  = document.getElementById('remoteDestEmpty');
 	const loadingTr = document.getElementById('remoteDestLoading');
-	const legacy    = document.getElementById('legacyRemoteFields');
+	const modalEl   = document.getElementById('remoteModal');
-	const legacyNote = document.getElementById('legacyRemoteNote');
+	// Lazy: resolve the Bootstrap modal at click-time. Bootstrap loads as a
-	const modal     = new bootstrap.Modal(document.getElementById('remoteModal'));
+	// deferred ES module, so `bootstrap` is not defined yet at DOMContentLoaded;
 	// referencing it here would throw and abort the whole handler (leaving the
 	// table stuck at "Loading…" and the Add button unbound).
 	const getModal  = () => bootstrap.Modal.getOrCreateInstance(modalEl);
 	// Type badge colours
 	const typeBadge = {sftp: 'bg-primary', s3: 'bg-warning text-dark', google_drive: 'bg-success'};
@@ -337,14 +340,10 @@ document.addEventListener('DOMContentLoaded', function() {
 		if (!remotesData.length) {
 			emptyMsg.style.display = '';
 			legacy.style.display = '';
 			legacyNote.style.display = 'none';
 			return;
 		}
 		emptyMsg.style.display = 'none';
 		legacy.style.display = 'none';
 		legacyNote.style.display = 'block';
 		remotesData.forEach(function(item) {
 			const tr = document.createElement('tr');
@@ -460,6 +459,29 @@ document.addEventListener('DOMContentLoaded', function() {
 		}
 	});
 	// ---- Upload SSH key file (fills the key textarea; no paste required) ----
 	const keyFileInput = document.getElementById('remoteSftpKeyFile');
 	if (keyFileInput) {
 		keyFileInput.addEventListener('change', function() {
 			const msg  = document.getElementById('remoteSftpKeyFileMsg');
 			const file = this.files && this.files[0];
 			if (!file) {
 				return;
 			}
 			const reader = new FileReader();
 			reader.onload = function(ev) {
 				document.getElementById('remoteCfg_sftp_key_data').value = ev.target.result;
 				if (msg) { msg.textContent = 'Loaded "' + file.name + '".'; msg.className = 'form-text text-success'; }
 			};
 			reader.onerror = function() {
 				if (msg) { msg.textContent = 'Could not read that file.'; msg.className = 'form-text text-danger'; }
 			};
 			reader.readAsText(file);
 		});
 	}
 	// ---- Add button ----
 	document.getElementById('btnAddRemote').addEventListener('click', function() {
 		openEdit(0);
@@ -507,8 +529,8 @@ document.addEventListener('DOMContentLoaded', function() {
 				const fields = configFields[item.type] || [];
 				fields.forEach(function(f) {
 					const el = document.getElementById('remoteCfg_' + prefix + f);
-					if (el && item.config && item.config[f] !== undefined) {
+					if (el && item.params && item.params[f] !== undefined) {
-						el.value = item.config[f];
+						el.value = item.params[f];
 					}
 				});
 			}
@@ -520,7 +542,7 @@ document.addEventListener('DOMContentLoaded', function() {
 		}
 		updateTypeFields();
-		modal.show();
+		getModal().show();
 	}
 	// ---- Type selector toggles field visibility ----
@@ -600,7 +622,7 @@ document.addEventListener('DOMContentLoaded', function() {
 				return;
 			}
-			modal.hide();
+			getModal().hide();
 			loadRemotes();
 		})
 		.catch(() => {
@@ -8,7 +8,7 @@
 -->
 <extension type="module" client="administrator" method="upgrade">
 	<name>Module - MokoSuiteBackup - cPanel</name>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-23</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
 -->
 <extension type="plugin" group="actionlog" method="upgrade">
 	<name>Action Log - MokoSuiteBackup</name>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
 -->
 <extension type="plugin" group="console" method="upgrade">
 	<name>Console - MokoSuiteBackup</name>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -13,7 +13,7 @@ namespace Joomla\Plugin\Console\MokoSuiteBackup\Command;
 defined('_JEXEC') or die;
 use Joomla\CMS\Factory;
-use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
+use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
 use Joomla\Console\Command\AbstractCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -40,20 +40,19 @@ class RunCommand extends AbstractCommand
 		$io->title('MokoSuiteBackup — Run Backup');
 		$io->text('Profile ID: ' . $profileId);
-		$engineFile = JPATH_ADMINISTRATOR . '/components/com_mokosuitebackup/src/Engine/BackupEngine.php';
+		$runnerFile = JPATH_ADMINISTRATOR . '/components/com_mokosuitebackup/src/Service/BackupRunner.php';
-		if (!file_exists($engineFile)) {
+		if (!file_exists($runnerFile)) {
 			$io->error('MokoSuiteBackup component not installed.');
 			return 1;
 		}
-		if (!class_exists(BackupEngine::class)) {
+		if (!class_exists(BackupRunner::class)) {
-			require_once $engineFile;
+			require_once $runnerFile;
 		}
-		$engine = new BackupEngine();
+		$result = (new BackupRunner())->run($profileId, $desc ?: 'CLI backup', 'cli');
 		$result = $engine->run($profileId, $desc ?: 'CLI backup', 'cli');
 		if ($result['success']) {
 			$io->success($result['message']);
@@ -227,11 +227,11 @@ class SnapshotCommand extends AbstractCommand
 		}
 		// Delete the snapshot file if it exists
-		if (!empty($record->file_path) && is_file($record->file_path)) {
+		if (!empty($record->data_file) && is_file($record->data_file)) {
-			if (!@unlink($record->file_path)) {
+			if (!@unlink($record->data_file)) {
-				$io->warning('Could not delete snapshot file: ' . $record->file_path);
+				$io->warning('Could not delete snapshot file: ' . $record->data_file);
 			} else {
-				$io->text('Deleted file: ' . $record->file_path);
+				$io->text('Deleted file: ' . $record->data_file);
 			}
 		}
@@ -7,7 +7,7 @@
 -->
 <extension type="plugin" group="content" method="upgrade">
 	<name>Content - MokoSuiteBackup</name>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -59,7 +59,7 @@
 					type="sql"
 					label="PLG_CONTENT_MOKOJOOMBACKUP_FIELD_PROFILE"
 					description="PLG_CONTENT_MOKOJOOMBACKUP_FIELD_PROFILE_DESC"
-					query="SELECT id AS value, title AS text FROM #__mokosuitebackup_profiles WHERE published = 1 ORDER BY ordering ASC"
+					query="SELECT id AS value, title AS text FROM #__mokosuitebackup_profiles WHERE published = 1 ORDER BY id ASC"
 					default="1"
 				>
 					<option value="1">Default Backup Profile</option>
@@ -14,7 +14,7 @@ defined('_JEXEC') or die;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
+use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
 use Joomla\Event\Event;
 use Joomla\Event\SubscriberInterface;
@@ -24,9 +24,11 @@ final class MokoSuiteBackupContent extends CMSPlugin implements SubscriberInterf
 	public static function getSubscribedEvents(): array
 	{
 		// Pre-update backups are owned by plg_system_mokosuitebackup, which also
 		// subscribes to onExtensionBeforeUpdate. Only pre-install is handled here
 		// to avoid running the backup twice on a single extension update.
 		return [
 			'onExtensionBeforeInstall' => 'onExtensionBeforeInstall',
 			'onExtensionBeforeUpdate'  => 'onExtensionBeforeUpdate',
 		];
 	}
@@ -42,18 +44,6 @@ final class MokoSuiteBackupContent extends CMSPlugin implements SubscriberInterf
 		$this->triggerAutoBackup('Pre-install backup');
 	}
 	/**
 	 * Trigger a backup before an extension is updated.
 	 */
 	public function onExtensionBeforeUpdate(Event $event): void
 	{
 		if (!(int) $this->params->get('backup_before_update', 1)) {
 			return;
 		}
 		$this->triggerAutoBackup('Pre-update backup');
 	}
 	/**
 	 * Run a backup using the configured profile.
 	 */
@@ -71,19 +61,18 @@ final class MokoSuiteBackupContent extends CMSPlugin implements SubscriberInterf
 		$session->set('mokosuitebackup.content_last_autobackup', time());
-		$engineFile = JPATH_ADMINISTRATOR . '/components/com_mokosuitebackup/src/Engine/BackupEngine.php';
+		$runnerFile = JPATH_ADMINISTRATOR . '/components/com_mokosuitebackup/src/Service/BackupRunner.php';
-		if (!file_exists($engineFile)) {
+		if (!file_exists($runnerFile)) {
 			return;
 		}
-		if (!class_exists(BackupEngine::class)) {
+		if (!class_exists(BackupRunner::class)) {
-			require_once $engineFile;
+			require_once $runnerFile;
 		}
 		try {
-			$engine = new BackupEngine();
+			(new BackupRunner())->run($profileId, $description, 'backend');
 			$engine->run($profileId, $description, 'backend');
 		} catch (\Throwable $e) {
 			// Non-fatal — log and continue with the install/update
 			Factory::getApplication()->enqueueMessage(
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="quickicon" method="upgrade">
 	<name>Quick Icon - MokoSuiteBackup</name>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -7,7 +7,7 @@
 -->
 <extension type="plugin" group="system" method="upgrade">
 	<name>System - MokoSuiteBackup</name>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -15,7 +15,7 @@ defined('_JEXEC') or die;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
+use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
 use Joomla\Event\Event;
 use Joomla\Event\SubscriberInterface;
@@ -91,8 +91,7 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 		@ini_set('memory_limit', '512M');
 		try {
-			$engine = new BackupEngine();
+			$result = (new BackupRunner())->run($profileId, 'Web cron backup', 'webcron');
 			$result = $engine->run($profileId, 'Web cron backup', 'webcron');
 			$this->sendJsonResponse(
 				$result['success'],
@@ -390,14 +389,29 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 		$profileId = (int) $params->get('default_profile', 1);
 		try {
-			$engine = new BackupEngine();
+			$result = (new BackupRunner())->run($profileId, $description, 'preaction');
-			$result = $engine->run($profileId, $description, 'preaction');
+			$app    = Factory::getApplication();
 			$status = $result['status'] ?? (!empty($result['success']) ? 'complete' : 'fail');
-			if (!$result['success']) {
+			/* Always surface the outcome so the pre-update backup is visible in the
-				Factory::getApplication()->enqueueMessage(
+			   admin — previously only failures produced a message, so a successful
-					'MokoSuiteBackup: ' . $description . ' failed — ' . $result['message'],
+			   pre-update backup fired no notification at all. */
 			if ($status === 'warning') {
 				$app->enqueueMessage(
 					'MokoSuiteBackup: ' . $description . ' completed with warnings — '
 					. ($result['message'] ?: 'the local archive was created but a remote upload failed; see the backup log.'),
 					'warning'
 				);
 			} elseif ($status === 'fail' || empty($result['success'])) {
 				$app->enqueueMessage(
 					'MokoSuiteBackup: ' . $description . ' failed — ' . ($result['message'] ?: 'unknown error'),
 					'error'
 				);
 			} else {
 				$app->enqueueMessage(
 					'MokoSuiteBackup: ' . $description . ' completed successfully.',
 					'message'
 				);
 			}
 		} catch (\Throwable $e) {
 			error_log('MokoSuiteBackup: ' . $description . ' failed: ' . $e->getMessage());
@@ -11,7 +11,7 @@
 			type="sql"
 			label="PLG_TASK_MOKOJOOMBACKUP_FIELD_PROFILE"
 			description="PLG_TASK_MOKOJOOMBACKUP_FIELD_PROFILE_DESC"
-			query="SELECT id AS value, title AS text FROM #__mokosuitebackup_profiles WHERE published = 1 ORDER BY ordering ASC"
+			query="SELECT id AS value, title AS text FROM #__mokosuitebackup_profiles WHERE published = 1 ORDER BY id ASC"
 			default="1"
 			required="true"
 		>
@@ -7,7 +7,7 @@
 -->
 <extension type="plugin" group="task" method="upgrade">
 	<name>Task - MokoSuiteBackup</name>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -72,7 +72,7 @@ final class MokoSuiteBackupTask extends CMSPlugin implements SubscriberInterface
 		$profileId = (int) ($params->profile_id ?? 1);
 		// Load the backup engine from the component
-		$engineFile = JPATH_ADMINISTRATOR . '/components/com_mokosuitebackup/src/Engine/BackupEngine.php';
+		$engineFile = JPATH_ADMINISTRATOR . '/components/com_mokosuitebackup/src/Service/BackupRunner.php';
 		if (!file_exists($engineFile)) {
 			$this->logTask('MokoSuiteBackup component not installed — cannot run backup.');
@@ -81,11 +81,11 @@ final class MokoSuiteBackupTask extends CMSPlugin implements SubscriberInterface
 		}
 		// The autoloader should handle this via namespace, but ensure class is available
-		if (!class_exists('\\Joomla\\Component\\MokoSuiteBackup\\Administrator\\Engine\\BackupEngine')) {
+		if (!class_exists('\\Joomla\\Component\\MokoSuiteBackup\\Administrator\\Service\\BackupRunner')) {
 			require_once $engineFile;
 		}
-		$engine = new \Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine();
+		$engine = new \Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner();
 		$result = $engine->run($profileId, 'Scheduled task backup', 'scheduled');
 		if ($result['success']) {
@@ -7,7 +7,7 @@
 -->
 <extension type="plugin" group="webservices" method="upgrade">
 	<name>Web Services - MokoSuiteBackup</name>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -8,7 +8,7 @@
 <extension type="package" method="upgrade">
 	<name>Package - MokoSuiteBackup</name>
 	<packagename>mokosuitebackup</packagename>
-	<version>02.54.00</version>
+	<version>02.58.01</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -12,6 +12,7 @@ defined('_JEXEC') or die;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Router\Route;
 class Pkg_MokoSuiteBackupInstallerScript
@@ -73,22 +74,32 @@ class Pkg_MokoSuiteBackupInstallerScript
 		/* Save download key before Joomla re-registers the update site */
 		if ($type === 'update') {
-			$this->preflight_saveKey();
+			$this->backupDownloadKey();
 		}
 		/* Remove any orphaned mis-registered component BEFORE the component install
 		   recreates its admin menu. The orphan (element com_component-mokosuitebackup)
 		   owns a "Backup" menu with alias "backup"; if it survives, the real
 		   component's menu creation collides ("The alias backup is already being used")
 		   and the whole install aborts. */
 		$this->removeOrphanedComponent();
 		return true;
 	}
 	/**
-	 * Called before install/update to preserve the download key.
+	 * The download key cached during preflight so it survives an update.
 	 *
 	 * Joomla re-registers update sites from the manifest on every update,
 	 * which can reset the extra_query (download key). We save it here
 	 * and restore it in postflight.
 	 */
 	private ?string $savedDownloadKey = null;
-	public function preflight_saveKey(): void
+	/**
 	 * Cache the existing download key from the update sites table before update runs.
 	 *
 	 * Joomla re-registers update sites from the manifest on every update, which
 	 * can reset the extra_query (download key). We save it here and restore it
 	 * in postflight.
 	 */
 	private function backupDownloadKey(): void
 	{
 		try {
 			$db    = Factory::getDbo();
@@ -108,19 +119,16 @@ class Pkg_MokoSuiteBackupInstallerScript
 				->where($db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokosuitebackup'))
 				->where($db->quoteName('e.type') . ' = ' . $db->quote('package'))
 				->setLimit(1);
 			$db->setQuery($query);
 			$key = $db->loadResult();
-			if (!empty($key)) {
+			$db->setQuery($query);
-				$this->savedDownloadKey = $key;
+			$extraQuery = (string) $db->loadResult();
 			if (!empty($extraQuery)) {
 				parse_str($extraQuery, $output);
 				$this->savedDownloadKey = $output['dlid'] ?? $extraQuery;
 			}
 		} catch (\Exception $e) {
-			error_log('MokoSuiteBackup: Could not save download key: ' . $e->getMessage());
+			Log::add('MokoSuiteBackup: Could not backup download key: ' . $e->getMessage(), Log::WARNING, 'jerror');
 			Factory::getApplication()->enqueueMessage(
 				'MokoSuiteBackup could not preserve your download/license key before the update. '
 				. 'Please verify your license key is still configured in System &rarr; Update Sites after this update completes.',
 				'warning'
 			);
 		}
 	}
@@ -138,8 +146,8 @@ class Pkg_MokoSuiteBackupInstallerScript
 			return;
 		}
-		/* Restore download key if it was saved before update */
+		/* Restore the download key preserved before the update re-registered the site */
-		if ($this->savedDownloadKey !== null) {
+		if ($type === 'update') {
 			$this->restoreDownloadKey();
 		}
@@ -168,14 +176,26 @@ class Pkg_MokoSuiteBackupInstallerScript
 		/* Sync submenu icons in #__menu (Joomla doesn't update icons on upgrades) */
 		$this->syncMenuIcons();
 		/* Warn if no license key configured */
 		$this->warnMissingLicenseKey();
 		/* Migrate profiles with old default backup_dir values to [DEFAULT_DIR] placeholder */
 		$this->migrateDefaultBackupDir();
-		/* Remind user to review backup profile settings */
+		/* Remove the orphaned mis-registered component (element
 		   com_component-mokosuitebackup) left behind when the component <name>
 		   briefly used the "Type - Name" convention. Self-healing on every update. */
 		$this->removeOrphanedComponent();
 		/* Drop legacy single-remote storage columns portably (replaces the old
 		   PREPARE/EXECUTE migration that MySQL 8 rejected in Joomla's installer). */
 		$this->dropLegacyRemoteColumns();
 		/* Install completion notice (install and update) */
 		$this->installSuccessful();
 		if ($type === 'install') {
 			/* Fresh install never carries a download key — prompt for one */
 			$this->warnMissingLicenseKey();
 			/* Remind user to review backup profile settings */
 			$profileUrl = Route::_('index.php?option=com_mokosuitebackup&view=profiles');
 			Factory::getApplication()->enqueueMessage(
@@ -188,6 +208,155 @@ class Pkg_MokoSuiteBackupInstallerScript
 		}
 	}
 	/**
 	 * Remove the orphaned component registration created when the component
 	 * <name> briefly used the "Type - Name" display convention. Joomla derives a
 	 * component's element from its <name>, so "Component - MokoSuiteBackup"
 	 * produced element com_component-mokosuitebackup — its own extension record,
 	 * admin menu items, schema rows and administrator/ folder — orphaning the real
 	 * com_mokosuitebackup on the old version. This reconciles affected sites on
 	 * update. Idempotent and non-fatal: does nothing when no orphan exists.
 	 *
 	 * @return  void
 	 */
 	private function removeOrphanedComponent(): void
 	{
 		try {
 			$db = Factory::getDbo();
 			$query = $db->getQuery(true)
 				->select($db->quoteName(['extension_id', 'element']))
 				->from($db->quoteName('#__extensions'))
 				->where($db->quoteName('type') . ' = ' . $db->quote('component'))
 				->where($db->quoteName('client_id') . ' = 1')
 				->where($db->quoteName('element') . ' LIKE ' . $db->quote('%component%mokosuitebackup%'))
 				->where($db->quoteName('element') . ' <> ' . $db->quote('com_mokosuitebackup'));
 			$db->setQuery($query);
 			$orphans = $db->loadObjectList();
 			if (empty($orphans)) {
 				return;
 			}
 			foreach ($orphans as $orphan) {
 				$id = (int) $orphan->extension_id;
 				/* Admin menu items owned by the orphan component */
 				$db->setQuery(
 					$db->getQuery(true)
 						->delete($db->quoteName('#__menu'))
 						->where($db->quoteName('component_id') . ' = ' . $id)
 				)->execute();
 				/* Schema-version rows */
 				$db->setQuery(
 					$db->getQuery(true)
 						->delete($db->quoteName('#__schemas'))
 						->where($db->quoteName('extension_id') . ' = ' . $id)
 				)->execute();
 				/* Update-site mapping (leave #__update_sites; harmless if orphaned) */
 				$db->setQuery(
 					$db->getQuery(true)
 						->delete($db->quoteName('#__update_sites_extensions'))
 						->where($db->quoteName('extension_id') . ' = ' . $id)
 				)->execute();
 				/* The bogus extension record itself */
 				$db->setQuery(
 					$db->getQuery(true)
 						->delete($db->quoteName('#__extensions'))
 						->where($db->quoteName('extension_id') . ' = ' . $id)
 				)->execute();
 				/* The stray admin component folder on disk */
 				$this->deleteFolderRecursive(JPATH_ADMINISTRATOR . '/components/' . $orphan->element);
 				Factory::getApplication()->enqueueMessage(
 					'MokoSuiteBackup: removed orphaned component registration "'
 					. htmlspecialchars($orphan->element, ENT_QUOTES, 'UTF-8') . '".',
 					'info'
 				);
 			}
 		} catch (\Throwable $e) {
 			/* Never block the install/update over best-effort cleanup */
 			Log::add('MokoSuiteBackup orphan-component cleanup failed: ' . $e->getMessage(), Log::WARNING, 'jerror');
 		}
 	}
 	/**
 	 * Drop the 26 legacy single-remote storage columns from the profiles table if
 	 * they are still present. Replaces sql/updates/mysql/02.56.01.sql, whose
 	 * PREPARE/EXECUTE/DEALLOCATE approach is rejected by Joomla's installer on
 	 * MySQL 8 (error 1295) and aborted the whole install. Done here in PHP: gate on
 	 * INFORMATION_SCHEMA, then issue a plain ALTER for only the columns that exist —
 	 * portable across MariaDB and MySQL 8. Idempotent and non-fatal.
 	 *
 	 * @return  void
 	 */
 	private function dropLegacyRemoteColumns(): void
 	{
 		try {
 			$db    = Factory::getDbo();
 			$table = $db->getPrefix() . 'mokosuitebackup_profiles';
 			$columns = [
 				'remote_storage',
 				'ftp_host', 'ftp_port', 'ftp_username', 'ftp_password', 'ftp_path', 'ftp_passive', 'ftp_ssl',
 				'sftp_host', 'sftp_port', 'sftp_username', 'sftp_auth_type', 'sftp_password', 'sftp_key_data', 'sftp_passphrase', 'sftp_path',
 				'gdrive_client_id', 'gdrive_client_secret', 'gdrive_refresh_token', 'gdrive_folder_id',
 				's3_endpoint', 's3_region', 's3_access_key', 's3_secret_key', 's3_bucket', 's3_path',
 			];
 			// Which legacy columns still exist on this install?
 			$db->setQuery(
 				$db->getQuery(true)
 					->select($db->quoteName('COLUMN_NAME'))
 					->from($db->quoteName('INFORMATION_SCHEMA.COLUMNS'))
 					->where($db->quoteName('TABLE_SCHEMA') . ' = DATABASE()')
 					->where($db->quoteName('TABLE_NAME') . ' = ' . $db->quote($table))
 					->where($db->quoteName('COLUMN_NAME') . ' IN (' . implode(',', array_map([$db, 'quote'], $columns)) . ')')
 			);
 			$present = $db->loadColumn();
 			if (empty($present)) {
 				return;
 			}
 			$drops = array_map(fn($c) => 'DROP COLUMN ' . $db->quoteName($c), $present);
 			$db->setQuery('ALTER TABLE ' . $db->quoteName($table) . ' ' . implode(', ', $drops));
 			$db->execute();
 		} catch (\Throwable $e) {
 			/* Best-effort — a leftover column is harmless and must never abort the install */
 			Log::add('MokoSuiteBackup legacy-remote-column drop failed: ' . $e->getMessage(), Log::WARNING, 'jerror');
 		}
 	}
 	/**
 	 * Recursively delete a directory (version-independent, no Folder dependency).
 	 *
 	 * @param   string  $dir  Absolute path
 	 *
 	 * @return  void
 	 */
 	private function deleteFolderRecursive(string $dir): void
 	{
 		if ($dir === '' || !is_dir($dir)) {
 			return;
 		}
 		$items = new \RecursiveIteratorIterator(
 			new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS),
 			\RecursiveIteratorIterator::CHILD_FIRST
 		);
 		foreach ($items as $item) {
 			$item->isDir() ? @rmdir($item->getPathname()) : @unlink($item->getPathname());
 		}
 		@rmdir($dir);
 	}
 	/**
 	 * Generate a cryptographically random webcron secret word on fresh install.
 	 */
@@ -460,23 +629,7 @@ class Pkg_MokoSuiteBackupInstallerScript
 		try {
 			$db = Factory::getDbo();
-			/* Find the parent menu item for our component */
+			/* Component extension_id first — needed to (re)create the parent menu. */
 			$query = $db->getQuery(true)
 				->select([$db->quoteName('id'), $db->quoteName('menutype')])
 				->from($db->quoteName('#__menu'))
 				->where($db->quoteName('client_id') . ' = 1')
 				->where($db->quoteName('level') . ' = 1')
 				->where($db->quoteName('link') . ' LIKE ' . $db->quote('index.php?option=com_mokosuitebackup%'))
 				->setLimit(1);
 			$db->setQuery($query);
 			$parent = $db->loadObject();
 			if (!$parent) {
 				error_log('MokoSuiteBackup: ensureSubmenuItems() — parent menu item not found');
 				return;
 			}
 			/* Get the component extension_id */
 			$query = $db->getQuery(true)
 				->select($db->quoteName('extension_id'))
 				->from($db->quoteName('#__extensions'))
@@ -491,6 +644,41 @@ class Pkg_MokoSuiteBackupInstallerScript
 				return;
 			}
 			/* Find the top-level "Backup" parent menu item for our component */
 			$query = $db->getQuery(true)
 				->select([$db->quoteName('id'), $db->quoteName('menutype')])
 				->from($db->quoteName('#__menu'))
 				->where($db->quoteName('client_id') . ' = 1')
 				->where($db->quoteName('level') . ' = 1')
 				->where($db->quoteName('link') . ' LIKE ' . $db->quote('index.php?option=com_mokosuitebackup%'))
 				->setLimit(1);
 			$db->setQuery($query);
 			$parent = $db->loadObject();
 			/* Self-heal: if the top-level menu was deleted (e.g. by a failed install
 			   after the duplicate-component mess), recreate it — otherwise the whole
 			   Backup menu stays gone and dependents (cPanel module, MokoSuiteClient)
 			   can't locate the component. */
 			if (!$parent) {
 				$parent = $this->createTopMenu($componentId);
 				if (!$parent) {
 					error_log('MokoSuiteBackup: ensureSubmenuItems() — parent menu missing and could not be created');
 					return;
 				}
 			}
 			/* Keep the top-level menu label on the short constant and owned by the
 			   real component. */
 			$db->setQuery(
 				$db->getQuery(true)
 					->update($db->quoteName('#__menu'))
 					->set($db->quoteName('title') . ' = ' . $db->quote('COM_MOKOJOOMBACKUP_SHORT'))
 					->set($db->quoteName('component_id') . ' = ' . (int) $componentId)
 					->where($db->quoteName('id') . ' = ' . (int) $parent->id)
 			);
 			$db->execute();
 			foreach ($submenus as $submenu) {
 				/* Check if this submenu item already exists */
 				$query = $db->getQuery(true)
@@ -556,6 +744,59 @@ class Pkg_MokoSuiteBackupInstallerScript
 		}
 	}
 	/**
 	 * Create the top-level "Backup" admin menu item for the component when it is
 	 * missing (deleted by a failed install / the duplicate-component fallout).
 	 * Label uses the short constant. Returns a lightweight {id, menutype} object,
 	 * or null on failure.
 	 *
 	 * @param   int  $componentId  Extension id of com_mokosuitebackup
 	 *
 	 * @return  object|null
 	 */
 	private function createTopMenu(int $componentId): ?object
 	{
 		try {
 			$table = Factory::getApplication()
 				->bootComponent('com_menus')
 				->getMVCFactory()
 				->createTable('Menu', 'Administrator');
 			$table->menutype     = 'main';
 			$table->title        = 'COM_MOKOJOOMBACKUP_SHORT';
 			$table->alias        = 'backup';
 			$table->link         = 'index.php?option=com_mokosuitebackup';
 			$table->type         = 'component';
 			$table->published    = 1;
 			$table->parent_id    = 1;
 			$table->level        = 1;
 			$table->component_id = $componentId;
 			$table->client_id    = 1;
 			$table->img          = 'class:archive';
 			$table->params       = '{}';
 			$table->language     = '*';
 			$table->access       = 1;
 			$table->setLocation(1, 'last-child');
 			if (!$table->check() || !$table->store()) {
 				error_log('MokoSuiteBackup: createTopMenu() failed: ' . $table->getError());
 				return null;
 			}
 			$obj           = new \stdClass();
 			$obj->id       = (int) $table->id;
 			$obj->menutype = 'main';
 			return $obj;
 		} catch (\Throwable $e) {
 			error_log('MokoSuiteBackup: createTopMenu() exception: ' . $e->getMessage());
 			return null;
 		}
 	}
 	private function fixPackageClientId(): void
 	{
 		try {
@@ -640,66 +881,57 @@ class Pkg_MokoSuiteBackupInstallerScript
 				->where($db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokosuitebackup'))
 				->where($db->quoteName('e.type') . ' = ' . $db->quote('package'))
 				->setLimit(1);
 			$db->setQuery($query);
 			$updateSiteId = (int) $db->loadResult();
-			if ($updateSiteId > 0) {
+			if ($updateSiteId > 0 && !empty($this->savedDownloadKey)) {
 				$query = $db->getQuery(true)
 					->update($db->quoteName('#__update_sites'))
-					->set($db->quoteName('extra_query') . ' = ' . $db->quote($this->savedDownloadKey))
+					->set($db->quoteName('extra_query') . ' = ' . $db->quote('dlid=' . $this->savedDownloadKey))
 					->where($db->quoteName('update_site_id') . ' = ' . $updateSiteId);
 				$db->setQuery($query);
 				$db->execute();
 			}
 		} catch (\Exception $e) {
-			error_log('MokoSuiteBackup: Could not restore download key: ' . $e->getMessage());
+			Log::add('MokoSuiteBackup: Could not restore download key: ' . $e->getMessage(), Log::WARNING, 'jerror');
 			Factory::getApplication()->enqueueMessage(
-				'MokoSuiteBackup: Your download/license key could not be preserved during the update. '
+				'<h4>MokoSuiteBackup</h4>'
-				. 'Please re-enter it in the Update Sites configuration to continue receiving updates.',
+					. '<p>Your download/license key could not be preserved during the update.</p>'
 					. '<p>Please re-enter it in the <a class="btn btn-sm btn-warning ms-2" href="index.php?option=com_installer&view=updatesites&filter[search]=pkg_mokosuitebackup">Update Sites</a> manager to continue receiving updates.</p>',
 				'warning'
 			);
 		}
 	}
 	/**
 	 * Show post-install license key prompt.
 	 */
 	private function warnMissingLicenseKey(): void
 	{
-		try
+		try {
 		{
 			$db = Factory::getDbo();
 			$db->setQuery(
 				$db->getQuery(true)
 					->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')])
 					->from($db->quoteName('#__update_sites'))
 					->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoSuiteBackup%') . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoSuiteBackup%') . ')')
 					->setLimit(1)
 			);
 			$site = $db->loadObject();
 			if ($site)
 			{
 				$eq = (string) ($site->extra_query ?? '');
 				if (!empty($eq) && strpos($eq, 'dlid=') !== false) { parse_str($eq, $p); if (!empty($p['dlid'])) { return; } }
 				$editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id;
 			}
 			else
 			{
 				$editUrl = 'index.php?option=com_installer&view=updatesites';
 			}
 			Factory::getApplication()->enqueueMessage(
-				'<strong>Moko Consulting License Key Required</strong> — '
+				'<h4>MokoSuiteBackup License Key Required</h4>'
-				. 'No download key is configured. Updates will not be available until a valid license key is entered. '
+					. '<p>A download/license key (DLID) is required to receive updates.</p>'
-				. '<a href="' . $editUrl . '" class="btn btn-sm btn-warning ms-2">Enter License Key</a>',
+					. '<p>Enter your key in the <a class="btn btn-sm btn-warning ms-2" href="index.php?option=com_installer&view=updatesites&filter[search]=pkg_mokosuitebackup">Update Sites</a> manager '
 					. 'or contact <a class="btn btn-sm btn-warning ms-2" href="https://mokoconsulting.tech/support" target="_blank" rel="noopener">Moko Consulting Support</a> to obtain one.</p>',
 				'warning'
 			);
-		}
+		} catch (\Exception $e) {}
-		catch (\Exception $e) {
+	}
-			error_log('MokoSuiteBackup: License key check failed: ' . $e->getMessage());
+
 	/**
 	 * Show install successful prompt.
 	 */
 	private function installSuccessful(): void
 	{
 		try {
 			Factory::getApplication()->enqueueMessage(
-				'MokoSuiteBackup could not verify your license key status. '
+				'<h4>MokoSuiteBackup installed successfully!</h4>',
-				. 'Please check System &rarr; Update Sites to ensure a valid license key is configured.',
+				'info'
 				'warning'
 			);
-		}
+		} catch (\Exception $e) {}
 	}
 }