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

Merge pull request 'feat: full-screen backup screen for pre-update + Backup Now (Akeeba-style), fixes white screen' (#238 ) from feat/fullscreen-backup-screen into dev
fix(security): enforce scheme allow-list on runbackup return URL
2026-07-06 03:58:23 +00:00 · 2026-07-06 03:58:05 +00:00 · 2026-07-05 22:57:40 -05:00 · 2026-07-05 22:55:28 -05:00 · 2026-07-06 03:34:43 +00:00 · 2026-07-06 03:34:19 +00:00
113 changed files with 2188 additions and 1587 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.14
 # 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,72 @@
 # Changelog
 ## [Unreleased]
-## [02.54.00] --- 2026-07-04
+### Added
 - **Full-screen backup screen** (`view=runbackup`) for both pre-update and manual backups, modelled on Akeeba's Backup-on-Update — replaces the earlier popup-modal approach. Clicking Joomla's **Install the update** now redirects (server-side, Akeeba-style) to a dedicated full-page backup screen that runs the stepped backup with a real progress bar and then **automatically continues the update** via a validated `returnurl` (flagged `is_backed_up=1` so the backup isn't repeated). Crucially, **no backup runs synchronously inside the update request** — which is what white-screened large sites. The dashboard **Backup Now** now opens the same full-screen screen instead of an inline modal. (#196)
 - Retention now prunes **remote** copies too: when a backup is pruned by age/count, its archive is deleted from every enabled remote destination (SFTP / FTP / S3 / Google Drive), not just the local copy. Each uploader gained an idempotent `delete()` method (already-absent file = success), and removal is best-effort — a failing destination is logged but never blocks local pruning. The shared standalone `restore.php` is intentionally left in place (every backup overwrites it, so newer backups still depend on it). (#229)
-## [02.53.00] --- 2026-07-04
+### Changed
 - Consolidated backup plumbing into shared helpers (#230):
  - New `RemoteUploaderFactory` replaces the `createUploaderFromParams()` copy that was duplicated in `BackupEngine` and `SteppedBackupEngine`.
  - `RetentionManager` is now the single retention authority — it takes the global `max_age_days`/`max_backups` fallback and gained `pruneOrphans()`; the system plugin's hourly cleanup delegates to it and its duplicate `deleteBackupRecord()` logic is removed.
  - The backend controller, Web Services API controller, and legacy `cli/mokosuitebackup.php` now run backups through the shared `BackupRunner` (gaining the normalized complete/warning/fail status) instead of instantiating `BackupEngine` directly.
-## [02.53.00] --- 2026-07-04
+### Fixed
 - Pre-update/uninstall backup no longer **white-screens** the update on large sites. The synchronous backup that runs inside the extension update/uninstall request now raises `max_execution_time`/`memory_limit` (and `ignore_user_abort`) like the web-cron path, so it can't exhaust the request's default limits mid-backup. (Core Joomla updates additionally get a full-screen backup screen — see below.)
 - Archive names for **CLI/console-triggered backups** no longer come out as `joomla.invalid_…`. The `[HOST]` placeholder took `$_SERVER['HTTP_HOST']` verbatim, but Joomla's console fills that with the reserved sentinel host `joomla.invalid`; the resolver now treats that (like empty/`localhost`) as unusable and falls back to the configured `live_site` host, then the system hostname. (Set the site's *live_site* to get the exact domain in CLI-built names.)
 - Standalone restore script generation no longer aborts backups with `str_replace() expects at least 3 arguments, 2 given`. `MokoRestore::generateStandaloneScript()` had a `str_replace()` call (the "Backup Archive" pre-check rewrite) that was missing its `$php` subject argument, so **every** standalone-mode backup fatally errored while "Generating standalone restore.php…" — the archive still finalized and uploaded, but no `restore.php` was ever produced (the true root cause behind #226). (#226)
 - Remote upload: the standalone restore script upload is no longer silent — its result is now checked and logged, and a failed restore-script upload marks the backup as `warning` (previously the result was discarded, so a missing restore script on the remote went unreported while the archive still showed success). (#226)
-## [02.52.24] --- 2026-06-30
+## [02.58.00] --- 2026-07-06
 ### 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)
 ### 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.14
 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;
 			}
 		);
 	}
 };
@@ -13,7 +13,7 @@ namespace Joomla\Component\MokoSuiteBackup\Api\Controller;
 defined('_JEXEC') or die;
 use Joomla\CMS\MVC\Controller\ApiController;
-use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
+use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
 class BackupsController extends ApiController
 {
@@ -38,8 +38,7 @@ class BackupsController extends ApiController
 		$profileId   = (int) ($data['profile'] ?? 1);
 		$description = $data['description'] ?? 'API backup ' . date('Y-m-d H:i:s');
-		$engine = new BackupEngine();
+		$result = (new BackupRunner())->run($profileId, $description, 'api');
 		$result = $engine->run($profileId, $description, 'api');
 		if ($result['success']) {
 			$this->app->setHeader('status', 200);
@@ -24,7 +24,6 @@ class JsonapiView extends BaseApiView
 		'origin',
 		'backup_type',
 		'archivename',
 		'absolute_path',
 		'total_size',
 		'db_size',
 		'files_count',
@@ -30,7 +30,7 @@ if (!defined('JPATH_BASE')) {
 require_once JPATH_BASE . '/includes/framework.php';
 use Joomla\CMS\Factory;
-use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
+use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
 // Parse CLI arguments
 $profileId   = 1;
@@ -56,8 +56,7 @@ echo "Profile: {$profileId}\n";
 echo "Description: {$description}\n";
 echo "Starting backup...\n\n";
-$engine = new BackupEngine();
+$result = (new BackupRunner())->run($profileId, $description, 'cli');
 $result = $engine->run($profileId, $description, 'cli');
 if ($result['success']) {
 	echo "SUCCESS: " . $result['message'] . "\n";
@@ -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>
@@ -331,9 +331,24 @@ COM_MOKOJOOMBACKUP_CONFIG_SHOW_UPDATE_NOTICE_DESC="Display the update site confi
 COM_MOKOJOOMBACKUP_CONFIG_PREACTION="Pre-action Backups"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UPDATE="Backup Before Extension Update"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UPDATE_DESC="Automatically run a full backup before any extension is updated. Uses the default profile. Throttled to once per 10 minutes to prevent duplicate backups during batch updates."
 COM_MOKOJOOMBACKUP_CONFIG_PREUPDATE_AUTO_INTERCEPT="Auto-run on Update click"
 COM_MOKOJOOMBACKUP_CONFIG_PREUPDATE_AUTO_INTERCEPT_DESC="When enabled, clicking the Update button on the Joomla Update or Extensions update page first pops the backup progress modal, runs the pre-update backup, then automatically continues the update. When disabled, a notice with a manual 'Back up now' button is shown instead."
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UNINSTALL="Backup Before Extension Uninstall"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UNINSTALL_DESC="Automatically run a full backup before any extension is uninstalled. Uses the default profile. Throttled to once per 10 minutes."
 ; Full-screen backup progress view (runbackup)
 COM_MOKOJOOMBACKUP_RUNBACKUP_TITLE="Backing Up"
 COM_MOKOJOOMBACKUP_RUNBACKUP_PROFILE="Profile: %s"
 COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING="Starting backup…"
 COM_MOKOJOOMBACKUP_RUNBACKUP_RUNNING="Backing up…"
 COM_MOKOJOOMBACKUP_RUNBACKUP_COMPLETE="Backup complete"
 COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUING="Backup complete — continuing…"
 COM_MOKOJOOMBACKUP_RUNBACKUP_FAILED="Backup failed"
 COM_MOKOJOOMBACKUP_RUNBACKUP_RETRY="Retry backup"
 COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUE_ANYWAY="Continue without backup"
 COM_MOKOJOOMBACKUP_RUNBACKUP_BACK_TO_DASHBOARD="Back to dashboard"
 COM_MOKOJOOMBACKUP_RUNBACKUP_LEAVE_WARNING="A backup is in progress. Leaving now will cancel it."
 COM_MOKOJOOMBACKUP_CONFIG_CLEANUP="Cleanup Defaults"
 COM_MOKOJOOMBACKUP_CONFIG_MAX_AGE="Max Backup Age (days)"
 COM_MOKOJOOMBACKUP_CONFIG_MAX_AGE_DESC="Default maximum age for backup records. Used by the system plugin and CLI cleanup command."
@@ -382,6 +397,8 @@ COM_MOKOJOOMBACKUP_FIELD_NOTIFY_USER_GROUPS_DESC="Select Joomla user groups whos
 ; Dashboard warnings
 COM_MOKOJOOMBACKUP_DASHBOARD_DEFAULT_DIR_WARNING_TITLE="Backup directory is inside the web root"
 COM_MOKOJOOMBACKUP_DASHBOARD_DEFAULT_DIR_WARNING="One or more profiles store backups in the default directory inside the web root. This may expose backup archives if .htaccess is not supported. Move backups to a directory outside the web root for better security."
 COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING_TITLE="Site URL (live_site) is not set"
 COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING="Your Global Configuration has no Site URL (live_site). CLI and scheduled backups can't reliably determine the site's domain (archive names fall back to the server hostname), and some URLs may be generated incorrectly. Set Site URL in System → Global Configuration to your full site address including https://."
 COM_MOKOJOOMBACKUP_WEB_ACCESSIBLE_WARNING="This backup is stored inside the web root and may be directly downloadable if .htaccess is not supported."
@@ -53,9 +53,24 @@ COM_MOKOJOOMBACKUP_CONFIG_SHOW_UPDATE_NOTICE_DESC="Display the update site confi
 COM_MOKOJOOMBACKUP_CONFIG_PREACTION="Pre-action Backups"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UPDATE="Backup Before Extension Update"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UPDATE_DESC="Automatically run a full backup before any extension is updated. Uses the default profile. Throttled to once per 10 minutes to prevent duplicate backups during batch updates."
 COM_MOKOJOOMBACKUP_CONFIG_PREUPDATE_AUTO_INTERCEPT="Auto-run on Update click"
 COM_MOKOJOOMBACKUP_CONFIG_PREUPDATE_AUTO_INTERCEPT_DESC="When enabled, clicking the Update button on the Joomla Update or Extensions update page first pops the backup progress modal, runs the pre-update backup, then automatically continues the update. When disabled, a notice with a manual 'Back up now' button is shown instead."
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UNINSTALL="Backup Before Extension Uninstall"
 COM_MOKOJOOMBACKUP_CONFIG_BACKUP_BEFORE_UNINSTALL_DESC="Automatically run a full backup before any extension is uninstalled. Uses the default profile. Throttled to once per 10 minutes."
 ; Full-screen backup progress view (runbackup)
 COM_MOKOJOOMBACKUP_RUNBACKUP_TITLE="Backing Up"
 COM_MOKOJOOMBACKUP_RUNBACKUP_PROFILE="Profile: %s"
 COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING="Starting backup…"
 COM_MOKOJOOMBACKUP_RUNBACKUP_RUNNING="Backing up…"
 COM_MOKOJOOMBACKUP_RUNBACKUP_COMPLETE="Backup complete"
 COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUING="Backup complete — continuing…"
 COM_MOKOJOOMBACKUP_RUNBACKUP_FAILED="Backup failed"
 COM_MOKOJOOMBACKUP_RUNBACKUP_RETRY="Retry backup"
 COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUE_ANYWAY="Continue without backup"
 COM_MOKOJOOMBACKUP_RUNBACKUP_BACK_TO_DASHBOARD="Back to dashboard"
 COM_MOKOJOOMBACKUP_RUNBACKUP_LEAVE_WARNING="A backup is in progress. Leaving now will cancel it."
 COM_MOKOJOOMBACKUP_CONFIG_CLEANUP="Cleanup Defaults"
 COM_MOKOJOOMBACKUP_CONFIG_MAX_AGE="Max Backup Age (days)"
 COM_MOKOJOOMBACKUP_CONFIG_MAX_AGE_DESC="Default maximum age for backup records. Used by the system plugin and CLI cleanup command."
@@ -73,6 +88,8 @@ COM_MOKOJOOMBACKUP_FOLDER_NOT_FOUND="Directory not found"
 COM_MOKOJOOMBACKUP_BACKUP_DIR_DEFAULT="Default (inside web root)"
 COM_MOKOJOOMBACKUP_DASHBOARD_DEFAULT_DIR_WARNING_TITLE="Backup directory is inside the web root"
 COM_MOKOJOOMBACKUP_DASHBOARD_DEFAULT_DIR_WARNING="One or more profiles store backups in the default directory inside the web root. This may expose backup archives if .htaccess is not supported. Move backups to a directory outside the web root for better security."
 COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING_TITLE="Site URL (live_site) is not set"
 COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING="Your Global Configuration has no Site URL (live_site). CLI and scheduled backups can't reliably determine the site's domain (archive names fall back to the server hostname), and some URLs may be generated incorrectly. Set Site URL in System → Global Configuration to your full site address including https://."
 COM_MOKOJOOMBACKUP_WEB_ACCESSIBLE_WARNING="This backup is stored inside the web root and may be directly downloadable if .htaccess is not supported."
 COM_MOKOJOOMBACKUP_FOLDER_EXISTS="Directory exists"
 COM_MOKOJOOMBACKUP_FOLDER_NOT_FOUND="Directory not found"
@@ -127,6 +144,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.14</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 */
@@ -0,0 +1 @@
 /* 02.58.02 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.03 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.04 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.05 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.06 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.07 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.08 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.09 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.10 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.11 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.12 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.13 — no schema changes */
@@ -0,0 +1 @@
 /* 02.58.14 — no schema changes */
@@ -84,6 +84,35 @@ class AjaxController extends BaseController
 		$this->sendJson($result);
 	}
 	/**
 	 * Mark the pre-update backup as satisfied for this session.
 	 *
 	 * Called by the update-page modal after a successful on-demand backup so the
 	 * imminent server-side onExtensionBeforeUpdate backup is skipped — it sets
 	 * the same 10-minute throttle key the system plugin checks, preventing a
 	 * duplicate backup when the admin then clicks Joomla's Update button.
 	 * POST: task=ajax.preupdateAck
 	 */
 	public function preupdateAck(): void
 	{
 		if (!Session::checkToken('get') && !Session::checkToken('post')) {
 			$this->sendJson(['error' => true, 'message' => 'Invalid token'], 403);
 			return;
 		}
 		if (!$this->app->getIdentity()->authorise('mokosuitebackup.backup.run', 'com_mokosuitebackup')) {
 			$this->sendJson(['error' => true, 'message' => 'Access denied'], 403);
 			return;
 		}
 		// Same key + semantics as plg_system_mokosuitebackup::runPreActionBackup().
 		Factory::getSession()->set('mokosuitebackup.preaction_backup_before_update', time());
 		$this->sendJson(['error' => false, 'message' => 'Pre-update backup acknowledged']);
 	}
 	/**
 	 * Cancel a backup record stuck in "running" status.
 	 * POST: task=ajax.cancelBackup&id=123
@@ -1201,6 +1230,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 +1253,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 +1296,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.
 	 */
@@ -16,8 +16,8 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\Component\MokoSuiteBackup\Administrator\Engine\BackupEngine;
 use Joomla\Component\MokoSuiteBackup\Administrator\Engine\RestoreEngine;
 use Joomla\Component\MokoSuiteBackup\Administrator\Service\BackupRunner;
 class BackupsController extends AdminController
 {
@@ -54,8 +54,7 @@ class BackupsController extends AdminController
 		$profileId   = $this->input->getInt('profile_id', 1);
 		$description = $this->input->getString('description', '');
-		$engine = new BackupEngine();
+		$result = (new BackupRunner())->run($profileId, $description, 'backend');
 		$result = $engine->run($profileId, $description, 'backend');
 		// Surface preflight warnings as Joomla messages
 		if (!empty($result['warnings'])) {
@@ -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,
@@ -304,7 +304,18 @@ class BackupEngine
 							$this->log('  Upload complete: ' . $result['message']);
 							if (!empty($restoreScriptPath) && is_file($restoreScriptPath)) {
-								$uploader->upload($restoreScriptPath, basename($restoreScriptPath));
+								$scriptName = basename($restoreScriptPath);
 								$this->log('  Uploading restore script: ' . $scriptName . '...');
 								$scriptResult = $uploader->upload($restoreScriptPath, $scriptName);
 								if (!empty($scriptResult['success'])) {
 									$this->log('  Restore script uploaded: ' . ($scriptResult['message'] ?? $scriptName));
 								} else {
 									/* Never silent: a missing restore script makes the archive
 									   much harder to restore, so surface it as a warning. */
 									$uploadFailed = true;
 									$this->log('  WARNING: Restore script upload failed: ' . ($scriptResult['message'] ?? 'unknown error'));
 								}
 							}
 						} else {
 							$uploadFailed = true;
@@ -321,48 +332,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 +499,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.
@@ -558,53 +511,23 @@ class BackupEngine
 	 */
 	private function createUploaderFromParams(string $type, array $params): RemoteUploaderInterface
 	{
-		$prefixMap = ['ftp' => 'ftp_', 'sftp' => 'sftp_', 's3' => 's3_', 'google_drive' => 'gdrive_'];
+		return RemoteUploaderFactory::create($type, $params);
 		$prefix    = $prefixMap[$type] ?? '';
 		$prefixed = [];
 		foreach ($params as $key => $value) {
 			$prefixed[$prefix . $key] = $value;
 		}
 		$fake = (object) $prefixed;
 		return match ($type) {
 			'ftp'          => new FtpUploader($fake),
 			'sftp'         => new SftpUploader($fake),
 			'google_drive' => new GoogleDriveUploader($fake),
 			's3'           => new S3Uploader($fake),
 			default        => throw new \InvalidArgumentException('Unknown remote storage type: ' . $type),
 		};
 	}
 	/**
 	 * 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 !== [];
 	}
 }
@@ -89,6 +89,52 @@ class FtpUploader implements RemoteUploaderInterface
 		}
 	}
 	public function delete(string $remoteName): array
 	{
 		if (!extension_loaded('ftp')) {
 			return ['success' => false, 'message' => 'PHP ext-ftp is required for FTP deletes. Enable it in php.ini.'];
 		}
 		if (empty($this->host)) {
 			return ['success' => false, 'message' => 'FTP host is not configured'];
 		}
 		$conn = $this->connect();
 		if (!$conn) {
 			return ['success' => false, 'message' => 'Failed to connect to FTP server ' . $this->host . ':' . $this->port];
 		}
 		try {
 			if (!@ftp_login($conn, $this->username, $this->password)) {
 				throw new \RuntimeException('FTP login failed for user: ' . $this->username);
 			}
 			if ($this->passive) {
 				ftp_pasv($conn, true);
 			}
 			$remoteFile = $this->remotePath . '/' . $remoteName;
 			/* Already-absent files: ftp_delete returns false, but if the file
 			   isn't there the retention goal is already met, so probe size to
 			   decide. ftp_size returns -1 when the file does not exist. */
 			if (@ftp_size($conn, $remoteFile) < 0) {
 				return ['success' => true, 'message' => 'FTP: nothing to delete (' . $remoteFile . ')'];
 			}
 			if (!@ftp_delete($conn, $remoteFile)) {
 				throw new \RuntimeException('ftp_delete failed for: ' . $remoteFile);
 			}
 			return ['success' => true, 'message' => 'Deleted from FTP: ' . $remoteFile];
 		} catch (\Throwable $e) {
 			return ['success' => false, 'message' => 'FTP delete failed: ' . $e->getMessage()];
 		} finally {
 			@ftp_close($conn);
 		}
 	}
 	public function testConnection(): array
 	{
 		if (empty($this->host)) {
@@ -81,6 +81,59 @@ class GoogleDriveUploader implements RemoteUploaderInterface
 		}
 	}
 	public function delete(string $remoteName): array
 	{
 		if (!extension_loaded('curl')) {
 			return ['success' => false, 'message' => 'PHP ext-curl is required for Google Drive deletes. Enable it in php.ini.'];
 		}
 		if (empty($this->clientId) || empty($this->refreshToken)) {
 			return ['success' => false, 'message' => 'Google Drive credentials not configured'];
 		}
 		try {
 			$accessToken = $this->getAccessToken();
 			/* Drive has no path addressing — resolve the file id(s) by name
 			   within the configured folder, then delete each match. */
 			$q = "name = '" . str_replace("'", "\\'", $remoteName) . "' and trashed = false";
 			if (!empty($this->folderId)) {
 				$q .= " and '" . $this->folderId . "' in parents";
 			}
 			$listUrl  = self::API_URL . '/files?q=' . rawurlencode($q) . '&fields=' . rawurlencode('files(id,name)') . '&pageSize=25';
 			$response = $this->curlRequest('GET', $listUrl, null, [
 				'Authorization: Bearer ' . $accessToken,
 			]);
 			if ($response['code'] !== 200) {
 				throw new \RuntimeException('Drive file lookup failed (HTTP ' . $response['code'] . ')');
 			}
 			$files = json_decode($response['body'], true)['files'] ?? [];
 			if (empty($files)) {
 				return ['success' => true, 'message' => 'Google Drive: nothing to delete (' . $remoteName . ')'];
 			}
 			foreach ($files as $file) {
 				$del = $this->curlRequest('DELETE', self::API_URL . '/files/' . rawurlencode($file['id']), null, [
 					'Authorization: Bearer ' . $accessToken,
 				]);
 				/* 204 = deleted, 404 = already gone — both acceptable. */
 				if ($del['code'] !== 204 && $del['code'] !== 200 && $del['code'] !== 404) {
 					return ['success' => false, 'message' => 'Google Drive delete failed for ' . $remoteName . ' (HTTP ' . $del['code'] . ')'];
 				}
 			}
 			return ['success' => true, 'message' => 'Deleted from Google Drive: ' . $remoteName];
 		} catch (\Throwable $e) {
 			return ['success' => false, 'message' => 'Google Drive delete failed: ' . $e->getMessage()];
 		}
 	}
 	public function testConnection(): array
 	{
 		if (empty($this->clientId) || empty($this->refreshToken)) {
@@ -204,7 +204,8 @@ ORIG,
        'ok'    => $backupCount > 0,
        'hint'  => 'Place one or more backup ZIP files in the same directory as ' . basename($_SERVER['SCRIPT_NAME']),
    ];
-REPL
+REPL,
 			$php
 		);
 		/* Modify remaining pre-checks to use getSelectedBackupFile() */
@@ -52,15 +52,25 @@ class PlaceholderResolver
 	{
 		$now      = new \DateTimeImmutable('now');
-		/* Resolve hostname: prefer HTTP_HOST (web), then try Joomla config (CLI), then system hostname */
+		/* Resolve hostname: prefer the real request host (web), then the
-		$rawHost = $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? '';
+		   configured live_site (CLI), then the system hostname. Joomla's console
 		   fills the request host with the placeholder 'joomla.invalid' (an
 		   RFC 6761 reserved TLD used as a CLI sentinel), so treat that — along
 		   with empty/localhost — as unusable and fall through; otherwise every
 		   CLI-triggered backup would be named 'joomla.invalid_…'. */
 		$unusable = static function (string $h): bool {
 			$h = strtolower(trim($h));
-		if (empty($rawHost) || $rawHost === 'localhost') {
+			return $h === '' || $h === 'localhost' || $h === 'joomla.invalid';
 		};
 		$rawHost = (string) ($_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? '');
 		if ($unusable($rawHost)) {
 			try {
-				$app = Factory::getApplication();
+				$liveSite = (string) Factory::getApplication()->get('live_site', '');
 				$liveSite = $app->get('live_site', '');
-				if (!empty($liveSite)) {
+				if ($liveSite !== '') {
 					$parsed = parse_url($liveSite, PHP_URL_HOST);
 					if (!empty($parsed)) {
@@ -68,12 +78,13 @@ class PlaceholderResolver
 					}
 				}
 			} catch (\Throwable $e) {
-				/* fallback */
+				/* fall through to system hostname */
 			}
 		}
-		if (empty($rawHost)) {
+		if ($unusable($rawHost)) {
-			$rawHost = php_uname('n');
+			$sysHost = php_uname('n');
 			$rawHost = $sysHost !== '' ? $sysHost : 'site';
 		}
 		$hostname = preg_replace('/[^a-zA-Z0-9._-]/', '', $rawHost);
@@ -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;
 			}
 		}
 	}
@@ -0,0 +1,69 @@
 <?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
 */
 namespace Joomla\Component\MokoSuiteBackup\Administrator\Engine;
 defined('_JEXEC') or die;
 /**
 * Builds a remote uploader from a `#__mokosuitebackup_remotes` row.
 *
 * This was previously a private method duplicated in both BackupEngine and
 * SteppedBackupEngine (and needed a third time by RetentionManager for remote
 * deletion). It is centralised here so the type→class map and the param
 * key-prefixing convention live in exactly one place.
 *
 * The remotes table stores per-type settings as a flat JSON object with
 * un-prefixed keys (e.g. `{"host":"…","path":"/backups"}`). The concrete
 * uploaders, however, read prefixed keys off a profile-shaped object
 * (e.g. `sftp_host`, `s3_bucket`). This factory bridges the two.
 */
 final class RemoteUploaderFactory
 {
 	/**
 	 * Map of remote type → the key prefix its uploader expects.
 	 */
 	private const PREFIX_MAP = [
 		'ftp'          => 'ftp_',
 		'sftp'         => 'sftp_',
 		's3'           => 's3_',
 		'google_drive' => 'gdrive_',
 	];
 	/**
 	 * Create an uploader for the given remote type from decoded JSON params.
 	 *
 	 * @param   string  $type    Remote type: ftp, sftp, s3, google_drive
 	 * @param   array   $params  Key-value params decoded from the remote's JSON
 	 *
 	 * @return  RemoteUploaderInterface
 	 *
 	 * @throws  \InvalidArgumentException  On an unknown remote type
 	 */
 	public static function create(string $type, array $params): RemoteUploaderInterface
 	{
 		$prefix   = self::PREFIX_MAP[$type] ?? '';
 		$prefixed = [];
 		foreach ($params as $key => $value) {
 			$prefixed[$prefix . $key] = $value;
 		}
 		$fake = (object) $prefixed;
 		return match ($type) {
 			'ftp'          => new FtpUploader($fake),
 			'sftp'         => new SftpUploader($fake),
 			'google_drive' => new GoogleDriveUploader($fake),
 			's3'           => new S3Uploader($fake),
 			default        => throw new \InvalidArgumentException('Unknown remote storage type: ' . $type),
 		};
 	}
 }
@@ -24,6 +24,21 @@ interface RemoteUploaderInterface
 	 */
 	public function upload(string $localPath, string $remoteName): array;
 	/**
 	 * Delete a previously-uploaded file from remote storage.
 	 *
 	 * Used by retention pruning so that expiring a local backup also removes
 	 * its archive from every remote destination. Implementations should treat
 	 * an already-absent remote file as success (idempotent delete), so a
 	 * partially-cleaned destination never blocks pruning.
 	 *
 	 * @param   string  $remoteName  Filename on the remote end (the same
 	 *                               $remoteName that was passed to upload())
 	 *
 	 * @return  array{success: bool, message: string}
 	 */
 	public function delete(string $remoteName): array;
 	/**
 	 * Test the connection / credentials without uploading.
 	 *
@@ -15,32 +15,54 @@ defined('_JEXEC') or die;
 use Joomla\Component\MokoSuiteBackup\Administrator\Utility\BackupDirectory;
 /**
- * Enforces per-profile backup retention.
+ * Enforces per-profile backup retention — the single retention authority.
 *
 * A profile may cap retained backups by age (retention_days) and/or by
- * number of copies (retention_count). A backup is pruned when EITHER rule
+ * number of copies (retention_count). When a profile leaves a rule at 0 the
- * matches: it is older than retention_days OR it falls outside the newest
+ * caller-supplied global default is used instead. A backup is pruned when
- * retention_count copies. Deleting a record also removes its archive and
+ * EITHER rule matches: it is older than the effective days OR it falls outside
- * log file, mirroring the Backup table's delete().
+ * the newest effective count of copies.
 *
 * Pruning a record removes, in this order:
 *   1. the DB row (#__mokosuitebackup_records),
 *   2. the local archive + its .log file, and
 *   3. the archive copy on every enabled remote destination for the profile.
 *
 * The standalone restore script (restore.php) is intentionally NOT deleted
 * from remotes: it is a single, fixed-name file that every backup overwrites,
 * so newer backups still depend on it — removing it while pruning an old
 * archive would break restore for the copies that remain.
 *
 * Because records do not store which destinations they were uploaded to,
 * remote deletion targets the profile's *currently enabled* remotes. Remote
 * deletes are idempotent (an already-absent file counts as success) and
 * best-effort: a failing remote is logged but never blocks local pruning.
 */
 final class RetentionManager
 {
 	/**
 	 * Prune old backups for a profile according to its retention settings.
 	 *
-	 * Called after a backup completes. Only 'complete' and 'warning' records
+	 * Called after a backup completes and from the periodic admin-side cleanup.
-	 * are considered — pending/running/failed records are never pruned here.
+	 * Only 'complete' and 'warning' records are considered — pending/running/
 	 * failed records are never pruned here.
 	 *
-	 * @param   object  $db       Database driver
+	 * @param   object  $db           Database driver
-	 * @param   object  $profile  Profile row (needs id, retention_days, retention_count)
+	 * @param   object  $profile      Profile row (needs id, retention_days, retention_count)
 	 * @param   int     $globalDays   Fallback max age (days) when the profile's is 0
 	 * @param   int     $globalCount  Fallback max copies when the profile's is 0
 	 *
 	 * @return  int  Number of backup records deleted
 	 */
-	public static function prune(object $db, object $profile): int
+	public static function prune(object $db, object $profile, int $globalDays = 0, int $globalCount = 0): int
 	{
 		$days  = (int) ($profile->retention_days ?? 0);
 		$count = (int) ($profile->retention_count ?? 0);
 		// A profile value of 0 means "use the global default".
 		$days  = $days > 0 ? $days : $globalDays;
 		$count = $count > 0 ? $count : $globalCount;
 		// No retention configured — nothing to do.
 		if ($days <= 0 && $count <= 0) {
 			return 0;
@@ -48,7 +70,7 @@ final class RetentionManager
 		// Newest first, so the index is the copy's position from the top.
 		$query = $db->getQuery(true)
-			->select($db->quoteName(['id', 'absolute_path', 'backupstart']))
+			->select($db->quoteName(['id', 'archivename', 'absolute_path', 'backupstart']))
 			->from($db->quoteName('#__mokosuitebackup_records'))
 			->where($db->quoteName('profile_id') . ' = ' . (int) $profile->id)
 			->where($db->quoteName('status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')')
@@ -61,6 +83,7 @@ final class RetentionManager
 		}
 		$cutoffTs = $days > 0 ? (time() - ($days * 86400)) : null;
 		$remotes  = self::loadEnabledRemotes($db, (int) $profile->id);
 		$deleted  = 0;
 		foreach ($records as $index => $record) {
@@ -72,7 +95,7 @@ final class RetentionManager
 				continue;
 			}
-			if (self::deleteRecord($db, $record)) {
+			if (self::deleteRecord($db, $record, $remotes)) {
 				$deleted++;
 			}
 		}
@@ -81,12 +104,54 @@ final class RetentionManager
 	}
 	/**
-	 * Delete a single backup record and its on-disk archive + log file.
+	 * Delete backup records whose profile no longer exists.
 	 *
-	 * The DB row is removed first; the files are only unlinked if that
+	 * Orphans have no owning profile and therefore no remote destinations to
-	 * succeeds, so a failed delete never orphans the record from its files.
+	 * reconcile, so only the local archive/log and DB row are removed.
 	 *
 	 * @param   object  $db  Database driver
 	 *
 	 * @return  int  Number of orphaned records deleted
 	 */
-	private static function deleteRecord(object $db, object $record): bool
+	public static function pruneOrphans(object $db): int
 	{
 		$query = $db->getQuery(true)
 			->select($db->quoteName(['r.id', 'r.archivename', 'r.absolute_path'], ['id', 'archivename', 'absolute_path']))
 			->from($db->quoteName('#__mokosuitebackup_records', 'r'))
 			->join(
 				'LEFT',
 				$db->quoteName('#__mokosuitebackup_profiles', 'p')
 				. ' ON ' . $db->quoteName('p.id') . ' = ' . $db->quoteName('r.profile_id')
 			)
 			->where($db->quoteName('p.id') . ' IS NULL')
 			->where($db->quoteName('r.status') . ' IN (' . implode(',', array_map([$db, 'quote'], ['complete', 'warning'])) . ')');
 		$db->setQuery($query);
 		$orphans = $db->loadObjectList() ?: [];
 		$deleted = 0;
 		foreach ($orphans as $record) {
 			if (self::deleteRecord($db, $record, [])) {
 				$deleted++;
 			}
 		}
 		return $deleted;
 	}
 	/**
 	 * Delete a single backup record, its on-disk archive + log file, and the
 	 * archive copy on each enabled remote destination.
 	 *
 	 * The DB row is removed first; the local files are only unlinked if that
 	 * succeeds, so a failed delete never orphans the record from its files.
 	 * Remote deletion is best-effort and runs regardless.
 	 *
 	 * @param   object    $db       Database driver
 	 * @param   object    $record   Record row (needs id, archivename, absolute_path)
 	 * @param   object[]  $remotes  Enabled remote rows (type, params) for the profile
 	 */
 	private static function deleteRecord(object $db, object $record, array $remotes): bool
 	{
 		$query = $db->getQuery(true)
 			->delete($db->quoteName('#__mokosuitebackup_records'))
@@ -113,6 +178,69 @@ final class RetentionManager
 			}
 		}
 		self::deleteFromRemotes($record, $remotes);
 		return true;
 	}
 	/**
 	 * Remove the record's archive from every enabled remote destination.
 	 *
 	 * Best-effort: each remote is tried independently and failures are logged,
 	 * never thrown, so one unreachable destination can't stall retention.
 	 *
 	 * @param   object    $record   Record row (needs archivename)
 	 * @param   object[]  $remotes  Enabled remote rows (type, params)
 	 */
 	private static function deleteFromRemotes(object $record, array $remotes): void
 	{
 		$archiveName = (string) ($record->archivename ?? '');
 		if ($archiveName === '' || empty($remotes)) {
 			return;
 		}
 		foreach ($remotes as $remote) {
 			try {
 				$params   = json_decode((string) ($remote->params ?? ''), true) ?: [];
 				$uploader = RemoteUploaderFactory::create((string) $remote->type, $params);
 				$result   = $uploader->delete($archiveName);
 				if (empty($result['success'])) {
 					error_log(
 						'MokoSuiteBackup: retention could not delete ' . $archiveName
 						. ' from ' . $remote->type . ' remote: ' . ($result['message'] ?? 'unknown error')
 					);
 				}
 			} catch (\Throwable $e) {
 				error_log(
 					'MokoSuiteBackup: retention remote-delete error for ' . $archiveName
 					. ' (' . ($remote->type ?? '?') . '): ' . $e->getMessage()
 				);
 			}
 		}
 	}
 	/**
 	 * Load the profile's enabled remote destinations (type + params only).
 	 *
 	 * Returns an empty array if the remotes table is missing (very old installs)
 	 * or the profile has none, so callers can iterate unconditionally.
 	 */
 	private static function loadEnabledRemotes(object $db, int $profileId): array
 	{
 		try {
 			$query = $db->getQuery(true)
 				->select($db->quoteName(['type', 'params']))
 				->from($db->quoteName('#__mokosuitebackup_remotes'))
 				->where($db->quoteName('profile_id') . ' = ' . $profileId)
 				->where($db->quoteName('enabled') . ' = 1')
 				->order($db->quoteName('ordering') . ' ASC');
 			$db->setQuery($query);
 			return $db->loadObjectList() ?: [];
 		} catch (\Throwable $e) {
 			return [];
 		}
 	}
 }
@@ -75,6 +75,54 @@ class S3Uploader implements RemoteUploaderInterface
 		}
 	}
 	public function delete(string $remoteName): array
 	{
 		if (!extension_loaded('curl')) {
 			return ['success' => false, 'message' => 'PHP ext-curl is required for S3 deletes. Enable it in php.ini.'];
 		}
 		if (empty($this->accessKey) || empty($this->secretKey) || empty($this->bucket)) {
 			return ['success' => false, 'message' => 'S3 credentials or bucket not configured'];
 		}
 		try {
 			$objectKey = ($this->path ? $this->path . '/' : '') . $remoteName;
 			$url       = $this->getObjectUrl($objectKey);
 			$headers   = $this->signRequest('DELETE', $url, hash('sha256', ''));
 			$ch = curl_init();
 			curl_setopt_array($ch, [
 				CURLOPT_URL            => $url,
 				CURLOPT_CUSTOMREQUEST  => 'DELETE',
 				CURLOPT_RETURNTRANSFER => true,
 				CURLOPT_HTTPHEADER     => $headers,
 				CURLOPT_TIMEOUT        => 60,
 			]);
 			$response = curl_exec($ch);
 			$code     = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (curl_errno($ch)) {
 				$error = curl_error($ch);
 				curl_close($ch);
 				throw new \RuntimeException('cURL error: ' . $error);
 			}
 			curl_close($ch);
 			/* S3 DELETE returns 204 on success and — by design — also 204 when
 			   the key never existed. 404 is treated as already-gone too. */
 			if ($code === 204 || $code === 200 || $code === 404) {
 				return ['success' => true, 'message' => 'Deleted from S3: s3://' . $this->bucket . '/' . $objectKey];
 			}
 			return ['success' => false, 'message' => 'S3 DELETE failed (HTTP ' . $code . '): ' . substr((string) $response, 0, 300)];
 		} catch (\Throwable $e) {
 			return ['success' => false, 'message' => 'S3 delete failed: ' . $e->getMessage()];
 		}
 	}
 	public function testConnection(): array
 	{
 		if (empty($this->accessKey) || empty($this->secretKey) || empty($this->bucket)) {
@@ -100,6 +100,40 @@ class SftpUploader implements RemoteUploaderInterface
 		}
 	}
 	public function delete(string $remoteName): array
 	{
 		if (empty($this->host) || empty($this->username)) {
 			return ['success' => false, 'message' => 'SFTP is not configured'];
 		}
 		$keyFile = null;
 		try {
 			if (!empty($this->keyData)) {
 				$keyFile = $this->writeTempKey();
 			}
 			/* rm -f exits 0 even when the file is already gone, so an
 			   already-deleted remote archive is treated as success. */
 			$remoteFile = $this->remotePath . '/' . $remoteName;
 			$cmd = $this->buildSshCommand('rm -f ' . escapeshellarg($remoteFile), $keyFile);
 			$output   = [];
 			$exitCode = 0;
 			exec($cmd . ' 2>&1', $output, $exitCode);
 			if ($exitCode !== 0) {
 				return ['success' => false, 'message' => 'SFTP delete failed: ' . implode(' ', $output)];
 			}
 			return ['success' => true, 'message' => 'Deleted from SFTP: ' . $remoteFile];
 		} catch (\Throwable $e) {
 			return ['success' => false, 'message' => 'SFTP delete failed: ' . $e->getMessage()];
 		} finally {
 			$this->cleanupTempKey($keyFile);
 		}
 	}
 	public function testConnection(): array
 	{
 		if (empty($this->host)) {
@@ -207,7 +241,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 +269,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 [];
 		}
 	}
 	/**
@@ -896,24 +806,7 @@ class SteppedBackupEngine
 	 */
 	private function createUploaderFromParams(string $type, array $params): RemoteUploaderInterface
 	{
-		$prefixMap = ['ftp' => 'ftp_', 'sftp' => 'sftp_', 's3' => 's3_', 'google_drive' => 'gdrive_'];
+		return RemoteUploaderFactory::create($type, $params);
 		$prefix    = $prefixMap[$type] ?? '';
 		$prefixed = [];
 		foreach ($params as $key => $value) {
 			$prefixed[$prefix . $key] = $value;
 		}
 		$fake = (object) $prefixed;
 		return match ($type) {
 			'ftp'          => new FtpUploader($fake),
 			'sftp'         => new SftpUploader($fake),
 			'google_drive' => new GoogleDriveUploader($fake),
 			's3'           => new S3Uploader($fake),
 			default        => throw new \InvalidArgumentException('Unknown remote storage type: ' . $type),
 		};
 	}
 }
@@ -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';
 		}
 	}
 }
@@ -0,0 +1,89 @@
 <?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
 */
 namespace Joomla\Component\MokoSuiteBackup\Administrator\View\Runbackup;
 defined('_JEXEC') or die;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 /**
 * Full-screen "run a backup" progress view.
 *
 * Auto-starts the stepped backup (ajax.init → loop ajax.step) and shows a
 * full-page progress screen. Used both by the dashboard "Backup Now" action
 * and — via the system plugin's pre-update redirect — as the interstitial
 * between clicking Joomla's Update and the update actually running. When a
 * `returnurl` is supplied the page redirects there once the backup completes
 * (e.g. back to `com_joomlaupdate&task=update.install&is_backed_up=1`).
 */
 class HtmlView extends BaseHtmlView
 {
 	public int $profileId = 1;
 	public string $profileTitle = '';
 	public string $description = '';
 	/** Raw (possibly base64) return URL from the request; validated in the layout. */
 	public string $returnUrl = '';
 	public bool $autostart = true;
 	public function display($tpl = null): void
 	{
 		$input = Factory::getApplication()->getInput();
 		$this->profileId   = (int) $input->getInt('profile_id', $input->getInt('profileid', 1));
 		$this->description  = $input->getString('description', '');
 		$this->returnUrl    = $input->getRaw('returnurl', '');
 		$this->autostart    = (bool) $input->getInt('autostart', 1);
 		if ($this->profileId <= 0) {
 			$this->profileId = 1;
 		}
 		$this->profileTitle = $this->loadProfileTitle($this->profileId);
 		$this->addToolbar();
 		parent::display($tpl);
 	}
 	/**
 	 * Look up the target profile's title for display (best-effort).
 	 */
 	private function loadProfileTitle(int $profileId): string
 	{
 		try {
 			$db    = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
 			$query = $db->getQuery(true)
 				->select($db->quoteName('title'))
 				->from($db->quoteName('#__mokosuitebackup_profiles'))
 				->where($db->quoteName('id') . ' = ' . (int) $profileId);
 			$db->setQuery($query);
 			return (string) ($db->loadResult() ?? '');
 		} catch (\Throwable $e) {
 			return '';
 		}
 	}
 	protected function addToolbar(): void
 	{
 		ToolbarHelper::title(
 			Text::_('COM_MOKOJOOMBACKUP_SHORT') . ': ' . Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_TITLE'),
 			'archive'
 		);
 	}
 }
@@ -17,6 +17,9 @@ use Joomla\CMS\Session\Session;
 $ajaxToken = Session::getFormToken();
 $ajaxUrl   = Route::_('index.php?option=com_mokosuitebackup&format=json', false);
 $runbackupUrl = Route::_('index.php?option=com_mokosuitebackup&view=runbackup&autostart=1', false);
 $liveSite     = trim((string) \Joomla\CMS\Factory::getApplication()->get('live_site', ''));
 ?>
 <?php if ($this->defaultDirWarning) : ?>
 <div class="alert alert-warning d-flex align-items-center mb-3" role="alert">
@@ -31,6 +34,16 @@ $ajaxUrl   = Route::_('index.php?option=com_mokosuitebackup&format=json', false)
 </div>
 <?php endif; ?>
 <?php if ($liveSite === '') : ?>
 <div class="alert alert-warning d-flex align-items-center mb-3" role="alert">
 	<span class="icon-warning-circle fs-4 me-3" aria-hidden="true"></span>
 	<div>
 		<strong><?php echo Text::_('COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING_TITLE'); ?></strong><br>
 		<?php echo Text::_('COM_MOKOJOOMBACKUP_DASHBOARD_LIVESITE_WARNING'); ?>
 	</div>
 </div>
 <?php endif; ?>
 <div class="row">
 	<!-- Row 1: Status Cards (clickable) -->
 	<div class="col-md-3 mb-3">
@@ -244,7 +257,7 @@ document.querySelectorAll('.mb-tile').forEach(function(tile) {
 							</option>
 						<?php endforeach; ?>
 					</select>
-					<button type="button" class="btn btn-primary w-100" onclick="window.mokosuitebackupStart()">
+					<button type="button" class="btn btn-primary w-100" onclick="mokosuitebackupGo()">
 						<span class="icon-download" aria-hidden="true"></span>
 						<?php echo Text::_('COM_MOKOJOOMBACKUP_TOOLBAR_BACKUP_NOW'); ?>
 					</button>
@@ -302,123 +315,18 @@ document.querySelectorAll('.mb-tile').forEach(function(tile) {
 	</div>
 </div>
 <!-- Stepped Backup Modal (reused from backups view) -->
 <div id="mokosuitebackup-modal" style="display:none; position:fixed; top:0; left:0; width:100%; height:100%; background:rgba(0,0,0,0.6); z-index:10000;">
 	<div style="max-width:500px; margin:10% auto; background:#fff; border-radius:8px; padding:2rem; box-shadow:0 4px 20px rgba(0,0,0,0.3);">
 		<h3 id="mb-modal-title" style="margin:0 0 1rem;">Backup in Progress</h3>
 		<div class="alert alert-warning py-1 px-2 mb-2" style="font-size:0.85rem;">
 			<span class="icon-warning-circle" aria-hidden="true"></span>
 			<strong>Do not navigate away or close this window</strong> while the backup is running.
 		</div>
 		<div style="background:#e9ecef; border-radius:4px; overflow:hidden; height:24px; margin-bottom:0.5rem;">
 			<div id="mb-progress-bar" style="height:100%; background:#0d6efd; transition:width 0.3s; width:0%; display:flex; align-items:center; justify-content:center; color:#fff; font-size:0.8rem; font-weight:bold;">0%</div>
 		</div>
 		<p id="mb-status" style="color:#666; font-size:0.9rem; margin:0.5rem 0;">Initializing...</p>
 		<p id="mb-phase" style="color:#999; font-size:0.8rem; margin:0;">Phase: init</p>
 	</div>
 </div>
 <script>
-(function() {
+/* "Backup Now" navigates to the full-screen backup progress page (view=runbackup)
-	const AJAX_URL = <?php echo json_encode($ajaxUrl); ?>;
+   for the selected profile — the same screen used for the pre-update backup. */
-	const TOKEN_NAME = <?php echo json_encode($ajaxToken); ?>;
+(function () {
 	'use strict';
-	var backupRunning = false;
+	var RUNBACKUP_URL = <?php echo json_encode($runbackupUrl); ?>;
-	window.addEventListener('beforeunload', function(e) {
+	window.mokosuitebackupGo = function () {
-		if (backupRunning) { e.preventDefault(); e.returnValue = ''; }
+		var sel = document.getElementById('mb-profile-select');
-	});
+		var pid = sel ? sel.value : '1';
-
+		window.location.href = RUNBACKUP_URL + '&profile_id=' + encodeURIComponent(pid);
-	function showModal() {
+	};
 		backupRunning = true;
 		document.getElementById('mokosuitebackup-modal').style.display = 'block';
 	}
 	function hideModal() {
 		backupRunning = false;
 		document.getElementById('mokosuitebackup-modal').style.display = 'none';
 	}
 	function updateProgress(progress, message, phase) {
 		const bar = document.getElementById('mb-progress-bar');
 		bar.style.width = progress + '%';
 		bar.textContent = progress + '%';
 		document.getElementById('mb-status').textContent = message;
 		document.getElementById('mb-phase').textContent = 'Phase: ' + phase;
 	}
 	async function postAjax(params) {
 		const form = new URLSearchParams();
 		form.append(TOKEN_NAME, '1');
 		for (const [k, v] of Object.entries(params)) {
 			form.append(k, v);
 		}
 		const res = await fetch(AJAX_URL, {
 			method: 'POST',
 			body: form,
 			headers: { 'X-Requested-With': 'XMLHttpRequest' }
 		});
 		return res.json();
 	}
 	async function startSteppedBackup() {
 		const profileSelect = document.getElementById('mb-profile-select');
 		const profileId = profileSelect ? profileSelect.value : '1';
 		showModal();
 		updateProgress(0, 'Initializing backup...', 'init');
 		try {
 			const initResult = await postAjax({
 				task: 'ajax.init',
 				profile_id: profileId
 			});
 			if (initResult.error) {
 				updateProgress(0, 'ERROR: ' + initResult.message, 'failed');
 				setTimeout(hideModal, 5000);
 				return;
 			}
 			// Show preflight warnings if any
 			if (initResult.warnings && initResult.warnings.length > 0) {
 				var warningEl = document.getElementById('mb-phase');
 				warningEl.textContent = 'Warnings: ' + initResult.warnings.join('; ');
 				warningEl.style.color = '#856404';
 			}
 			const sessionId = initResult.session_id;
 			updateProgress(initResult.progress, initResult.message, initResult.phase);
 			let done = false;
 			while (!done) {
 				const stepResult = await postAjax({
 					task: 'ajax.step',
 					session_id: sessionId
 				});
 				if (stepResult.error) {
 					updateProgress(0, 'ERROR: ' + stepResult.message, 'failed');
 					setTimeout(hideModal, 5000);
 					return;
 				}
 				updateProgress(stepResult.progress, stepResult.message, stepResult.phase);
 				done = stepResult.done || false;
 			}
 			document.getElementById('mb-modal-title').textContent = 'Backup Complete';
 			setTimeout(function() {
 				hideModal();
 				location.reload();
 			}, 2000);
 		} catch (err) {
 			updateProgress(0, 'ERROR: ' + err.message, 'failed');
 			setTimeout(hideModal, 5000);
 		}
 	}
 	window.mokosuitebackupStart = startSteppedBackup;
 })();
 </script>
@@ -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(() => {
@@ -0,0 +1,253 @@
 <?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
 *
 * Full-screen backup progress screen. Reuses the stepped-backup AJAX
 * (ajax.init → loop ajax.step). On completion, redirects to a validated
 * return URL (pre-update flow) or shows a completion panel (Backup Now).
 */
 defined('_JEXEC') or die;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 $ajaxToken = Session::getFormToken();
 $ajaxUrl   = Route::_('index.php?option=com_mokosuitebackup&format=json', false);
 /* Validate the return URL to prevent an open redirect / javascript: XSS
   (the value ends up in window.location.href). Accept ONLY:
     - an absolute http(s) URL whose host matches this site, or
     - a root-relative path starting with a single "/" (not "//").
   This rejects javascript:, data:, vbscript: (empty host) and
   protocol-relative //evil.com. Falls back to '' (no redirect). */
 $safeReturnUrl = '';
 if ($this->returnUrl !== '') {
 	$decoded = base64_decode($this->returnUrl, true);
 	$raw     = ($decoded !== false && $decoded !== '') ? $decoded : $this->returnUrl;
 	$isAbsoluteHttp = (bool) preg_match('#^https?://#i', $raw);
 	$isRootRelative = isset($raw[0]) && $raw[0] === '/' && (!isset($raw[1]) || $raw[1] !== '/');
 	if ($isAbsoluteHttp || $isRootRelative) {
 		try {
 			$rootHost = Uri::getInstance(Uri::root())->getHost();
 			$target   = new Uri($raw);
 			$scheme   = strtolower((string) $target->getScheme());
 			$schemeOk = $scheme === '' || $scheme === 'http' || $scheme === 'https';
 			$hostOk   = $target->getHost() === '' || strcasecmp($target->getHost(), $rootHost) === 0;
 			if ($schemeOk && $hostOk) {
 				$safeReturnUrl = $raw;
 			}
 		} catch (\Throwable $e) {
 			$safeReturnUrl = '';
 		}
 	}
 }
 $dashboardUrl = Route::_('index.php?option=com_mokosuitebackup&view=dashboard', false);
 $config = [
 	'ajaxUrl'      => $ajaxUrl,
 	'token'        => $ajaxToken,
 	'profileId'    => $this->profileId,
 	'description'  => $this->description,
 	'returnUrl'    => $safeReturnUrl,
 	'dashboardUrl' => $dashboardUrl,
 	'autostart'    => $this->autostart,
 	'labels'       => [
 		'starting'   => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING'),
 		'running'    => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_RUNNING'),
 		'complete'   => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_COMPLETE'),
 		'continuing' => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUING'),
 		'failed'     => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_FAILED'),
 		'retry'      => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_RETRY'),
 		'continue'   => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_CONTINUE_ANYWAY'),
 		'dashboard'  => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_BACK_TO_DASHBOARD'),
 		'leaveWarn'  => Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_LEAVE_WARNING'),
 	],
 ];
 ?>
 <div class="msb-runbackup" style="max-width:640px;margin:3rem auto;padding:0 1rem;">
 	<div class="card shadow-sm">
 		<div class="card-body p-4">
 			<h1 class="h4 mb-1" id="msb-rb-title">
 				<span class="icon-archive" aria-hidden="true"></span>
 				<?php echo Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_TITLE'); ?>
 			</h1>
 			<p class="text-muted mb-4" id="msb-rb-subtitle">
 				<?php echo htmlspecialchars(
 					$this->profileTitle !== ''
 						? Text::sprintf('COM_MOKOJOOMBACKUP_RUNBACKUP_PROFILE', $this->profileTitle)
 						: Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING'),
 					ENT_QUOTES,
 					'UTF-8'
 				); ?>
 			</p>
 			<div class="progress mb-3" style="height:1.75rem;">
 				<div id="msb-rb-bar" class="progress-bar progress-bar-striped progress-bar-animated"
 					 role="progressbar" style="width:0;" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0">0%</div>
 			</div>
 			<div id="msb-rb-phase" class="fw-bold mb-1"></div>
 			<div id="msb-rb-status" class="text-muted small mb-3"><?php echo htmlspecialchars(Text::_('COM_MOKOJOOMBACKUP_RUNBACKUP_STARTING'), ENT_QUOTES, 'UTF-8'); ?></div>
 			<div id="msb-rb-actions" class="d-none">
 				<button type="button" id="msb-rb-retry" class="btn btn-primary d-none"></button>
 				<a href="#" id="msb-rb-continue" class="btn btn-warning d-none"></a>
 				<a href="<?php echo $dashboardUrl; ?>" id="msb-rb-dashboard" class="btn btn-secondary d-none"></a>
 			</div>
 		</div>
 	</div>
 </div>
 <script>
 (function () {
 	'use strict';
 	var CFG = <?php echo json_encode($config); ?>;
 	var L = CFG.labels || {};
 	var running = false;
 	var el = {
 		bar:       document.getElementById('msb-rb-bar'),
 		phase:     document.getElementById('msb-rb-phase'),
 		status:    document.getElementById('msb-rb-status'),
 		title:     document.getElementById('msb-rb-title'),
 		actions:   document.getElementById('msb-rb-actions'),
 		retry:     document.getElementById('msb-rb-retry'),
 		continue:  document.getElementById('msb-rb-continue'),
 		dashboard: document.getElementById('msb-rb-dashboard')
 	};
 	function setBar(pct, striped) {
 		pct = Math.max(0, Math.min(100, parseInt(pct, 10) || 0));
 		el.bar.style.width = pct + '%';
 		el.bar.textContent = pct + '%';
 		el.bar.setAttribute('aria-valuenow', pct);
 		if (!striped) {
 			el.bar.classList.remove('progress-bar-striped', 'progress-bar-animated');
 		}
 	}
 	function setPhase(t) { el.phase.textContent = t || ''; }
 	function setStatus(t) { if (t) { el.status.textContent = t; } }
 	function post(params) {
 		var body = new URLSearchParams();
 		body.append(CFG.token, '1');
 		Object.keys(params).forEach(function (k) { body.append(k, params[k]); });
 		return fetch(CFG.ajaxUrl, {
 			method: 'POST',
 			body: body,
 			headers: { 'X-Requested-With': 'XMLHttpRequest' }
 		}).then(function (r) { return r.json(); });
 	}
 	function showActions() { el.actions.classList.remove('d-none'); }
 	function showBtn(node, label, href) {
 		node.textContent = label;
 		if (href) { node.setAttribute('href', href); }
 		node.classList.remove('d-none');
 	}
 	function onComplete() {
 		el.bar.classList.remove('progress-bar-striped', 'progress-bar-animated');
 		el.bar.classList.add('bg-success');
 		setBar(100, false);
 		el.title.textContent = L.complete || 'Backup complete';
 		if (CFG.returnUrl) {
 			setStatus(L.continuing || 'Continuing…');
 			window.setTimeout(function () { window.location.href = CFG.returnUrl; }, 1200);
 		} else {
 			setStatus(L.complete || 'Backup complete');
 			showActions();
 			showBtn(el.dashboard, L.dashboard || 'Back to dashboard', CFG.dashboardUrl);
 		}
 	}
 	function onError(message) {
 		running = false;
 		el.bar.classList.remove('progress-bar-striped', 'progress-bar-animated');
 		el.bar.classList.add('bg-danger');
 		el.title.textContent = L.failed || 'Backup failed';
 		setStatus(message || 'Backup failed');
 		showActions();
 		el.retry.textContent = L.retry || 'Retry';
 		el.retry.classList.remove('d-none');
 		el.retry.onclick = function () {
 			el.retry.classList.add('d-none');
 			el.continue.classList.add('d-none');
 			el.bar.classList.remove('bg-danger');
 			el.bar.classList.add('progress-bar-striped', 'progress-bar-animated');
 			run();
 		};
 		if (CFG.returnUrl) {
 			showBtn(el.continue, L.continue || 'Continue without backup', CFG.returnUrl);
 		}
 		showBtn(el.dashboard, L.dashboard || 'Back to dashboard', CFG.dashboardUrl);
 	}
 	async function run() {
 		if (running) { return; }
 		running = true;
 		el.actions.classList.add('d-none');
 		setBar(0, true);
 		setPhase('');
 		setStatus(L.starting || 'Starting backup…');
 		try {
 			var init = await post({ task: 'ajax.init', profile_id: CFG.profileId, description: CFG.description });
 			if (!init || init.error || !init.session_id) {
 				throw new Error((init && init.message) || 'Could not start backup');
 			}
 			setBar(init.progress, true);
 			setPhase(init.phase || '');
 			setStatus(init.message || (L.running || 'Backing up…'));
 			var done = false;
 			while (!done) {
 				var step = await post({ task: 'ajax.step', session_id: init.session_id });
 				if (!step || step.error) {
 					throw new Error((step && step.message) || 'Backup step failed');
 				}
 				setBar(step.progress, true);
 				setPhase(step.phase || '');
 				setStatus(step.message || '');
 				done = step.done || false;
 			}
 			running = false;
 			onComplete();
 		} catch (err) {
 			onError(err && err.message ? err.message : String(err));
 		}
 	}
 	/* Warn before leaving while a backup is mid-flight. */
 	window.addEventListener('beforeunload', function (e) {
 		if (running) { e.preventDefault(); e.returnValue = L.leaveWarn || ''; }
 	});
 	if (CFG.autostart) {
 		document.addEventListener('DOMContentLoaded', run);
 	}
 })();
 </script>
@@ -8,7 +8,7 @@
 -->
 <extension type="module" client="administrator" method="upgrade">
 	<name>Module - MokoSuiteBackup - cPanel</name>
-	<version>02.54.00</version>
+	<version>02.58.14</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.14</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.14</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);
 			}
 		}
--- a/Show More
+++ b/Show More