M5: AMO install flow, prompt model, uninstall; M6: nothing here

app/src/main/java/dev/nova/browser/TabManager.kt

@@ -21,10 +21,12 @@ import java.io.File
  * Navigation/loading state arrives via delegates (no polling getters exist).
  * Session restore is URL-level. History powers the URL bar autocomplete.
  *
- * M3 extension registry: WebExtensionController.list() refreshes a local
- * registry of installed add-ons; enable/disable go through the controller
- * with EnableSource.USER. Enabled state is tracked locally (the current
- * WebExtension javadoc does not expose a stable isEnabled accessor).
+ * M3/M5 extension registry: WebExtensionController.list() refreshes a local
+ * registry; enable/disable/uninstall/install go through the controller.
+ * Enabled state is tracked locally (no stable isEnabled accessor in the
+ * current WebExtension javadoc). Install permission prompts are surfaced to
+ * the UI through pendingInstall — GV refuses installs without a
+ * PromptDelegate that returns a GeckoResult.
  */
 class TabManager(private val runtime: GeckoRuntime, private val context: Context) {
 
@@ -36,6 +38,15 @@ class TabManager(private val runtime: GeckoRuntime, private val context: Context
         val name: String,
         val version: String,
         val description: String,
+        val isBuiltIn: Boolean,
+    )
+
+    /** M5: an install-permission prompt awaiting the user's decision. */
+    data class InstallPrompt(
+        val name: String,
+        val permissions: List<String>,
+        val origins: List<String>,
+        val respond: (allow: Boolean) -> Unit,
     )
 
     /** Observable tab list for Compose. */
@@ -60,10 +71,13 @@ class TabManager(private val runtime: GeckoRuntime, private val context: Context
     /** Console lines forwarded from the dev-console extension. */
     val consoleLines = mutableStateListOf<String>()
 
-    /** M3: extension id → enabled, tracked by Nova (see class comment). */
+    /** Extension id → enabled, tracked by Nova (see class comment). */
     val extensionStates = mutableStateMapOf<String, Boolean>()
     private val extensionsById = mutableMapOf<String, WebExtension>()
 
+    /** M5: install-permission prompt currently awaiting user decision. */
+    val pendingInstall = mutableStateOf<InstallPrompt?>(null)
+
     private var nextId = 1
     private var restoring = false
 
@@ -137,7 +151,12 @@ class TabManager(private val runtime: GeckoRuntime, private val context: Context
             }
         }
 
-        session.open(runtime)
+        // M6: per-session tracking protection on top of the runtime policy.
+        val settings = GeckoSessionSettings.Builder()
+            .useTrackingProtection(true)
+            .build()
+
+        session.open(runtime, settings)
 
         // Content scripts of the dev-console extension can sendNativeMessage to us.
         devExtension?.let { ext ->
@@ -186,7 +205,7 @@ class TabManager(private val runtime: GeckoRuntime, private val context: Context
         activeTabId.value?.let { canGoForwardStates[it] == true } ?: false
 
     // ------------------------------------------------------------------
-    // Extension registry (M3)
+    // Extension registry (M3/M5)
     // ------------------------------------------------------------------
 
     /**
@@ -200,12 +219,12 @@ class TabManager(private val runtime: GeckoRuntime, private val context: Context
                 val infos = list?.map { ext ->
                     extensionsById[ext.id] = ext
                     if (!extensionStates.containsKey(ext.id)) extensionStates[ext.id] = true
-                    val name = ext.metaData?.name
                     TabManager.ExtInfo(
                         id = ext.id,
-                        name = name?.ifBlank { ext.id } ?: ext.id,
+                        name = ext.metaData?.name?.ifBlank { ext.id } ?: ext.id,
                         version = ext.metaData?.version ?: "",
                         description = ext.metaData?.description ?: "",
+                        isBuiltIn = ext.isBuiltIn,
                     )
                 } ?: emptyList()
                 callback(infos)
@@ -248,6 +267,65 @@ class TabManager(private val runtime: GeckoRuntime, private val context: Context
         )
     }
 
+    /** M5: uninstalls a non-builtin extension. */
+    fun uninstallExtension(id: String, onDone: () -> Unit) {
+        val ext = extensionsById[id]
+        if (ext == null) {
+            Log.w("Nova", "uninstallExtension: unknown extension $id")
+            onDone()
+            return
+        }
+        runtime.webExtensionController.uninstall(ext).accept(
+            {
+                extensionsById.remove(id)
+                extensionStates.remove(id)
+                Log.i("Nova", "Extension $id uninstalled")
+                onDone()
+            },
+            { error ->
+                Log.e("Nova", "uninstall failed for $id", error)
+                onDone()
+            }
+        )
+    }
+
+    /**
+     * M5: installs an AMO add-on from its .xpi URL or add-on page URL.
+     * install(uri) accepts a remote https: .xpi; GV downloads, validates the
+     * Mozilla signature, then raises onInstallPromptRequest via the prompt
+     * delegate (see BrowserActivity) — the user decision flows through
+     * pendingInstall.
+     */
+    fun installFromAmo(input: String, onResult: (ok: Boolean, message: String) -> Unit) {
+        val trimmed = input.trim()
+        val xpiUrl = when {
+            trimmed.endsWith(".xpi") -> trimmed
+            trimmed.contains("addons.mozilla.org") && trimmed.contains("/addon/") -> {
+                val slug = trimmed.substringAfter("/addon/").substringBefore("/").trim('/')
+                if (slug.isBlank()) null else "https://addons.mozilla.org/firefox/downloads/latest/$slug/addon.xpi"
+            }
+            else -> null
+        }
+        if (xpiUrl == null) {
+            onResult(false, "Paste an AMO add-on URL (addons.mozilla.org/…/addon/…) or a direct .xpi link.")
+            return
+        }
+        Log.i("Nova", "Installing extension from $xpiUrl")
+        runtime.webExtensionController.install(xpiUrl, WebExtensionController.INSTALLATION_METHOD_MANAGER).accept(
+            { ext ->
+                if (ext != null) {
+                    extensionsById[ext.id] = ext
+                    extensionStates[ext.id] = true
+                }
+                onResult(true, "Installed ${ext?.id ?: "add-on"}")
+            },
+            { error ->
+                Log.e("Nova", "install failed", error)
+                onResult(false, "Install failed: ${error.message}")
+            }
+        )
+    }
+
     // ------------------------------------------------------------------
     // History (M2)
     // ------------------------------------------------------------------