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

.mokogitea/workflows/deploy-manual.yml

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

.mokogitea/workflows/issue-branch.yml

@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 01.30.00
+# VERSION: 01.39.02
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

.mokogitea/workflows/security-audit.yml

@@ -1,82 +0,0 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Security
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
-# PATH: /.gitea/workflows/security-audit.yml
-# VERSION: 01.00.00
-# BRIEF: Dependency vulnerability scanning for composer and npm packages
-
-name: "Universal: Security Audit"
-
-on:
-  schedule:
-    - cron: '0 6 * * 1'  # Weekly on Monday at 06:00 UTC
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'composer.json'
-      - 'composer.lock'
-      - 'package.json'
-      - 'package-lock.json'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-env:
-  NTFY_URL: ${{ vars.NTFY_URL || 'https://ntfy.mokoconsulting.tech' }}
-  NTFY_TOPIC: ${{ vars.NTFY_TOPIC || 'gitea-security' }}
-
-jobs:
-  audit:
-    name: Dependency Audit
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Composer audit
-        if: hashFiles('composer.lock') != ''
-        run: |
-          echo "=== Composer Security Audit ==="
-          if ! command -v composer &> /dev/null; then
-            sudo apt-get update -qq
-            sudo apt-get install -y -qq php-cli composer >/dev/null 2>&1
-          fi
-          composer audit --format=plain 2>&1 | tee /tmp/composer-audit.txt
-          RESULT=$?
-          if [ $RESULT -ne 0 ]; then
-            echo "::warning::Composer vulnerabilities found"
-            echo "composer_vulnerable=true" >> "$GITHUB_ENV"
-          else
-            echo "No known vulnerabilities in composer dependencies"
-          fi
-
-      - name: NPM audit
-        if: hashFiles('package-lock.json') != ''
-        run: |
-          echo "=== NPM Security Audit ==="
-          npm audit --production 2>&1 | tee /tmp/npm-audit.txt || true
-          if npm audit --production 2>&1 | grep -q "found 0 vulnerabilities"; then
-            echo "No known vulnerabilities in npm dependencies"
-          else
-            echo "::warning::NPM vulnerabilities found"
-            echo "npm_vulnerable=true" >> "$GITHUB_ENV"
-          fi
-
-      - name: Notify on vulnerabilities
-        if: env.composer_vulnerable == 'true' || env.npm_vulnerable == 'true'
-        run: |
-          REPO="${{ github.event.repository.name }}"
-          curl -sS \
-            -H "Title: ${REPO} has vulnerable dependencies" \
-            -H "Tags: lock,warning" \
-            -H "Priority: high" \
-            -d "Security audit found vulnerabilities. Review dependency updates." \
-            "${NTFY_URL}/${NTFY_TOPIC}" || true

CHANGELOG.md

@@ -1,17 +1,6 @@
 # Changelog
 ## [Unreleased]
 
-## [01.30.00] --- 2026-06-22
-
-## [01.30.00] --- 2026-06-22
-
-### Changed
-- Remote upload failure no longer marks the entire backup as failed — local archive is preserved with status 'complete' (#66)
-
-### Added
-- Snapshots now capture tags, custom fields, field values, and field-category mappings when articles are included (#57)
-- Snapshot retention settings: max count and max age with automatic cleanup (#63)
-
 ## [01.27.03] --- 2026-06-21
 
 ## [01.27.03] --- 2026-06-21
@@ -19,3 +8,7 @@
 ## [01.27.00] --- 2026-06-21
 
 ## [01.27.00] --- 2026-06-21
+
+## [01.27.00] --- 2026-06-21
+
+## [01.27.00] --- 2026-06-21

README.md

@@ -1,6 +1,6 @@
 # MokoSuiteBackup
 
-<!-- VERSION: 01.30.00 -->
+<!-- VERSION: 01.39.02 -->
 
 Full-site backup and restore for Joomla — database, files, and configuration.
 

source/packages/com_mokosuitebackup/config.xml

@@ -118,27 +118,6 @@
 		/>
 	</fieldset>
 
-	<fieldset name="snapshot_cleanup" label="COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_RETENTION">
-		<field
-			name="snapshot_retention_count"
-			type="number"
-			label="COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_MAX_COUNT"
-			description="COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_MAX_COUNT_DESC"
-			default="20"
-			min="0"
-			max="100"
-		/>
-		<field
-			name="snapshot_retention_days"
-			type="number"
-			label="COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_MAX_AGE"
-			description="COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_MAX_AGE_DESC"
-			default="30"
-			min="0"
-			max="365"
-		/>
-	</fieldset>
-
 	<fieldset name="notifications" label="COM_MOKOJOOMBACKUP_CONFIG_NOTIFICATIONS">
 		<field
 			name="notify_email"

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

@@ -269,13 +269,6 @@ COM_MOKOJOOMBACKUP_CONFIG_NOTIFY_SUCCESS_DESC="Send email when any backup comple
 COM_MOKOJOOMBACKUP_CONFIG_NOTIFY_FAILURE="Notify on Failure"
 COM_MOKOJOOMBACKUP_CONFIG_NOTIFY_FAILURE_DESC="Send email when any backup fails (unless overridden by profile)."
 
-; Snapshot Retention
-COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_RETENTION="Snapshot Retention"
-COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_MAX_COUNT="Max Snapshot Count"
-COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_MAX_COUNT_DESC="Maximum number of content snapshots to keep. Oldest are removed first. Set to 0 for unlimited."
-COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_MAX_AGE="Max Snapshot Age (days)"
-COM_MOKOJOOMBACKUP_CONFIG_SNAPSHOT_MAX_AGE_DESC="Delete snapshots older than this many days. Set to 0 for unlimited."
-
 ; Web Cron
 COM_MOKOJOOMBACKUP_CONFIG_WEBCRON="Web Cron"
 COM_MOKOJOOMBACKUP_CONFIG_WEBCRON_ENABLED="Enable Web Cron"

source/packages/com_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="component" method="upgrade">
 	<name>MokoSuiteBackup</name>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/com_mokosuitebackup/src/Engine/BackupEngine.php

@@ -255,36 +255,26 @@ class BackupEngine
 			}
 
 			$remoteFilename = '';
-			$uploadFailed   = false;
 
 			// Step 3: Remote upload (if configured)
-			// Wrapped in its own try-catch so a remote failure does not mark
-			// the entire backup as failed — the local archive is preserved.
 			$remoteStorage = $profile->remote_storage ?? 'none';
 
 			if ($remoteStorage !== 'none') {
-				try {
+				$this->log('Starting remote upload (' . $remoteStorage . ')...');
-					$this->log('Starting remote upload (' . $remoteStorage . ')...');
+				$uploader     = $this->createUploader($remoteStorage, $profile);
-					$uploader     = $this->createUploader($remoteStorage, $profile);
+				$uploadResult = $uploader->upload($archivePath, $archiveName);
-					$uploadResult = $uploader->upload($archivePath, $archiveName);
 
-					if ($uploadResult['success']) {
+				if ($uploadResult['success']) {
-						$remoteFilename = $uploadResult['remote_path'] ?? $archiveName;
+					$remoteFilename = $uploadResult['remote_path'] ?? $archiveName;
-						$this->log('Remote upload complete: ' . $uploadResult['message']);
+					$this->log('Remote upload complete: ' . $uploadResult['message']);
 
-						// Delete local copy if configured
+					// Delete local copy if configured
-						if (empty($profile->remote_keep_local) && is_file($archivePath)) {
+					if (empty($profile->remote_keep_local) && is_file($archivePath)) {
-							@unlink($archivePath);
+						@unlink($archivePath);
-							$this->log('Local copy removed (remote_keep_local = off)');
+						$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) {
+				} else {
-					$uploadFailed = true;
+					$this->log('WARNING: Remote upload failed: ' . $uploadResult['message']);
-					$this->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
 					$this->log('Local backup is preserved.');
 				}
 			}
@@ -319,14 +309,9 @@ class BackupEngine
 
 			$db->updateObject('#__mokosuitebackup_records', $update, 'id');
 
-			// Send success notification (backup completed, even if upload failed)
+			// Send success notification
 			NotificationSender::send($profile, $update, true, implode("\n", $this->log));
 
-			// If remote upload failed, also send a failure notification for the upload
-			if ($uploadFailed) {
-				NotificationSender::send($profile, $update, false, "Remote upload failed — see backup log for details.\n\n" . implode("\n", $this->log));
-			}
-
 			// Dispatch event for actionlog and other listeners
 			$this->dispatchAfterRun(true, $recordId, $description, $profileId, $origin);
 

source/packages/com_mokosuitebackup/src/Engine/SnapshotEngine.php

@@ -41,10 +41,6 @@ class SnapshotEngine
 	private const ARTICLE_RELATED = [
 		'#__workflow_associations',
 		'#__contentitem_tag_map',
-		'#__tags',
-		'#__fields',
-		'#__fields_values',
-		'#__fields_categories',
 	];
 
 	/**
@@ -111,32 +107,6 @@ class SnapshotEngine
 				$rows = $this->dumpTagMap($db, $prefix);
 				$data['tables']['#__contentitem_tag_map'] = $rows;
 				$this->log('  #__contentitem_tag_map: ' . count($rows) . ' rows');
-
-				// Tags — dump all (shared, small table)
-				$rows = $this->dumpTable($db, str_replace('#__', $prefix, '#__tags'), '#__tags', 'articles');
-				$data['tables']['#__tags'] = $rows;
-				$this->log('  #__tags: ' . count($rows) . ' rows');
-
-				// Custom fields — only com_content.article context
-				$rows = $this->dumpFilteredTable(
-					$db,
-					str_replace('#__', $prefix, '#__fields'),
-					'#__fields',
-					'context',
-					'com_content.article'
-				);
-				$data['tables']['#__fields'] = $rows;
-				$this->log('  #__fields: ' . count($rows) . ' rows');
-
-				// Field values — only for com_content.article fields (table is shared across extensions)
-				$rows = $this->dumpFieldValues($db, $prefix);
-				$data['tables']['#__fields_values'] = $rows;
-				$this->log('  #__fields_values: ' . count($rows) . ' rows');
-
-				// Field-category mappings — only for com_content.article fields
-				$rows = $this->dumpFieldCategories($db, $prefix);
-				$data['tables']['#__fields_categories'] = $rows;
-				$this->log('  #__fields_categories: ' . count($rows) . ' rows');
 			}
 
 			// Count items
@@ -261,52 +231,6 @@ class SnapshotEngine
 		return $db->loadAssocList() ?: [];
 	}
 
-	/**
-	 * Dump field-category mappings for com_content.article fields.
-	 *
-	 * Uses a subquery: field_id IN (SELECT id FROM #__fields WHERE context = 'com_content.article')
-	 */
-	/**
-	 * Dump field values only for com_content.article fields.
-	 */
-	private function dumpFieldValues(object $db, string $prefix): array
-	{
-		$fvTable = $prefix . 'fields_values';
-		$fTable  = $prefix . 'fields';
-
-		$subQuery = $db->getQuery(true)
-			->select($db->quoteName('id'))
-			->from($db->quoteName($fTable))
-			->where($db->quoteName('context') . ' = ' . $db->quote('com_content.article'));
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName($fvTable))
-			->where($db->quoteName('field_id') . ' IN (' . $subQuery . ')');
-		$db->setQuery($query);
-
-		return $db->loadAssocList() ?: [];
-	}
-
-	private function dumpFieldCategories(object $db, string $prefix): array
-	{
-		$fcTable = $prefix . 'fields_categories';
-		$fTable  = $prefix . 'fields';
-
-		$subQuery = $db->getQuery(true)
-			->select($db->quoteName('id'))
-			->from($db->quoteName($fTable))
-			->where($db->quoteName('context') . ' = ' . $db->quote('com_content.article'));
-
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName($fcTable))
-			->where($db->quoteName('field_id') . ' IN (' . $subQuery . ')');
-		$db->setQuery($query);
-
-		return $db->loadAssocList() ?: [];
-	}
-
 	private function log(string $message): void
 	{
 		$this->log[] = '[' . date('H:i:s') . '] ' . $message;

source/packages/com_mokosuitebackup/src/Engine/SnapshotRestoreEngine.php

@@ -33,10 +33,6 @@ class SnapshotRestoreEngine
 		'#__contentitem_tag_map'     => null,  // composite key, handled specially
 		'#__modules'                 => 'id',
 		'#__modules_menu'            => null,  // composite key, handled specially
-		'#__tags'                    => 'id',
-		'#__fields'                  => 'id',
-		'#__fields_values'           => null,  // composite key, handled specially
-		'#__fields_categories'       => null,  // composite key, handled specially
 	];
 
 	/**
@@ -286,48 +282,6 @@ class SnapshotRestoreEngine
 				$query->where($db->quoteName('moduleid') . ' IN (' . implode(',', $moduleIds) . ')');
 				break;
 
-			case '#__tags':
-				// Only delete tags that exist in the snapshot — never wipe all tags
-				$ids = array_filter(array_column($rows, 'id'));
-
-				if (empty($ids)) {
-					return;
-				}
-
-				$ids = array_map('intval', $ids);
-				$query->where($db->quoteName('id') . ' IN (' . implode(',', $ids) . ')');
-				break;
-
-			case '#__fields':
-				// Only delete custom fields scoped to com_content.article
-				$query->where($db->quoteName('context') . ' = ' . $db->quote('com_content.article'));
-				break;
-
-			case '#__fields_values':
-				// Only delete field values for com_content.article fields
-				$prefix = $db->getPrefix();
-				$fTable = $prefix . 'fields';
-
-				$subQuery = $db->getQuery(true)
-					->select($db->quoteName('id'))
-					->from($db->quoteName($fTable))
-					->where($db->quoteName('context') . ' = ' . $db->quote('com_content.article'));
-				$query->where($db->quoteName('field_id') . ' IN (' . $subQuery . ')');
-				break;
-
-			case '#__fields_categories':
-				// Delete field-category mappings for com_content.article fields only
-				$prefix = $db->getPrefix();
-				$fTable = $prefix . 'fields';
-
-				$subQuery = $db->getQuery(true)
-					->select($db->quoteName('id'))
-					->from($db->quoteName($fTable))
-					->where($db->quoteName('context') . ' = ' . $db->quote('com_content.article'));
-
-				$query->where($db->quoteName('field_id') . ' IN (' . $subQuery . ')');
-				break;
-
 			// #__content and #__content_frontpage are fully owned by com_content
 			default:
 				break;
@@ -349,10 +303,6 @@ class SnapshotRestoreEngine
 			$tables[] = '#__content_frontpage';
 			$tables[] = '#__workflow_associations';
 			$tables[] = '#__contentitem_tag_map';
-			$tables[] = '#__tags';
-			$tables[] = '#__fields';
-			$tables[] = '#__fields_values';
-			$tables[] = '#__fields_categories';
 		}
 
 		if (in_array('categories', $types)) {

source/packages/com_mokosuitebackup/src/Engine/SteppedBackupEngine.php

@@ -389,47 +389,37 @@ class SteppedBackupEngine
 	private function stepUpload(SteppedSession $session): void
 	{
 		$db = Factory::getDbo();
+
+		// 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),
+			'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);
+
 		$remoteFilename = '';
-		$uploadFailed   = false;
 
-		// Wrapped in its own try-catch so a remote failure does not mark
+		if ($result['success']) {
-		// the entire backup as failed — the local archive is preserved.
+			$remoteFilename = $result['remote_path'] ?? $session->archiveName;
-		try {
+			$session->log('Remote upload complete: ' . $result['message']);
-			// 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) {
+			if (!$session->remoteKeepLocal && is_file($session->archivePath)) {
-				'ftp'          => new FtpUploader($profile),
+				@unlink($session->archivePath);
-				'google_drive' => new GoogleDriveUploader($profile),
+				$session->log('Local copy removed');
-				'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 (!$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) {
+		} else {
-			$uploadFailed = true;
+			$session->log('WARNING: Remote upload failed: ' . $result['message']);
-			$session->log('WARNING: Remote upload threw an exception: ' . $e->getMessage());
-			$session->log('Local backup is preserved.');
 		}
 
 		// Update record with remote filename
@@ -443,16 +433,14 @@ class SteppedBackupEngine
 
 		$session->currentStep++;
 		$session->phase = 'complete';
-		$session->statusMessage = $uploadFailed
+		$session->statusMessage = 'Backup complete';
-			? 'Backup complete (remote upload failed — local archive preserved)'
+		$this->completeRecord($session);
-			: 'Backup complete';
-		$this->completeRecord($session, $uploadFailed);
 	}
 
 	/**
 	 * Mark the backup record as complete.
 	 */
-	private function completeRecord(SteppedSession $session, bool $uploadFailed = false): void
+	private function completeRecord(SteppedSession $session): void
 	{
 		$db         = Factory::getDbo();
 		$logContent = implode("\n", $session->log);
@@ -502,11 +490,6 @@ class SteppedBackupEngine
 				];
 
 				NotificationSender::send($profile, $record, true, $logContent);
-
-				// If remote upload failed, also send a failure notification for the upload
-				if ($uploadFailed) {
-					NotificationSender::send($profile, $record, false, "Remote upload failed — see backup log for details.\n\n" . $logContent);
-				}
 			}
 		} catch (\Throwable $e) {
 			error_log('MokoSuiteBackup: SteppedBackupEngine notification failed: ' . $e->getMessage());

source/packages/plg_actionlog_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="actionlog" method="upgrade">
 	<name>Action Log - MokoSuiteBackup</name>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_console_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="console" method="upgrade">
 	<name>Console - MokoSuiteBackup</name>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_content_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="content" method="upgrade">
 	<name>Content - MokoSuiteBackup</name>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-04</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_quickicon_mokosuitebackup/mokosuitebackup.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="quickicon" method="upgrade">
 	<name>Quick Icon - MokoSuiteBackup</name>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_system_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="system" method="upgrade">
 	<name>System - MokoSuiteBackup</name>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_system_mokosuitebackup/src/Extension/MokoSuiteBackup.php

@@ -136,7 +136,6 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 		$session->set('mokosuitebackup.last_cleanup', time());
 
 		$this->cleanupOldBackups();
-		$this->cleanupOldSnapshots();
 	}
 
 	/**
@@ -153,93 +152,6 @@ final class MokoSuiteBackup extends CMSPlugin implements SubscriberInterface
 		}
 	}
 
-	/**
-	 * Remove old content snapshots per component retention settings.
-	 *
-	 * Respects snapshot_retention_days (max age) and snapshot_retention_count
-	 * (max number to keep). A value of 0 means unlimited for that setting.
-	 */
-	private function cleanupOldSnapshots(): void
-	{
-		try {
-			$this->doSnapshotCleanup();
-		} catch (\Throwable $e) {
-			error_log('MokoSuiteBackup: cleanupOldSnapshots() failed: ' . $e->getMessage());
-		}
-	}
-
-	private function doSnapshotCleanup(): void
-	{
-		$db            = Factory::getDbo();
-		$params        = ComponentHelper::getParams('com_mokosuitebackup');
-		$retentionDays = (int) $params->get('snapshot_retention_days', 30);
-		$retentionCount = (int) $params->get('snapshot_retention_count', 20);
-
-		// Delete snapshots older than retention_days
-		if ($retentionDays > 0) {
-			$cutoff = date('Y-m-d H:i:s', strtotime("-{$retentionDays} days"));
-			$query  = $db->getQuery(true)
-				->select([$db->quoteName('id'), $db->quoteName('data_file')])
-				->from($db->quoteName('#__mokosuitebackup_snapshots'))
-				->where($db->quoteName('created') . ' < ' . $db->quote($cutoff))
-				->order($db->quoteName('created') . ' DESC');
-			$db->setQuery($query);
-			$expired = $db->loadObjectList();
-
-			foreach ($expired as $snapshot) {
-				$this->deleteSnapshotRecord($db, $snapshot);
-			}
-		}
-
-		// Enforce max count (keep newest)
-		if ($retentionCount > 0) {
-			$query = $db->getQuery(true)
-				->select('COUNT(*)')
-				->from($db->quoteName('#__mokosuitebackup_snapshots'));
-			$db->setQuery($query);
-			$totalCount = (int) $db->loadResult();
-
-			if ($totalCount > $retentionCount) {
-				$excess = $totalCount - $retentionCount;
-				$query  = $db->getQuery(true)
-					->select([$db->quoteName('id'), $db->quoteName('data_file')])
-					->from($db->quoteName('#__mokosuitebackup_snapshots'))
-					->order($db->quoteName('created') . ' ASC');
-				$db->setQuery($query, 0, $excess);
-				$oldest = $db->loadObjectList();
-
-				foreach ($oldest as $snapshot) {
-					$this->deleteSnapshotRecord($db, $snapshot);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Delete a snapshot record and its JSON data file.
-	 */
-	private function deleteSnapshotRecord(object $db, object $snapshot): void
-	{
-		if (!empty($snapshot->data_file) && is_file($snapshot->data_file)) {
-			if (!@unlink($snapshot->data_file)) {
-				error_log('MokoSuiteBackup: Could not delete snapshot file (id=' . $snapshot->id . '): ' . $snapshot->data_file);
-
-				return;
-			}
-		}
-
-		try {
-			$db->setQuery(
-				$db->getQuery(true)
-					->delete($db->quoteName('#__mokosuitebackup_snapshots'))
-					->where($db->quoteName('id') . ' = ' . (int) $snapshot->id)
-			);
-			$db->execute();
-		} catch (\Exception $e) {
-			error_log('MokoSuiteBackup: Could not delete snapshot record ' . $snapshot->id . ': ' . $e->getMessage());
-		}
-	}
-
 	private function doCleanup(): void
 	{
 		$db              = Factory::getDbo();

source/packages/plg_task_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="task" method="upgrade">
 	<name>Task - MokoSuiteBackup</name>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_webservices_mokosuitebackup/mokosuitebackup.xml

@@ -7,7 +7,7 @@
  -->
 <extension type="plugin" group="webservices" method="upgrade">
 	<name>Web Services - MokoSuiteBackup</name>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/pkg_mokosuitebackup.xml

@@ -8,7 +8,7 @@
 <extension type="package" method="upgrade">
 	<name>Package - MokoSuiteBackup</name>
 	<packagename>mokosuitebackup</packagename>
-	<version>01.30.00</version>
+	<version>01.39.02</version>
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>