feat: migrate Flatpak integrations with native updates

3 files changed, 206 insertions, 36 deletions

diff --git a/py_modules/lsfg_vk/flatpak_service.py b/py_modules/lsfg_vk/flatpak_service.py
index 5832cf4..fe965aa 100644
--- a/py_modules/lsfg_vk/flatpak_service.py
+++ b/py_modules/lsfg_vk/flatpak_service.py
@@ -18,6 +18,9 @@ from .constants import (
 from .types import BaseResponse
 
 
+SUPPORTED_FLATPAK_VERSIONS = ("23.08", "24.08", "25.08")
+
+
 class FlatpakExtensionStatus(BaseResponse):
     """Response for Flatpak extension status"""
     def __init__(self, success: bool = False, message: str = "", error: str = "", 
@@ -88,6 +91,25 @@ class FlatpakService(BaseService):
         plugin_dir = Path(__file__).resolve().parent.parent.parent
         return plugin_dir / BIN_DIR / filename
 
+    def _get_installed_extension_versions(self) -> list[str]:
+        """Return installed lsfg-vk runtime branches from the user Flatpak installation."""
+        result = self._run_flatpak_command(
+            ["list", "--user", "--runtime"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        installed_runtimes = result.stdout
+        base_extension_name = "org.freedesktop.Platform.VulkanLayer.lsfgvk"
+        return [
+            version
+            for version in SUPPORTED_FLATPAK_VERSIONS
+            if any(
+                base_extension_name in line and version in line
+                for line in installed_runtimes.splitlines()
+            )
+        ]
+
     def _remove_legacy_app_overrides(self, app_id: str) -> list[str]:
         """Remove only the v1 overrides previously created by this plugin."""
         legacy_dll_path = self.user_home / ".local/share/Steam/steamapps/common/Lossless Scaling/Lossless.dll"
@@ -175,26 +197,10 @@ class FlatpakService(BaseService):
                                           error_msg,
                                           installed_23_08=False, installed_24_08=False, installed_25_08=False)
 
-            result = self._run_flatpak_command(
-                ["list", "--runtime"],
-                capture_output=True, text=True, check=True
-            )
-
-            installed_runtimes = result.stdout
-
-            base_extension_name = "org.freedesktop.Platform.VulkanLayer.lsfgvk"
-            installed_23_08 = False
-            installed_24_08 = False
-            installed_25_08 = False
-
-            for line in installed_runtimes.split('\n'):
-                if base_extension_name in line:
-                    if "23.08" in line:
-                        installed_23_08 = True
-                    elif "24.08" in line:
-                        installed_24_08 = True
-                    elif "25.08" in line:
-                        installed_25_08 = True
+            installed_versions = self._get_installed_extension_versions()
+            installed_23_08 = "23.08" in installed_versions
+            installed_24_08 = "24.08" in installed_versions
+            installed_25_08 = "25.08" in installed_versions
 
             status_msg = []
             if installed_23_08:
@@ -220,9 +226,9 @@ class FlatpakService(BaseService):
                                       installed_23_08=False, installed_24_08=False, installed_25_08=False)
 
     def install_extension(self, version: str) -> BaseResponse:
-        """Install a specific version of the lsfg-vk Flatpak extension"""
+        """Install or update a specific version of the lsfg-vk Flatpak extension."""
         try:
-            if version not in ["23.08", "24.08", "25.08"]:
+            if version not in SUPPORTED_FLATPAK_VERSIONS:
                 return self._error_response(BaseResponse, "Invalid version. Must be '23.08', '24.08', or '25.08'")
 
             if not self.check_flatpak_available():
@@ -235,7 +241,14 @@ class FlatpakService(BaseService):
                 return self._error_response(BaseResponse, error_msg)
 
             result = self._run_flatpak_command(
-                ["install", "--user", "--noninteractive", str(bundle_path)],
+                [
+                    "install",
+                    "--user",
+                    "--or-update",
+                    "--assumeyes",
+                    "--noninteractive",
+                    str(bundle_path),
+                ],
                 capture_output=True, text=True
             )
 
@@ -255,10 +268,161 @@ class FlatpakService(BaseService):
             self.log.error(error_msg)
             return self._error_response(BaseResponse, error_msg)
 
+    def _get_flatpak_app_ids(self) -> list[str]:
+        """Return application IDs in the user Flatpak installation."""
+        result = self._run_flatpak_command(
+            ["list", "--app"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        app_ids = []
+        for line in result.stdout.splitlines():
+            parts = line.split("\t")
+            if len(parts) >= 2 and parts[1].strip():
+                app_ids.append(parts[1].strip())
+        return app_ids
+
+    def _get_app_override_output(self, app_id: str) -> Optional[str]:
+        """Return an app's user override output, or None if it cannot be read."""
+        result = self._run_flatpak_command(
+            ["override", "--user", "--show", app_id],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode != 0:
+            return None
+        return result.stdout
+
+    def _has_legacy_app_override(self, output: str) -> bool:
+        """Detect only overrides written by the v1 plugin."""
+        config_path, _ = self._get_lsfg_paths()
+        legacy_dll_path = self.user_home / ".local/share/Steam/steamapps/common/Lossless Scaling/Lossless.dll"
+        legacy_config = f"LSFG_CONFIG={config_path}/conf.toml"
+        return (
+            legacy_config in output
+            or str(legacy_dll_path) in output
+            or str(self.lsfg_launch_script_path) in output
+        )
+
+    def _migrate_legacy_app_overrides(self) -> Dict[str, Any]:
+        """Upgrade v1 app overrides without changing unrelated Flatpak apps."""
+        migrated_apps = []
+        failed_apps = []
+        try:
+            for app_id in self._get_flatpak_app_ids():
+                output = self._get_app_override_output(app_id)
+                if output is None or not self._has_legacy_app_override(output):
+                    continue
+
+                result = self.set_app_override(app_id)
+                if result.get("success"):
+                    migrated_apps.append(app_id)
+                else:
+                    failed_apps.append({"app_id": app_id, "error": result.get("error", "unknown error")})
+        except (subprocess.CalledProcessError, OSError) as error:
+            stderr = getattr(error, "stderr", None)
+            return self._error_response(
+                BaseResponse,
+                f"Could not inspect Flatpak applications: {stderr or error}",
+                migrated_apps=migrated_apps,
+                failed_apps=failed_apps,
+            )
+
+        if failed_apps:
+            return self._error_response(
+                BaseResponse,
+                f"Failed to migrate overrides for {len(failed_apps)} Flatpak application(s)",
+                migrated_apps=migrated_apps,
+                failed_apps=failed_apps,
+            )
+        return self._success_response(
+            BaseResponse,
+            f"Migrated {len(migrated_apps)} legacy Flatpak app override(s)",
+            migrated_apps=migrated_apps,
+            failed_apps=failed_apps,
+        )
+
+    def update_installed_extensions(self) -> Dict[str, Any]:
+        """Update existing user Flatpak extensions and migrate their v1 app overrides."""
+        empty_result = {
+            "updated_versions": [],
+            "failed_versions": [],
+            "migrated_apps": [],
+            "failed_apps": [],
+        }
+        try:
+            if not self.check_flatpak_available():
+                return self._success_response(
+                    BaseResponse,
+                    "Flatpak is unavailable; skipped runtime and app-override migration",
+                    skipped=True,
+                    **empty_result,
+                )
+
+            installed_versions = self._get_installed_extension_versions()
+            if not installed_versions:
+                return self._success_response(
+                    BaseResponse,
+                    "No installed lsfg-vk Flatpak runtimes require migration",
+                    skipped=True,
+                    **empty_result,
+                )
+
+            updated_versions = []
+            failed_versions = []
+            for version in installed_versions:
+                result = self.install_extension(version)
+                if result.get("success"):
+                    updated_versions.append(version)
+                else:
+                    failed_versions.append({"version": version, "error": result.get("error", "unknown error")})
+
+            if failed_versions:
+                return self._error_response(
+                    BaseResponse,
+                    "Flatpak runtime migration failed; legacy app overrides were left unchanged",
+                    skipped=False,
+                    updated_versions=updated_versions,
+                    failed_versions=failed_versions,
+                    migrated_apps=[],
+                    failed_apps=[],
+                )
+
+            override_result = self._migrate_legacy_app_overrides()
+            response = {
+                "updated_versions": updated_versions,
+                "failed_versions": [],
+                "migrated_apps": override_result.get("migrated_apps", []),
+                "failed_apps": override_result.get("failed_apps", []),
+            }
+            if not override_result.get("success"):
+                return self._error_response(
+                    BaseResponse,
+                    override_result.get("error", "Flatpak app override migration failed"),
+                    skipped=False,
+                    **response,
+                )
+            return self._success_response(
+                BaseResponse,
+                f"Updated {len(updated_versions)} Flatpak runtime(s); "
+                f"migrated {len(response['migrated_apps'])} app override(s)",
+                skipped=False,
+                **response,
+            )
+        except (subprocess.CalledProcessError, OSError) as error:
+            stderr = getattr(error, "stderr", None)
+            return self._error_response(
+                BaseResponse,
+                f"Could not migrate installed Flatpak runtimes: {stderr or error}",
+                skipped=False,
+                **empty_result,
+            )
+
     def uninstall_extension(self, version: str) -> BaseResponse:
         """Uninstall a specific version of the lsfg-vk Flatpak extension"""
         try:
-            if version not in ["23.08", "24.08", "25.08"]:
+            if version not in SUPPORTED_FLATPAK_VERSIONS:
                 return self._error_response(BaseResponse, "Invalid version. Must be '23.08', '24.08', or '25.08'")
 
             if not self.check_flatpak_available():
@@ -301,7 +465,7 @@ class FlatpakService(BaseService):
                                           apps=[], total_apps=0)
 
             result = self._run_flatpak_command(
-                ["list", "--app"],
+                ["list", "--user", "--app"],
                 capture_output=True, text=True, check=True
             )
 
@@ -337,15 +501,9 @@ class FlatpakService(BaseService):
     def _check_app_override_status(self, app_id: str) -> Dict[str, bool]:
         """Check if an app has lsfg-vk overrides set"""
         try:
-            result = self._run_flatpak_command(
-                ["override", "--user", "--show", app_id],
-                capture_output=True, text=True
-            )
-
-            if result.returncode != 0:
+            output = self._get_app_override_output(app_id)
+            if output is None:
                 return {"filesystem": False, "env": False}
-
-            output = result.stdout
             config_path, dll_directory = self._get_lsfg_paths()
 
             filesystem_section = ""
diff --git a/py_modules/lsfg_vk/plugin.py b/py_modules/lsfg_vk/plugin.py
index c2f22e3..1b99501 100644
--- a/py_modules/lsfg_vk/plugin.py
+++ b/py_modules/lsfg_vk/plugin.py
@@ -37,12 +37,23 @@ class Plugin:
         self.flatpak_service = FlatpakService()
 
     async def install_lsfg_vk(self) -> Dict[str, Any]:
-        """Install lsfg-vk by extracting the zip file to ~/.local
+        """Install/update the native layer and migrate installed Flatpak integrations.
         
         Returns:
             InstallationResponse dict with success status and message/error
         """
-        return self.installation_service.install()
+        installation_result = self.installation_service.install()
+        if not installation_result.get("success"):
+            return installation_result
+
+        flatpak_result = self.flatpak_service.update_installed_extensions()
+        installation_result["flatpak_update"] = flatpak_result
+        if not flatpak_result.get("success") and not flatpak_result.get("skipped"):
+            installation_result["message"] = (
+                f"{installation_result.get('message', 'lsfg-vk updated successfully')}; "
+                f"Flatpak migration warning: {flatpak_result.get('error', 'unknown error')}"
+            )
+        return installation_result
 
     async def check_lsfg_vk_installed(self) -> Dict[str, Any]:
         """Check if lsfg-vk is already installed
@@ -359,7 +370,7 @@ class Plugin:
         return self.flatpak_service.get_extension_status()
 
     async def install_flatpak_extension(self, version: str) -> Dict[str, Any]:
-        """Install lsfg-vk Flatpak runtime extension
+        """Install or update an lsfg-vk Flatpak runtime extension
         
         Args:
             version: Runtime version to install ("23.08", "24.08", or "25.08")
diff --git a/py_modules/lsfg_vk/types.py b/py_modules/lsfg_vk/types.py
index 6f3cd05..3210d25 100644
--- a/py_modules/lsfg_vk/types.py
+++ b/py_modules/lsfg_vk/types.py
@@ -25,6 +25,7 @@ class InstallationResponse(BaseResponse):
     """Response for installation operations"""
     message: str
     error: Optional[str]
+    flatpak_update: Optional[Dict[str, Any]]
 
 
 class UninstallationResponse(BaseResponse):