Remove delta apps on full restore even if earlier stages failed (#7323)

During a full restore, removing apps that are not part of the backup was
written as `success = success and await backup.remove_delta_apps()`.
The short-circuit meant that if an earlier stage such as the folder
restore had already failed, remove_delta_apps was never awaited and
apps not in the backup stayed installed.

Always run remove_delta_apps and combine its result afterwards.

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

Author: mrueg

supervisor/backups/manager.py

@@ -744,7 +744,8 @@ async def _do_restore(
                 # Delete delta apps
                 if replace:
                     self._change_stage(RestoreJobStage.REMOVE_DELTA_APPS, backup)
-                    success = success and await backup.remove_delta_apps()
+                    delta_success = await backup.remove_delta_apps()
+                    success = success and delta_success
 
                 if app_list:
                     self._change_stage(RestoreJobStage.APP_REPOSITORIES, backup)

tests/backups/test_manager.py

@@ -287,6 +287,36 @@ async def test_do_restore_full_different_app(
     assert coresys.core.state == CoreState.RUNNING
 
 
+@pytest.mark.usefixtures("supervisor_internet")
+async def test_do_restore_full_removes_delta_apps_after_folder_failure(
+    coresys: CoreSys, full_backup_mock: Backup, install_app_ssh: App
+):
+    """Test full restore still removes apps not in backup if folder restore fails."""
+    await coresys.core.set_state(CoreState.RUNNING)
+    coresys.hardware.disk.get_disk_free_space = lambda x: 5000
+    coresys.homeassistant.core.start = AsyncMock(return_value=None)
+    coresys.homeassistant.core.stop = AsyncMock(return_value=None)
+    coresys.homeassistant.core.update = AsyncMock(return_value=None)
+    install_app_ssh.uninstall = AsyncMock(return_value=None)
+
+    manager = await BackupManager(coresys).load_config()
+
+    backup_instance = full_backup_mock.return_value
+    backup_instance.app_list = ["differentslug"]
+    backup_instance.sys_apps = coresys.apps
+    backup_instance.restore_folders.return_value = False
+    backup_instance.remove_delta_apps = partial(
+        Backup.remove_delta_apps, backup_instance
+    )
+    assert not await manager.do_restore_full(backup_instance)
+
+    backup_instance.restore_folders.assert_called_once()
+    install_app_ssh.uninstall.assert_called_once()
+    backup_instance.restore_apps.assert_called_once()
+
+    assert coresys.core.state == CoreState.RUNNING
+
+
 @pytest.mark.usefixtures("supervisor_internet", "install_app_ssh")
 async def test_do_restore_partial_minimal(
     coresys: CoreSys, partial_backup_mock: Backup