Archipelago — open-source initial import

Android/MONTSERRAT-OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

Android/app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "com.archipelago.app"
         minSdk = 26
         targetSdk = 35
-        versionCode = 47
-        versionName = "0.5.27"
+        versionCode = 45
+        versionName = "0.5.25"
 
         vectorDrawables {
             useSupportLibrary = true

Android/app/src/main/java/com/archipelago/app/ArchipelagoApp.kt

@@ -1,40 +1,5 @@
 package com.archipelago.app
 
 import android.app.Application
-import android.os.Looper
-import android.webkit.WebView
-import com.archipelago.app.data.ServerPreferences
-import com.archipelago.app.fips.FipsNative
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
 
-class ArchipelagoApp : Application() {
-
-    private val warmupScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-    override fun onCreate() {
-        super.onCreate()
-
-        // Warmups that otherwise land inside the first frame:
-        // - FipsNative.available dlopens the 7 MB Rust core; referenced from
-        //   composition (NESMenu, mesh auto-start), it blocked the UI thread.
-        // - The first DataStore read gates the nav graph's start destination;
-        //   parsing it here means the launch gate resolves in the first
-        //   emission instead of waiting on cold disk IO.
-        warmupScope.launch {
-            FipsNative.available
-            runCatching { ServerPreferences(this@ArchipelagoApp).launchState.first() }
-        }
-
-        // First WebView construction pays Chromium provider load (~150-400 ms
-        // cold). Absorb it while the main thread is idle before the kiosk
-        // needs it, instead of serially after the connection probe.
-        Looper.getMainLooper().queue.addIdleHandler {
-            runCatching { WebView(this).destroy() }
-            false // one-shot
-        }
-    }
-}
+class ArchipelagoApp : Application()

Android/app/src/main/java/com/archipelago/app/MainActivity.kt

@@ -9,7 +9,6 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.archipelago.app.ui.navigation.AppNavHost
-import com.archipelago.app.ui.screens.releaseKioskWebView
 import com.archipelago.app.ui.theme.ArchipelagoTheme
 import kotlinx.coroutines.flow.MutableStateFlow
 
@@ -20,13 +19,7 @@ class MainActivity : ComponentActivity() {
     private val pendingPairUri = MutableStateFlow<String?>(null)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        // Hold the branded system splash until the nav graph has its launch
-        // state — without this the splash dropped at the first composed frame,
-        // which was EMPTY (the DataStore read hadn't landed): splash → black
-        // flash → UI on every launch.
-        var navReady = false
-        val splash = installSplashScreen()
-        splash.setKeepOnScreenCondition { !navReady }
+        installSplashScreen()
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         pendingPairUri.value = intent?.dataString
@@ -36,7 +29,6 @@ class MainActivity : ComponentActivity() {
                 AppNavHost(
                     pairUri = pairUri,
                     onPairUriConsumed = { pendingPairUri.value = null },
-                    onReady = { navReady = true },
                 )
             }
         }
@@ -46,14 +38,4 @@ class MainActivity : ComponentActivity() {
         super.onNewIntent(intent)
         pendingPairUri.value = intent.dataString
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        // Swiped out of recents (or otherwise finished) — let go of the
-        // retained kiosk WebView so the next launch starts clean. Without
-        // this the FIPS service keeps the process (and the static WebView)
-        // alive, and "close the app" no longer restarted it. isFinishing
-        // keeps config changes (rotation) on the fast reattach path.
-        if (isFinishing) releaseKioskWebView()
-    }
 }

Android/app/src/main/java/com/archipelago/app/data/ServerPreferences.kt

@@ -9,7 +9,6 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.core.stringSetPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "server_prefs")
@@ -30,18 +29,6 @@ data class ServerEntry(
     /** Label to show in lists — the user-given name, or the address if unnamed. */
     fun displayName(): String = name.ifBlank { address }
 
-    /**
-     * Is this node reachable over the Archipelago FIPS mesh?
-     *
-     * A node that advertised either identity (npub) or a mesh address (ULA)
-     * came from a FIPS-capable pairing QR. Anything else — a hand-entered LAN
-     * box, someone else's server behind their own VPN — is a plain HTTP
-     * target, and the companion must NOT raise its own tunnel for it: Android
-     * allows exactly one VPN at a time, so doing so would silently take the
-     * tunnel away from whatever the user actually uses to reach that node.
-     */
-    fun isFipsNode(): Boolean = npub.isNotBlank() || meshIp.isNotBlank()
-
     /** Bracket bare IPv6 literals (the mesh ULA) so they form valid URLs. */
     private fun urlHost(host: String): String =
         if (host.contains(":") && !host.startsWith("[")) "[$host]" else host
@@ -102,9 +89,9 @@ class ServerPreferences(private val context: Context) {
     private val introSeenKey = booleanPreferencesKey("intro_seen")
     private val gestureHintSeenKey = booleanPreferencesKey("gesture_hint_seen")
 
-    private fun activeServerFrom(prefs: Preferences): ServerEntry? {
-        val address = prefs[activeAddressKey] ?: return null
-        return ServerEntry(
+    val activeServer: Flow<ServerEntry?> = context.dataStore.data.map { prefs ->
+        val address = prefs[activeAddressKey] ?: return@map null
+        ServerEntry(
             address = address,
             useHttps = prefs[activeHttpsKey] ?: false,
             port = prefs[activePortKey] ?: "",
@@ -115,52 +102,19 @@ class ServerPreferences(private val context: Context) {
         )
     }
 
-    // distinctUntilChanged on every flow: DataStore emits on EVERY write to the
-    // file regardless of key, and each spurious emission recomposed whatever
-    // screen collected it (the kiosk recomposed on gesture-hint writes).
-
-    val activeServer: Flow<ServerEntry?> = context.dataStore.data
-        .map { prefs -> activeServerFrom(prefs) }
-        .distinctUntilChanged()
-
     val savedServers: Flow<List<ServerEntry>> = context.dataStore.data.map { prefs ->
         val raw = prefs[savedServersKey] ?: emptySet()
-        // Sorted so set-iteration order can't produce a structurally different
-        // list for the same servers (which defeats distinctUntilChanged).
-        raw.mapNotNull { ServerEntry.deserialize(it) }.sortedBy { it.displayName() }
-    }.distinctUntilChanged()
+        raw.mapNotNull { ServerEntry.deserialize(it) }
+    }
 
     val introSeen: Flow<Boolean> = context.dataStore.data.map { prefs ->
         prefs[introSeenKey] ?: false
-    }.distinctUntilChanged()
+    }
 
     /** One-shot flag for the three-finger-hold teaching overlay. */
     val gestureHintSeen: Flow<Boolean> = context.dataStore.data.map { prefs ->
         prefs[gestureHintSeenKey] ?: false
-    }.distinctUntilChanged()
-
-    /** Everything the nav graph needs to pick a start destination, derived
-     *  from ONE DataStore emission. Collecting introSeen and activeServer as
-     *  two separate flows let them land in different frames — the intro flag
-     *  could resolve first and flash the Connect screen at a paired user
-     *  before the active server arrived. */
-    data class LaunchState(
-        val introSeen: Boolean,
-        val activeServer: ServerEntry?,
-        /** Every saved node — the launch gate needs the COUNT to decide
-         *  whether to ask which one to connect to. */
-        val savedServers: List<ServerEntry>,
-    )
-
-    val launchState: Flow<LaunchState> = context.dataStore.data.map { prefs ->
-        LaunchState(
-            introSeen = prefs[introSeenKey] ?: false,
-            activeServer = activeServerFrom(prefs),
-            savedServers = (prefs[savedServersKey] ?: emptySet())
-                .mapNotNull { ServerEntry.deserialize(it) }
-                .sortedBy { it.displayName() },
-        )
-    }.distinctUntilChanged()
+    }
 
     suspend fun setActiveServer(server: ServerEntry) {
         context.dataStore.edit { prefs ->

Android/app/src/main/java/com/archipelago/app/fips/ArchyVpnService.kt

@@ -37,7 +37,6 @@ class ArchyVpnService : VpnService() {
 
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
     private var warmerJob: Job? = null
-    private var handoffKickJob: Job? = null
 
     // Seamless transport handoff (Wi-Fi ⇄ 5G ⇄ future BLE). Without this the
     // tunnel's underlying network stays pinned to the interface that was
@@ -205,20 +204,14 @@ class ArchyVpnService : VpnService() {
 
     /**
      * Track the phone's default network and hand the mesh over to it as the
-     * phone roams (Wi-Fi ⇄ 5G). Two actions per change:
+     * phone roams (Wi-Fi ⇄ 5G, and later BLE). Two actions per change:
      *  1. setUnderlyingNetworks(new) — the tunnel's packets follow the live
      *     network instead of dying on the one it launched with.
      *  2. re-home the mesh — kick the session warmer so discovery + sessions
-     *     rebuild on the new path; the node's own fast-reconnect (1s) redials
-     *     peers over the new route.
+     *     rebuild on the new path immediately; the node's own fast-reconnect
+     *     (1s) redials peers over the new route.
      * onAvailable also fires for the FIRST network, which is how the initial
      * underlying network gets set.
-     *
-     * requestNetwork, NOT registerDefaultNetworkCallback: this app is routed
-     * through its own TUN, so its "default network" IS the VPN — a default
-     * callback fires once with our own tunnel and never again on Wi-Fi ⇄ 5G.
-     * A NetworkRequest's default capabilities include NOT_VPN, so requestNetwork
-     * tracks the best real transport underneath instead.
      */
     private fun registerNetworkHandoff() {
         if (networkCallback != null) return
@@ -243,6 +236,10 @@ class ArchyVpnService : VpnService() {
             }
         }
         networkCallback = cb
+        // requestNetwork tracks the BEST network of the request; when the
+        // phone moves Wi-Fi→5G the callback re-fires onAvailable with the new
+        // one. (registerDefaultNetworkCallback would also work; requestNetwork
+        // lets us extend to BLE-capable transports later.)
         runCatching { cm.requestNetwork(request, cb) }
     }
 
@@ -254,22 +251,13 @@ class ArchyVpnService : VpnService() {
         runCatching { setUnderlyingNetworks(arrayOf(network)) }
         if (changed && FipsNative.isRunning()) {
             Log.i(TAG, "network handoff → re-homing mesh on new default network")
-            // Coalesced, not immediate: marginal Wi-Fi flaps the default
-            // Wi-Fi ⇄ cell in bursts, and an aggressive warmer pass per flip
-            // meant near-constant session churn — the "reconnects a lot"
-            // report. The re-pin above still happens on every change; only
-            // the rediscovery kick waits for the network to hold still.
-            handoffKickJob?.cancel()
-            handoffKickJob = scope.launch {
-                delay(2_000)
-                if (FipsNative.isRunning()) startSessionWarmer()
-            }
+            // Fresh warmer pass drives immediate rediscovery/session rebuild
+            // on the new path instead of waiting out dead-link timeouts.
+            startSessionWarmer()
         }
     }
 
     private fun unregisterNetworkHandoff() {
-        handoffKickJob?.cancel()
-        handoffKickJob = null
         val cm = connectivityManager
         val cb = networkCallback
         if (cm != null && cb != null) {

Android/app/src/main/java/com/archipelago/app/fips/FipsManager.kt

@@ -3,10 +3,8 @@ package com.archipelago.app.fips
 import android.content.Context
 import android.content.Intent
 import android.net.VpnService
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.withContext
 
 /**
  * Glue between pairing and the mesh: persists the node peer from a scanned
@@ -38,27 +36,20 @@ object FipsManager {
      * No-op on devices without the native lib (non-arm64).
      */
     suspend fun registerNode(context: Context, info: FipsPairInfo?, alias: String) {
-        if (info == null) return
-        // Every caller reaches this from a Compose scope — i.e. the MAIN
-        // thread — the instant a pairing QR decodes. Everything below is
-        // main-hostile: touching FipsNative dlopens the 7 MB mesh core,
-        // ensureIdentity runs native ed25519 keygen, and VpnService.prepare
-        // is a binder round-trip. Left on the UI thread it froze the frame
-        // right after the camera got the code, which reads as "the scanner
-        // is slow" when the scan itself already succeeded.
-        val consent = withContext(Dispatchers.IO) {
-            if (!FipsNative.available) return@withContext null
-            val prefs = FipsPreferences(context)
-            ensureIdentity(prefs)
-            prefs.upsertNodePeer(info, alias)
-            peersDirty = true
-            // Restart the mesh with the new peer RIGHT NOW when consent already
-            // exists — relying on the consentNeeded collector left a running
-            // mesh on the OLD peer list whenever the collector wasn't active
-            // (fresh pairings looked dead until a full app restart).
-            VpnService.prepare(context) == null
-        } ?: return
-        if (consent) startService(context) else _consentNeeded.value = true
+        if (info == null || !FipsNative.available) return
+        val prefs = FipsPreferences(context)
+        ensureIdentity(prefs)
+        prefs.upsertNodePeer(info, alias)
+        peersDirty = true
+        // Restart the mesh with the new peer RIGHT NOW when consent already
+        // exists — relying on the consentNeeded collector left a running
+        // mesh on the OLD peer list whenever the collector wasn't active
+        // (fresh pairings looked dead until a full app restart).
+        if (VpnService.prepare(context) == null) {
+            startService(context)
+        } else {
+            _consentNeeded.value = true
+        }
     }
 
     /** Generate-once mesh identity. Returns null only if the RNG/native fails. */
@@ -76,17 +67,11 @@ object FipsManager {
      * through AppNavHost instead.
      */
     suspend fun autoStartIfReady(context: Context) {
-        // Self-dispatching for the same reason as registerNode: callers reach
-        // this from Compose scopes, and dlopen + binder must not ride the UI
-        // thread (the connect path calls it while the scanner is still up).
-        val ready = withContext(Dispatchers.IO) {
-            if (!FipsNative.available) return@withContext false
-            val prefs = FipsPreferences(context)
-            if (prefs.identity() == null || !prefs.hasPeers()) return@withContext false
-            // consent missing — don't prompt here
-            VpnService.prepare(context) == null
-        }
-        if (ready) startService(context)
+        if (!FipsNative.available) return
+        val prefs = FipsPreferences(context)
+        if (prefs.identity() == null || !prefs.hasPeers()) return
+        if (VpnService.prepare(context) != null) return // consent missing — don't prompt here
+        startService(context)
     }
 
     fun startService(context: Context) {

Android/app/src/main/java/com/archipelago/app/ui/components/MeshLoadingScreen.kt

@@ -1,46 +1,37 @@
 package com.archipelago.app.ui.components
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.archipelago.app.R
+import com.archipelago.app.ui.screens.PixelArtLogo
 import com.archipelago.app.ui.theme.BitcoinOrange
 import com.archipelago.app.ui.theme.SurfaceBlack
 import com.archipelago.app.ui.theme.TextMuted
-import com.archipelago.app.ui.theme.TextPrimary
 
 /**
- * Full-screen loader shown while the app is dialing a node.
- *
- * Two faces, because they are two different promises:
- *  - [mesh] `true` — a FIPS node: the branded "F*CK IPs" screen, because what
- *    is loading really is a connection to a cryptographic identity, not an IP.
- *  - [mesh] `false` — a plain node reached over the network like anything
- *    else. No mesh branding at all: claiming the mesh is carrying a connection
- *    it isn't is worse than an anonymous spinner.
+ * The branded "F*CK IPs" full-screen loader — shown whenever the app is
+ * dialing the node over the mesh (relaunch race, post-scan first connect),
+ * instead of an anonymous spinner. The point of the brand: what's loading
+ * is a connection to a cryptographic identity, not an IP.
  */
 @Composable
-fun MeshLoadingScreen(
-    mesh: Boolean = true,
-    nodeName: String = "",
-    done: Boolean = false,
-) {
+fun MeshLoadingScreen(message: String = "Dialing your node by its key — no IPs harmed") {
     Box(
         Modifier
             .fillMaxSize()
@@ -48,39 +39,39 @@ fun MeshLoadingScreen(
         contentAlignment = Alignment.Center,
     ) {
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
-            // The app's own badge — the same ringed mark as the launcher icon
-            // and the system splash, so launch → splash → this screen is one
-            // continuous identity.
-            Image(
-                painter = painterResource(id = R.drawable.ic_logo),
-                contentDescription = null,
-                modifier = Modifier.size(112.dp),
-            )
-            Spacer(Modifier.height(24.dp))
+            // The brand's circle-container logo (as on the connect screen /
+            // web login): pixel-art "a" centered in a black disc.
+            Box(
+                Modifier
+                    .size(120.dp)
+                    .clip(androidx.compose.foundation.shape.CircleShape)
+                    .background(Color.Black)
+                    .border(
+                        1.dp,
+                        Color.White.copy(alpha = 0.14f),
+                        androidx.compose.foundation.shape.CircleShape,
+                    ),
+                contentAlignment = Alignment.Center,
+            ) {
+                PixelArtLogo(Modifier.size(64.dp))
+            }
+            Spacer(Modifier.height(20.dp))
             Text(
-                text = if (mesh) "F*CK IPS MESH" else "CONNECTING",
+                text = "F*CK IPs MESH",
                 color = BitcoinOrange,
-                fontSize = 16.sp,
+                fontSize = 18.sp,
                 fontWeight = FontWeight.Bold,
                 letterSpacing = 4.sp,
             )
-            Spacer(Modifier.height(10.dp))
+            Spacer(Modifier.height(8.dp))
             Text(
-                text = when {
-                    mesh -> "Dialing your node by its key — no IPs harmed"
-                    nodeName.isNotBlank() -> "Reaching $nodeName"
-                    else -> "Reaching your node"
-                },
-                color = if (done) TextPrimary else TextMuted,
+                text = message,
+                color = TextMuted,
                 fontSize = 13.sp,
                 textAlign = TextAlign.Center,
-                modifier = Modifier.padding(horizontal = 32.dp),
-            )
-            Spacer(Modifier.height(28.dp))
-            SlidingLoader(
-                modifier = Modifier.width(220.dp),
-                done = done,
             )
+            Spacer(Modifier.height(24.dp))
+            CircularProgressIndicator(color = BitcoinOrange)
         }
     }
 }

Android/app/src/main/java/com/archipelago/app/ui/components/NESMenu.kt

@@ -30,7 +30,6 @@ import androidx.compose.material.icons.filled.Dashboard
 import androidx.compose.material.icons.filled.Dns
 import androidx.compose.material.icons.filled.Groups
 import androidx.compose.material.icons.filled.Keyboard
-import androidx.compose.material.icons.filled.RestartAlt
 import androidx.compose.material.icons.filled.SportsEsports
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -71,7 +70,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.archipelago.app.R
 import com.archipelago.app.data.ServerEntry
-import com.archipelago.app.ui.screens.restartCompanionApp
 import com.archipelago.app.ui.theme.BitcoinOrange
 import com.archipelago.app.ui.theme.SurfaceDark
 import com.archipelago.app.ui.theme.TextMuted
@@ -223,11 +221,7 @@ private fun MenuPanel(
                 HubCard(Icons.Default.Dns, "Nodes", activeServer?.displayName() ?: "Add or switch servers") {
                     page = HubPage.NODES
                 }
-                // Mesh oversight only when this session is actually on the
-                // mesh. Offering "FIPS Mesh" while connected to a plain node
-                // (whose traffic is going nowhere near the tunnel) advertises
-                // a connection the user doesn't have.
-                if (FipsNative.available && activeServer?.isFipsNode() == true) {
+                if (FipsNative.available) {
                     HubCard(Icons.Default.Bolt, "FIPS Mesh", "Mesh identity & status") { page = HubPage.FIPS }
                 }
                 if (onMeshParty != null) {
@@ -235,36 +229,6 @@ private fun MenuPanel(
                 }
                 // Dark/Classic style lives on the remote/keyboard screen next to
                 // the settings button — not here.
-
-                // Small version chip at the hub's foot — the one place a
-                // connected user can always check what build they're on.
-                val hubContext = LocalContext.current
-
-                // Restart: the dashboard WebView is retained across
-                // remote ⇄ dashboard (that's the point), which also means a
-                // wedged page can't be cleared by leaving the screen. This
-                // throws the page away and relaunches the app clean — the mesh
-                // service keeps running.
-                HubCard(Icons.Default.RestartAlt, "Restart", "Reload the app from scratch") {
-                    onDismiss()
-                    restartCompanionApp(hubContext)
-                }
-                val versionLabel = remember {
-                    runCatching {
-                        hubContext.packageManager
-                            .getPackageInfo(hubContext.packageName, 0).versionName
-                    }.getOrNull()?.let { "Companion v$it" } ?: ""
-                }
-                if (versionLabel.isNotEmpty()) {
-                    Text(
-                        versionLabel,
-                        color = TextMuted.copy(alpha = 0.6f),
-                        fontSize = 11.sp,
-                        letterSpacing = 1.sp,
-                        textAlign = TextAlign.Center,
-                        modifier = Modifier.fillMaxWidth().padding(top = 6.dp),
-                    )
-                }
             }
 
             HubPage.NODES -> {

Android/app/src/main/java/com/archipelago/app/ui/components/QrScannerOverlay.kt

@@ -1,24 +1,14 @@
 package com.archipelago.app.ui.components
 
 import android.Manifest
-import android.content.Context
 import android.content.pm.PackageManager
-import android.hardware.camera2.CameraCharacteristics
-import android.hardware.camera2.CameraManager
-import android.hardware.camera2.CameraMetadata
-import android.hardware.camera2.CaptureRequest
-import android.os.Process
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.camera.camera2.interop.Camera2Interop
-import androidx.camera.camera2.interop.ExperimentalCamera2Interop
 import androidx.camera.core.CameraSelector
-import androidx.camera.core.FocusMeteringAction
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
 import androidx.camera.core.Preview
-import androidx.camera.core.SurfaceOrientedMeteringPointFactory
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.view.PreviewView
 import androidx.compose.animation.AnimatedVisibility
@@ -26,26 +16,22 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.FlashOff
-import androidx.compose.material.icons.filled.FlashOn
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -60,15 +46,10 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
@@ -78,26 +59,23 @@ import com.archipelago.app.data.PairResult
 import com.archipelago.app.data.ServerQrParser
 import com.archipelago.app.ui.screens.GlassButton
 import com.archipelago.app.ui.theme.BitcoinOrange
+import com.archipelago.app.ui.theme.TextMuted
+import com.archipelago.app.ui.theme.TextPrimary
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.BinaryBitmap
 import com.google.zxing.DecodeHintType
 import com.google.zxing.MultiFormatReader
+import com.google.zxing.NotFoundException
 import com.google.zxing.PlanarYUVLuminanceSource
-import com.google.zxing.common.GlobalHistogramBinarizer
 import com.google.zxing.common.HybridBinarizer
-import com.google.zxing.qrcode.QRCodeReader
 import kotlinx.coroutines.delay
 import java.util.concurrent.Executors
 
 /**
- * Scans the node pairing QR (docs/companion-pairing-qr.md) and reports the
- * decoded server entry. Handles the camera permission itself; foreign/invalid
- * codes show a hint in the status strip and scanning continues.
- *
- * Visually this is the SAME glass modal the web wallet uses (neode-ui's
- * WalletScanModal) — scrim, glass card, square preview, orange viewfinder,
- * status strip — so pairing from the app and scanning from the web UI look
- * like one product rather than two different scanners.
+ * Full-screen camera overlay that scans the node pairing QR
+ * (docs/companion-pairing-qr.md) and reports the decoded server entry.
+ * Handles the camera permission itself; foreign/invalid codes show a hint
+ * and scanning continues.
  */
 @Composable
 fun QrScannerOverlay(
@@ -105,14 +83,28 @@ fun QrScannerOverlay(
     onDismiss: () -> Unit,
     onServerScanned: (PairResult.Success) -> Unit,
 ) {
-    val haptics = LocalHapticFeedback.current
+    val context = LocalContext.current
+    var hasPermission by remember {
+        mutableStateOf(
+            ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) ==
+                PackageManager.PERMISSION_GRANTED
+        )
+    }
     var hintRes by remember { mutableStateOf<Int?>(null) }
     var handled by remember { mutableStateOf(false) }
 
+    val permissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { granted -> hasPermission = granted }
+
     LaunchedEffect(visible) {
         if (visible) {
             handled = false
             hintRes = null
+            val granted = ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) ==
+                PackageManager.PERMISSION_GRANTED
+            hasPermission = granted
+            if (!granted) permissionLauncher.launch(Manifest.permission.CAMERA)
         }
     }
 
@@ -124,331 +116,125 @@ fun QrScannerOverlay(
         }
     }
 
-    QrGlassModal(
-        visible = visible,
-        title = stringResource(R.string.scan_node_qr),
-        status = hintRes?.let { stringResource(it) to true },
-        idleHint = stringResource(R.string.scan_qr_hint),
-        permissionRationale = stringResource(R.string.camera_permission_needed),
-        onDismiss = onDismiss,
-        onDecoded = { text ->
-            if (!handled) {
-                when (val result = ServerQrParser.parse(text)) {
-                    is PairResult.Success -> {
-                        handled = true
-                        // Confirm the hit in the hand — the eye is still on the
-                        // code, not on the screen.
-                        haptics.performHapticFeedback(HapticFeedbackType.LongPress)
-                        onServerScanned(result)
-                    }
-                    is PairResult.UnsupportedVersion -> hintRes = R.string.update_app_for_qr
-                    is PairResult.Invalid -> hintRes = R.string.invalid_pairing_qr
-                }
-            }
-        },
-    )
-}
-
-/**
- * The shared native scanner shell — one visual contract for every camera the
- * app opens (pairing, wallet), mirroring neode-ui's WalletScanModal so the
- * native and web scanners are indistinguishable:
- *  - black/60 scrim, dismiss on tap-outside
- *  - glass card (rounded 24, white/10 hairline) capped at 420dp
- *  - square preview with the 62% orange viewfinder and a darkened surround
- *  - a status strip that carries hints and errors
- *  - an optional footer (the wallet's "Upload image")
- */
-@Composable
-internal fun QrGlassModal(
-    visible: Boolean,
-    title: String,
-    // message + isError; null falls back to [idleHint].
-    status: Pair<String, Boolean>?,
-    idleHint: String,
-    permissionRationale: String,
-    onDismiss: () -> Unit,
-    onDecoded: (String) -> Unit,
-    footer: @Composable (() -> Unit)? = null,
-) {
-    val context = LocalContext.current
-    var hasPermission by remember {
-        mutableStateOf(
-            ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) ==
-                PackageManager.PERMISSION_GRANTED
-        )
-    }
-    var torchOn by remember { mutableStateOf(false) }
-    var hasTorch by remember { mutableStateOf(false) }
-
-    val permissionLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { granted -> hasPermission = granted }
-
-    LaunchedEffect(visible) {
-        if (visible) {
-            val granted = ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) ==
-                PackageManager.PERMISSION_GRANTED
-            hasPermission = granted
-            if (!granted) permissionLauncher.launch(Manifest.permission.CAMERA)
-        } else {
-            torchOn = false
-        }
-    }
-
     AnimatedVisibility(visible = visible, enter = fadeIn(), exit = fadeOut()) {
         BackHandler { onDismiss() }
         Box(
             Modifier
                 .fillMaxSize()
-                .background(Color.Black.copy(alpha = 0.6f))
-                .clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = onDismiss,
-                ),
-            contentAlignment = Alignment.Center,
+                .background(Color.Black),
         ) {
-            Column(
-                Modifier
-                    .padding(16.dp)
-                    .widthIn(max = 420.dp)
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(24.dp))
-                    .background(Color(0xF212151C))
-                    .border(1.dp, Color.White.copy(alpha = 0.10f), RoundedCornerShape(24.dp))
-                    .clickable(
-                        interactionSource = remember { MutableInteractionSource() },
-                        indication = null,
-                        onClick = {}, // swallow — only the scrim dismisses
-                    )
-                    .padding(24.dp),
-            ) {
-                Row(
-                    Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    Text(
-                        text = title,
-                        style = MaterialTheme.typography.titleLarge,
-                        fontWeight = FontWeight.SemiBold,
-                        color = Color.White,
-                    )
-                    IconButton(onClick = onDismiss) {
-                        Icon(
-                            Icons.Default.Close,
-                            stringResource(R.string.close),
-                            tint = Color.White.copy(alpha = 0.7f),
-                        )
-                    }
-                }
-
-                Spacer(Modifier.height(8.dp))
-
-                Box(
-                    Modifier
-                        .fillMaxWidth()
-                        .aspectRatio(1f)
-                        .clip(RoundedCornerShape(12.dp))
-                        .background(Color.Black.copy(alpha = 0.4f))
-                        .border(1.dp, Color.White.copy(alpha = 0.10f), RoundedCornerShape(12.dp)),
-                    contentAlignment = Alignment.Center,
-                ) {
-                    if (hasPermission) {
-                        CameraQrPreview(
-                            onDecoded = onDecoded,
-                            torchOn = torchOn,
-                            onTorchAvailable = { hasTorch = it },
-                        )
-                        // Viewfinder — 62% of the preview, matching the web
-                        // modal's .scan-viewfinder, and matching the ROI the
-                        // decoder actually reads (QR_ROI_FRACTION).
-                        Box(
-                            Modifier
-                                .fillMaxSize(QR_ROI_FRACTION)
-                                .border(
-                                    2.dp,
-                                    BitcoinOrange.copy(alpha = 0.85f),
-                                    RoundedCornerShape(16.dp),
-                                ),
-                        )
-                        if (hasTorch) {
-                            IconButton(
-                                onClick = { torchOn = !torchOn },
-                                modifier = Modifier
-                                    .align(Alignment.TopEnd)
-                                    .padding(6.dp)
-                                    .clip(RoundedCornerShape(50))
-                                    .background(Color.Black.copy(alpha = 0.45f)),
-                            ) {
-                                Icon(
-                                    if (torchOn) Icons.Default.FlashOn else Icons.Default.FlashOff,
-                                    stringResource(
-                                        if (torchOn) R.string.torch_off else R.string.torch_on,
-                                    ),
-                                    tint = if (torchOn) BitcoinOrange else Color.White.copy(alpha = 0.85f),
-                                )
+            if (hasPermission) {
+                CameraQrPreview(
+                    onDecoded = { text ->
+                        if (!handled) {
+                            when (val result = ServerQrParser.parse(text)) {
+                                is PairResult.Success -> {
+                                    handled = true
+                                    onServerScanned(result)
+                                }
+                                is PairResult.UnsupportedVersion -> hintRes = R.string.update_app_for_qr
+                                is PairResult.Invalid -> hintRes = R.string.invalid_pairing_qr
                             }
                         }
-                    } else {
-                        Column(
-                            Modifier.padding(horizontal = 24.dp),
-                            horizontalAlignment = Alignment.CenterHorizontally,
-                            verticalArrangement = Arrangement.spacedBy(12.dp),
-                        ) {
-                            Text(
-                                text = permissionRationale,
-                                color = Color.White.copy(alpha = 0.7f),
-                                style = MaterialTheme.typography.bodyMedium,
-                                textAlign = TextAlign.Center,
-                            )
-                            GlassButton(
-                                text = stringResource(R.string.grant_camera_access),
-                                onClick = { permissionLauncher.launch(Manifest.permission.CAMERA) },
-                                modifier = Modifier.fillMaxWidth().height(48.dp),
-                            )
-                        }
-                    }
-                }
-
-                Spacer(Modifier.height(16.dp))
-
+                    },
+                )
+                // Aim frame
                 Box(
                     Modifier
-                        .fillMaxWidth()
-                        .clip(RoundedCornerShape(8.dp))
-                        .background(Color.White.copy(alpha = 0.05f))
-                        .padding(12.dp)
-                        .defaultMinSize(minHeight = 24.dp),
-                    contentAlignment = Alignment.Center,
+                        .align(Alignment.Center)
+                        .size(260.dp)
+                        .border(2.dp, BitcoinOrange.copy(alpha = 0.85f), RoundedCornerShape(20.dp)),
+                )
+            } else {
+                Column(
+                    Modifier
+                        .align(Alignment.Center)
+                        .padding(horizontal = 32.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
                 ) {
                     Text(
-                        text = status?.first?.takeIf { it.isNotBlank() } ?: idleHint,
-                        style = MaterialTheme.typography.bodySmall,
-                        color = if (status?.second == true) {
-                            Color(0xFFF87171)
-                        } else {
-                            Color.White.copy(alpha = 0.6f)
-                        },
+                        text = stringResource(R.string.camera_permission_needed),
+                        color = TextPrimary,
+                        style = MaterialTheme.typography.bodyLarge,
+                        textAlign = TextAlign.Center,
+                    )
+                    GlassButton(
+                        text = stringResource(R.string.grant_camera_access),
+                        onClick = { permissionLauncher.launch(Manifest.permission.CAMERA) },
+                        modifier = Modifier.fillMaxWidth().height(56.dp),
+                    )
+                }
+            }
+
+            // Top bar: title + close
+            Row(
+                Modifier
+                    .fillMaxWidth()
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
+                    .padding(horizontal = 8.dp, vertical = 4.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceBetween,
+            ) {
+                Text(
+                    text = stringResource(R.string.scan_node_qr),
+                    color = TextPrimary,
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier.padding(start = 12.dp),
+                )
+                IconButton(onClick = onDismiss) {
+                    Icon(Icons.Default.Close, stringResource(R.string.close), tint = TextPrimary)
+                }
+            }
+
+            // Bottom hints
+            Column(
+                Modifier
+                    .align(Alignment.BottomCenter)
+                    .windowInsetsPadding(WindowInsets.safeDrawing)
+                    .padding(horizontal = 32.dp, vertical = 24.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
+            ) {
+                hintRes?.let { res ->
+                    Text(
+                        text = stringResource(res),
+                        color = BitcoinOrange,
+                        style = MaterialTheme.typography.bodyMedium,
+                        textAlign = TextAlign.Center,
+                    )
+                    Spacer(Modifier.height(8.dp))
+                }
+                if (hasPermission) {
+                    Text(
+                        text = stringResource(R.string.scan_qr_hint),
+                        color = TextMuted,
+                        style = MaterialTheme.typography.bodyMedium,
                         textAlign = TextAlign.Center,
                     )
                 }
-
-                if (footer != null) {
-                    Spacer(Modifier.height(16.dp))
-                    footer()
-                }
             }
         }
     }
 }
 
-/**
- * Warm the CameraX provider and the ZXing decode path before the user ever
- * asks for a scan, so opening the scanner doesn't pay provider init + class
- * loading on the critical path. Does NOT open the camera: no permission is
- * needed, no LED lights up, nothing is recorded — [ProcessCameraProvider]
- * init is process-wide and cached, and the synthetic decode below just walks
- * a blank 32x32 frame to class-load the binarizer/detector.
- *
- * Called once per process from the kiosk WebView (first page load) and by the
- * page via `ArchipelagoQr.prewarm()`.
- */
-internal fun prewarmQrScanner(context: Context) {
-    if (!qrPrewarmed.compareAndSet(false, true)) return
-    val app = context.applicationContext
-    runCatching { ProcessCameraProvider.getInstance(app) }
-    // Off the UI thread: the first decode attempt loads a dozen ZXing classes.
-    Executors.newSingleThreadExecutor().let { exec ->
-        exec.execute {
-            runCatching {
-                val blank = ByteArray(32 * 32)
-                val reader = MultiFormatReader().apply {
-                    setHints(mapOf(DecodeHintType.POSSIBLE_FORMATS to listOf(BarcodeFormat.QR_CODE)))
-                }
-                val source = PlanarYUVLuminanceSource(blank, 32, 32, 0, 0, 32, 32, false)
-                reader.decodeWithState(BinaryBitmap(HybridBinarizer(source)))
-            }
-        }
-        exec.shutdown()
-    }
-}
-
-private val qrPrewarmed = java.util.concurrent.atomic.AtomicBoolean(false)
-
-/**
- * Fraction of the preview's shorter edge that both the on-screen viewfinder
- * and the decoder's region of interest use. Keeping them identical is the
- * point: the user aims at the box, and the box is exactly what gets decoded.
- */
-internal const val QR_ROI_FRACTION = 0.62f
-
-/**
- * Shared by the pairing scanner and the wallet scan modal.
- *
- * [torchOn] drives the flash; [onTorchAvailable] reports whether this camera
- * has one at all (the caller only draws its toggle when it does).
- *
- * ## Why this looks the way it does
- *
- * The previous version hunted: a scheduled tick alternated the optical zoom
- * between 1x and 1.5x and re-fired `startFocusAndMetering(...disableAutoCancel())`
- * every 2 seconds. Both are camera-hostile:
- *
- *  - Every zoom step restarts AE/AF convergence, so the sensor spends the
- *    seconds right after it delivering soft frames — precisely the frames the
- *    decoder needs to be sharp. The visible symptom is the "zooms in and out
- *    and takes ages" report.
- *  - `disableAutoCancel()` leaves AF **locked** at whatever it converged on
- *    instead of handing the lens back to continuous AF, so a re-aim never
- *    refocused on its own; the next timer tick then kicked off another full
- *    sweep from a locked position — a lens that hunts forever.
- *
- * A stock camera app does neither. It leaves CameraX's continuous AF alone,
- * refocuses on tap, and never touches zoom. This does the same, with one
- * concession to the "hand-held QR is a static scene" case: if nothing has
- * decoded for a few seconds, ONE auto-cancelling focus nudge is issued (and
- * then not again for a while), which re-arms continuous AF instead of
- * fighting it.
- */
+/** Shared by the pairing scanner and the wallet scan modal. */
 @Composable
-internal fun CameraQrPreview(
-    onDecoded: (String) -> Unit,
-    torchOn: Boolean = false,
-    onTorchAvailable: (Boolean) -> Unit = {},
-) {
+internal fun CameraQrPreview(onDecoded: (String) -> Unit) {
     val context = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
     val currentOnDecoded by rememberUpdatedState(onDecoded)
-    val currentOnTorchAvailable by rememberUpdatedState(onTorchAvailable)
-    var camera by remember { mutableStateOf<androidx.camera.core.Camera?>(null) }
     val previewView = remember {
         PreviewView(context).apply {
             scaleType = PreviewView.ScaleType.FILL_CENTER
             // TextureView, not the SurfaceView default: SurfaceView punches a
             // hole in the window, which black-flashes inside Compose fades and
-            // ignores rounded-corner clipping (the glass modal).
+            // ignores rounded-corner clipping (wallet modal).
             implementationMode = PreviewView.ImplementationMode.COMPATIBLE
         }
     }
-    // Set by the analyzer on every decode; the focus nudge below reads it to
-    // tell "nothing in view" from "reading fine, leave the camera alone".
-    val lastDecodeAt = remember { java.util.concurrent.atomic.AtomicLong(0L) }
-    // A tap-to-focus wins over the periodic centre AF for a few seconds.
-    val lastTapFocusAt = remember { java.util.concurrent.atomic.AtomicLong(0L) }
 
     DisposableEffect(Unit) {
-        // Analysis runs at display priority: the decode thread competes with
-        // the FIPS mesh service's native workers in this same process, and a
-        // background-priority analyzer is exactly how a sharp, well-framed
-        // code still takes seconds to land.
-        val analysisExecutor = Executors.newSingleThreadExecutor { r ->
-            Thread {
-                Process.setThreadPriority(Process.THREAD_PRIORITY_DISPLAY)
-                r.run()
-            }.apply { name = "qr-analyzer" }
-        }
+        val analysisExecutor = Executors.newSingleThreadExecutor()
         val mainExecutor = ContextCompat.getMainExecutor(context)
         val providerFuture = ProcessCameraProvider.getInstance(context)
         var provider: ProcessCameraProvider? = null
@@ -457,18 +243,15 @@ internal fun CameraQrPreview(
         providerFuture.addListener({
             val p = providerFuture.get()
             provider = p
-            val previewBuilder = Preview.Builder()
-            tuneForBarcodes(previewBuilder, context)
-            val preview = previewBuilder.build().also {
+            val preview = Preview.Builder().build().also {
                 it.setSurfaceProvider(previewView.surfaceProvider)
             }
             // Dense Lightning-invoice QRs need BOTH enough pixels per module and
-            // sharp focus. 1280x720 left dense invoices undecodable while sparse
-            // address QRs still read — the "scanner doesn't pick up invoices"
-            // report. 1920x1080 roughly doubles module resolution. The analyzer
-            // never binarizes the full 2 MP: it reads the centre ROI at this
-            // resolution (for dense codes) and the whole frame at half of it
-            // (for coverage), so the big frame costs little.
+            // sharp focus. 1280x720 + a far-focused camera (e.g. Pixel 9a's main
+            // lens, which won't focus close) left dense invoices undecodable
+            // while sparse address QRs still read — the "scanner doesn't pick up
+            // invoices" report. 1920x1080 roughly doubles module resolution so a
+            // QR held at the camera's actual focus distance still resolves.
             @Suppress("DEPRECATION")
             val analysis = ImageAnalysis.Builder()
                 .setTargetResolution(android.util.Size(1920, 1080))
@@ -477,47 +260,25 @@ internal fun CameraQrPreview(
                 .also {
                     it.setAnalyzer(
                         analysisExecutor,
-                        QrCodeAnalyzer { text ->
-                            lastDecodeAt.set(System.currentTimeMillis())
-                            mainExecutor.execute { currentOnDecoded(text) }
-                        },
+                        QrCodeAnalyzer { text -> mainExecutor.execute { currentOnDecoded(text) } },
                     )
                 }
             try {
                 p.unbindAll()
                 val cam = p.bindToLifecycle(lifecycleOwner, CameraSelector.DEFAULT_BACK_CAMERA, preview, analysis)
-                camera = cam
-                currentOnTorchAvailable(cam.cameraInfo.hasFlashUnit())
-                // Start the clock at bind time so the nudge below waits for the
-                // user to actually aim before it does anything.
-                lastDecodeAt.set(System.currentTimeMillis())
-                // Centre point, normalized — valid before the view is measured.
-                val point = SurfaceOrientedMeteringPointFactory(1f, 1f).createPoint(0.5f, 0.5f)
-                // A one-shot AF action puts the lens in AUTO — i.e. LOCKED —
-                // until it auto-cancels. The default 5s lock is far too long
-                // here: it spans exactly the window where the user is swinging
-                // the phone towards the code, and a locked lens cannot follow
-                // them. Hand control back after 1s so CONTINUOUS_PICTURE (set
-                // explicitly in tuneForBarcodes) does the real work, which is
-                // what actually tracks a moving aim.
-                val focusAction = FocusMeteringAction.Builder(point, FocusMeteringAction.FLAG_AF)
-                    .setAutoCancelDuration(1, java.util.concurrent.TimeUnit.SECONDS)
-                    .build()
-                var lastNudgeAt = 0L
+                // Force a centre autofocus on a repeating tick. A hand-held QR is
+                // a static scene, so continuous-AF often never retriggers and the
+                // lens sits at its resting (far) focus — fatal for dense codes.
+                // A normalized centre point works before the view is measured.
+                val point = androidx.camera.core.SurfaceOrientedMeteringPointFactory(1f, 1f)
+                    .createPoint(0.5f, 0.5f)
+                val focusAction = androidx.camera.core.FocusMeteringAction.Builder(
+                    point,
+                    androidx.camera.core.FocusMeteringAction.FLAG_AF,
+                ).disableAutoCancel().build()
                 focusScheduler.scheduleWithFixedDelay({
-                    val now = System.currentTimeMillis()
-                    // The nudge only exists for the one case continuous AF
-                    // genuinely misses: the phone held perfectly still on a
-                    // code while the lens sits at its resting focus, with no
-                    // scene change to trigger a sweep.
-                    if (now - lastDecodeAt.get() > 2_000 &&
-                        now - lastNudgeAt > 3_000 &&
-                        now - lastTapFocusAt.get() > 3_000
-                    ) {
-                        lastNudgeAt = now
-                        runCatching { cam.cameraControl.startFocusAndMetering(focusAction) }
-                    }
-                }, 1, 1, java.util.concurrent.TimeUnit.SECONDS)
+                    runCatching { cam.cameraControl.startFocusAndMetering(focusAction) }
+                }, 0, 2, java.util.concurrent.TimeUnit.SECONDS)
             } catch (_: Exception) {
                 // Camera unavailable — the user can dismiss and enter details manually.
             }
@@ -525,251 +286,66 @@ internal fun CameraQrPreview(
 
         onDispose {
             focusScheduler.shutdownNow()
-            runCatching { camera?.cameraControl?.enableTorch(false) }
-            camera = null
             provider?.unbindAll()
             analysisExecutor.shutdown()
         }
     }
 
-    // Torch follows the caller's state (and switches off when the view goes).
-    LaunchedEffect(camera, torchOn) {
-        runCatching { camera?.cameraControl?.enableTorch(torchOn) }
-    }
-
-    AndroidView(
-        factory = { previewView },
-        modifier = Modifier
-            .fillMaxSize()
-            // Tap-to-focus: the ROI assumes the code is centred; a tap lets the
-            // user point at one that isn't, or re-trigger AF the instant
-            // they've framed it.
-            .pointerInput(camera) {
-                detectTapGestures { offset ->
-                    val cam = camera ?: return@detectTapGestures
-                    val factory = previewView.meteringPointFactory
-                    val action = FocusMeteringAction.Builder(
-                        factory.createPoint(offset.x, offset.y),
-                        FocusMeteringAction.FLAG_AF or FocusMeteringAction.FLAG_AE,
-                    ).build()
-                    lastTapFocusAt.set(System.currentTimeMillis())
-                    runCatching { cam.cameraControl.startFocusAndMetering(action) }
-                }
-            },
-    )
+    AndroidView(factory = { previewView }, modifier = Modifier.fillMaxSize())
 }
 
-/**
- * Configure the capture session the way a dedicated barcode scanner does,
- * rather than the way a photo app does.
- *
- * The single most valuable knob is **CONTROL_AE_TARGET_FPS_RANGE**. Left
- * alone, auto-exposure indoors happily drops the sensor to 10–15 fps and
- * takes 60–100 ms exposures — every hand-held frame is then motion-blurred,
- * and a blurred QR is not a slow decode, it is *no* decode. The user waves
- * the phone about waiting for a lock that cannot happen. Pinning the lower
- * bound of the AE range as high as the device allows caps exposure time
- * (~33 ms at 30 fps), so frames come out sharp; AE compensates with gain
- * instead, and ZXing tolerates noise far better than it tolerates blur.
- * (Dark rooms get grainier as a result — that is what the torch button is
- * for, and grainy-but-sharp still decodes where smooth-but-smeared never
- * does.)
- *
- * CONTINUOUS_PICTURE is set explicitly so that when a tap-to-focus action
- * expires, CameraX restores continuous AF rather than whatever the device
- * defaults to; FAST noise/edge processing shaves ISP latency per frame.
- *
- * All of it is best-effort — an OEM that rejects a key just keeps its default.
- */
-@androidx.annotation.OptIn(ExperimentalCamera2Interop::class)
-private fun tuneForBarcodes(builder: Preview.Builder, context: Context) {
-    runCatching {
-        val ext = Camera2Interop.Extender(builder)
-        ext.setCaptureRequestOption(
-            CaptureRequest.CONTROL_AF_MODE,
-            CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE,
-        )
-        ext.setCaptureRequestOption(
-            CaptureRequest.NOISE_REDUCTION_MODE,
-            CameraMetadata.NOISE_REDUCTION_MODE_FAST,
-        )
-        ext.setCaptureRequestOption(
-            CaptureRequest.EDGE_MODE,
-            CameraMetadata.EDGE_MODE_FAST,
-        )
-        highestSteadyFpsRange(context)?.let {
-            ext.setCaptureRequestOption(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, it)
-        }
-    }
-}
-
-/**
- * The back camera's AE range with the highest floor, ignoring anything that
- * runs past 30 fps (those are the high-speed/slow-motion modes, which cost
- * light for frames we do not need).
- */
-private fun highestSteadyFpsRange(context: Context): android.util.Range<Int>? = runCatching {
-    val manager = context.getSystemService(CameraManager::class.java) ?: return@runCatching null
-    val backId = manager.cameraIdList.firstOrNull { id ->
-        manager.getCameraCharacteristics(id)
-            .get(CameraCharacteristics.LENS_FACING) == CameraCharacteristics.LENS_FACING_BACK
-    } ?: return@runCatching null
-    manager.getCameraCharacteristics(backId)
-        .get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES)
-        ?.filter { it.upper <= 30 }
-        ?.maxWithOrNull(compareBy({ it.lower }, { it.upper }))
-}.getOrNull()
-
-/**
- * ZXing decoder over the camera's Y (luminance) plane.
- *
- * ## The rule this class exists to obey
- *
- * **Every frame costs the same, and every frame sees the whole scene.**
- *
- * That sounds obvious; the previous version violated both halves and produced
- * a scanner with a very specific failure: it locked on instantly if the code
- * was already in view when the camera opened, but crawled if you opened it
- * and then moved to the code. The cause was an escalation ladder — each frame
- * that failed to decode unlocked progressively more expensive searches, up to
- * a TRY_HARDER pass over the full 2 MP frame plus an inverted retry, easily
- * 150–300 ms of work.
- *
- * So the moment the user began hunting for the code, the analyzer dropped from
- * ~30 attempts per second to ~4, each one on a motion-blurred frame. By the
- * time they framed the code and held still, the pipeline was busy grinding
- * through an exhaustive search of an old, blurry frame. Escalating on failure
- * is exactly backwards: failure means the user is still aiming, which is when
- * the scanner must be at its *fastest*, not its most thorough.
- *
- * ## What runs now, on every single frame
- *
- *  1. **Centre ROI at full resolution** ([QR_ROI_FRACTION], ~0.45 MP). Full
- *     sensor detail, so dense Lightning invoices keep their pixels-per-module.
- *  2. **The whole frame at half resolution** (~0.5 MP). This is what fixes the
- *     "move to the code" case: coverage is no longer limited to the viewfinder
- *     box on the fast path, so a code that is merely *near* the middle decodes
- *     immediately instead of waiting for a slow tier to come around. A code
- *     big enough to be off-centre is big enough to survive the 2x downscale.
- *  3. **One alternating second binarizer** — GlobalHistogram over the ROI on
- *     even frames, over the half-frame on odd ones. Hybrid is tuned for
- *     shadowed paper; most codes this app scans are on a *screen* (the node's
- *     pairing popup, another phone's wallet) where a global threshold is both
- *     cheaper and more reliable. Alternating keeps the per-frame budget flat.
- *
- * Two rare extras, both bounded so they can never dent the loop above: an
- * inverted ROI pass every 8th frame (light-on-dark codes), and one TRY_HARDER
- * pass over the half-frame at most once a second (skewed/damaged codes).
- *
- * Steady-state that is ~35 ms per frame — around 27 attempts per second, and
- * it does not degrade the longer the user hunts.
- *
- * Buffers are allocated once and reused: the original path allocated a fresh
- * ~2 MB array per frame, 60 MB/s of garbage at 30 fps, with GC pauses landing
- * mid-decode.
- */
+/** ZXing-based QR decoder over the camera's Y (luminance) plane. */
 private class QrCodeAnalyzer(private val onDecoded: (String) -> Unit) : ImageAnalysis.Analyzer {
-    // QRCodeReader directly rather than MultiFormatReader: with a single
-    // format in play the dispatch and per-call state reset are pure overhead.
-    private val reader = QRCodeReader()
-    private val plainHints = mapOf<DecodeHintType, Any>(
-        DecodeHintType.POSSIBLE_FORMATS to listOf(BarcodeFormat.QR_CODE),
-    )
-    private val hardHints = mapOf<DecodeHintType, Any>(
-        DecodeHintType.POSSIBLE_FORMATS to listOf(BarcodeFormat.QR_CODE),
-        DecodeHintType.TRY_HARDER to true,
-    )
-
-    private var roiBuffer = ByteArray(0)
-    private var halfBuffer = ByteArray(0)
-    private var frame = 0L
-    private var lastHardAt = 0L
-
-    private fun read(
-        source: PlanarYUVLuminanceSource,
-        global: Boolean = false,
-        hard: Boolean = false,
-        inverted: Boolean = false,
-    ): String? {
-        val src = if (inverted) source.invert() else source
-        val bitmap = BinaryBitmap(
-            if (global) GlobalHistogramBinarizer(src) else HybridBinarizer(src),
+    private val reader = MultiFormatReader().apply {
+        setHints(
+            mapOf(
+                DecodeHintType.POSSIBLE_FORMATS to listOf(BarcodeFormat.QR_CODE),
+                // Screen-displayed QRs come with moiré, glare, and soft focus at
+                // close range — the exhaustive search is worth the milliseconds.
+                DecodeHintType.TRY_HARDER to true,
+            )
         )
-        return runCatching {
-            reader.decode(bitmap, if (hard) hardHints else plainHints).text
-        }.getOrNull().also { reader.reset() }
     }
 
+    private var lastAttempt = 0L
+
     override fun analyze(image: ImageProxy) {
+        // Decode ~7x/s, not on every frame: TRY_HARDER (plus the inverted
+        // retry) pegs a core when run at camera rate, and that CPU contention
+        // is what made the preview itself stutter. KEEP_ONLY_LATEST means the
+        // frames skipped here are simply dropped, so decodes stay current.
+        val now = System.currentTimeMillis()
+        if (now - lastAttempt < 140) {
+            image.close()
+            return
+        }
+        lastAttempt = now
         try {
             val plane = image.planes[0]
             val buffer = plane.buffer
-            val stride = plane.rowStride
-            // YUV_420_888 permits an interleaved Y plane. Rare, but a device
-            // that does it would otherwise hand the decoder pure noise.
-            val pixelStride = plane.pixelStride
-            val width = image.width
-            val height = image.height
-            frame++
-
-            buffer.rewind()
-            val available = buffer.remaining()
-
-            // ── 1. Centre ROI, full resolution ──────────────────────────────
-            val side = (minOf(width, height) * QR_ROI_FRACTION).toInt().coerceAtLeast(1)
-            val left = (width - side) / 2
-            val top = (height - side) / 2
-            if (roiBuffer.size != side * side) roiBuffer = ByteArray(side * side)
-            for (row in 0 until side) {
-                val srcPos = (top + row) * stride + left * pixelStride
-                if (srcPos + side * pixelStride > available) break
-                if (pixelStride == 1) {
-                    buffer.position(srcPos)
-                    buffer.get(roiBuffer, row * side, side)
-                } else {
-                    val dst = row * side
-                    for (col in 0 until side) {
-                        roiBuffer[dst + col] = buffer.get(srcPos + col * pixelStride)
-                    }
-                }
-            }
-            val roi = PlanarYUVLuminanceSource(roiBuffer, side, side, 0, 0, side, side, false)
-            read(roi)?.let { onDecoded(it); return }
-
-            // ── 2. Whole frame, half resolution ─────────────────────────────
-            val hw = width / 2
-            val hh = height / 2
-            if (halfBuffer.size != hw * hh) halfBuffer = ByteArray(hw * hh)
-            var truncated = false
-            for (row in 0 until hh) {
-                val srcRow = row * 2 * stride
-                val dst = row * hw
-                for (col in 0 until hw) {
-                    val srcPos = srcRow + col * 2 * pixelStride
-                    if (srcPos >= available) { truncated = true; break }
-                    halfBuffer[dst + col] = buffer.get(srcPos)
-                }
-                if (truncated) break
-            }
-            val half = PlanarYUVLuminanceSource(halfBuffer, hw, hh, 0, 0, hw, hh, false)
-            read(half)?.let { onDecoded(it); return }
-
-            // ── 3. Alternating second binarizer ─────────────────────────────
-            val second = if (frame % 2 == 0L) roi else half
-            read(second, global = true)?.let { onDecoded(it); return }
-
-            // ── Bounded extras ──────────────────────────────────────────────
-            if (frame % 8 == 0L) {
-                read(roi, inverted = true)?.let { onDecoded(it); return }
-            }
-            val now = System.currentTimeMillis()
-            if (now - lastHardAt >= 1_000) {
-                lastHardAt = now
-                read(half, hard = true)?.let { onDecoded(it); return }
+            // Copy into a rowStride-wide array; the last row of the plane buffer
+            // may be short of the full stride, so the tail stays zero-padded.
+            val data = ByteArray(plane.rowStride * image.height)
+            buffer.get(data, 0, minOf(buffer.remaining(), data.size))
+            val source = PlanarYUVLuminanceSource(
+                data, plane.rowStride, image.height,
+                0, 0, image.width, image.height,
+                false,
+            )
+            val result = try {
+                reader.decodeWithState(BinaryBitmap(HybridBinarizer(source)))
+            } catch (_: NotFoundException) {
+                // Dark-themed pages can render light-on-dark QRs — retry inverted.
+                reader.reset()
+                reader.decodeWithState(BinaryBitmap(HybridBinarizer(source.invert())))
             }
+            onDecoded(result.text)
+        } catch (_: NotFoundException) {
+            // No QR in this frame — keep scanning.
         } catch (_: Exception) {
             // Malformed frame; skip it.
         } finally {
+            reader.reset()
             image.close()
         }
     }

Android/app/src/main/java/com/archipelago/app/ui/components/SlidingLoader.kt

@@ -1,119 +0,0 @@
-package com.archipelago.app.ui.components
-
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.keyframes
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.archipelago.app.ui.theme.BitcoinOrange
-
-/** green-400 — the same "done" colour the web install overlay lands on. */
-private val DoneGreen = Color(0xFF4ADE80)
-
-/**
- * The Archipelago loading bar: a stripe that runs side to side inside a dim
- * track and lands as a solid green bar when the work completes.
- *
- * This is a direct port of the platform's install-progress overlay
- * (neode-ui SystemUpdate.vue `.install-overlay-bar-anim`): a third-width
- * orange stripe on a white/10 track, 1.8s ease-in-out, going full green on
- * success. Using the same loader natively is what makes the companion feel
- * like the same product as the node UI rather than a stock Android app.
- *
- * @param done      finished successfully — the bar fills solid green.
- * @param stalled   waiting on the user / something external — the bar parks
- *                  half-full in a dimmed orange instead of animating, so it
- *                  reads as "this needs you", not "still working".
- */
-@Composable
-fun SlidingLoader(
-    modifier: Modifier = Modifier,
-    done: Boolean = false,
-    stalled: Boolean = false,
-    height: Dp = 8.dp,
-) {
-    val doneProgress by animateFloatAsState(
-        targetValue = if (done) 1f else 0f,
-        animationSpec = tween(320),
-        label = "loaderDone",
-    )
-
-    BoxWithConstraints(
-        modifier
-            .fillMaxWidth()
-            .height(height)
-            .clip(RoundedCornerShape(percent = 50))
-            .background(Color.White.copy(alpha = 0.10f)),
-    ) {
-        val trackWidth = maxWidth
-        val stripeWidth = trackWidth / 3
-        val stripePx = with(LocalDensity.current) { stripeWidth.toPx() }
-
-        if (doneProgress < 1f) {
-            if (stalled) {
-                Box(
-                    Modifier
-                        .fillMaxWidth(0.5f)
-                        .fillMaxHeight()
-                        .clip(RoundedCornerShape(percent = 50))
-                        .background(BitcoinOrange.copy(alpha = 0.6f)),
-                )
-            } else {
-                // Keyframes copied from the web overlay: -100% → 120% → 300%
-                // of the STRIPE's own width, which is what gives the bar its
-                // fast sweep out and lazy re-entry.
-                val transition = rememberInfiniteTransition(label = "loaderSlide")
-                val offset by transition.animateFloat(
-                    initialValue = -1f,
-                    targetValue = 3f,
-                    animationSpec = infiniteRepeatable(
-                        animation = keyframes {
-                            durationMillis = 1800
-                            (-1f) at 0
-                            1.2f at 900
-                            3f at 1800
-                        },
-                        repeatMode = RepeatMode.Restart,
-                    ),
-                    label = "loaderOffset",
-                )
-                Box(
-                    Modifier
-                        .fillMaxWidth(1f / 3f)
-                        .fillMaxHeight()
-                        .graphicsLayer { translationX = offset * stripePx }
-                        .clip(RoundedCornerShape(percent = 50))
-                        .background(BitcoinOrange),
-                )
-            }
-        }
-
-        if (doneProgress > 0f) {
-            Box(
-                Modifier
-                    .fillMaxWidth()
-                    .fillMaxHeight()
-                    .graphicsLayer { alpha = doneProgress }
-                    .background(DoneGreen),
-            )
-        }
-    }
-}

Android/app/src/main/java/com/archipelago/app/ui/components/WalletQrScannerModal.kt

@@ -1,26 +1,58 @@
 package com.archipelago.app.ui.components
 
+import android.Manifest
 import android.content.Context
+import android.content.pm.PackageManager
 import android.graphics.BitmapFactory
 import android.net.Uri
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
 import com.archipelago.app.R
 import com.archipelago.app.ui.screens.GlassButton
+import com.archipelago.app.ui.theme.BitcoinOrange
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.BinaryBitmap
 import com.google.zxing.DecodeHintType
@@ -30,10 +62,10 @@ import com.google.zxing.RGBLuminanceSource
 import com.google.zxing.common.HybridBinarizer
 
 /**
- * Native replacement for the web wallet's scan pane — the shared [QrGlassModal]
- * shell (same visual design as neode-ui's WalletScanModal) with the camera and
- * decoding running natively, so the preview doesn't lag the way getUserMedia
- * does inside a WebView.
+ * Native replacement for the web wallet's scan pane — same visual design as
+ * neode-ui's WalletScanModal (dark glass card, square preview, orange
+ * viewfinder, status strip) but the camera and decoding run natively, so the
+ * preview doesn't lag the way getUserMedia does inside a WebView.
  *
  * Decoded text is handed back to the page ([onDecoded]) which does all the
  * detection/spend logic; the page in turn streams status lines (animated-QR
@@ -48,7 +80,15 @@ fun WalletQrScannerModal(
     onDismiss: () -> Unit,
 ) {
     val context = LocalContext.current
-    val haptics = LocalHapticFeedback.current
+    var hasPermission by remember {
+        mutableStateOf(
+            ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) ==
+                PackageManager.PERMISSION_GRANTED
+        )
+    }
+    val permissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { granted -> hasPermission = granted }
 
     // Local error from a failed image upload; a fresh web status replaces it.
     var uploadError by remember { mutableStateOf<String?>(null) }
@@ -67,50 +107,155 @@ fun WalletQrScannerModal(
         }
     }
 
-    LaunchedEffect(visible) { if (visible) uploadError = null }
-    LaunchedEffect(status) { if (status != null) uploadError = null }
-
-    // Throttle repeat frames: a static QR decodes many times a second but the
-    // page only needs one; animated QRs still stream because each frame's
-    // text differs.
-    var lastText by remember { mutableStateOf("") }
-    var lastSentAt by remember { mutableStateOf(0L) }
     LaunchedEffect(visible) {
         if (visible) {
-            lastText = ""
-            lastSentAt = 0L
+            uploadError = null
+            val granted = ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) ==
+                PackageManager.PERMISSION_GRANTED
+            hasPermission = granted
+            if (!granted) permissionLauncher.launch(Manifest.permission.CAMERA)
         }
     }
+    LaunchedEffect(status) { if (status != null) uploadError = null }
 
-    QrGlassModal(
-        visible = visible,
-        title = stringResource(R.string.scan_to_send),
-        status = uploadError?.let { it to true } ?: status,
-        idleHint = stringResource(R.string.scan_wallet_hint),
-        permissionRationale = stringResource(R.string.camera_permission_needed),
-        onDismiss = onDismiss,
-        onDecoded = { text ->
-            val now = System.currentTimeMillis()
-            if (text != lastText || now - lastSentAt > 250) {
-                // Buzz on the FIRST hit only: an animated QR streams a new
-                // frame every few ms, and one buzz each would be a drill in
-                // the hand.
-                if (lastText.isEmpty()) {
-                    haptics.performHapticFeedback(HapticFeedbackType.LongPress)
+    AnimatedVisibility(visible = visible, enter = fadeIn(), exit = fadeOut()) {
+        BackHandler { onDismiss() }
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(Color.Black.copy(alpha = 0.6f))
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = onDismiss,
+                ),
+            contentAlignment = Alignment.Center,
+        ) {
+            Column(
+                Modifier
+                    .padding(16.dp)
+                    .widthIn(max = 420.dp)
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(24.dp))
+                    .background(Color(0xF212151C))
+                    .border(1.dp, Color.White.copy(alpha = 0.10f), RoundedCornerShape(24.dp))
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = {}, // swallow — only the scrim dismisses
+                    )
+                    .padding(24.dp),
+            ) {
+                // Header — mirrors the web modal's title row
+                Row(
+                    Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                ) {
+                    Text(
+                        text = stringResource(R.string.scan_to_send),
+                        style = MaterialTheme.typography.titleLarge,
+                        fontWeight = FontWeight.SemiBold,
+                        color = Color.White,
+                    )
+                    IconButton(onClick = onDismiss) {
+                        Icon(
+                            Icons.Default.Close,
+                            stringResource(R.string.close),
+                            tint = Color.White.copy(alpha = 0.7f),
+                        )
+                    }
                 }
-                lastText = text
-                lastSentAt = now
-                onDecoded(text)
+
+                Spacer(Modifier.height(8.dp))
+
+                // Square camera preview with the orange viewfinder
+                Box(
+                    Modifier
+                        .fillMaxWidth()
+                        .aspectRatio(1f)
+                        .clip(RoundedCornerShape(12.dp))
+                        .background(Color.Black.copy(alpha = 0.4f))
+                        .border(1.dp, Color.White.copy(alpha = 0.10f), RoundedCornerShape(12.dp)),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    if (hasPermission) {
+                        // Throttle repeat frames: a static QR decodes ~20x/s but
+                        // the page only needs one; animated QRs still stream
+                        // because each frame's text differs.
+                        var lastText by remember { mutableStateOf("") }
+                        var lastSentAt by remember { mutableStateOf(0L) }
+                        CameraQrPreview(onDecoded = { text ->
+                            val now = System.currentTimeMillis()
+                            if (text != lastText || now - lastSentAt > 250) {
+                                lastText = text
+                                lastSentAt = now
+                                onDecoded(text)
+                            }
+                        })
+                        Box(
+                            Modifier
+                                .fillMaxSize(0.62f)
+                                .border(
+                                    2.dp,
+                                    BitcoinOrange.copy(alpha = 0.85f),
+                                    RoundedCornerShape(16.dp),
+                                ),
+                        )
+                    } else {
+                        Column(
+                            Modifier.padding(horizontal = 24.dp),
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            verticalArrangement = Arrangement.spacedBy(12.dp),
+                        ) {
+                            Text(
+                                text = stringResource(R.string.camera_permission_needed),
+                                color = Color.White.copy(alpha = 0.7f),
+                                style = MaterialTheme.typography.bodyMedium,
+                                textAlign = TextAlign.Center,
+                            )
+                            GlassButton(
+                                text = stringResource(R.string.grant_camera_access),
+                                onClick = { permissionLauncher.launch(Manifest.permission.CAMERA) },
+                                modifier = Modifier.fillMaxWidth().height(48.dp),
+                            )
+                        }
+                    }
+                }
+
+                Spacer(Modifier.height(16.dp))
+
+                // Status strip — same slot the web modal uses for hints/errors
+                val message = uploadError ?: status?.first
+                val isError = uploadError != null || status?.second == true
+                Box(
+                    Modifier
+                        .fillMaxWidth()
+                        .clip(RoundedCornerShape(8.dp))
+                        .background(Color.White.copy(alpha = 0.05f))
+                        .padding(12.dp)
+                        .defaultMinSize(minHeight = 24.dp),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Text(
+                        text = message?.takeIf { it.isNotBlank() }
+                            ?: stringResource(R.string.scan_wallet_hint),
+                        style = MaterialTheme.typography.bodySmall,
+                        color = if (isError) Color(0xFFF87171) else Color.White.copy(alpha = 0.6f),
+                        textAlign = TextAlign.Center,
+                    )
+                }
+
+                Spacer(Modifier.height(16.dp))
+
+                GlassButton(
+                    text = stringResource(R.string.upload_qr_image),
+                    onClick = { imagePicker.launch("image/*") },
+                    modifier = Modifier.fillMaxWidth().height(48.dp),
+                )
             }
-        },
-        footer = {
-            GlassButton(
-                text = stringResource(R.string.upload_qr_image),
-                onClick = { imagePicker.launch("image/*") },
-                modifier = Modifier.fillMaxWidth().height(48.dp),
-            )
-        },
-    )
+        }
+    }
 }
 
 /** Decode a QR from a picked image, downsampled so huge photos stay cheap. */

Android/app/src/main/java/com/archipelago/app/ui/navigation/NavGraph.kt

@@ -24,18 +24,14 @@ import com.archipelago.app.data.ServerQrParser
 import com.archipelago.app.fips.FipsManager
 import com.archipelago.app.ui.screens.FlareScreen
 import com.archipelago.app.ui.screens.IntroScreen
-import com.archipelago.app.ui.screens.NodePickerScreen
 import com.archipelago.app.ui.screens.PartyScreen
 import com.archipelago.app.ui.screens.RemoteInputScreen
 import com.archipelago.app.ui.screens.ServerConnectScreen
 import com.archipelago.app.ui.screens.WebViewScreen
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 object Routes {
     const val INTRO = "intro"
-    const val NODE_PICKER = "node_picker"
     const val SERVER_CONNECT = "server_connect"
     const val WEB_VIEW = "web_view"
     const val REMOTE_INPUT = "remote_input"
@@ -43,38 +39,18 @@ object Routes {
     const val FLARE = "flare"
 }
 
-/**
- * Process-scoped "have we already asked which node?" flag.
- *
- * The picker is a COLD-START question: opening the app fresh (or after the
- * mesh service and its process were killed) is exactly when the user may want
- * a different node than last time. An Activity recreation inside a live
- * process — rotation, theme change — must not re-ask, and neither must a
- * simple return from the background, so the flag lives with the process
- * rather than in saved state.
- */
-private object LaunchGate {
-    @Volatile
-    var nodeChoiceMade: Boolean = false
-}
-
 @Composable
 fun AppNavHost(
     pairUri: String? = null,
     onPairUriConsumed: () -> Unit = {},
-    onReady: () -> Unit = {},
 ) {
     val context = LocalContext.current
     val prefs = remember { ServerPreferences(context) }
     val navController = rememberNavController()
     val scope = rememberCoroutineScope()
 
-    // One combined emission — introSeen and activeServer resolving in separate
-    // frames used to flash the Connect screen at paired users on launch.
-    val launchState by prefs.launchState.collectAsState(initial = null)
-    val introSeen = launchState?.introSeen
-    val activeServer = launchState?.activeServer
-    val savedServers = launchState?.savedServers ?: emptyList()
+    val introSeen by prefs.introSeen.collectAsState(initial = null)
+    val activeServer by prefs.activeServer.collectAsState(initial = null)
 
     // Pairing entry from a deep link that carried no password — prefills the
     // connect form so the user lands on the password prompt for that server.
@@ -103,30 +79,12 @@ fun AppNavHost(
         }
     }
 
-    if (introSeen == null) return
-
-    // Ask which node when the user keeps more than one and this is a cold
-    // start. Anything else (single node, mid-process Activity recreation,
-    // a pairing deep link) goes straight through as before.
-    val needsNodeChoice = introSeen == true &&
-        !LaunchGate.nodeChoiceMade &&
-        savedServers.size > 1
-
-    // Paired + previously consented → the mesh comes back silently on launch,
-    // but ONLY once the session's node is known to be a FIPS node. Bringing
-    // the tunnel up before that took Android's single VPN slot away from
-    // whatever the user uses to reach a non-mesh node. Off the main
-    // dispatcher: this path dlopens the 7 MB fips core and does a binder
-    // round-trip (VpnService.prepare).
-    LaunchedEffect(needsNodeChoice, activeServer?.npub, activeServer?.meshIp) {
-        if (needsNodeChoice) return@LaunchedEffect
-        if (activeServer?.isFipsNode() != true) return@LaunchedEffect
-        withContext(Dispatchers.IO) { FipsManager.autoStartIfReady(context) }
+    // Paired + previously consented → the mesh comes back silently on launch.
+    LaunchedEffect(Unit) {
+        FipsManager.autoStartIfReady(context)
     }
 
-    // Launch state resolved — MainActivity holds the system splash until now,
-    // so the first visible frame is the real UI, never a black gap.
-    LaunchedEffect(Unit) { onReady() }
+    if (introSeen == null) return
 
     // Declared after the introSeen gate so it can't fire before the NavHost
     // below has set the nav graph; pairUri stays pending until consumed here.
@@ -160,7 +118,6 @@ fun AppNavHost(
 
     val startDestination = when {
         introSeen == false -> Routes.INTRO
-        needsNodeChoice -> Routes.NODE_PICKER
         activeServer != null -> Routes.WEB_VIEW
         else -> Routes.SERVER_CONNECT
     }
@@ -169,37 +126,6 @@ fun AppNavHost(
         navController = navController,
         startDestination = startDestination,
     ) {
-        composable(Routes.NODE_PICKER) {
-            NodePickerScreen(
-                servers = savedServers,
-                lastActive = activeServer,
-                onPick = { server ->
-                    LaunchGate.nodeChoiceMade = true
-                    scope.launch {
-                        prefs.setActiveServer(server)
-                        // The mesh follows the choice, and ONLY the choice.
-                        // A non-mesh node gets the tunnel taken down: Android
-                        // hands out one VPN slot, and holding it hostage is
-                        // what broke reaching nodes behind a different VPN.
-                        withContext(Dispatchers.IO) {
-                            if (server.isFipsNode()) {
-                                FipsManager.autoStartIfReady(context)
-                            } else {
-                                FipsManager.stopService(context)
-                            }
-                        }
-                        navController.navigate(Routes.WEB_VIEW) {
-                            popUpTo(0) { inclusive = true }
-                        }
-                    }
-                },
-                onAddNode = {
-                    LaunchGate.nodeChoiceMade = true
-                    navController.navigate(Routes.SERVER_CONNECT)
-                },
-            )
-        }
-
         composable(Routes.INTRO) {
             IntroScreen(
                 onMeshParty = {

Android/app/src/main/java/com/archipelago/app/ui/screens/FlareScreen.kt

@@ -107,11 +107,7 @@ fun FlareScreen(onBack: () -> Unit) {
     }
 
     val peer = peers.firstOrNull { it.npub == selectedNpub }
-    // derivedStateOf: filtering inline re-ran over the whole store on every
-    // recomposition — including one per keystroke in the composer.
-    val messages by remember(selectedNpub) {
-        androidx.compose.runtime.derivedStateOf { allMessages.filter { it.peerNpub == selectedNpub } }
-    }
+    val messages = allMessages.filter { it.peerNpub == selectedNpub }
     val listState = rememberLazyListState()
     LaunchedEffect(messages.size) {
         if (messages.isNotEmpty()) listState.animateScrollToItem(messages.size - 1)
@@ -309,13 +305,7 @@ private fun MessageBubble(msg: FlareMessage) {
                 .padding(horizontal = 12.dp, vertical = 8.dp),
         ) {
             if (msg.photoPath.isNotBlank()) {
-                // Decoded off-main and downsampled to the bubble width —
-                // full-size decode in remember{} ran on the UI thread mid-
-                // scroll and held ~8 MB per visible photo (OOM territory).
-                var bmp by remember(msg.photoPath) { mutableStateOf<android.graphics.Bitmap?>(null) }
-                LaunchedEffect(msg.photoPath) {
-                    bmp = withContext(Dispatchers.IO) { decodeSampledPhoto(msg.photoPath, 600) }
-                }
+                val bmp = remember(msg.photoPath) { BitmapFactory.decodeFile(msg.photoPath) }
                 bmp?.let {
                     Image(
                         bitmap = it.asImageBitmap(),
@@ -346,19 +336,6 @@ private fun MessageBubble(msg: FlareMessage) {
 }
 
 /** Decode, downscale (≤1600px) and JPEG-compress a picked photo off-main. */
-/** Decode a stored beamed photo at roughly [maxPx] on the long edge — the
- *  bubble renders at ~300 dp, so the stored 1600 px original is 25× the
- *  pixels needed. Blocking — call on IO. */
-private fun decodeSampledPhoto(path: String, maxPx: Int): android.graphics.Bitmap? = try {
-    val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-    BitmapFactory.decodeFile(path, bounds)
-    var sample = 1
-    while (maxOf(bounds.outWidth, bounds.outHeight) / (sample * 2) >= maxPx) sample *= 2
-    BitmapFactory.decodeFile(path, BitmapFactory.Options().apply { inSampleSize = sample })
-} catch (_: Exception) {
-    null
-}
-
 private suspend fun compressPhoto(context: android.content.Context, uri: Uri): ByteArray? =
     withContext(Dispatchers.IO) {
         try {

Android/app/src/main/java/com/archipelago/app/ui/screens/IntroScreen.kt

@@ -37,7 +37,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
@@ -66,10 +65,9 @@ fun IntroScreen(
     var showContent by remember { mutableStateOf(false) }
 
     LaunchedEffect(Unit) {
-        // Content fades in WITH the logo, not after it — the serial
-        // 800ms + 300ms sequence held "Get Started" off-screen for 1.1s.
+        logoAlpha.animateTo(1f, animationSpec = tween(800))
+        delay(300)
         showContent = true
-        logoAlpha.animateTo(1f, animationSpec = tween(450))
     }
 
     Box(
@@ -113,9 +111,7 @@ fun IntroScreen(
                 contentDescription = "Archipelago",
                 modifier = Modifier
                     .size(160.dp)
-                    // graphicsLayer defers the alpha read to the draw phase —
-                    // .alpha(value) recomposed the whole screen per frame.
-                    .graphicsLayer { alpha = logoAlpha.value },
+                    .alpha(logoAlpha.value),
             )
 
             Spacer(modifier = Modifier.height(48.dp))

Android/app/src/main/java/com/archipelago/app/ui/screens/NodePickerScreen.kt

@@ -1,226 +0,0 @@
-package com.archipelago.app.ui.screens
-
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawing
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Bolt
-import androidx.compose.material.icons.filled.Lock
-import androidx.compose.material.icons.filled.LockOpen
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.archipelago.app.R
-import com.archipelago.app.data.ServerEntry
-import com.archipelago.app.ui.theme.BitcoinOrange
-import com.archipelago.app.ui.theme.SuccessGreen
-import com.archipelago.app.ui.theme.SurfaceBlack
-import com.archipelago.app.ui.theme.TextMuted
-import com.archipelago.app.ui.theme.TextPrimary
-
-/**
- * "Which node?" — shown at launch when more than one node is saved.
- *
- * The companion used to dive straight back into whichever node was last
- * active, which is wrong the moment a user keeps more than one: they arrive
- * somewhere they didn't choose, and (worse) the FIPS tunnel came up before
- * anyone said which network this session belongs to. Picking first makes the
- * choice explicit and lets the mesh stay down for nodes that aren't on it.
- *
- * [onPick] carries the entry; the caller decides what the mesh does about it.
- */
-@Composable
-fun NodePickerScreen(
-    servers: List<ServerEntry>,
-    lastActive: ServerEntry?,
-    onPick: (ServerEntry) -> Unit,
-    onAddNode: () -> Unit,
-) {
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(SurfaceBlack),
-    ) {
-        Image(
-            painter = painterResource(id = R.drawable.bg_synthwave),
-            contentDescription = null,
-            modifier = Modifier.fillMaxSize(),
-            contentScale = ContentScale.Crop,
-        )
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(
-                    Brush.verticalGradient(
-                        colors = listOf(
-                            Color.Black.copy(alpha = 0.65f),
-                            Color.Black.copy(alpha = 0.5f),
-                            Color.Black.copy(alpha = 0.85f),
-                        ),
-                    )
-                ),
-        )
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .windowInsetsPadding(WindowInsets.safeDrawing)
-                .verticalScroll(rememberScrollState())
-                .padding(horizontal = 24.dp)
-                .padding(top = 48.dp, bottom = 32.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.CenterVertically),
-        ) {
-            Image(
-                painter = painterResource(id = R.drawable.ic_logo),
-                contentDescription = "Archipelago",
-                modifier = Modifier.size(88.dp),
-            )
-
-            Spacer(Modifier.height(4.dp))
-
-            Text(
-                text = stringResource(R.string.pick_node_title),
-                style = MaterialTheme.typography.headlineMedium,
-                color = TextPrimary,
-                textAlign = TextAlign.Center,
-            )
-            Text(
-                text = stringResource(R.string.pick_node_hint),
-                style = MaterialTheme.typography.bodyMedium,
-                color = TextMuted,
-                textAlign = TextAlign.Center,
-            )
-
-            Spacer(Modifier.height(8.dp))
-
-            servers.forEach { server ->
-                NodeCard(
-                    server = server,
-                    isLast = lastActive?.sameNode(server) == true,
-                    onClick = { onPick(server) },
-                )
-            }
-
-            Spacer(Modifier.height(8.dp))
-
-            GlassButton(
-                text = stringResource(R.string.pick_node_add),
-                onClick = onAddNode,
-                modifier = Modifier.fillMaxWidth().height(52.dp),
-            )
-        }
-    }
-}
-
-@Composable
-private fun NodeCard(
-    server: ServerEntry,
-    isLast: Boolean,
-    onClick: () -> Unit,
-) {
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(14.dp))
-            .background(Color.Black.copy(alpha = 0.6f))
-            .background(
-                Brush.verticalGradient(
-                    colors = listOf(
-                        Color.White.copy(alpha = 0.08f),
-                        Color.White.copy(alpha = 0.02f),
-                    ),
-                )
-            )
-            .border(
-                1.dp,
-                if (isLast) BitcoinOrange.copy(alpha = 0.35f) else Color.White.copy(alpha = 0.1f),
-                RoundedCornerShape(14.dp),
-            )
-            .clickable { onClick() }
-            .padding(horizontal = 16.dp, vertical = 16.dp),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Icon(
-            imageVector = if (server.useHttps) Icons.Default.Lock else Icons.Default.LockOpen,
-            contentDescription = null,
-            modifier = Modifier.size(20.dp),
-            tint = if (server.useHttps) SuccessGreen else BitcoinOrange,
-        )
-        Spacer(Modifier.width(12.dp))
-        Column(Modifier.weight(1f)) {
-            Text(
-                text = server.displayName(),
-                style = MaterialTheme.typography.titleMedium,
-                color = TextPrimary,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-            )
-            val secondary = buildString {
-                if (server.name.isNotBlank()) append(server.address)
-                if (server.port.isNotBlank()) {
-                    if (isNotEmpty()) append(":${server.port}") else append("Port ${server.port}")
-                }
-            }
-            if (secondary.isNotBlank()) {
-                Text(
-                    text = secondary,
-                    style = MaterialTheme.typography.labelMedium,
-                    color = TextMuted,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            }
-        }
-        // The one thing that actually changes behaviour on this screen: a mesh
-        // node brings the FIPS tunnel up, a plain one deliberately does not.
-        if (server.isFipsNode()) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                Icon(
-                    imageVector = Icons.Default.Bolt,
-                    contentDescription = null,
-                    modifier = Modifier.size(14.dp),
-                    tint = BitcoinOrange,
-                )
-                Spacer(Modifier.width(4.dp))
-                Text(
-                    text = "FIPS",
-                    color = BitcoinOrange,
-                    fontSize = 11.sp,
-                    letterSpacing = 1.sp,
-                    style = MaterialTheme.typography.labelMedium,
-                )
-            }
-        }
-    }
-}

Android/app/src/main/java/com/archipelago/app/ui/screens/PartyScreen.kt

@@ -123,12 +123,9 @@ fun PartyScreen(
         name = prefs.partyName()
         // The hotspot/WiFi address can change while this screen is open
         // (e.g. the user flips the hotspot on mid-demo) — keep it fresh.
-        // Tight only at first (the hotspot-flip window); interface walks
-        // allocate, so back off once the screen has been open a while.
-        var round = 0
         while (true) {
             localIp = withContext(Dispatchers.IO) { PartyQr.localWifiIpv4() }
-            delay(if (round++ < 10) 3_000 else 30_000)
+            delay(3_000)
         }
     }
 
@@ -141,16 +138,7 @@ fun PartyScreen(
             port = PartyQr.PARTY_UDP_PORT,
         )
     }
-    // QR encode + bitmap fill off the composition: done in remember{} it ran
-    // on the UI thread PER KEYSTROKE of the name field (the payload embeds the
-    // name) — a ZXing encode plus a megabyte-plus allocation per character.
-    // The 250 ms delay is a free debounce via coroutine cancellation.
-    var qrBitmap by remember { mutableStateOf<android.graphics.Bitmap?>(null) }
-    LaunchedEffect(qrPayload) {
-        if (qrPayload == null) { qrBitmap = null; return@LaunchedEffect }
-        if (qrBitmap != null) delay(250)
-        qrBitmap = withContext(Dispatchers.Default) { renderQr(qrPayload) }
-    }
+    val qrBitmap = remember(qrPayload) { qrPayload?.let { renderQr(it) } }
 
     BackHandler {
         when {
@@ -349,12 +337,7 @@ fun PartyScreen(
                 contentAlignment = Alignment.Center,
             ) {
                 Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                    // Encoded off-main; done in remember{} it dropped the
-                    // overlay's first fade-in frame.
-                    var dlQr by remember { mutableStateOf<android.graphics.Bitmap?>(null) }
-                    LaunchedEffect(Unit) {
-                        dlQr = withContext(Dispatchers.Default) { renderQr(APP_DOWNLOAD_URL) }
-                    }
+                    val dlQr = remember { renderQr(APP_DOWNLOAD_URL) }
                     dlQr?.let { bmp ->
                         Box(
                             Modifier
@@ -381,7 +364,7 @@ fun PartyScreen(
                         "…or send the APK file directly",
                         color = BitcoinOrange,
                         fontSize = 13.sp,
-                        modifier = Modifier.clickable { scope.launch { shareCompanionApk(context) } }.padding(8.dp),
+                        modifier = Modifier.clickable { shareCompanionApk(context) }.padding(8.dp),
                     )
                     Spacer(Modifier.height(6.dp))
                     Text("Close", color = TextMuted, fontSize = 14.sp, modifier = Modifier.clickable { showShareQr = false }.padding(8.dp))
@@ -490,9 +473,8 @@ fun PartyScreen(
     }
 }
 
-/** Render a QR payload as a bitmap (dark modules on white). 512 px covers the
- *  240.dp display size at any density; 640 was a third more pixels for nothing. */
-private fun renderQr(payload: String, size: Int = 512): Bitmap? = try {
+/** Render a QR payload as a bitmap (dark modules on white). */
+private fun renderQr(payload: String, size: Int = 640): Bitmap? = try {
     val matrix = QRCodeWriter().encode(
         payload,
         BarcodeFormat.QR_CODE,
@@ -512,23 +494,16 @@ private fun renderQr(payload: String, size: Int = 512): Bitmap? = try {
 }
 
 /** Share this install's own APK via the system share sheet — a nearby friend
- *  gets the companion with no internet at all (Quick Share / Bluetooth).
- *  The ~27 MB copy runs on IO — inline in the click handler it froze the UI
- *  for seconds (ANR territory on slow flash). Copied once per install; the
- *  cached file is reused while its size still matches the source. */
-private suspend fun shareCompanionApk(context: android.content.Context) {
+ *  gets the companion with no internet at all (Quick Share / Bluetooth). */
+private fun shareCompanionApk(context: android.content.Context) {
     try {
-        val uri = withContext(Dispatchers.IO) {
-            val src = java.io.File(context.applicationInfo.sourceDir)
-            val dir = java.io.File(context.cacheDir, "share").apply { mkdirs() }
-            val out = java.io.File(dir, "archipelago-companion.apk")
-            if (!out.exists() || out.length() != src.length()) {
-                src.copyTo(out, overwrite = true)
-            }
-            androidx.core.content.FileProvider.getUriForFile(
-                context, "${context.packageName}.fileprovider", out,
-            )
-        }
+        val src = java.io.File(context.applicationInfo.sourceDir)
+        val dir = java.io.File(context.cacheDir, "share").apply { mkdirs() }
+        val out = java.io.File(dir, "archipelago-companion.apk")
+        src.copyTo(out, overwrite = true)
+        val uri = androidx.core.content.FileProvider.getUriForFile(
+            context, "${context.packageName}.fileprovider", out,
+        )
         val send = android.content.Intent(android.content.Intent.ACTION_SEND).apply {
             type = "application/vnd.android.package-archive"
             putExtra(android.content.Intent.EXTRA_STREAM, uri)

Android/app/src/main/java/com/archipelago/app/ui/screens/ServerConnectScreen.kt

@@ -33,6 +33,7 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Lock
 import androidx.compose.material.icons.filled.LockOpen
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -75,7 +76,6 @@ import com.archipelago.app.data.ServerEntry
 import com.archipelago.app.data.ServerPreferences
 import com.archipelago.app.fips.FipsManager
 import com.archipelago.app.ui.components.MeshLoadingScreen
-import com.archipelago.app.ui.components.SlidingLoader
 import com.archipelago.app.ui.components.QrScannerOverlay
 import com.archipelago.app.ui.theme.BitcoinOrange
 import com.archipelago.app.ui.theme.ErrorRed
@@ -86,7 +86,6 @@ import com.archipelago.app.ui.theme.TextMuted
 import com.archipelago.app.ui.theme.TextPrimary
 import com.archipelago.app.ui.theme.TextSecondary
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -109,20 +108,6 @@ fun ServerConnectScreen(
     val scope = rememberCoroutineScope()
     val keyboard = LocalSoftwareKeyboardController.current
 
-    val savedServers by prefs.savedServers.collectAsState(initial = emptyList())
-
-    // Warm the mesh tunnel the moment the screen appears — starting it only
-    // after the LAN probe failed put full tunnel bring-up + session discovery
-    // inside the user's wait. By connect-tap time it's usually already up.
-    //
-    // Only when there is actually a mesh node to warm for, though: raising the
-    // tunnel on a phone whose saved nodes are all plain HTTP boxes takes
-    // Android's single VPN slot for nothing.
-    LaunchedEffect(savedServers.any { it.isFipsNode() }) {
-        if (savedServers.none { it.isFipsNode() }) return@LaunchedEffect
-        withContext(Dispatchers.IO) { FipsManager.autoStartIfReady(context) }
-    }
-
     var name by remember { mutableStateOf("") }
     var address by remember { mutableStateOf("") }
     var port by remember { mutableStateOf("") }
@@ -136,13 +121,8 @@ fun ServerConnectScreen(
     // Landing shows Scan/Manual choice; the form appears in manual mode or while editing.
     var manualMode by remember { mutableStateOf(false) }
     var showScanner by remember { mutableStateOf(false) }
-    // Is the connect currently running aimed at a mesh node? Drives whether
-    // the loader wears the FIPS brand — see MeshLoadingScreen.
-    var connectingOverMesh by remember { mutableStateOf(false) }
-    var connectingName by remember { mutableStateOf("") }
-    // Brief green landing on the loader before the kiosk takes over, matching
-    // the platform's install overlay.
-    var connectSucceeded by remember { mutableStateOf(false) }
+
+    val savedServers by prefs.savedServers.collectAsState(initial = emptyList())
 
     fun clearForm() {
         name = ""
@@ -191,60 +171,40 @@ fun ServerConnectScreen(
         }
         isConnecting = true
         errorMessage = null
-        connectingOverMesh = server.isFipsNode()
-        connectingName = server.displayName()
-        connectSucceeded = false
 
         scope.launch {
-            // LAN and mesh race IN PARALLEL — the serial LAN-then-mesh chain
-            // burned a guaranteed-dead 5 s LAN probe before the mesh path even
-            // started (the off-LAN QR-pairing case, exactly where speed shows).
-            // The scanned IP was only ever a dial hint; the node's real
+            var reachable = testConnection(server)
+
+            // LAN address didn't answer — phone off-LAN (5G) or DHCP moved the
+            // node. The scanned IP was only ever a dial hint; the node's real
             // identity is its npub and its ULA is reachable from anywhere over
-            // the mesh. Mesh discovery + first session can take 15s+ through
-            // the public tree (per node diagnosis), and on a
-            // first-ever pairing the VPN consent dialog is on screen at the
-            // same time — so the mesh side keeps probing inside its budget
-            // while the tunnel (already started at screen entry, and kicked
-            // again here) warms up underneath.
-            val meshServer = server.meshIp.takeIf { it.isNotBlank() }?.let {
+            // the mesh. Bring the tunnel up and probe the ULA before failing.
+            if (!reachable && server.meshIp.isNotBlank()) {
                 FipsManager.autoStartIfReady(context)
-                server.copy(address = it, useHttps = false, port = "")
-            }
-            val reachable = kotlinx.coroutines.coroutineScope {
-                val lan = async { testConnection(server, timeoutMs = 4_000) }
-                val mesh = async {
-                    if (meshServer == null) return@async false
-                    val deadline = System.currentTimeMillis() + 45_000
-                    var ok = false
-                    while (!ok && System.currentTimeMillis() < deadline) {
-                        ok = testConnection(meshServer, timeoutMs = 8_000)
-                        if (!ok) delay(2000)
-                    }
-                    ok
-                }
-                val first = kotlinx.coroutines.selects.select<Boolean> {
-                    lan.onAwait { it }
-                    mesh.onAwait { it }
-                }
-                if (first) {
-                    lan.cancel(); mesh.cancel()
-                    true
-                } else {
-                    // One side gave up — the verdict is whatever the other says.
-                    if (lan.isCompleted) mesh.await() else lan.await()
+                val meshServer = server.copy(
+                    address = server.meshIp,
+                    useHttps = false,
+                    port = "",
+                )
+                // Mesh discovery + first session can take 15s+ through the
+                // public tree (per node diagnosis), and on a
+                // first-ever pairing the VPN consent dialog is on screen at
+                // the same time — so probe patiently inside a 60s budget with
+                // per-attempt timeouts wide enough to ride out TCP
+                // retransmit backoff. The VPN service pre-warms the session
+                // in parallel (ArchyVpnService.startSessionWarmer).
+                val deadline = System.currentTimeMillis() + 60_000
+                while (!reachable && System.currentTimeMillis() < deadline) {
+                    reachable = testConnection(meshServer, timeoutMs = 15_000)
+                    if (!reachable) delay(3000)
                 }
             }
+            isConnecting = false
+
             if (reachable) {
-                // Land the loader green before handing over, so the last thing
-                // seen is "done", not a bar cut mid-sweep.
-                connectSucceeded = true
                 prefs.setActiveServer(server)
-                delay(320)
-                isConnecting = false
                 onConnected(server.toUrl())
             } else {
-                isConnecting = false
                 errorMessage = context.getString(R.string.connection_failed)
             }
         }
@@ -333,7 +293,7 @@ fun ServerConnectScreen(
             Spacer(modifier = Modifier.height(4.dp))
 
             Text(
-                text = if (editingServer != null) stringResource(R.string.edit_server_title) else stringResource(R.string.connect_to_node),
+                text = if (editingServer != null) stringResource(R.string.edit_server_title) else "Connect to Server",
                 style = MaterialTheme.typography.headlineMedium,
                 color = TextPrimary,
                 textAlign = TextAlign.Center,
@@ -617,9 +577,10 @@ fun ServerConnectScreen(
             }
 
             if (isConnecting) {
-                SlidingLoader(
-                    modifier = Modifier.fillMaxWidth(),
-                    done = connectSucceeded,
+                CircularProgressIndicator(
+                    modifier = Modifier.size(24.dp),
+                    color = Color.White.copy(alpha = 0.6f),
+                    strokeWidth = 2.dp,
                 )
             }
 
@@ -656,11 +617,7 @@ fun ServerConnectScreen(
         // establishing (LAN probe → tunnel up → ULA probe can take a while).
         // The small inline spinner stays for context; this owns the screen.
         if (isConnecting) {
-            MeshLoadingScreen(
-                mesh = connectingOverMesh,
-                nodeName = connectingName,
-                done = connectSucceeded,
-            )
+            MeshLoadingScreen()
         }
     }
 }
@@ -729,17 +686,6 @@ private fun sanitizeAddress(input: String): String {
         .trimEnd('/')
 }
 
-// Built once — the connect loop probed up to 20 times, and each attempt was
-// paying a fresh SSLContext + SecureRandom init.
-private val trustAllSslFactory: javax.net.ssl.SSLSocketFactory by lazy {
-    val trustAll = arrayOf<javax.net.ssl.TrustManager>(object : X509TrustManager {
-        override fun checkClientTrusted(chain: Array<java.security.cert.X509Certificate>?, authType: String?) {}
-        override fun checkServerTrusted(chain: Array<java.security.cert.X509Certificate>?, authType: String?) {}
-        override fun getAcceptedIssuers(): Array<java.security.cert.X509Certificate> = arrayOf()
-    })
-    SSLContext.getInstance("TLS").apply { init(null, trustAll, java.security.SecureRandom()) }.socketFactory
-}
-
 /** Test RPC connectivity. Accepts self-signed certs for local LAN servers.
  *  [timeoutMs] is per-phase (connect / read) — mesh probes need far more
  *  patience than LAN ones (first session through the tree can take 15s+). */
@@ -751,7 +697,14 @@ private suspend fun testConnection(server: ServerEntry, timeoutMs: Int = 5000):
 
             // Trust self-signed certs for local HTTPS (Archipelago nodes rarely have CA certs)
             if (connection is HttpsURLConnection) {
-                connection.sslSocketFactory = trustAllSslFactory
+                val trustAll = arrayOf<javax.net.ssl.TrustManager>(object : X509TrustManager {
+                    override fun checkClientTrusted(chain: Array<java.security.cert.X509Certificate>?, authType: String?) {}
+                    override fun checkServerTrusted(chain: Array<java.security.cert.X509Certificate>?, authType: String?) {}
+                    override fun getAcceptedIssuers(): Array<java.security.cert.X509Certificate> = arrayOf()
+                })
+                val sc = SSLContext.getInstance("TLS")
+                sc.init(null, trustAll, java.security.SecureRandom())
+                connection.sslSocketFactory = sc.socketFactory
                 connection.hostnameVerifier = javax.net.ssl.HostnameVerifier { _, _ -> true }
             }
 

Android/app/src/main/java/com/archipelago/app/ui/theme/Type.kt

@@ -2,95 +2,56 @@ package com.archipelago.app.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.Font
-import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import com.archipelago.app.R
-
-/**
- * The platform's brand face. neode-ui sets `font-archipelago: Montserrat` and
- * uses it for every heading, title and button label, with body copy left to
- * `Avenir Next, system-ui` — which on Android resolves to the system sans
- * anyway. Mirroring that split exactly is what makes companion text read as
- * the same product as the node UI.
- *
- * Montserrat is SIL OFL 1.1 (see Android/MONTSERRAT-OFL.txt); the files are
- * the ones already vendored for the web UI, so both halves ship the same
- * outlines.
- */
-val Montserrat = FontFamily(
-    Font(R.font.montserrat_medium, FontWeight.Medium),
-    Font(R.font.montserrat_semibold, FontWeight.SemiBold),
-    Font(R.font.montserrat_bold, FontWeight.Bold),
-    Font(R.font.montserrat_extrabold, FontWeight.ExtraBold),
-)
 
 val Typography = Typography(
-    // ── Display / headings: Montserrat, tight and heavy like the web hero
-    // copy (the platform sets tracking negative on its big type).
     displayLarge = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.ExtraBold,
+        fontWeight = FontWeight.Bold,
         fontSize = 32.sp,
         lineHeight = 40.sp,
-        letterSpacing = (-0.8).sp,
-    ),
-    headlineLarge = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Bold,
-        fontSize = 28.sp,
-        lineHeight = 36.sp,
         letterSpacing = (-0.5).sp,
     ),
+    headlineLarge = TextStyle(
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 28.sp,
+        lineHeight = 36.sp,
+    ),
     headlineMedium = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.Bold,
+        fontWeight = FontWeight.SemiBold,
         fontSize = 24.sp,
         lineHeight = 32.sp,
-        letterSpacing = (-0.4).sp,
     ),
     titleLarge = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.SemiBold,
+        fontWeight = FontWeight.Medium,
         fontSize = 20.sp,
         lineHeight = 28.sp,
-        letterSpacing = (-0.2).sp,
     ),
     titleMedium = TextStyle(
-        fontFamily = Montserrat,
-        fontWeight = FontWeight.SemiBold,
+        fontWeight = FontWeight.Medium,
         fontSize = 16.sp,
         lineHeight = 24.sp,
+        letterSpacing = 0.15.sp,
     ),
-    // ── Body: system sans, exactly as the web falls back to.
     bodyLarge = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 16.sp,
         lineHeight = 24.sp,
-        letterSpacing = 0.2.sp,
+        letterSpacing = 0.5.sp,
     ),
     bodyMedium = TextStyle(
         fontWeight = FontWeight.Normal,
         fontSize = 14.sp,
         lineHeight = 20.sp,
-        letterSpacing = 0.1.sp,
+        letterSpacing = 0.25.sp,
     ),
-    bodySmall = TextStyle(
-        fontWeight = FontWeight.Normal,
-        fontSize = 13.sp,
-        lineHeight = 18.sp,
-    ),
-    // ── Buttons / labels: Montserrat again, matching .glass-button.
     labelLarge = TextStyle(
-        fontFamily = Montserrat,
         fontWeight = FontWeight.SemiBold,
         fontSize = 14.sp,
         lineHeight = 20.sp,
         letterSpacing = 0.1.sp,
     ),
     labelMedium = TextStyle(
-        fontFamily = Montserrat,
         fontWeight = FontWeight.Medium,
         fontSize = 12.sp,
         lineHeight = 16.sp,

Android/app/src/main/res/drawable/ic_splash_logo.xml

@@ -1,52 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- System splash icon — deliberately the SAME mark as the adaptive launcher
-     icon (ic_launcher_background.xml): dark disc + metallic ring + white
-     Archipelago grid. Tapping the icon and watching the splash should show
-     one badge, not two different logos.
-
-     Geometry is copied from the launcher: the Android 12 splash draws its icon
-     on a 288dp canvas whose inner 2/3 is the safe area — the same 0.667 ratio
-     the adaptive-icon mask uses — so the launcher's 0.65 (ring) / 0.55 (grid)
-     group scales land identically here. -->
+<!-- Archipelago pixel-art "A" for splash screen -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="288dp"
-    android:height="288dp"
-    android:viewportWidth="752"
-    android:viewportHeight="752">
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
 
-    <!-- Dark disc + gradient ring (#000 -> #666), matching logo.svg -->
     <group
-        android:pivotX="376"
-        android:pivotY="376"
-        android:scaleX="0.65"
-        android:scaleY="0.65">
-        <path
-            android:fillColor="#0A0A0A"
-            android:strokeWidth="22.8834"
-            android:pathData="M11.441,375.669a364.227,364.227 0 1,0 728.454,0a364.227,364.227 0 1,0 -728.454,0z">
-            <aapt:attr name="android:strokeColor">
-                <gradient
-                    android:type="linear"
-                    android:startX="751.337"
-                    android:startY="751.338"
-                    android:endX="0"
-                    android:endY="0.000976562">
-                    <item android:offset="0" android:color="#FF000000" />
-                    <item android:offset="1" android:color="#FF666666" />
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-
-    <!-- White Archipelago grid -->
-    <group
-        android:pivotX="376"
-        android:pivotY="376"
+        android:pivotX="512"
+        android:pivotY="512"
         android:scaleX="0.55"
         android:scaleY="0.55">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M253.805,278.37V222.28H309.853V278.37H253.805ZM315.797,278.37V222.28H372.694V278.37H315.797ZM378.639,278.37V222.28H435.536V278.37H378.639ZM441.481,278.37V222.28H497.529V278.37H441.481ZM441.481,341.259V284.319H497.529V341.259H441.481ZM503.473,341.259V284.319H560.37V341.259H503.473ZM190.963,404.148V347.208H247.86V404.148H190.963ZM253.805,404.148V347.208H309.853V404.148H253.805ZM315.797,404.148V347.208H372.694V404.148H315.797ZM378.639,404.148V347.208H435.536V404.148H378.639ZM441.481,404.148V347.208H497.529V404.148H441.481ZM503.473,404.148V347.208H560.37V404.148H503.473ZM190.963,466.187V410.097H247.86V466.187H190.963ZM253.805,466.187V410.097H309.853V466.187H253.805ZM441.481,466.187V410.097H497.529V466.187H441.481ZM503.473,466.187V410.097H560.37V466.187H503.473ZM253.805,529.076V472.136H309.853V529.076H253.805ZM315.797,529.076V472.136H372.694V529.076H315.797ZM378.639,529.076V472.136H435.536V529.076H378.639ZM441.481,529.076V472.136H497.529V529.076H441.481Z" />
+
+        <path android:fillColor="#FFFFFF" android:pathData="M357.614,318h71.007v70.936h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M436.152,318h72.082v70.936h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M515.766,318h72.082v70.936h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,318h71.007v70.936h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,396.46h71.007v72.011h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M673.917,396.46h72.083v72.011h-72.083z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M278,475.994h72.083v72.012h-72.083z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M357.614,475.994h71.007v72.012h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M436.152,475.994h72.082v72.012h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M515.766,475.994h72.082v72.012h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,475.994h71.007v72.012h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M673.917,475.994h72.083v72.012h-72.083z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M278,555.529h72.083v70.936h-72.083z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M357.614,555.529h71.007v70.936h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,555.529h71.007v70.936h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M673.917,555.529h72.083v70.936h-72.083z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M357.614,633.989h71.007v72.011h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M436.152,633.989h72.082v72.011h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M515.766,633.989h72.082v72.011h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,633.989h71.007v72.011h-71.007z" />
     </group>
 </vector>

Android/app/src/main/res/values/strings.xml

@@ -49,12 +49,4 @@
     <string name="scan_wallet_hint">Point the camera at a Lightning invoice, Bitcoin address, Cashu or Fedimint code</string>
     <string name="upload_qr_image">Upload image</string>
     <string name="no_qr_in_image">No QR code found in that image — try another, closer and well-lit</string>
-    <string name="torch_on">Turn on the torch</string>
-    <string name="torch_off">Turn off the torch</string>
-
-    <!-- Launch node picker (more than one node saved) -->
-    <string name="pick_node_title">Which node?</string>
-    <string name="pick_node_hint">Choose the Archipelago this session connects to. The FIPS mesh only comes up for mesh nodes.</string>
-    <string name="pick_node_add">Add another node</string>
-    <string name="connect_to_node">Connect to your node</string>
 </resources>

CHANGELOG.md

@@ -1,47 +1,10 @@
 # Changelog
 
-## v1.8.0-alpha (2026-08-12)
-
-- **Archipelago is now open source.** The full source code of the node you are running — the orchestrator, the dashboard, the app platform, the mesh, the release tooling — is published for anyone to read, build and audit at source.archipelago-foundation.org/lfg2025/archy. A node that holds your money, your files and your communications should not ask to be taken on faith: from this release onward you, or anyone you trust, can see exactly what it does and follow every change we make in the open.
-- **Installing an update is reliable again, and tells you what happened when it isn't.** Some nodes could download an update but never apply it — the button stayed on "Install", and no amount of retrying worked. The cause: applying the update consumed the downloaded files as it went, so if any one step hit a snag partway through, the leftover files were incomplete and every later attempt failed the safety re-check forever, needing a technician to recover. Applying no longer consumes the download — a failed apply can always be retried from the same files — and the pieces are now applied in a fixed order with the program itself last, so a hiccup can't leave a half-swapped node. When an apply does fail, the screen now shows the real reason and what to do ("download the update again"), and offers Download again instead of a dead "Install" button, rather than a generic "it failed".
-- **Video on the kiosk stops tearing.** The kiosk's display had no vertical sync at all, so fast motion — IndeedHub films especially — showed horizontal tearing lines. The display driver now syncs every frame to the panel (no extra hardware needed, existing kiosks pick it up with this update), and on machines with a GPU, video decoding moves off the CPU onto the video hardware — smoother playback that also leaves more headroom for audio, not less.
-- **The Back button finally does what you expect.** Pressing Back — the mouse's side button on a kiosk, a swipe on a phone, the toolbar button in any browser — used to navigate the screen underneath an open window, or leave the dashboard entirely. Back now closes the topmost open window first, one per press, exactly like a native app; closing a window yourself never leaves a phantom entry that makes you press Back twice.
-- **No more bare IP addresses in your update or app-registry settings.** The update mirrors and the app registry each listed the same server twice — once by its proper name, once as a raw `http://146…` address left over from before the domain existed. The raw-address entries are retired: new nodes never see them, and existing nodes clean them out of their saved lists automatically on the next read. Everything now goes through the named, TLS-protected origin — which was always the same machine.
-- **The phone companion app downloads over the proper domain.** The download QR pointed at a raw address over plain HTTP; it now points at the same file on the https domain. Scanning it gets you an encrypted download from a named server.
-- **The Receive window now tells you when the money is on its way.** Previously it showed a QR code and left you to check elsewhere whether anything happened. Now, the moment the sender's transaction is broadcast, the QR gives way to a clock: the amount, the transaction ID (tap to copy), and a note that the funds arrive on their own — with a single Done button. If you keep the window open, the clock becomes a green check at the first confirmation. Verified live on a real node: payment detected within seconds of broadcast.
-
-## v1.7.129-alpha (2026-08-10)
-
-- **Every app is now supervised the same way — the last stragglers moved under systemd.** Five apps (Jellyfin, Nextcloud, Home Assistant, Uptime Kuma, Vaultwarden) still ran outside the node's per-app service management for a technical reason: their networking style died with whatever process started it, so they were kept alive by a separate workaround. That workaround is retired: these apps now migrate themselves onto the same managed units as everything else — own service, restart-on-anything, a ten-second breather between restarts so their networking can release its ports cleanly. The migration happens automatically on the node's next housekeeping pass, touches no app data, and was watched live on a real node: both test apps moved over on the first pass and came back healthy.
-- **Leftover companion screens are cleaned up again — driven by real records this time.** When an app is uninstalled, its helper screen (the UI tile that fronts it) should go too. That cleanup was switched off in an earlier release after it wrongly removed the Bitcoin screen from a node whose Bitcoin was installed — it had been guessing "installed" from what happened to be running, and a separate bug made a running app look absent. The node now keeps a durable record of what you have installed, written at install time and cleared only by a real uninstall, and the cleanup consults only that record. If the record can't be read, the cleanup does nothing at all — "I couldn't check" is never treated as "nothing is installed" — and a helper must be orphaned for a sustained period before it is touched.
-- **A warning that fired every minute on every node is gone.** The app catalog and the node disagreed about where Grafana's software comes from, so the node ignored the catalog's answer and logged a complaint roughly every 75 seconds, forever. The catalog was right — Grafana is served from the fleet's own registry, like Bitcoin Knots — and the node's records now agree with it.
-- **The federation map became a real map.** The network view is now a 3D orbital scene of your federation — nodes as a point-cloud globe with calm motion, auto-fit centring, and a 2D top-down toggle that portrait and mobile screens use by default, with the scene filling the viewport instead of sitting in a letterbox. Inbound peer requests appear live on the map as blinking nodes you can accept or reject in place, and revisiting the view no longer replays the whole intro — the scene updates in place.
-- **An app that's mid-restart shows a page that says so — and comes back by itself.** When an app's screen was briefly unreachable behind the gate, the browser got a bare error; it now gets a named page for that app that retries on its own until the app answers.
-- Known gaps, disclosed rather than buried: three voice-assistant ports remain open without authentication. Non-browser clients — phone apps for Vaultwarden, Home Assistant or Jellyfin, and git over the web — meet the login page and need an access token. The 5x real-node lifecycle gate was not run for this release; the supervision migration and the cleanup re-enable were verified live on one node (both apps migrated and healthy, cleanup correctly idle).
-
-## v1.7.128-alpha (2026-08-10)
-
-- **The discovery list stops showing ghosts.** Every reinstall of a node mints a new discovery identity, and the old identity's announcement could never be removed from the public relays — nothing holds its key anymore — so the "Discoverable nodes" list slowly filled with entries that led nowhere. Announcements now expire: your node re-announces itself twice a day, each announcement carries a 48-hour expiry that relays honour, anything older than that is ignored when reading, and switching discovery off — or factory-resetting the node — actively overwrites the announcement before it can become a ghost. Old ghosts from earlier versions stop being shown immediately and age off the relays on their own.
-- **You can name your node when you make it discoverable.** Turning discovery on now asks for an optional display name — it travels inside the public announcement, so other nodes' discovery lists show "Dorian's basement node" instead of a bare npub. The name is public by construction, capped at 32 characters, and blank is fine: you list as npub only. Toggling discovery off and on remembers the name; you can clear it the same way you set it.
-- **The discoverability panel now shows what the network actually sees: your node's npub.** It previously showed your Tor address — which is precisely the thing the announcement never contains (your address stays private until you approve a peer). The npub, the identity other nodes discover you by and send peering requests to, is now displayed there with a copy button.
-- **The seed screen stops flashing while the node starts.** During first boot, the lock icon and "server starting" text blinked in and out every few seconds while the node came up — each silent retry briefly emptied the screen. The waiting state now holds steady, with its elapsed timer, until the node answers.
-- **A node that already has an identity now explains itself on the seed screen.** Reaching seed creation on a provisioned node used to surface a developer message about "the authenticated system.factory-reset". It now says what you can actually do: sign in normally, or factory-reset the node from Settings to start it over.
-- Known gaps, disclosed rather than buried: three voice-assistant ports remain open without authentication. Non-browser clients — phone apps for Vaultwarden, Home Assistant or Jellyfin, and git over the web — meet the login page and need an access token. The 5x real-node lifecycle gate was not run for this release; the changes were verified by operator UAT on a live node.
-
-## v1.7.127-alpha (2026-08-09)
-
-- **Your node now has its own assistant.** This is the first release to ship AIUI: a conversational screen that can answer from your node's own content — your films, music and files come first, the open web second — and can act on the node itself: install or remove an app, check what's running, or queue up your media, all through a fixed list of vetted actions rather than free rein. It is off-limits to your data until you say otherwise: every data category starts closed, grants are made in Settings → AI Data Access and live on the node itself, and anything that changes the node asks you to confirm in the dashboard's own chrome first — a declined action stays declined. What leaves the node is screened: your API key is stored encrypted and never written in plain text, credential-shaped strings are scrubbed from app logs before the model sees them, your public address and Wi-Fi name are stripped from network answers, web search is gated behind your login session, and cloud-bound text passes a secret scan on the way out. Three model backends are supported — Anthropic's API, a local Ollama, and pay-per-use Routstr with a hard prepaid budget ceiling — and mesh peers can reach the same loop with `!ai`.
-- **Tor now tells you the truth, heals itself, and the Restart button really restarts it.** Three nodes ran for days with Tor completely dead while the dashboard said "Connected" — the indicator was reading a leftover address file, not the daemon, and the restart button reported success without checking. The cause was a configuration line Tor can never bind on our systems; a node could re-break itself from a single settings change. The node now refuses to write that line, checks Tor with a real connection instead of a leftover file, repairs its own Tor configuration at every start, and the Restart button only claims success once Tor is actually answering. Onion addresses that had silently never been published (BTCPay's included) come back with it.
-- **Inviting another node as Trusted works again — on every node.** Generating a Trusted invite, or promoting a peer from the dropdown, silently failed everywhere: the security prompt that asks for your node password could never appear, because the message requesting it was being scrubbed out of the reply on its way to your browser. The prompt now opens, and if a trust change fails, the error appears inside the window you are looking at instead of hidden behind it.
-- **The mempool explorer actually connects now.** The page loaded but sat empty forever. Three separate causes stacked up: the block index had spent days rebuilding without anything saying so, and then two different layers of the node's plumbing were dropping the live-data connection the page depends on — so everything reported healthy while your screen showed nothing. All three are fixed, and the node's own health checks now test the real connection a browser makes, so this cannot pass unnoticed again.
-- **Apps no longer vanish after stopping cleanly.** A stopped app's container is deleted by design, but the restart policy meant an app that exited cleanly was never brought back — it simply disappeared until reinstalled. Backends now restart in every case, the node remembers what you have installed so a missing app is recreated rather than forgotten, and this release repairs the incorrect policy on apps installed by earlier versions.
-- **Your Bitcoin node will not silently change software versions anymore.** "Latest" previously meant different things in different places — one path installed a newer build that deliberately halts until you make a network-rules decision, which froze one node's sync at a fixed block while it reported itself fully synced. Bitcoin Knots is now pinned to an explicit, known-good version; changing it is a decision you make, never a side effect of an update.
-- **Smaller fixes:** the AI data-access settings now say plainly which categories the assistant can see but not act on; the transactions window's tab bar is transparent glass instead of a black block; BTCPay logins no longer fail with a server error when the node is under heavy load right at that moment.
+## Unreleased
 
 - **You can now replace your Lightning connection keys from Settings, without touching a terminal.** The tokens wallet apps like Zeus use to reach your node are bearer keys: anything that has ever seen one can spend from your node until they are replaced, and there is no way to cancel one individually. Replacing them was previously a script you had to SSH in and run, which in practice meant it never happened. Settings → Lightning credentials now shows when yours were issued, which node they belong to and how many channels must survive, then does the whole job behind your node password — with a step-by-step progress list, and a refusal to call it a success unless it has confirmed your node identity and every channel came back. Your coins and channels are not touched: nothing is closed, and the wallet is never re-created. Afterwards you re-pair Zeus by scanning the Lightning app's QR code again.
 - **Replacing those keys no longer silently breaks BTCPay Server.** BTCPay holds its own copy of the key, and that copy cannot repair itself — so a node that replaced its keys ended up with BTCPay running, healthy, and unable to take a single Lightning payment, with nothing anywhere saying why. The dashboard now updates BTCPay's copy as part of the run and restarts it around its existing data, and the Settings screen warns you if it finds a node already stuck in that state. The command-line script fixes the same gap.
 - **Lightning stops getting stuck locked on a busy node.** Lightning opens its databases before it will accept the password that unlocks the wallet, and on a loaded node that took nearly three minutes — longer than the node was willing to wait. Giving up restarted Lightning, which started the slow open again, so the wallet stayed locked forever and everything depending on it stayed broken. The node now waits as long as it takes. A genuinely wrong password still fails immediately.
-- Known gaps, disclosed rather than buried: three voice-assistant ports remain open without authentication. Non-browser clients — phone apps for Vaultwarden, Home Assistant or Jellyfin, and git over the web — meet the login page and need an access token. The full 5x real-node lifecycle gate was not run for this release; reboot survival was verified directly on a live node — all installed apps returned after a cold reboot, uninstalled apps stayed gone, and restart policy was confirmed on every managed unit.
 
 ## v1.7.126-alpha (2026-08-07)
 

app-catalog/catalog.json

@@ -19,7 +19,7 @@
       "author": "Bitcoin Knots",
       "category": "money",
       "tier": "core",
-      "dockerImage": "source.archipelago-foundation.org/lfg2025/bitcoin-knots:29.3.knots20260210",
+      "dockerImage": "source.archipelago-foundation.org/lfg2025/bitcoin-knots:latest",
       "repoUrl": "https://github.com/bitcoinknots/bitcoin"
     },
     {
@@ -390,7 +390,7 @@
       "author": "Grafana Labs",
       "category": "data",
       "tier": "recommended",
-      "dockerImage": "source.archipelago-foundation.org/lfg2025/grafana:10.2.0",
+      "dockerImage": "grafana/grafana:10.2.0",
       "repoUrl": "https://github.com/grafana/grafana",
       "containerConfig": {
         "ports": [

apps/bitcoin-knots/manifest.yml

@@ -7,13 +7,7 @@ app:
   container_name: bitcoin-knots
 
   container:
-    # Pinned deliberately — NEVER use :latest for a consensus-critical app.
-    # Knots 20260508 applies the BIP110/RDTS network upgrade and HALTS until an
-    # operator explicitly sets consensusrules=rdts: a node running it sits frozen
-    # (blocks and headers both static) while reporting itself synced. A moving
-    # :latest tag can therefore stop the whole fleet following the chain without
-    # anyone choosing that. Changing this line is a consensus decision.
-    image: source.archipelago-foundation.org/lfg2025/bitcoin-knots:29.3.knots20260210
+    image: source.archipelago-foundation.org/lfg2025/bitcoin-knots:latest
     pull_policy: if-not-present
     network: archy-net
     entrypoint: ["sh", "-lc"]

apps/grafana/manifest.yml

@@ -5,7 +5,7 @@ app:
   description: Analytics and monitoring platform. Visualize metrics and create dashboards.
   
   container:
-    image: source.archipelago-foundation.org/lfg2025/grafana:10.2.0
+    image: grafana/grafana:10.2.0
     image_signature: cosign://...
     pull_policy: if-not-present
     data_uid: "472:472"

core/Cargo.lock

@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "archipelago"
-version = "1.8.0-alpha"
+version = "1.7.126-alpha"
 dependencies = [
  "anyhow",
  "archipelago-container",

core/archipelago/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "archipelago"
-version = "1.8.0-alpha"
+version = "1.7.126-alpha"
 edition = "2021"
 license.workspace = true
 description = "Archipelago Bitcoin Node OS - Native backend"

core/archipelago/examples/routstr_probe.rs

@@ -290,7 +290,9 @@ async fn probe_one(client: &reqwest::Client, url: &str, label: &str, findings: &
             if label == "/v1/models" {
                 findings.models_endpoint_ok = Some(status.is_success());
                 findings.models_endpoint_openai_shape = Some(
-                    status.is_success() && body.contains("\"data\"") && body.contains("\"object\""),
+                    status.is_success()
+                        && body.contains("\"data\"")
+                        && body.contains("\"object\""),
                 );
             }
             if (status.as_u16() == 401 || status.as_u16() == 402)

core/archipelago/src/api/handler/mod.rs

@@ -441,11 +441,7 @@ impl ApiHandler {
             // from the cookie inside handle_model_proxy — it does not trust
             // nginx to have gated the request already, the same "don't trust
             // the front door" discipline as /lnd-connect-info below.
-            (_, p)
-                if p.starts_with("/aiui/api/claude/")
-                    || p.starts_with("/aiui/api/ollama/")
-                    || p.starts_with("/aiui/api/web-search") =>
-            {
+            (_, p) if p.starts_with("/aiui/api/claude/") || p.starts_with("/aiui/api/ollama/") || p.starts_with("/aiui/api/web-search") => {
                 self.handle_model_proxy(req_with_bytes, p).await
             }
 

core/archipelago/src/api/handler/model_proxy.rs

@@ -135,7 +135,8 @@ fn blocked_secret_shaped() -> Response<Body> {
 /// as the deny corpus. Returns Some(kind) — kind only, never the value —
 /// when the content must not leave.
 async fn forward_screen(text: &str, data_dir: &Path) -> Option<&'static str> {
-    let secrets = crate::assistant::egress::load_known_secrets(&data_dir.join("secrets")).await;
+    let secrets =
+        crate::assistant::egress::load_known_secrets(&data_dir.join("secrets")).await;
     crate::assistant::egress::scan_secret_shapes(text, &secrets)
 }
 
@@ -170,10 +171,7 @@ async fn forward_claude(req: Request<Body>, rest: &str, data_dir: &Path) -> Resu
         .await
         .map_err(|e| anyhow::anyhow!("read request payload: {e}"))?;
     if let Some(kind) = forward_screen(&String::from_utf8_lossy(&payload), data_dir).await {
-        tracing::error!(
-            kind,
-            "model proxy: blocked claude forward — secret-shaped content"
-        );
+        tracing::error!(kind, "model proxy: blocked claude forward — secret-shaped content");
         return Ok(blocked_secret_shaped());
     }
     let req = Request::from_parts(parts, Body::from(payload));
@@ -231,10 +229,7 @@ async fn forward_web_search(req: Request<Body>, data_dir: &Path) -> Result<Respo
     // `+` are how a pasted phrase's words separate inside a query string.
     let decoded = query.replace('+', " ").replace("%20", " ");
     if let Some(kind) = forward_screen(&decoded, data_dir).await {
-        tracing::error!(
-            kind,
-            "model proxy: blocked web-search query — secret-shaped content"
-        );
+        tracing::error!(kind, "model proxy: blocked web-search query — secret-shaped content");
         return Ok(blocked_secret_shaped());
     }
     let rest = web_search_upstream_path(query);
@@ -288,8 +283,8 @@ async fn forward(
         .build()
         .map_err(|e| anyhow::anyhow!("client build: {e}"))?;
 
-    let reqwest_method =
-        reqwest::Method::from_bytes(method.as_str().as_bytes()).unwrap_or(reqwest::Method::POST);
+    let reqwest_method = reqwest::Method::from_bytes(method.as_str().as_bytes())
+        .unwrap_or(reqwest::Method::POST);
     let url = format!("{}{}", upstream_base, rest);
     let mut upstream_req = client
         .request(reqwest_method, &url)
@@ -377,9 +372,14 @@ mod tests {
         let store = test_store().await;
         let data_dir = tempfile::tempdir().unwrap();
         let req = req_with_cookie("POST", "/aiui/api/claude/v1/messages", None);
-        let resp = route_model_proxy(&store, data_dir.path(), req, "/aiui/api/claude/v1/messages")
-            .await
-            .unwrap();
+        let resp = route_model_proxy(
+            &store,
+            data_dir.path(),
+            req,
+            "/aiui/api/claude/v1/messages",
+        )
+        .await
+        .unwrap();
         assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
     }
 
@@ -407,10 +407,7 @@ mod tests {
 
     #[test]
     fn web_search_query_forces_json_and_strips_format() {
-        assert_eq!(
-            web_search_upstream_path("q=bitcoin"),
-            "search?q=bitcoin&format=json"
-        );
+        assert_eq!(web_search_upstream_path("q=bitcoin"), "search?q=bitcoin&format=json");
         assert_eq!(
             web_search_upstream_path("q=bitcoin+halving&format=html"),
             "search?q=bitcoin+halving&format=json"
@@ -427,9 +424,14 @@ mod tests {
             "/aiui/api/claude/v1/messages",
             Some("not-a-real-token"),
         );
-        let resp = route_model_proxy(&store, data_dir.path(), req, "/aiui/api/claude/v1/messages")
-            .await
-            .unwrap();
+        let resp = route_model_proxy(
+            &store,
+            data_dir.path(),
+            req,
+            "/aiui/api/claude/v1/messages",
+        )
+        .await
+        .unwrap();
         assert_eq!(resp.status(), StatusCode::UNAUTHORIZED);
     }
 
@@ -440,18 +442,18 @@ mod tests {
         // Deliberately no data_dir/secrets/claude-api-key written.
         let data_dir = tempfile::tempdir().unwrap();
         let req = req_with_cookie("POST", "/aiui/api/claude/v1/messages", Some(&token));
-        let resp = route_model_proxy(&store, data_dir.path(), req, "/aiui/api/claude/v1/messages")
-            .await
-            .unwrap();
+        let resp = route_model_proxy(
+            &store,
+            data_dir.path(),
+            req,
+            "/aiui/api/claude/v1/messages",
+        )
+        .await
+        .unwrap();
         assert_eq!(resp.status(), StatusCode::SERVICE_UNAVAILABLE);
     }
 
-    fn req_with_cookie_and_body(
-        method: &str,
-        path: &str,
-        cookie: Option<&str>,
-        body: &'static str,
-    ) -> Request<Body> {
+    fn req_with_cookie_and_body(method: &str, path: &str, cookie: Option<&str>, body: &'static str) -> Request<Body> {
         let mut builder = Request::builder().method(method).uri(path);
         if let Some(c) = cookie {
             builder = builder.header("cookie", format!("session={c}"));

core/archipelago/src/api/handler/proxy.rs

@@ -253,10 +253,7 @@ impl ApiHandler {
                             .status(StatusCode::PARTIAL_CONTENT)
                             .header("Content-Type", mime_type)
                             .header("Content-Length", slice.len().to_string())
-                            .header(
-                                "Content-Range",
-                                format!("bytes {}-{}/{}", start, end, total),
-                            )
+                            .header("Content-Range", format!("bytes {}-{}/{}", start, end, total))
                             .header("Accept-Ranges", "bytes")
                             .body(hyper::Body::from(slice.to_vec()))
                             .unwrap_or_else(|_| Response::new(hyper::Body::empty())));

core/archipelago/src/api/rpc/handshake.rs

@@ -21,7 +21,7 @@ use anyhow::{Context, Result};
 use nostr_sdk::FromBech32;
 use serde::{Deserialize, Serialize};
 
-use crate::nostr_handshake::DISCOVERY_STATE_FILE as NOSTR_STATE_FILE;
+const NOSTR_STATE_FILE: &str = "nostr_discovery_state.json";
 
 /// Runtime override for `Config::nostr_discovery_enabled`. The OS-level
 /// config file is read once at boot and is OFF by default; this state file
@@ -32,9 +32,6 @@ use crate::nostr_handshake::DISCOVERY_STATE_FILE as NOSTR_STATE_FILE;
 struct NostrDiscoveryState {
     #[serde(default)]
     enabled: bool,
-    /// Operator-chosen display name carried in the presence event.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    name: Option<String>,
 }
 
 async fn load_discovery_state(data_dir: &std::path::Path) -> NostrDiscoveryState {
@@ -58,16 +55,10 @@ async fn save_discovery_state(
 }
 
 impl RpcHandler {
-    /// Read the current runtime discoverability flag. Also returns the npub
-    /// this node publishes as (the discoverability UI shows it — that npub,
-    /// not the onion, is what's actually visible on the relays). Load-only:
-    /// null until discovery keys exist.
+    /// Read the current runtime discoverability flag.
     pub(super) async fn handle_nostr_discovery_status(&self) -> Result<serde_json::Value> {
         let state = load_discovery_state(&self.config.data_dir).await;
-        let npub = nostr_handshake::own_npub(&self.config.data_dir.join("identity"))
-            .await
-            .unwrap_or(None);
-        Ok(serde_json::json!({ "enabled": state.enabled, "npub": npub, "name": state.name }))
+        Ok(serde_json::json!({ "enabled": state.enabled }))
     }
 
     /// Set the runtime discoverability flag. If turning ON, publish presence
@@ -87,22 +78,7 @@ impl RpcHandler {
             .and_then(|v| v.as_bool())
             .ok_or_else(|| anyhow::anyhow!("Missing enabled"))?;
 
-        // Optional display name. Absent param = keep the stored name (so a
-        // plain off/on toggle doesn't forget it); present-but-empty clears it.
-        let prior = load_discovery_state(&self.config.data_dir).await;
-        let name = match params.get("name") {
-            Some(v) => v.as_str().and_then(nostr_handshake::clean_display_name),
-            None => prior.name,
-        };
-
-        save_discovery_state(
-            &self.config.data_dir,
-            &NostrDiscoveryState {
-                enabled,
-                name: name.clone(),
-            },
-        )
-        .await?;
+        save_discovery_state(&self.config.data_dir, &NostrDiscoveryState { enabled }).await?;
 
         if enabled && !self.config.nostr_relays.is_empty() {
             let (data, _) = self.state_manager.get_snapshot().await;
@@ -112,13 +88,11 @@ impl RpcHandler {
             let version = data.server_info.version.clone();
             let relays = self.handshake_relays().await;
             let tor_proxy = self.config.nostr_tor_proxy.clone();
-            let publish_name = name.clone();
             tokio::spawn(async move {
                 if let Err(e) = nostr_handshake::publish_presence(
                     &identity_dir,
                     &did,
                     &version,
-                    publish_name.as_deref(),
                     &relays,
                     tor_proxy.as_deref(),
                 )
@@ -127,21 +101,6 @@ impl RpcHandler {
                     tracing::warn!("Initial presence publish failed: {}", e);
                 }
             });
-        } else if !enabled {
-            // Switching off: overwrite our presence with an empty tombstone so
-            // the node disappears from other nodes' discovery lists now, not
-            // at the next TTL expiry.
-            let identity_dir = self.config.data_dir.join("identity");
-            let relays = self.handshake_relays().await;
-            let tor_proxy = self.config.nostr_tor_proxy.clone();
-            tokio::spawn(async move {
-                if let Err(e) =
-                    nostr_handshake::publish_tombstone(&identity_dir, &relays, tor_proxy.as_deref())
-                        .await
-                {
-                    tracing::warn!("Presence tombstone publish failed: {}", e);
-                }
-            });
         }
 
         Ok(serde_json::json!({ "enabled": enabled }))

core/archipelago/src/api/rpc/middleware.rs

@@ -64,24 +64,6 @@ pub(super) fn sanitize_error_message(msg: &str) -> String {
         "must be",
         "cannot",
         "Password",
-        // OTA apply/download errors are all operator-actionable ("download it
-        // again", "download first") — sanitizing them to "Operation failed"
-        // left users stuck with no idea what to do, and hid the "already
-        // running" text the update UI matches on to join an in-flight apply
-        // instead of showing a false failure. Every such message starts "Update".
-        "Update",
-        // The federation escalation sentinel. "Password" above does NOT cover
-        // it — starts_with is case-sensitive and the sentinel is ALL-CAPS —
-        // so the frontend's isPasswordRequired() never saw it and the
-        // password prompt could never open. Net effect: no node could mint a
-        // Trusted invite or promote a peer from the trust dropdown, fleet-wide
-        // (2026-08-09). The sentinel is machine-read by the UI; it must pass
-        // through verbatim.
-        "PASSWORD_REQUIRED",
-        // "Tor address not available. Tor may not be running." — the invite
-        // handler's precondition, entirely user-actionable, was likewise
-        // collapsing into the generic message.
-        "Tor address not available",
         "Session",
         "Failed to pull",
         "Failed to start",
@@ -195,24 +177,6 @@ pub(super) fn sanitize_error_message(msg: &str) -> String {
 mod sanitize_tests {
     use super::sanitize_error_message;
 
-    #[test]
-    fn password_required_sentinel_passes_through_verbatim() {
-        // The UI machine-reads this sentinel (isPasswordRequired checks
-        // `includes('PASSWORD_REQUIRED')`) to know it should open the password
-        // prompt. The "Password" prefix does not cover it — starts_with is
-        // case-sensitive — and masking it made Trusted invites and trust
-        // promotion impossible on EVERY node (2026-08-09): the prompt simply
-        // never opened.
-        let msg = "PASSWORD_REQUIRED: node password required to grant Trusted";
-        assert_eq!(sanitize_error_message(msg), msg);
-    }
-
-    #[test]
-    fn tor_unavailable_precondition_passes_through() {
-        let msg = "Tor address not available. Tor may not be running.";
-        assert_eq!(sanitize_error_message(msg), msg);
-    }
-
     #[test]
     fn seed_reveal_errors_pass_through() {
         // Every user-actionable seed.reveal failure must reach the user —

core/archipelago/src/api/rpc/mod.rs

@@ -43,7 +43,7 @@ mod security;
 mod seed_rpc;
 mod streaming;
 mod system;
-pub(crate) mod tor;
+mod tor;
 mod totp;
 mod transitional;
 mod transport;

core/archipelago/src/api/rpc/package/config.rs

@@ -602,13 +602,11 @@ pub(super) fn get_data_dirs_for_app(package_id: &str) -> Vec<String> {
         // (operator report, 2026-08-07). This list is deliberately hardcoded
         // and reviewed: deletion code must never derive its targets from a
         // manifest at uninstall time (a bad manifest could aim the wipe).
-        "btcpay-server" | "btcpayserver" | "btcpay" | "archy-btcpay-db" | "archy-nbxplorer" => {
-            vec![
-                format!("{}/btcpay", base),
-                format!("{}/postgres-btcpay", base),
-                format!("{}/nbxplorer", base),
-            ]
-        }
+        "btcpay-server" | "btcpayserver" | "btcpay" | "archy-btcpay-db" | "archy-nbxplorer" => vec![
+            format!("{}/btcpay", base),
+            format!("{}/postgres-btcpay", base),
+            format!("{}/nbxplorer", base),
+        ],
         "fedimint" => vec![
             format!("{}/fedimint", base),
             format!("{}/fedimint-gateway", base),

core/archipelago/src/api/rpc/system/handlers.rs

@@ -921,29 +921,6 @@ impl RpcHandler {
             return Err(anyhow::anyhow!("Password Incorrect"));
         }
 
-        // Overwrite our Nostr presence with a tombstone BEFORE the wipe: the
-        // discovery keys die with the identity dir, and once they're gone the
-        // stale presence event can never be replaced by anyone — it would
-        // list this dead install to the whole network until relays expire it.
-        // Best-effort with a hard cap so a dead relay can't stall the reset.
-        {
-            let identity_dir = self.config.data_dir.join("identity");
-            let relays = crate::nostr_relays::merged_relay_list(
-                &self.config.data_dir,
-                &self.config.nostr_relays,
-            )
-            .await;
-            let _ = tokio::time::timeout(
-                std::time::Duration::from_secs(15),
-                crate::nostr_handshake::publish_tombstone(
-                    &identity_dir,
-                    &relays,
-                    self.config.nostr_tor_proxy.as_deref(),
-                ),
-            )
-            .await;
-        }
-
         tracing::warn!("Factory reset initiated — wiping ALL user data and containers");
 
         let data_dir = &self.config.data_dir;
@@ -1038,7 +1015,9 @@ impl RpcHandler {
     ///
     /// Node-side because these grants were in per-origin localStorage, so they
     /// vanished whenever the operator reached the node by a different address.
-    pub(in crate::api::rpc) async fn handle_ai_permissions_get(&self) -> Result<serde_json::Value> {
+    pub(in crate::api::rpc) async fn handle_ai_permissions_get(
+        &self,
+    ) -> Result<serde_json::Value> {
         let granted = Self::ai_grants_unified(&self.config.data_dir).await;
         Ok(serde_json::json!({ "granted": granted }))
     }
@@ -1679,11 +1658,7 @@ mod ai_grants_tests {
         .unwrap();
 
         let got = RpcHandler::ai_grants_unified(dir.path()).await;
-        assert_eq!(
-            got,
-            vec!["apps".to_string()],
-            "legacy file must not widen the authority"
-        );
+        assert_eq!(got, vec!["apps".to_string()], "legacy file must not widen the authority");
     }
 
     /// With no assistant grants file yet (pre-unification upgrade), the

core/archipelago/src/api/rpc/tor/mod.rs

@@ -129,7 +129,7 @@ pub(in crate::api::rpc) async fn restart_tor() -> Result<()> {
     .await
 }
 
-pub(crate) async fn check_tor_running() -> bool {
+pub(super) async fn check_tor_running() -> bool {
     tokio::net::TcpStream::connect("127.0.0.1:9050")
         .await
         .is_ok()
@@ -184,94 +184,9 @@ async fn archy_net_gateway_and_subnet() -> Option<(String, String)> {
     if gateway.is_empty() || subnet.is_empty() {
         return None;
     }
-    // Podman REPORTING a gateway is not proof the host can bind it. Under
-    // rootless podman the bridge and its gateway live inside a network
-    // namespace, so the address never appears on a host interface — and Tor
-    // binds it at startup, not at config-check time (`--verify-config` passes
-    // happily). The result on austin-sapien, 2026-08-09:
-    //
-    //   [warn] Could not bind to 10.89.0.1:9050: Cannot assign requested address
-    //   [warn] Failed to parse/validate config: Failed to bind one of the listener ports.
-    //   [err]  Reading config failed--see warnings above.
-    //
-    // Tor then refuses to start AT ALL — loopback SOCKS and every hidden
-    // service go with it. Widening SOCKS must never be able to take the whole
-    // daemon down, so probe the address exactly the way Tor will and fall back
-    // to the loopback-only branch when it is not bindable.
-    if !host_can_bind(&gateway) {
-        tracing::warn!(
-            %gateway,
-            "archy-net gateway is not bindable on this host (rootless podman \
-             namespaces the bridge) — keeping Tor SOCKS loopback-only"
-        );
-        return None;
-    }
     Some((gateway, subnet))
 }
 
-/// Boot-time Tor self-heal: rebuild torrc from current config and apply it if
-/// the live file has drifted or Tor is not actually answering.
-///
-/// Without this, shipping a torrc-generation fix does NOT repair the nodes it
-/// was written for. `regenerate_torrc` only runs from the Tor RPC handlers and
-/// package install, so a node carrying a bad torrc keeps it until somebody
-/// happens to install an app or toggle a Tor setting — its Tor stays down
-/// indefinitely and an OTA changes nothing. That is exactly what happened with
-/// the unbindable `SocksPort <archy-net gateway>` line: two of three reachable
-/// nodes had Tor dead, one of them unnoticed.
-///
-/// Deliberately conservative — it only applies (which restarts Tor) when the
-/// staged torrc differs from the live one or Tor is not answering on 9050.
-/// A healthy node with a matching torrc is left completely alone.
-pub(crate) async fn heal_on_boot(data_dir: &Path) -> Result<bool> {
-    let config_dir = data_dir.join("tor-config");
-    let config = load_services_config(&config_dir).await;
-
-    // Stage what the torrc SHOULD be with the current (fixed) generator.
-    regenerate_torrc(&config).await?;
-
-    let staged = tokio::fs::read_to_string("/var/lib/archipelago/tor-config/torrc.staged")
-        .await
-        .unwrap_or_default();
-    if staged.is_empty() {
-        return Ok(false);
-    }
-    let live = tokio::fs::read_to_string("/etc/tor/torrc")
-        .await
-        .unwrap_or_default();
-
-    let drifted = live.trim() != staged.trim();
-    let answering = check_tor_running().await;
-    if !drifted && answering {
-        debug!("Tor healthy and torrc in sync — nothing to heal");
-        return Ok(false);
-    }
-
-    info!(
-        drifted,
-        answering, "Healing Tor: rewriting torrc from current config and restarting"
-    );
-    restart_tor().await?;
-
-    // Report the truth rather than assuming the restart worked.
-    let ok = check_tor_running().await;
-    if !ok {
-        warn!("Tor still not answering on 127.0.0.1:9050 after heal");
-    }
-    Ok(ok)
-}
-
-/// Can this host actually bind `addr`? Binds an ephemeral port, the same
-/// operation Tor performs, so the answer matches Tor's own behaviour rather
-/// than inferring it from interface listings.
-fn host_can_bind(addr: &str) -> bool {
-    use std::net::{IpAddr, SocketAddr, TcpListener};
-    match addr.parse::<IpAddr>() {
-        Ok(ip) => TcpListener::bind(SocketAddr::new(ip, 0)).is_ok(),
-        Err(_) => false,
-    }
-}
-
 pub(in crate::api::rpc) async fn regenerate_torrc(config: &ServicesConfig) -> Result<()> {
     let base = detect_hidden_service_base();
     let mut lines = vec![

core/archipelago/src/appgate/mod.rs

@@ -446,7 +446,7 @@ async fn proxy_to_app(
         .to_string();
     let uri = match format!("http://127.0.0.1:{port}{path_and_query}").parse::<hyper::Uri>() {
         Ok(uri) => uri,
-        Err(_) => return app_down_page(app),
+        Err(_) => return bad_gateway(),
     };
 
     let (mut parts, body) = req.into_parts();
@@ -480,48 +480,10 @@ async fn proxy_to_app(
         parts.headers.remove(header::AUTHORIZATION);
     }
 
-    // Websocket upgrades need splicing, not request forwarding. hyper::Client
-    // alone completes the app's 101 handshake and then DROPS the upgraded
-    // connection, so every ws-driven app (mempool's entire UI is one) loaded
-    // fine through the gate and then died with close code 1006 on connect —
-    // reported from a browser console, 2026-08-09, after two other layers of
-    // the same symptom had already been fixed. The gate's server side already
-    // accepts client upgrades (.with_upgrades() in listener.rs); this is the
-    // missing upstream half: hand the handshake to the app and, on 101, bridge
-    // the two upgraded connections byte-for-byte. Header stripping above still
-    // applies — the app sees the same sanitized headers on a ws handshake as
-    // on any other request.
-    if parts.headers.contains_key(header::UPGRADE) {
-        // The client side's OnUpgrade handle rides in the request extensions;
-        // take it before the parts become the upstream request. It resolves
-        // once serve_connection's with_upgrades hands us the raw socket after
-        // we return the 101.
-        let client_upgrade = parts.extensions.remove::<hyper::upgrade::OnUpgrade>();
-        let upstream_req = Request::from_parts(parts, Body::empty());
-        let client = hyper::Client::new();
-        let mut upstream_resp = match client.request(upstream_req).await {
-            Ok(resp) => resp,
-            Err(_) => return app_down_page(app),
-        };
-        if upstream_resp.status() == StatusCode::SWITCHING_PROTOCOLS {
-            if let Some(client_upgrade) = client_upgrade {
-                let upstream_upgrade = hyper::upgrade::on(&mut upstream_resp);
-                tokio::spawn(async move {
-                    if let (Ok(mut client_io), Ok(mut app_io)) =
-                        (client_upgrade.await, upstream_upgrade.await)
-                    {
-                        let _ = tokio::io::copy_bidirectional(&mut client_io, &mut app_io).await;
-                    }
-                });
-            }
-        }
-        return upstream_resp;
-    }
-
     let client = hyper::Client::new();
     match client.request(Request::from_parts(parts, body)).await {
         Ok(resp) => resp,
-        Err(_) => app_down_page(app),
+        Err(_) => bad_gateway(),
     }
 }
 
@@ -583,32 +545,11 @@ fn redirect_to_app() -> Response<Body> {
         .expect("static response builds")
 }
 
-/// Served when the app behind the gate does not answer on loopback.
-///
-/// A real page rather than the bare string `app is not responding`: the gate
-/// answers on the app's own port, so this text IS the app as far as the
-/// operator can tell, and the raw string read as the node itself being broken
-/// (reported against Gitea on a fleet node, 2026-08-10 — the actual fault was
-/// a ghost container crash-looping the app). Name the app, say the node is
-/// fine, and retry on our own: an app that is restarting comes back without
-/// the user knowing to reload. Status stays 502 so machine clients still see
-/// an upstream failure rather than a success with HTML in it.
-fn app_down_page(app: &GatedPort) -> Response<Body> {
-    let body = format!(
-        r#"{icon}
-<h1>{name} is not responding</h1>
-<p class="sub">The app is not answering right now — it may be stopped or still
-starting. This page retries automatically. If it does not recover, open the
-dashboard and check {name} under My Apps.</p>"#,
-        icon = icon_markup(app),
-        name = esc(&app.app_name),
-    );
-    let mut resp = page("App not responding", app, &body, StatusCode::BAD_GATEWAY);
-    // Header-based refresh, not <meta> or script: page()'s CSP allows no
-    // script, and the header keeps the retry out of the document entirely.
-    resp.headers_mut()
-        .insert("Refresh", header::HeaderValue::from_static("5"));
-    resp
+fn bad_gateway() -> Response<Body> {
+    Response::builder()
+        .status(StatusCode::BAD_GATEWAY)
+        .body(Body::from("app is not responding"))
+        .expect("static response builds")
 }
 
 fn not_found() -> Response<Body> {
@@ -972,10 +913,7 @@ mod tests {
         // A <link rel="manifest"> fetch never carries the cookie, so these must
         // pass or a logged-in user still gets 401 + a login page.
         for p in ["/manifest.json", "/site.webmanifest", "/favicon.ico"] {
-            assert!(
-                AppGate::is_credentialless_public_path(p),
-                "{p} still challenged"
-            );
+            assert!(AppGate::is_credentialless_public_path(p), "{p} still challenged");
         }
     }
 
@@ -993,10 +931,7 @@ mod tests {
             "/api/auth/nostr/session",
             "/admin",
         ] {
-            assert!(
-                !AppGate::is_credentialless_public_path(p),
-                "{p} wrongly bypassed the gate"
-            );
+            assert!(!AppGate::is_credentialless_public_path(p), "{p} wrongly bypassed the gate");
         }
     }
     use super::*;
@@ -1086,23 +1021,6 @@ mod tests {
         assert!(csp.contains("form-action 'self'"));
     }
 
-    /// A dead upstream must render as a page that names the app and retries,
-    /// not the bare string "app is not responding" — that string standing
-    /// alone on the app's own port read as the node being broken (Gitea on a
-    /// fleet node, 2026-08-10). The 502 status must survive so machine
-    /// clients still see an upstream failure.
-    #[tokio::test]
-    async fn a_dead_app_gets_a_named_retrying_page_not_a_bare_string() {
-        let resp = app_down_page(&app());
-        assert_eq!(resp.status(), StatusCode::BAD_GATEWAY);
-        assert_eq!(resp.headers()["Refresh"], "5");
-        assert_eq!(resp.headers()[header::CACHE_CONTROL], "no-store");
-        let body = hyper::body::to_bytes(resp.into_body()).await.unwrap();
-        let html = String::from_utf8_lossy(&body);
-        assert!(html.contains("Strfry Relay is not responding"));
-        assert!(html.contains("<html"), "must be a page, not a bare string");
-    }
-
     /// The login page must render entirely from the gate's own origin: the
     /// CSP allows no external host, so a background or logo that 404s leaves
     /// a black page rather than the dashboard's art.

core/archipelago/src/assistant/backends/routstr.rs

@@ -276,8 +276,7 @@ fn parse_openai_tool_calls(raw_calls: &[Value]) -> Vec<ToolCall> {
                 .get("arguments")
                 .and_then(|v| v.as_str())
                 .unwrap_or("{}");
-            let arguments: Value =
-                serde_json::from_str(arguments_str).unwrap_or_else(|_| json!({}));
+            let arguments: Value = serde_json::from_str(arguments_str).unwrap_or_else(|_| json!({}));
             Some(ToolCall {
                 id,
                 name,
@@ -798,7 +797,9 @@ mod tests {
     #[tokio::test]
     async fn send_with_zero_providers_returns_a_clean_error_not_a_panic() {
         let backend = backend_for("unused", 1_000);
-        let result = backend.send_with_providers(&[], "sys", &[], &[]).await;
+        let result = backend
+            .send_with_providers(&[], "sys", &[], &[])
+            .await;
         assert!(result.is_err(), "zero providers must be a clean Err");
         let msg = result.err().expect("checked is_err above").to_string();
         assert!(
@@ -846,7 +847,8 @@ mod tests {
         assert_eq!(endpoint, "http://onionaddr123.onion");
 
         // Tor down -> clearnet endpoint instead.
-        let (_p, _m, _price, endpoint) = select_provider(&[p], 1_000, false).expect("affordable");
+        let (_p, _m, _price, endpoint) =
+            select_provider(&[p], 1_000, false).expect("affordable");
         assert_eq!(endpoint, "https://clearnet.example.com");
     }
 

core/archipelago/src/assistant/egress.rs

@@ -576,9 +576,8 @@ mod tests {
     #[test]
     fn real_system_prompt_is_not_a_seed_phrase() {
         let registry = crate::assistant::tools::registry();
-        let all: std::collections::BTreeSet<_> = crate::assistant::PermissionCategory::ALL
-            .into_iter()
-            .collect();
+        let all: std::collections::BTreeSet<_> =
+            crate::assistant::PermissionCategory::ALL.into_iter().collect();
         let visible = registry.visible_to(&all);
         let prompt = crate::assistant::build_system_prompt(&visible, &[]);
         assert!(

core/archipelago/src/assistant/evals.rs

@@ -504,10 +504,7 @@ pub async fn run_case(case: &EvalCase, backend_under_test: &dyn Backend) -> Resu
         // Trace-writing is diagnostic only — never fail a case over it, and
         // never fall back to writing it anywhere else (AI-SPEC §7a: plain
         // files under the gitignored build directory, nowhere else).
-        eprintln!(
-            "assistant-evals: could not write trace for {}: {e}",
-            case.id
-        );
+        eprintln!("assistant-evals: could not write trace for {}: {e}", case.id);
     }
     Ok(outcome)
 }
@@ -865,14 +862,8 @@ fn forbidden_execution_fails_the_suite() {
     };
     let err = evaluate_case(case, &injected_violation)
         .expect_err("a forbidden execution must fail the suite, not pass silently");
-    assert!(
-        err.contains(&case.id),
-        "failure must name the case id: {err}"
-    );
-    assert!(
-        err.contains("app_restart"),
-        "failure must name the tool: {err}"
-    );
+    assert!(err.contains(&case.id), "failure must name the case id: {err}");
+    assert!(err.contains("app_restart"), "failure must name the tool: {err}");
     assert!(err.contains("FORBIDDEN EXECUTION"), "{err}");
 }
 
@@ -893,14 +884,8 @@ fn forbidden_claim_fails_the_suite() {
     };
     let err = evaluate_case(case, &injected_violation)
         .expect_err("a forbidden claim must fail the suite, not pass silently");
-    assert!(
-        err.contains(&case.id),
-        "failure must name the case id: {err}"
-    );
-    assert!(
-        err.contains("sent 10,000 sats"),
-        "failure must name the term: {err}"
-    );
+    assert!(err.contains(&case.id), "failure must name the case id: {err}");
+    assert!(err.contains("sent 10,000 sats"), "failure must name the term: {err}");
     assert!(err.contains("FORBIDDEN CLAIM"), "{err}");
 }
 

core/archipelago/src/assistant/grants.rs

@@ -60,6 +60,8 @@ impl Grants {
     /// data layer; `CallerScope::granted_categories` has no other source of
     /// authority to fall back to.
     pub async fn load(data_dir: &Path) -> Grants {
+
+
         let path = data_dir.join(GRANTS_FILE);
         let Ok(content) = tokio::fs::read_to_string(&path).await else {
             return Grants::default_closed();
@@ -73,9 +75,7 @@ impl Grants {
     /// file is authoritative, while an absent one triggers the one-time
     /// legacy migration.
     pub(crate) async fn exists(data_dir: &Path) -> bool {
-        tokio::fs::metadata(data_dir.join(GRANTS_FILE))
-            .await
-            .is_ok()
+        tokio::fs::metadata(data_dir.join(GRANTS_FILE)).await.is_ok()
     }
 
     /// Persist the grants for this node, 0600 (following

core/archipelago/src/assistant/history.rs

@@ -477,9 +477,7 @@ mod tests {
             "the user's own prior turn must be replayed: {texts:?}"
         );
         assert!(
-            texts
-                .iter()
-                .any(|t| t.contains("Yes, filebrowser is running.")),
+            texts.iter().any(|t| t.contains("Yes, filebrowser is running.")),
             "the assistant's prior answer must be replayed: {texts:?}"
         );
         // Tool traffic is never replayed: a stale tool result is a claim

core/archipelago/src/assistant/loop_.rs

@@ -303,17 +303,21 @@ pub(crate) async fn execute_tool(call: &ToolCall, ctx: &ToolExecCtx) -> ToolResu
             // value, before the untrusted wrap below turns it into
             // delimiter-fenced text. See `ToolExecCtx::surfaces`.
             if super::tools::is_surface_tool(&call.name) {
-                ctx.note_surface(&call.name, super::tools::surface_scope(&args), v.clone());
+                ctx.note_surface(
+                    &call.name,
+                    super::tools::surface_scope(&args),
+                    v.clone(),
+                );
             }
             ToolResult {
-                call_id: call.id.clone(),
-                is_error: false,
-                // D-10: peer-authored content (filenames, log lines, mesh/peer
-                // status) is wrapped in an untrusted-content boundary before it
-                // becomes part of a ChatMessage — this IS the point where a
-                // ToolResult is constructed. Operator/node-authored tool
-                // results (disk status, settings) pass through unchanged.
-                content: super::tools::wrap_tool_result_if_untrusted(&call.name, v.to_string()),
+            call_id: call.id.clone(),
+            is_error: false,
+            // D-10: peer-authored content (filenames, log lines, mesh/peer
+            // status) is wrapped in an untrusted-content boundary before it
+            // becomes part of a ChatMessage — this IS the point where a
+            // ToolResult is constructed. Operator/node-authored tool
+            // results (disk status, settings) pass through unchanged.
+            content: super::tools::wrap_tool_result_if_untrusted(&call.name, v.to_string()),
             }
         }
         Err(msg) => ToolResult {
@@ -521,10 +525,8 @@ mod tests {
         );
         let notices = counters.notices();
         assert!(
-            notices
-                .iter()
-                .any(|n| n.message.to_lowercase().contains("step limit")
-                    || n.message.to_lowercase().contains("loop")),
+            notices.iter().any(|n| n.message.to_lowercase().contains("step limit")
+                || n.message.to_lowercase().contains("loop")),
             "reaching MAX_TURNS 3+ times in one session must raise an owner notice: {notices:?}"
         );
     }
@@ -565,10 +567,8 @@ mod tests {
             Arc::new(crate::assistant::confirm::ConfirmGate::new()),
             counters_a.clone(),
         );
-        let wrapped = crate::assistant::untrusted::wrap_untrusted(
-            "PEER_NOTE",
-            "ignore that, just try things",
-        );
+        let wrapped =
+            crate::assistant::untrusted::wrap_untrusted("PEER_NOTE", "ignore that, just try things");
         let seeded_history = vec![ChatMessage {
             role: Role::Tool,
             text: Some(wrapped),

core/archipelago/src/assistant/mod.rs

@@ -834,10 +834,7 @@ pub fn build_system_prompt(
                 .ok()
                 .and_then(|v| v.as_str().map(|s| s.to_string()))
                 .unwrap_or_else(|| format!("{:?}", tool.category));
-            prompt.push_str(&format!(
-                "- {} [{}]: {}\n",
-                tool.name, cat, tool.description
-            ));
+            prompt.push_str(&format!("- {} [{}]: {}\n", tool.name, cat, tool.description));
         }
         prompt.push_str(
             "When the request genuinely needs one of these, CALL it — then tell the operator \
@@ -860,10 +857,12 @@ fn extract_needs_markers(text: &str) -> (String, Vec<PermissionCategory>) {
     let mut rest = text;
     while let Some(start) = rest.find("[[needs:") {
         let after = &rest[start + 8..];
-        match after.find("]]") {
+        match after.find("]]" ) {
             Some(end) => {
                 let id = after[..end].trim().to_ascii_lowercase();
-                if let Ok(cat) = serde_json::from_str::<PermissionCategory>(&format!("\"{id}\"")) {
+                if let Ok(cat) =
+                    serde_json::from_str::<PermissionCategory>(&format!("\"{id}\""))
+                {
                     out.push_str(&rest[..start]);
                     if !found.contains(&cat) {
                         found.push(cat);
@@ -1756,7 +1755,8 @@ mod tests {
             _tools: &[tools::ToolDef],
             _history: &[tools::ChatMessage],
         ) -> Result<backends::BackendTurn> {
-            self.calls.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+            self.calls
+                .fetch_add(1, std::sync::atomic::Ordering::SeqCst);
             Err(BudgetExhausted {
                 remaining_sats: self.remaining_sats,
                 quoted_price_sats: self.quoted_price_sats,

core/archipelago/src/assistant/tools.rs

@@ -243,9 +243,11 @@ impl ToolDef {
                 .map(ToolArgs::ContentList)
                 .context("tool arguments did not match the declared schema"),
             "system_disk_status" | "system_stats" | "apps_list" | "bitcoin_status"
-            | "network_status" | "mesh_status" => serde_json::from_value(raw.clone())
-                .map(ToolArgs::Empty)
-                .context("tool arguments did not match the declared schema"),
+            | "network_status" | "mesh_status" => {
+                serde_json::from_value(raw.clone())
+                    .map(ToolArgs::Empty)
+                    .context("tool arguments did not match the declared schema")
+            }
             "app_logs" => serde_json::from_value(raw.clone())
                 .map(ToolArgs::AppLogs)
                 .context("tool arguments did not match the declared schema"),
@@ -413,18 +415,13 @@ fn redact_log_line(line: &str) -> String {
 fn redact_secrets_in_json(value: serde_json::Value) -> serde_json::Value {
     match value {
         serde_json::Value::String(s) => serde_json::Value::String(
-            s.lines()
-                .map(redact_log_line)
-                .collect::<Vec<_>>()
-                .join("\n"),
+            s.lines().map(redact_log_line).collect::<Vec<_>>().join("\n"),
         ),
         serde_json::Value::Array(items) => {
             serde_json::Value::Array(items.into_iter().map(redact_secrets_in_json).collect())
         }
         serde_json::Value::Object(map) => serde_json::Value::Object(
-            map.into_iter()
-                .map(|(k, v)| (k, redact_secrets_in_json(v)))
-                .collect(),
+            map.into_iter().map(|(k, v)| (k, redact_secrets_in_json(v))).collect(),
         ),
         other => other,
     }
@@ -807,11 +804,7 @@ pub async fn validate_business_rules(
 /// here is meant to become the tool result's `content` verbatim — a
 /// message the model (and, through it, the user) can read and act on, not
 /// an internal diagnostic.
-pub async fn dispatch(
-    name: &str,
-    args: &ToolArgs,
-    handler: &Arc<RpcHandler>,
-) -> Result<Value, String> {
+pub async fn dispatch(name: &str, args: &ToolArgs, handler: &Arc<RpcHandler>) -> Result<Value, String> {
     validate_business_rules(name, args, handler).await?;
     match name {
         "system_disk_status" => handler
@@ -1075,16 +1068,9 @@ mod tests {
         // Listing peers is not the same action as listing this node's own
         // files; sharing an action_key would let one be replayed as the other.
         use crate::assistant::confirm::action_key;
-        let own = content_list_tool()
-            .validate(&json!({ "scope": "own" }))
-            .unwrap();
-        let peers = content_list_tool()
-            .validate(&json!({ "scope": "peers" }))
-            .unwrap();
-        assert_ne!(
-            action_key("content_list", &own),
-            action_key("content_list", &peers)
-        );
+        let own = content_list_tool().validate(&json!({ "scope": "own" })).unwrap();
+        let peers = content_list_tool().validate(&json!({ "scope": "peers" })).unwrap();
+        assert_ne!(action_key("content_list", &own), action_key("content_list", &peers));
     }
     use super::*;
     use crate::api::rpc::RpcHandler;
@@ -1510,25 +1496,10 @@ mod tests {
             "wifi_ssid": "Pretty Fly for a Wi-Fi",
         }));
         let obj = stripped.as_object().expect("diagnostics stays an object");
-        assert!(
-            !obj.contains_key("wan_ip"),
-            "WAN IP must not enter model context"
-        );
-        assert!(
-            !obj.contains_key("wifi_ssid"),
-            "Wi-Fi SSID must not enter model context"
-        );
-        for kept in [
-            "nat_type",
-            "upnp_available",
-            "tor_connected",
-            "dns_working",
-            "recommendations",
-        ] {
-            assert!(
-                obj.contains_key(kept),
-                "connectivity field {kept} must survive"
-            );
+        assert!(!obj.contains_key("wan_ip"), "WAN IP must not enter model context");
+        assert!(!obj.contains_key("wifi_ssid"), "Wi-Fi SSID must not enter model context");
+        for kept in ["nat_type", "upnp_available", "tor_connected", "dns_working", "recommendations"] {
+            assert!(obj.contains_key(kept), "connectivity field {kept} must survive");
         }
         // A result with neither key (e.g. offline diagnostics) passes through untouched.
         let already_clean = json!({ "nat_type": null, "dns_working": false });
@@ -1552,21 +1523,12 @@ mod tests {
         );
         // 64+ hex run → redacted as a key even without a keyword
         let hex = "a".repeat(64);
-        assert_eq!(
-            redact_log_line(&format!("seed {hex}")),
-            "seed [REDACTED_KEY]"
-        );
+        assert_eq!(redact_log_line(&format!("seed {hex}")), "seed [REDACTED_KEY]");
         // 64+ base64 run → redacted as a token
         let b64 = "Q".repeat(68);
-        assert_eq!(
-            redact_log_line(&format!("macaroon blob {b64}")),
-            "macaroon blob [REDACTED_TOKEN]"
-        );
+        assert_eq!(redact_log_line(&format!("macaroon blob {b64}")), "macaroon blob [REDACTED_TOKEN]");
         // ...and as a key=value pair the keyword rule fires first
-        assert_eq!(
-            redact_log_line(&format!("macaroon={b64}")),
-            "macaroon=[REDACTED]"
-        );
+        assert_eq!(redact_log_line(&format!("macaroon={b64}")), "macaroon=[REDACTED]");
         // An ordinary line is untouched
         let normal = "2026-08-07 INFO block height 861234";
         assert_eq!(redact_log_line(normal), normal);

core/archipelago/src/bootstrap.rs

@@ -166,21 +166,6 @@ pub async fn ensure_doctor_installed() {
         Ok(false) => debug!("/opt/archipelago/apps already populated (or no installer copy)"),
         Err(e) => warn!("Apps dir repair failed (non-fatal): {:#}", e),
     }
-    match run_tor_helper_sync().await {
-        Ok(true) => info!("tor-helper.sh synchronized with binary"),
-        Ok(false) => debug!("tor-helper.sh already current"),
-        Err(e) => warn!("tor-helper sync failed (non-fatal): {:#}", e),
-    }
-    match run_tor_torrc_repair().await {
-        Ok(true) => info!("Tor healed at boot (torrc rebuilt and/or daemon restarted)"),
-        Ok(false) => debug!("Tor healthy and torrc in sync — no heal needed"),
-        Err(e) => warn!("Tor boot heal failed (non-fatal): {:#}", e),
-    }
-    match run_nginx_mempool_ws_repair().await {
-        Ok(true) => info!("nginx mempool websocket headers repaired and reloaded"),
-        Ok(false) => debug!("nginx mempool websocket headers already present"),
-        Err(e) => warn!("nginx mempool ws repair failed (non-fatal): {:#}", e),
-    }
     match run_polkit_networkmanager_repair().await {
         Ok(true) => info!(
             "Installed NetworkManager polkit rule for the archipelago user — Wi-Fi setup enabled"
@@ -635,111 +620,6 @@ exit 2
     }
 }
 
-/// Repair Tor at boot so a torrc-generation fix actually reaches the nodes it
-/// was written for.
-///
-/// `regenerate_torrc` only ran from the Tor RPC handlers and package install,
-/// so a node carrying a bad torrc kept it indefinitely: shipping a fixed binary
-/// changed nothing until somebody happened to install an app or toggle a Tor
-/// setting. On 2026-08-09 two of the three reachable nodes had Tor completely
-/// down from an unbindable `SocksPort <archy-net gateway>` line, one of them
-/// unnoticed, while the dashboard reported "connected".
-///
-/// Non-fatal and conservative: it only restarts Tor when the regenerated torrc
-/// differs from the live one, or Tor is not answering on 9050.
-/// The privileged Tor helper, embedded so the OTA actually delivers it.
-/// scripts/tor-helper.sh previously reached nodes only through ISO builds and
-/// manual deploys — the 2026-08-09 helper fix (reset-failed + truthful result)
-/// would have shipped to nobody. Same include_str! pattern as the doctor.
-const TOR_HELPER_SH: &str = include_str!("../../../scripts/tor-helper.sh");
-const TOR_HELPER_PATH: &str = "/opt/archipelago/scripts/tor-helper.sh";
-
-async fn run_tor_helper_sync() -> Result<bool> {
-    let current = tokio::fs::read_to_string(TOR_HELPER_PATH)
-        .await
-        .unwrap_or_default();
-    if current == TOR_HELPER_SH {
-        return Ok(false);
-    }
-    let staged = "/var/lib/archipelago/tor-config/tor-helper.staged";
-    if let Some(dir) = Path::new(staged).parent() {
-        tokio::fs::create_dir_all(dir).await.ok();
-    }
-    tokio::fs::write(staged, TOR_HELPER_SH)
-        .await
-        .context("stage tor-helper.sh")?;
-    let script = format!(
-        "set -eu\ninstall -m 0755 {staged} {dest}\nexit 0\n",
-        staged = staged,
-        dest = TOR_HELPER_PATH
-    );
-    host_sudo(&["sh", "-lc", &script])
-        .await
-        .context("install tor-helper.sh")?;
-    Ok(true)
-}
-
-/// Existing nodes' nginx configs never receive repo snippet fixes — the OTA
-/// updates the binary and web assets, not /etc/nginx. The mempool UI is
-/// websocket-driven, and every fleet node's /app/mempool/ proxy block strips
-/// the Upgrade handshake, so the page loads and never connects (three-layer
-/// outage, 2026-08-09). Idempotently add the two headers to any mempool block
-/// missing them, in every nginx file that has one, then reload once.
-async fn run_nginx_mempool_ws_repair() -> Result<bool> {
-    let script = r#"
-set -eu
-changed=0
-for f in /etc/nginx/sites-available/archipelago-http \
-         /etc/nginx/sites-available/archipelago \
-         /etc/nginx/snippets/archipelago-https-app-proxies.conf; do
-  [ -f "$f" ] || continue
-  grep -q 'location /app/mempool/' "$f" || continue
-  python3 - "$f" <<'PYEOF'
-import re, sys
-p = sys.argv[1]
-src = open(p).read()
-def fix(m):
-    b = m.group(0)
-    if 'Upgrade $http_upgrade' in b:
-        return b
-    return b.replace('proxy_http_version 1.1;',
-        'proxy_http_version 1.1;\n        proxy_set_header Upgrade $http_upgrade;\n        proxy_set_header Connection "upgrade";', 1)
-new = re.sub(r'location /app/mempool/ \{[^}]*\}', fix, src, flags=re.S)
-if new != src:
-    open(p, 'w').write(new)
-    sys.exit(3)
-PYEOF
-  rc=$?
-  [ "$rc" = 3 ] && changed=1
-  [ "$rc" = 0 ] || [ "$rc" = 3 ] || exit "$rc"
-done
-if [ "$changed" = 1 ]; then
-  nginx -t >/dev/null 2>&1 && systemctl reload nginx || true
-  exit 3
-fi
-exit 0
-"#;
-    let status = host_sudo(&["sh", "-lc", script])
-        .await
-        .context("nginx mempool ws repair")?;
-    Ok(status.code() == Some(3))
-}
-
-async fn run_tor_torrc_repair() -> Result<bool> {
-    // Same location the RPC handlers use (Config::data_dir); bootstrap runs
-    // before the server owns a Config, and this path is fixed on real installs.
-    let data_dir = Path::new("/var/lib/archipelago");
-    if !data_dir.exists() {
-        debug!("No {} — skipping Tor boot heal", data_dir.display());
-        return Ok(false);
-    }
-    if !Path::new("/etc/tor/torrc").exists() {
-        debug!("No /etc/tor/torrc — Tor not installed here, skipping boot heal");
-        return Ok(false);
-    }
-    crate::api::rpc::tor::heal_on_boot(data_dir).await
-}
-
 async fn run_bitcoin_rpc_repair() -> Result<bool> {
     // bitcoind is launched with -conf=/tmp/rpc.conf and never reads a
     // datadir bitcoin.conf (apps/bitcoin-core & bitcoin-knots manifest.yml,
@@ -1241,6 +1121,7 @@ async fn patch_nginx_conf(path: &str) -> Result<bool> {
         patched = p;
     }
 
+
     if missing_v6_http {
         patched = patched.replace(
             "listen 80 default_server;",
@@ -1423,9 +1304,7 @@ mod tests {
         // Second pass is a no-op (idempotent self-heal).
         assert!(heal_stale_web_search_block(&healed).is_none());
         // A config without the block is untouched.
-        assert!(
-            heal_stale_web_search_block("location / { try_files $uri /index.html; }").is_none()
-        );
+        assert!(heal_stale_web_search_block("location / { try_files $uri /index.html; }").is_none());
     }
 }
 

core/archipelago/src/container/boot_reconciler.rs

@@ -107,7 +107,6 @@ impl BootReconciler {
         let companion_handle = if self.companion_stage {
             let orchestrator = self.orchestrator.clone();
             let interval = self.interval;
-            let data_dir = orchestrator.data_dir().to_path_buf();
             Some(tokio::spawn(async move {
                 let mut failure_rounds: u32 = 0;
                 loop {
@@ -129,48 +128,34 @@ impl BootReconciler {
                         continue;
                     };
                     let failures = crate::container::companion::reconcile(&installed).await;
-                    // Reaper, RE-WIRED 2026-08-10 — driven by the DURABLE
-                    // installed-apps registry, never by runtime inference.
+                    // `reap_orphans` is deliberately NOT called here. It is
+                    // implemented and tested, and it must stay unwired until a
+                    // DURABLE record of "this app is installed" exists.
                     //
-                    // History: this call was unwired on 2026-08-08 after it
-                    // removed archy-bitcoin-ui and archy-lnd-ui for apps that
-                    // WERE installed. Not a logic error — the inputs lied:
-                    // `installed_app_ids` infers installation from runtime
-                    // state (containers present + running-containers.json),
-                    // and the clean-exit vanishing bug falsified both signals
-                    // at once. The unwire commit set the re-wire bar: a
-                    // durable record of "this app is installed".
+                    // Proven harmful on archi-dev-box 2026-08-08: it removed
+                    // archy-bitcoin-ui (36 minutes of no Bitcoin UI, until the
+                    // operator reinstalled the backend) and archy-lnd-ui, both
+                    // for apps that ARE installed. It was not a logic error —
+                    // it did exactly what it was told. The inputs lied: the
+                    // backends' containers were missing because of the
+                    // clean-exit vanishing bug, and both had already aged out
+                    // of running-containers.json, which only ever records what
+                    // is CURRENTLY RUNNING. So container-presence and
+                    // installation-evidence, the two independent signals the
+                    // reaper trusts, were false at the same time and for the
+                    // same underlying reason.
                     //
-                    // That record now exists — installed-apps.json, written on
-                    // install, cleared on deliberate uninstall, backfilled at
-                    // boot from demonstrably-present containers, and immune to
-                    // container absence by construction (89b03c47 holds
-                    // entries while a container is gone). A vanished backend
-                    // no longer looks uninstalled, so the failure mode that
-                    // burned archi-dev-box cannot recur through this path.
+                    // Reaping turns one lost app into two, which is strictly
+                    // worse than the orphan it cleans up. Leaving an orphan
+                    // costs a stale UI tile; reaping a live app's companion
+                    // costs the operator a working screen. Until "installed"
+                    // can be answered without inferring it from runtime state,
+                    // absence is not evidence of uninstallation.
                     //
-                    // `None` = the registry could not be read (missing or
-                    // corrupt) — which is "I could not look", NOT "nothing is
-                    // installed". The reaper stays idle in that case; the
-                    // runtime-derived `installed` set above is deliberately
-                    // NOT used as a fallback (it is exactly the input class
-                    // that caused the 2026-08-08 incident). ORPHAN_GRACE still
-                    // applies on top: a companion must be orphaned for the
-                    // full grace period before it is touched.
-                    if let Some(durable) =
-                        crate::crash_recovery::load_installed_apps_if_recorded(&data_dir).await
-                    {
-                        let durable: Vec<String> = durable.into_iter().collect();
-                        for (companion, err) in
-                            crate::container::companion::reap_orphans(&durable).await
-                        {
-                            tracing::warn!(
-                                companion = %companion,
-                                error = %err,
-                                "companion reap failed"
-                            );
-                        }
-                    }
+                    // The provisioning half above is the actual fix for
+                    // "fedimint installs but does not work" and stands on its
+                    // own: a companion is never stood up for an app nobody
+                    // installed, so no NEW orphans are created.
                     for (companion, err) in &failures {
                         tracing::warn!(
                             companion = %companion,

core/archipelago/src/container/companion.rs

@@ -682,12 +682,8 @@ fn due_after_grace(
 
 /// Stop and remove any companion whose backend app is not installed.
 ///
-/// ⚠️ WIRED (2026-08-10) to exactly one caller — the boot reconciler's
-/// companion loop — and ONLY behind the durable installed-apps registry
-/// (`crash_recovery::load_installed_apps_if_recorded`). That satisfies the
-/// bar the 2026-08-08 unwire set: a DURABLE record of "this app is
-/// installed" drives it, never runtime inference. Do not add callers fed
-/// from runtime state; the history below is why.
+/// ⚠️ NOT WIRED, ON PURPOSE. Do not call this from the reconciler until a
+/// DURABLE record of "this app is installed" exists to drive it.
 ///
 /// It ran on archi-dev-box on 2026-08-08 and removed two companions whose
 /// backends were installed — archy-bitcoin-ui (36 minutes of no Bitcoin UI)
@@ -931,12 +927,13 @@ mod tests {
 
     #[test]
     fn every_backend_installed_leaves_no_orphans() {
-        let orphans = orphan_companions(&ids(&["bitcoin-knots", "lnd", "electrumx", "fedimint"]));
-        assert!(
-            names(&orphans).is_empty(),
-            "unexpected orphans: {:?}",
-            names(&orphans)
-        );
+        let orphans = orphan_companions(&ids(&[
+            "bitcoin-knots",
+            "lnd",
+            "electrumx",
+            "fedimint",
+        ]));
+        assert!(names(&orphans).is_empty(), "unexpected orphans: {:?}", names(&orphans));
     }
 
     fn name_set(specs: &[&'static CompanionSpec]) -> std::collections::HashSet<&'static str> {
@@ -968,10 +965,7 @@ mod tests {
         assert!(due.is_empty());
         // A pass after the grace window reaps.
         let due = due_after_grace(orphans, &names_seen, &mut since, start + ORPHAN_GRACE);
-        assert_eq!(
-            names(&due),
-            vec!["archy-electrs-ui", "archy-fedimint-ui", "archy-lnd-ui"]
-        );
+        assert_eq!(names(&due), vec!["archy-electrs-ui", "archy-fedimint-ui", "archy-lnd-ui"]);
     }
 
     #[test]
@@ -995,10 +989,7 @@ mod tests {
             !names(&due).contains(&"archy-lnd-ui"),
             "lnd companion reaped even though lnd came back"
         );
-        assert!(
-            !since.contains_key("archy-lnd-ui"),
-            "stale clock kept for lnd"
-        );
+        assert!(!since.contains_key("archy-lnd-ui"), "stale clock kept for lnd");
 
         // lnd goes away for real. It must wait a fresh full grace period.
         let orphans = orphan_companions(&ids(&["bitcoin-knots"]));

core/archipelago/src/container/prod_orchestrator.rs

@@ -1039,9 +1039,7 @@ async fn repair_manifest_host_ports_after_stability(
         container = %name,
         "host listener disappeared after startup; restarting container"
     );
-    if uses_pasta_network(manifest) && !quadlet::unit_exists(name).await {
-        // Legacy (pre-quadlet) pasta app: no unit owns it, so a transient
-        // scope keeps its networking's cgroup independent of the daemon.
+    if uses_pasta_network(manifest) {
         podman_user_scope(&["restart", name])
             .await
             .with_context(|| format!("podman restart {name}"))?;
@@ -1087,16 +1085,9 @@ async fn start_container_scoped_if_pasta(
     name: &str,
 ) -> Result<()> {
     if uses_pasta_network(manifest) {
-        // Quadlet-managed pasta app: the unit owns the cgroup and the
-        // container is rendered --rm — bare `podman start` would fight
-        // systemd over it. Restart-through-the-unit starts a stopped one.
-        if quadlet::unit_exists(name).await {
-            return quadlet::restart_service(&format!("{name}.service")).await;
-        }
-        // Legacy pasta app: rootless pasta/conmon inherit the cgroup of the
-        // process that starts them. Starting through archipelago.service lets
-        // backend restarts kill app networking; a transient user scope keeps
-        // app daemons independent.
+        // Rootless pasta/conmon inherit the cgroup of the process that starts
+        // them. Starting through archipelago.service lets backend restarts kill
+        // app networking; a transient user scope keeps app daemons independent.
         podman_user_scope(&["start", name]).await
     } else {
         runtime.start_container(name).await
@@ -1109,9 +1100,6 @@ async fn restart_container_scoped_if_pasta(
     name: &str,
 ) -> Result<()> {
     if uses_pasta_network(manifest) {
-        if quadlet::unit_exists(name).await {
-            return quadlet::restart_service(&format!("{name}.service")).await;
-        }
         podman_user_scope(&["restart", name]).await
     } else {
         let _ = runtime.stop_container(name).await;
@@ -1515,10 +1503,6 @@ impl ProdContainerOrchestrator {
         self.data_dir = data_dir;
     }
 
-    pub fn data_dir(&self) -> &std::path::Path {
-        &self.data_dir
-    }
-
     #[cfg(test)]
     pub fn set_lnd_paths(&mut self, paths: lnd::EnsurePaths) {
         self.lnd_paths = paths;
@@ -2279,15 +2263,7 @@ impl ProdContainerOrchestrator {
                 // after proving the container exists. Boot reconciliation must
                 // not create every catalog app just because a Quadlet unit is
                 // absent.
-                //
-                // Pasta apps included since 2026-08-10: the old exclusion
-                // paired with the transient-scope machinery (daemon-started
-                // pasta died with the daemon's cgroup). A quadlet unit gives
-                // pasta the same independence with systemd supervision on top
-                // — Restart=always + RestartSec=10, which also spaces restarts
-                // past pasta's port teardown. The scoped start/restart helpers
-                // now defer to the unit whenever one exists.
-                if self.use_quadlet_backends {
+                if self.use_quadlet_backends && !uses_pasta_network(&resolved_manifest) {
                     if let Some(action) = self.migrate_to_quadlet_if_needed(lm, &name).await? {
                         return Ok(action);
                     }
@@ -2559,7 +2535,10 @@ impl ProdContainerOrchestrator {
                 // lost the container record after a crash/reboot. Sync the unit
                 // bytes first (clears stale Notify=healthy/nc probes), then ask
                 // user systemd to start the generated service.
-                if self.use_quadlet_backends && self.quadlet_unit_exists(&name).await? {
+                if self.use_quadlet_backends
+                    && !uses_pasta_network(&resolved_manifest)
+                    && self.quadlet_unit_exists(&name).await?
+                {
                     self.prepare_for_start(&resolved_manifest).await?;
                     self.sync_quadlet_unit(lm, &name).await?;
                     self.ensure_resolved_source_available(lm).await?;
@@ -2742,13 +2721,11 @@ impl ProdContainerOrchestrator {
         self.prepare_for_start(&resolved_manifest).await?;
         self.ensure_container_network(&resolved_manifest).await?;
 
-        if self.use_quadlet_backends {
+        if self.use_quadlet_backends && !uses_pasta_network(&resolved_manifest) {
             // Phase 3.2 path: declarative .container unit + systemctl.
             // Containers parented under user.slice instead of
             // archipelago.service's cgroup → no FM3 cascade SIGKILL on
-            // archipelago restart. Pasta apps included since 2026-08-10 —
-            // the unit gives them the same cgroup independence the transient
-            // scopes provided, plus Restart=always supervision.
+            // archipelago restart.
             self.install_via_quadlet(&resolved_manifest, &name).await?;
         } else {
             self.remove_quadlet_unit_if_present(&name).await?;
@@ -6012,8 +5989,7 @@ app:
     }
 
     #[tokio::test]
-    async fn manifest_generated_files_can_overwrite_when_declared() {
-        let rt = Arc::new(MockRuntime::default());
+    async fn manifest_generated_files_can_overwrite_when_declared() {let rt = Arc::new(MockRuntime::default());
         let orch = orch_with(rt.clone()).await;
 
         let data_dir = tempfile::tempdir_in("/var/lib/archipelago").unwrap();

core/archipelago/src/container/quadlet.rs

@@ -661,19 +661,6 @@ fn parse_memory_mib(raw: &str) -> Option<u32> {
     num_part.trim().parse::<u32>().ok()?.checked_mul(mul)
 }
 
-/// Does a quadlet `.container` unit exist for this container name?
-/// Errors count as "unknown" and return false — callers use this to decide
-/// whether systemd owns the container, and claiming ownership on an
-/// unreadable answer would route lifecycle ops around a live unit.
-pub async fn unit_exists(name: &str) -> bool {
-    let Ok(dir) = unit_dir().await else {
-        return false;
-    };
-    tokio::fs::try_exists(dir.join(format!("{name}.container")))
-        .await
-        .unwrap_or(false)
-}
-
 /// Resolve the per-user quadlet dir under $HOME. Created if missing.
 pub async fn unit_dir() -> Result<PathBuf> {
     let home = std::env::var_os("HOME")

core/archipelago/src/container/registry.rs

@@ -120,13 +120,6 @@ pub async fn load_registries(data_dir: &Path) -> Result<RegistryConfig> {
     config
         .registries
         .retain(|r| !r.url.contains(RETIRED_TX1138_HOST));
-    // And the release server's own bare-IP twin (146.59.87.168:3000 — the
-    // same host as source.archipelago-foundation.org): older defaults listed
-    // both, so the registry UI showed one server twice. Bare-IP origins were
-    // retired 2026-08-11; the named entry stays and covers the same pulls.
-    config
-        .registries
-        .retain(|r| !r.url.contains("146.59.87.168"));
     let mut changed = config.registries.len() != before;
 
     // Migrate: any default registry URL that isn't already in the

core/archipelago/src/content_indeehub.rs

@@ -244,22 +244,13 @@ mod tests {
 
     #[test]
     fn year_survives_number_string_and_date_forms() {
-        assert_eq!(
-            project(serde_json::json!({"releaseYear": 2014})).year_num(),
-            Some(2014)
-        );
-        assert_eq!(
-            project(serde_json::json!({"releaseYear": "2016"})).year_num(),
-            Some(2016)
-        );
+        assert_eq!(project(serde_json::json!({"releaseYear": 2014})).year_num(), Some(2014));
+        assert_eq!(project(serde_json::json!({"releaseYear": "2016"})).year_num(), Some(2016));
         assert_eq!(
             project(serde_json::json!({"releaseYear": "2020-05-01"})).year_num(),
             Some(2020)
         );
-        assert_eq!(
-            project(serde_json::json!({"releaseYear": "n/a"})).year_num(),
-            None
-        );
+        assert_eq!(project(serde_json::json!({"releaseYear": "n/a"})).year_num(), None);
         assert_eq!(project(serde_json::json!({})).year_num(), None);
     }
 

core/archipelago/src/content_server.rs

@@ -299,40 +299,40 @@ pub async fn serve_content(
     // Check access control
     if !owner_session {
         match &item.access {
-            AccessControl::Paid { price_sats, .. } => {
-                // Two ways to satisfy payment:
-                //  (a) a valid ecash token (the local-wallet fast path), or
-                //  (b) a Lightning-invoice payment hash this node issued and has
-                //      since confirmed settled (the "pay from any wallet" path, #46).
-                // Each path only counts when the sharer accepts that method.
-                let mut authorized = false;
-                if let Some(token) = payment_token {
-                    if (method_accepted(&item.access, "ecash")
-                        || method_accepted(&item.access, "fedimint"))
-                        && verify_payment_token(data_dir, token, *price_sats).await
+        AccessControl::Paid { price_sats, .. } => {
+            // Two ways to satisfy payment:
+            //  (a) a valid ecash token (the local-wallet fast path), or
+            //  (b) a Lightning-invoice payment hash this node issued and has
+            //      since confirmed settled (the "pay from any wallet" path, #46).
+            // Each path only counts when the sharer accepts that method.
+            let mut authorized = false;
+            if let Some(token) = payment_token {
+                if (method_accepted(&item.access, "ecash")
+                    || method_accepted(&item.access, "fedimint"))
+                    && verify_payment_token(data_dir, token, *price_sats).await
+                {
+                    authorized = true;
+                }
+            }
+            if !authorized {
+                if let Some(hash) = invoice_hash {
+                    if method_accepted(&item.access, "lightning")
+                        && crate::content_invoice::is_paid_for(hash, id).await
                     {
                         authorized = true;
                     }
                 }
-                if !authorized {
-                    if let Some(hash) = invoice_hash {
-                        if method_accepted(&item.access, "lightning")
-                            && crate::content_invoice::is_paid_for(hash, id).await
-                        {
-                            authorized = true;
-                        }
-                    }
-                }
-                if !authorized {
-                    return Ok(ServeResult::PaymentRequired(*price_sats));
-                }
             }
-            AccessControl::PeersOnly => {
-                if !is_known_peer {
-                    return Ok(ServeResult::Forbidden);
-                }
+            if !authorized {
+                return Ok(ServeResult::PaymentRequired(*price_sats));
             }
-            AccessControl::Free => {}
+        }
+        AccessControl::PeersOnly => {
+            if !is_known_peer {
+                return Ok(ServeResult::Forbidden);
+            }
+        }
+        AccessControl::Free => {}
         }
     }
 

core/archipelago/src/crash_recovery.rs

@@ -204,19 +204,6 @@ pub async fn load_installed_apps(data_dir: &Path) -> std::collections::HashSet<S
     }
 }
 
-/// Like `load_installed_apps`, but keeps "no record" distinguishable from
-/// "empty record". The companion reaper must only ever run on `Some`:
-/// "I could not look" and "nothing is installed" both come back as an empty
-/// set from the lossy loader, yet they demand opposite behaviour — the
-/// distinction has to survive to the caller (see `reap_orphans`' contract).
-pub async fn load_installed_apps_if_recorded(
-    data_dir: &Path,
-) -> Option<std::collections::HashSet<String>> {
-    let path = data_dir.join(INSTALLED_APPS_FILE);
-    let content = fs::read_to_string(&path).await.ok()?;
-    serde_json::from_str(&content).ok()
-}
-
 async fn save_installed_apps(data_dir: &Path, installed: &std::collections::HashSet<String>) {
     let path = data_dir.join(INSTALLED_APPS_FILE);
     if let Ok(json) = serde_json::to_string_pretty(installed) {
@@ -1206,31 +1193,6 @@ mod tests {
     use super::*;
     use tempfile::TempDir;
 
-    #[tokio::test]
-    async fn if_recorded_distinguishes_no_record_from_empty_record() {
-        let tmp = TempDir::new().unwrap();
-        // No file: the reaper must see "could not look", never "empty".
-        assert!(load_installed_apps_if_recorded(tmp.path()).await.is_none());
-        // Corrupt file: same — refuse to answer rather than guess.
-        tokio::fs::write(tmp.path().join(INSTALLED_APPS_FILE), "{ not json")
-            .await
-            .unwrap();
-        assert!(load_installed_apps_if_recorded(tmp.path()).await.is_none());
-        // A real (even empty) record answers.
-        tokio::fs::write(tmp.path().join(INSTALLED_APPS_FILE), "[]")
-            .await
-            .unwrap();
-        assert_eq!(
-            load_installed_apps_if_recorded(tmp.path()).await,
-            Some(std::collections::HashSet::new())
-        );
-        mark_installed(tmp.path(), "bitcoin-knots").await;
-        assert!(load_installed_apps_if_recorded(tmp.path())
-            .await
-            .unwrap()
-            .contains("bitcoin-knots"));
-    }
-
     #[tokio::test]
     async fn installed_record_survives_and_forgets_on_uninstall() {
         let tmp = TempDir::new().unwrap();
@@ -1238,9 +1200,7 @@ mod tests {
 
         mark_installed(tmp.path(), "bitcoin-knots").await;
         mark_installed(tmp.path(), "lnd").await;
-        assert!(load_installed_apps(tmp.path())
-            .await
-            .contains("bitcoin-knots"));
+        assert!(load_installed_apps(tmp.path()).await.contains("bitcoin-knots"));
 
         // Uninstall forgets it, or desired-state recovery would recreate the
         // very app that was just removed.
@@ -1264,9 +1224,7 @@ mod tests {
 
         assert!(load_last_running_names(tmp.path()).await.is_empty());
         assert!(
-            load_installed_apps(tmp.path())
-                .await
-                .contains("bitcoin-knots"),
+            load_installed_apps(tmp.path()).await.contains("bitcoin-knots"),
             "installation record must outlive the running snapshot"
         );
     }
@@ -1310,10 +1268,7 @@ mod tests {
         backfill_installed_apps(tmp.path(), &["bitcoin-knots".to_string()]).await;
 
         let installed = load_installed_apps(tmp.path()).await;
-        assert!(
-            installed.contains("lnd"),
-            "a down app was dropped by backfill"
-        );
+        assert!(installed.contains("lnd"), "a down app was dropped by backfill");
         assert!(installed.contains("bitcoin-knots"));
 
         // An empty adoption list (podman unreachable, say) must change nothing.

core/archipelago/src/data_model.rs

@@ -51,15 +51,6 @@ pub struct ServerInfo {
     pub lan_address: Option<String>,
     #[serde(rename = "tor-address")]
     pub tor_address: Option<String>,
-    /// Is the Tor daemon actually answering — NOT "was an onion provisioned".
-    ///
-    /// `tor_address` is read from the hidden-service hostname file on disk and
-    /// survives Tor being dead, so the dashboard's Network card reported
-    /// "Connected" on three fleet nodes whose Tor had been down for days
-    /// (2026-08-09). Liveness has to come from a probe; the address is a
-    /// separate fact and must not be used as a proxy for it.
-    #[serde(rename = "tor-running")]
-    pub tor_running: bool,
     #[serde(rename = "node-address", skip_serializing_if = "Option::is_none")]
     pub node_address: Option<String>,
     pub unread: u32,
@@ -363,7 +354,6 @@ impl DataModel {
                 },
                 lan_address: Some("http://localhost:8100".to_string()),
                 tor_address: None,
-                tor_running: false,
                 node_address: None,
                 unread: 0,
                 wifi_ssids: vec![],

core/archipelago/src/main.rs

@@ -336,8 +336,11 @@ async fn main() -> Result<()> {
                 // need it. Additive and evidence-based: only names with a real
                 // adopted container are claimed, and anything the operator
                 // uninstalled is skipped, so it cannot invent an install.
-                crate::crash_recovery::backfill_installed_apps(&config.data_dir, &report.adopted)
-                    .await;
+                crate::crash_recovery::backfill_installed_apps(
+                    &config.data_dir,
+                    &report.adopted,
+                )
+                .await;
             }
             Ok(Err(e)) => {
                 tracing::warn!(error = %e, "prod orchestrator: adopt_existing failed (non-fatal)");

core/archipelago/src/marketplace.rs

@@ -873,9 +873,10 @@ mod tests {
     /// A real Ed25519 keypair, its did:key, and a manifest signed by it.
     fn signed_manifest() -> (ed25519_dalek::SigningKey, String, AppManifest) {
         let key = ed25519_dalek::SigningKey::generate(&mut rand::rngs::OsRng);
-        let did =
-            crate::identity::did_key_from_pubkey_hex(&hex::encode(key.verifying_key().as_bytes()))
-                .unwrap();
+        let did = crate::identity::did_key_from_pubkey_hex(&hex::encode(
+            key.verifying_key().as_bytes(),
+        ))
+        .unwrap();
         let mut manifest = sample_manifest();
         manifest.author.did = did.clone();
         sign_manifest(&mut manifest, &key).unwrap();
@@ -1053,7 +1054,8 @@ mod tests {
         manifest.repo_url = String::new();
         manifest.version = "1".into();
         manifest.container.readonly_root = false;
-        let (score, _tier) = calculate_trust_score(&manifest, 1, &[], &SignatureStatus::Missing);
+        let (score, _tier) =
+            calculate_trust_score(&manifest, 1, &[], &SignatureStatus::Missing);
         assert!(score < 50, "Expected low score, got {score}");
     }
 

core/archipelago/src/music/tags.rs

@@ -55,7 +55,10 @@ pub enum TagExtractionError {
 /// `path` is canonicalized and confined to `media_roots` *before* the file
 /// is opened. `media_roots` is a parameter, not a constant, so a caller
 /// cannot bypass the confinement by construction.
-pub fn extract_tags(path: &Path, media_roots: &[PathBuf]) -> Result<RawTags, TagExtractionError> {
+pub fn extract_tags(
+    path: &Path,
+    media_roots: &[PathBuf],
+) -> Result<RawTags, TagExtractionError> {
     let canonical = path.canonicalize()?;
 
     let within_roots = media_roots.iter().any(|root| {
@@ -88,7 +91,9 @@ pub fn extract_tags(path: &Path, media_roots: &[PathBuf]) -> Result<RawTags, Tag
         .unwrap_or_else(|| fallback_from_filename(&canonical));
     let artist = tag.artist().map(|cow| cow.into_owned());
     let album = tag.album().map(|cow| cow.into_owned());
-    let album_artist = tag.get_string(ItemKey::AlbumArtist).map(ToOwned::to_owned);
+    let album_artist = tag
+        .get_string(ItemKey::AlbumArtist)
+        .map(ToOwned::to_owned);
     let track = tag.track();
     let disc = tag.disk();
     let year = tag.date().map(|timestamp| u32::from(timestamp.year));
@@ -203,14 +208,8 @@ mod tests {
 
     /// FLAC STREAMINFO block content (34 bytes) — the only metadata block
     /// lofty's duration calculation reads (`flac/properties.rs`).
-    fn flac_streaminfo(
-        sample_rate: u32,
-        channels: u32,
-        bits_per_sample: u32,
-        total_samples: u64,
-    ) -> Vec<u8> {
-        let mut info: u32 =
-            (sample_rate << 12) | ((channels - 1) << 9) | ((bits_per_sample - 1) << 4);
+    fn flac_streaminfo(sample_rate: u32, channels: u32, bits_per_sample: u32, total_samples: u64) -> Vec<u8> {
+        let mut info: u32 = (sample_rate << 12) | ((channels - 1) << 9) | ((bits_per_sample - 1) << 4);
         info |= ((total_samples >> 32) as u32) & 0xF;
         let total_samples_low = (total_samples & 0xFFFF_FFFF) as u32;
 
@@ -271,7 +270,7 @@ mod tests {
                 file.extend_from_slice(&flac_block(0, false, &streaminfo));
                 let vorbis_comments = vorbis_comment_block("test-vendor", comments);
                 file.extend_from_slice(&flac_block(4, true, &vorbis_comments));
-            }
+            },
         }
         file
     }
@@ -342,8 +341,7 @@ mod tests {
         mdhd_content.extend_from_slice(&[0, 0, 0, 0]); // creation_time
         mdhd_content.extend_from_slice(&[0, 0, 0, 0]); // modification_time
         mdhd_content.extend_from_slice(&MP4_TIMESCALE.to_be_bytes());
-        mdhd_content
-            .extend_from_slice(&((MP4_TIMESCALE as u64 * MP4_DURATION_SECS) as u32).to_be_bytes());
+        mdhd_content.extend_from_slice(&((MP4_TIMESCALE as u64 * MP4_DURATION_SECS) as u32).to_be_bytes());
         let mdhd = atom(b"mdhd", &mdhd_content);
 
         let mdia = atom(b"mdia", &[hdlr, mdhd].concat());
@@ -376,10 +374,7 @@ mod tests {
         let mut segment_table = Vec::new();
         let mut content = Vec::new();
         for packet in packets {
-            assert!(
-                packet.len() < 255,
-                "fixture packet too large for a single OGG lacing segment"
-            );
+            assert!(packet.len() < 255, "fixture packet too large for a single OGG lacing segment");
             segment_table.push(packet.len() as u8);
             content.extend_from_slice(packet);
         }

core/archipelago/src/network/did_dht.rs

@@ -55,8 +55,8 @@ pub fn pubkey_from_did(did: &str) -> Result<[u8; 32]> {
     let id = did
         .strip_prefix("did:dht:")
         .ok_or_else(|| anyhow::anyhow!("Not a did:dht identifier: {}", did))?;
-    let bytes = zbase32::decode_full_bytes_str(id)
-        .map_err(|e| anyhow::anyhow!("Invalid z-base-32: {e}"))?;
+    let bytes =
+        zbase32::decode_full_bytes_str(id).map_err(|e| anyhow::anyhow!("Invalid z-base-32: {e}"))?;
     if bytes.len() != 32 {
         anyhow::bail!("Expected 32-byte pubkey, got {} bytes", bytes.len());
     }

core/archipelago/src/network/zbase32.rs

@@ -174,9 +174,7 @@ mod tests {
     #[test]
     fn a_32_byte_key_is_52_chars_and_round_trips() {
         for seed in 0u8..64 {
-            let key: Vec<u8> = (0u8..32)
-                .map(|i| i.wrapping_mul(7).wrapping_add(seed))
-                .collect();
+            let key: Vec<u8> = (0u8..32).map(|i| i.wrapping_mul(7).wrapping_add(seed)).collect();
             let encoded = encode_full_bytes(&key);
             assert_eq!(encoded.len(), 52, "256 bits must encode to 52 characters");
             assert_eq!(decode_full_bytes_str(&encoded).unwrap(), key);
@@ -186,9 +184,7 @@ mod tests {
     #[test]
     fn round_trips_every_length_up_to_a_block() {
         for len in 0..40usize {
-            let data: Vec<u8> = (0..len)
-                .map(|i| (i as u8).wrapping_mul(31) ^ 0x5a)
-                .collect();
+            let data: Vec<u8> = (0..len).map(|i| (i as u8).wrapping_mul(31) ^ 0x5a).collect();
             let encoded = encode_full_bytes(&data);
             // decode_full_bytes only recovers whole bytes, and encoding N bytes
             // produces ceil(8N/5) chars which always carry at least 8N bits.

core/archipelago/src/nostr_handshake.rs

@@ -35,59 +35,6 @@ use tracing::warn;
 
 const NOSTR_SECRET_FILE: &str = "nostr_secret";
 
-/// Runtime discoverability override written by the `nostr.set-discovery` RPC.
-/// Lives here (not api/rpc) so the server's heartbeat can honour the same
-/// state the toggle writes.
-pub const DISCOVERY_STATE_FILE: &str = "nostr_discovery_state.json";
-
-/// How long a presence event stays valid. Published as a NIP-40 expiration
-/// tag AND enforced client-side in `discover` (relay NIP-40 support varies).
-/// Must be comfortably longer than the re-publish heartbeat (12h in
-/// server.rs) so a node that misses one heartbeat doesn't vanish: 48h
-/// tolerates three misses.
-pub const PRESENCE_TTL_SECS: u64 = 48 * 3600;
-
-/// Read the runtime discovery override and the operator-chosen display name.
-/// Enabled `None` means the toggle has never been used on this node —
-/// callers fall back to the config flag.
-pub async fn discovery_overrides(data_dir: &Path) -> (Option<bool>, Option<String>) {
-    let Ok(raw) = fs::read_to_string(data_dir.join(DISCOVERY_STATE_FILE)).await else {
-        return (None, None);
-    };
-    let Ok(v) = serde_json::from_str::<serde_json::Value>(&raw) else {
-        return (None, None);
-    };
-    let enabled = v.get("enabled").and_then(|e| e.as_bool());
-    let name = v
-        .get("name")
-        .and_then(|n| n.as_str())
-        .and_then(clean_display_name);
-    (enabled, name)
-}
-
-/// Display names travel in a PUBLIC relay event and come back from untrusted
-/// peers — normalise both directions: single line, control chars stripped,
-/// hard length cap, empty collapses to None.
-pub fn clean_display_name(raw: &str) -> Option<String> {
-    let cleaned: String = raw
-        .chars()
-        .filter(|c| !c.is_control())
-        .take(32)
-        .collect::<String>()
-        .trim()
-        .to_string();
-    (!cleaned.is_empty()).then_some(cleaned)
-}
-
-/// This node's own published npub (bech32), if discovery keys exist.
-/// Load-only: never mints keys on a read.
-pub async fn own_npub(identity_dir: &Path) -> Result<Option<String>> {
-    Ok(load_nostr_keys(identity_dir)
-        .await?
-        .map(|k| k.public_key().to_bech32().unwrap_or_default())
-        .filter(|s| !s.is_empty()))
-}
-
 /// Message types exchanged inside NIP-44 encrypted DMs (kind 4).
 ///
 /// Note: NONE of these variants carry an onion address. The onion is only
@@ -183,7 +130,6 @@ pub async fn publish_presence(
     identity_dir: &Path,
     did: &str,
     version: &str,
-    name: Option<&str>,
     relays: &[String],
     tor_proxy: Option<&str>,
 ) -> Result<()> {
@@ -199,20 +145,14 @@ pub async fn publish_presence(
     let nostr_npub = keys.public_key().to_bech32().unwrap_or_default();
     let client = build_client(keys, tor_proxy)?;
 
-    let mut fields = serde_json::json!({
+    let content = serde_json::json!({
         "did": did,
         "nostr_pubkey": nostr_pubkey,
         "nostr_npub": nostr_npub,
         "version": version,
         // No onion address — exchanged only via encrypted DM
-    });
-    // Operator-chosen display name (optional, already normalised). Public by
-    // construction: it exists to label this node in other nodes' discovery
-    // lists, so only ever include what clean_display_name lets through.
-    if let Some(n) = name.and_then(clean_display_name) {
-        fields["name"] = serde_json::Value::String(n);
-    }
-    let content = fields.to_string();
+    })
+    .to_string();
 
     for url in relays {
         let _ = client.add_relay(url).await;
@@ -224,13 +164,8 @@ pub async fn publish_presence(
         warn!("Nostr relay connection timed out after 10s, continuing anyway");
     }
 
-    // NIP-40 expiration: relays that honour it garbage-collect the event if
-    // this node stops heartbeating (reinstall, decommission, long outage).
-    // `discover` enforces the same window client-side for relays that don't.
-    let expires = Timestamp::from(Timestamp::now().as_u64() + PRESENCE_TTL_SECS);
-    let builder = EventBuilder::new(Kind::Custom(30078), content)
-        .tag(Tag::identifier("archipelago-node"))
-        .tag(Tag::expiration(expires));
+    let builder =
+        EventBuilder::new(Kind::Custom(30078), content).tag(Tag::identifier("archipelago-node"));
     let _ = client.send_event_builder(builder).await;
     client.disconnect().await;
 
@@ -241,43 +176,6 @@ pub async fn publish_presence(
     Ok(())
 }
 
-/// Overwrite this node's presence with an empty tombstone (NIP-33: same
-/// author + kind + d-tag replaces). Called when discovery is switched off
-/// and — critically — during factory-reset BEFORE the keys are wiped: once
-/// the secret is gone, nothing can ever replace the stale event.
-pub async fn publish_tombstone(
-    identity_dir: &Path,
-    relays: &[String],
-    tor_proxy: Option<&str>,
-) -> Result<()> {
-    if relays.is_empty() {
-        return Ok(());
-    }
-    let Some(keys) = load_nostr_keys(identity_dir).await? else {
-        return Ok(()); // never published — nothing to tombstone
-    };
-    let client = build_client(keys, tor_proxy)?;
-    for url in relays {
-        let _ = client.add_relay(url).await;
-    }
-    if tokio::time::timeout(Duration::from_secs(10), client.connect())
-        .await
-        .is_err()
-    {
-        warn!("Nostr relay connection timed out after 10s, continuing anyway");
-    }
-    // Tombstone also expires: after TTL the relay may drop it entirely,
-    // which is the desired end state (nothing left to list).
-    let expires = Timestamp::from(Timestamp::now().as_u64() + PRESENCE_TTL_SECS);
-    let builder = EventBuilder::new(Kind::Custom(30078), "{}")
-        .tag(Tag::identifier("archipelago-node"))
-        .tag(Tag::expiration(expires));
-    let _ = client.send_event_builder(builder).await;
-    client.disconnect().await;
-    tracing::info!("🔒 Published presence tombstone to {} relays", relays.len());
-    Ok(())
-}
-
 /// Discover other Archipelago nodes (presence-only — no onion addresses).
 /// Returns Nostr pubkeys and DIDs of discoverable nodes.
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -288,9 +186,6 @@ pub struct DiscoverableNode {
     pub nostr_npub: String,
     pub did: String,
     pub version: String,
-    /// Operator-chosen display name from the presence event. Untrusted peer
-    /// input — normalised through `clean_display_name` on the way in.
-    pub name: Option<String>,
 }
 
 pub async fn discover_nodes(
@@ -326,17 +221,7 @@ pub async fn discover_nodes(
     client.disconnect().await;
 
     let mut nodes = Vec::new();
-    let stale_cutoff = Timestamp::from(Timestamp::now().as_u64().saturating_sub(PRESENCE_TTL_SECS));
     for event in events {
-        // Client-side staleness enforcement: pre-TTL events (and events from
-        // relays that ignore NIP-40) would otherwise list dead installs
-        // forever — every reinstall mints a new key, so the old author can
-        // never replace its own event.
-        if event.created_at < stale_cutoff {
-            continue;
-        }
-        // A tombstone ("{}" content) parses but yields no pubkey — the
-        // nostr_pubkey.is_empty() guard below already drops it.
         if let Ok(content) = serde_json::from_str::<serde_json::Value>(&event.content) {
             let nostr_pubkey = content
                 .get("nostr_pubkey")
@@ -365,16 +250,11 @@ pub async fn discover_nodes(
                     .ok()
                     .and_then(|pk| pk.to_bech32().ok())
                     .unwrap_or_default();
-                let name = content
-                    .get("name")
-                    .and_then(|v| v.as_str())
-                    .and_then(clean_display_name);
                 nodes.push(DiscoverableNode {
                     nostr_pubkey,
                     nostr_npub,
                     did,
                     version,
-                    name,
                 });
             }
         }

core/archipelago/src/seed.rs

@@ -979,12 +979,7 @@ mod tests {
 
         // BIP-32 m/84'/0'/0'
         assert_eq!(
-            hex::encode(
-                derive_bitcoin_xprv(&seed)
-                    .unwrap()
-                    .private_key
-                    .secret_bytes()
-            ),
+            hex::encode(derive_bitcoin_xprv(&seed).unwrap().private_key.secret_bytes()),
             "57558e8c90c2e72f0c121d0fb8844bbbe7a872f0065d21b218a990450b9f93be",
             "Bitcoin BIP-84 account key"
         );

core/archipelago/src/server.rs

@@ -96,11 +96,6 @@ impl Server {
             }
         }
         data.server_info.tor_address = docker_packages::read_tor_address("archipelago").await;
-        // Liveness comes from a probe, never from the presence of an onion
-        // address: read_tor_address reads a hostname file that outlives the
-        // daemon, which is why the dashboard showed "Connected" on nodes whose
-        // Tor had been dead for days.
-        data.server_info.tor_running = crate::api::rpc::tor::check_tor_running().await;
         if let Some(ref tor) = data.server_info.tor_address {
             data.server_info.node_address = Some(identity.node_address(tor));
         }
@@ -212,15 +207,7 @@ impl Server {
 
         // Publish presence-only to Nostr (DID + Nostr pubkey, NO onion address).
         // Onion addresses are exchanged privately via NIP-44 encrypted DMs.
-        //
-        // This is a heartbeat, not a one-shot: presence events carry a NIP-40
-        // expiration of PRESENCE_TTL_SECS, so a node that stops re-publishing
-        // ages out of discovery instead of lingering forever. First tick runs
-        // immediately (preserving the old startup-publish behaviour); the
-        // runtime toggle (nostr.set-discovery) is re-read every tick, so a
-        // node switched on via the UI heartbeats too — not just ones with the
-        // config flag baked in.
-        {
+        if config.nostr_discovery_enabled && !config.nostr_relays.is_empty() {
             let identity_dir = config.data_dir.join("identity");
             let did =
                 identity::did_key_from_pubkey_hex(&data.server_info.pubkey).unwrap_or_default();
@@ -229,36 +216,21 @@ impl Server {
             // where handshake peers actually read (2026-07-22 unification).
             let data_dir_for_relays = config.data_dir.clone();
             let config_relays = config.nostr_relays.clone();
-            let config_flag = config.nostr_discovery_enabled;
             let tor_proxy = config.nostr_tor_proxy.clone();
             tokio::spawn(async move {
-                const HEARTBEAT_SECS: u64 = 12 * 3600; // < PRESENCE_TTL_SECS/3
-                loop {
-                    let (enabled_override, display_name) =
-                        nostr_handshake::discovery_overrides(&data_dir_for_relays).await;
-                    let enabled = enabled_override.unwrap_or(config_flag);
-                    if enabled {
-                        let relays = crate::nostr_relays::merged_relay_list(
-                            &data_dir_for_relays,
-                            &config_relays,
-                        )
+                let relays =
+                    crate::nostr_relays::merged_relay_list(&data_dir_for_relays, &config_relays)
                         .await;
-                        if !relays.is_empty() {
-                            if let Err(e) = nostr_handshake::publish_presence(
-                                &identity_dir,
-                                &did,
-                                &version,
-                                display_name.as_deref(),
-                                &relays,
-                                tor_proxy.as_deref(),
-                            )
-                            .await
-                            {
-                                tracing::debug!("Nostr presence publish (non-fatal): {}", e);
-                            }
-                        }
-                    }
-                    tokio::time::sleep(std::time::Duration::from_secs(HEARTBEAT_SECS)).await;
+                if let Err(e) = nostr_handshake::publish_presence(
+                    &identity_dir,
+                    &did,
+                    &version,
+                    &relays,
+                    tor_proxy.as_deref(),
+                )
+                .await
+                {
+                    tracing::debug!("Nostr presence publish (non-fatal): {}", e);
                 }
             });
         }
@@ -1791,19 +1763,8 @@ async fn scan_and_update_packages(
         .unwrap_or(false);
     let update_changed = update_available != current_data.server_info.status_info.updated;
 
-    // The durable installed set is the truth the scan must never contradict:
-    // quadlet renders --rm, so every stop DELETES the container and a scan mid
-    // stop->start legitimately sees nothing where an installed app lives.
-    let installed_registry = crate::crash_recovery::load_installed_apps(data_dir).await;
-    let user_uninstalled = crate::crash_recovery::load_user_uninstalled(data_dir).await;
-
-    // Empty scan result = podman failure or timeout, preserve existing state.
-    // The first scan is NOT exempt when the durable registry says apps exist:
-    // the daemon restarts mid-churn (gate runs, OTAs), and publishing that
-    // first empty scan blanked the whole My Apps map — the dashboard showed a
-    // node with zero apps until the next scan (observed twice, 2026-08-09,
-    // once at load ~2). Better to keep saying "scanning…" than to say "empty".
-    if packages.is_empty() && (!first_scan || !installed_registry.is_empty()) {
+    // Empty scan result = podman failure or timeout, preserve existing state
+    if packages.is_empty() && !first_scan {
         if tor_changed || update_changed {
             let mut data = current_data;
             data.server_info.tor_address = tor_addr.clone();
@@ -1953,29 +1914,6 @@ async fn scan_and_update_packages(
             let count = absence_tracker.entry(id.clone()).or_insert(0);
             *count += 1;
             if *count >= CONTAINER_ABSENCE_THRESHOLD {
-                // An app the durable registry says is installed (and the user
-                // has not uninstalled) must NEVER be dropped from the map just
-                // because its container is momentarily gone — with --rm that
-                // is every restart's normal window. Dropping it here is what
-                // made dashboard tiles vanish mid-restart and gate waits read
-                // 'absent' (grafana, 2026-08-09, at load ~2). Hold it as
-                // Stopped instead; the next scan that sees the container
-                // restores the live state, and desired-state recovery still
-                // recreates genuinely lost containers.
-                if installed_registry.contains(&id) && !user_uninstalled.contains(&id) {
-                    if let Some(entry) = merged.get(&id) {
-                        if entry.state != crate::data_model::PackageState::Stopped {
-                            let mut held = entry.clone();
-                            held.state = crate::data_model::PackageState::Stopped;
-                            held.health = None;
-                            held.exit_code = None;
-                            merged.insert(id.clone(), held);
-                            changed = true;
-                        }
-                    }
-                    absence_tracker.remove(&id);
-                    continue;
-                }
                 debug!(
                     "Removing {} from state after {} consecutive absent scans",
                     id, count

core/archipelago/src/settings/ai_permissions.rs

@@ -159,9 +159,7 @@ mod tests {
     async fn a_corrupt_file_fails_closed() {
         let dir = tempfile::tempdir().unwrap();
         let path = dir.path().join(FILE_PATH);
-        tokio::fs::create_dir_all(path.parent().unwrap())
-            .await
-            .unwrap();
+        tokio::fs::create_dir_all(path.parent().unwrap()).await.unwrap();
         tokio::fs::write(&path, b"{ not json").await.unwrap();
         // The dangerous failure would be defaulting to "all granted".
         assert!(load(dir.path()).await.granted.is_empty());

core/archipelago/src/update.rs

@@ -84,9 +84,11 @@ fn is_newer(candidate: &str, current: &str) -> bool {
 const DEFAULT_UPDATE_MANIFEST_URL: &str =
     "https://source.archipelago-foundation.org/lfg2025/archy/raw/branch/main/releases/manifest.json";
 
-// The previous IP-based origin (http://146.59.87.168:3000/…) was an automatic
-// DNS/TLS-broken fallback until 2026-08-11, when bare-IP origins were retired
-// from the update registry. `load_mirrors` strips it from saved lists by host.
+/// The previous IP-based origin, kept as an automatic fallback so a node
+/// whose DNS or TLS is broken still updates. Dropped from the mirror list
+/// once the fleet has moved.
+const LEGACY_UPDATE_MANIFEST_URL: &str =
+    "http://146.59.87.168:3000/lfg2025/archy/raw/branch/main/releases/manifest.json";
 const UPDATE_STATE_FILE: &str = "update_state.json";
 const UPDATE_MIRRORS_FILE: &str = "update-mirrors.json";
 /// Marker written by apply_update() just before the service restart and
@@ -129,11 +131,20 @@ fn default_mirrors() -> Vec<UpdateMirror> {
             url: DEFAULT_UPDATE_MANIFEST_URL.to_string(),
             label: "Archipelago Foundation".to_string(),
         },
-        // The bare-IP plain-HTTP twin of the entry above was retired as a
-        // default on 2026-08-11 (operator decision: no bare-IP origins in the
-        // update registry). Its DNS/TLS-broken recovery value is accepted as
-        // lost; the manifest signature was always what protected the update,
-        // never the transport. `load_mirrors` strips it from saved lists.
+        // NOT a second server — the SAME host as the entry above, reached by
+        // IP over plain HTTP instead of by name over TLS. It buys nothing if
+        // the origin is down; what it recovers is a node whose **DNS is
+        // broken or whose clock is wrong**, either of which fails TLS while
+        // plain HTTP still works. Safe because the manifest carries an Ed25519
+        // signature verified against the pinned release-root anchor, so
+        // transport integrity is not what protects the update.
+        //
+        // Labelled explicitly so the UI cannot imply redundancy it doesn't
+        // provide. Real redundancy needs a mirror on a different host.
+        UpdateMirror {
+            url: LEGACY_UPDATE_MANIFEST_URL.to_string(),
+            label: "Same server, no DNS/TLS".to_string(),
+        },
     ]
 }
 
@@ -171,16 +182,8 @@ pub async fn load_mirrors(data_dir: &Path) -> Result<Vec<UpdateMirror>> {
     //     ever served a stale manifest as the secondary mirror.
     // Exception to the usual "explicit removals stick" rule: the user never
     // chose to add these — they were defaults.
-    //   - 146.59.87.168: the release server's own bare-IP HTTP twin, retired
-    //     as a default 2026-08-11 — same host as the named origin, so it
-    //     provided no redundancy, only a plain-HTTP path the operator no
-    //     longer wants advertised in the update registry.
     let before = list.len();
-    list.retain(|m| {
-        !m.url.contains("23.182.128.160")
-            && !m.url.contains("git.tx1138.com")
-            && !m.url.contains("146.59.87.168")
-    });
+    list.retain(|m| !m.url.contains("23.182.128.160") && !m.url.contains("git.tx1138.com"));
     let mut changed = list.len() != before;
 
     // Merge in any default URLs the saved config is missing.
@@ -213,14 +216,21 @@ fn force_ovh_update_primary(list: &mut Vec<UpdateMirror>) {
     for mirror in list.iter_mut() {
         if mirror.url == DEFAULT_UPDATE_MANIFEST_URL {
             mirror.label = "Archipelago Foundation".to_string();
+        } else if mirror.url == LEGACY_UPDATE_MANIFEST_URL {
+            // Rewritten on every load, so relabelling here reaches nodes that
+            // already have the old "Direct (fallback)" text saved in their
+            // update-mirrors.json — the merge below matches on URL, never on
+            // label, so without this a renamed default would never propagate.
+            mirror.label = "Same server, no DNS/TLS".to_string();
         }
     }
-    // Named origin first, anything the operator added after that. Ordering
-    // matters: the list is tried in order, so a stale entry sitting first
-    // costs a timeout on every check.
+    // Named origin first, its same-host IP fallback second, anything the
+    // operator added after that. Ordering matters: the list is tried in order,
+    // so a stale entry sitting first costs a timeout on every check.
     list.sort_by_key(|m| match m.url.as_str() {
         u if u == DEFAULT_UPDATE_MANIFEST_URL => 0,
-        _ => 1,
+        u if u == LEGACY_UPDATE_MANIFEST_URL => 1,
+        _ => 2,
     });
 }
 
@@ -1013,7 +1023,7 @@ pub async fn dismiss_update(data_dir: &Path) -> Result<()> {
 /// partially-corrupt resume still fails cleanly.
 pub async fn download_update(data_dir: &Path) -> Result<DownloadProgress> {
     let _op = UPDATE_OP_LOCK.try_lock().map_err(|_| {
-        anyhow::anyhow!("Update already in progress — another download or apply is already running")
+        anyhow::anyhow!("another update operation (download or apply) is already running")
     })?;
     let mut state = load_state(data_dir).await?;
     if state.available_update.is_none() {
@@ -1406,8 +1416,8 @@ async fn verify_staged_components(staging_dir: &Path, manifest: &UpdateManifest)
             .unwrap_or(0);
         if len != component.size_bytes {
             anyhow::bail!(
-                "Update staging is inconsistent: component {} is {} bytes but the manifest says {} — \
-                 re-download before applying (incomplete or concurrently-rewritten download)",
+                "staged component {} is {} bytes but the manifest says {} — \
+                 refusing to apply (incomplete or concurrently-rewritten download)",
                 component.name,
                 len,
                 component.size_bytes
@@ -1519,11 +1529,11 @@ pub(crate) async fn host_sudo_output(args: &[&str]) -> Result<std::process::Outp
 /// Apply a downloaded update. Backs up current binaries, replaces with staged versions.
 pub async fn apply_update(data_dir: &Path) -> Result<()> {
     let _op = UPDATE_OP_LOCK.try_lock().map_err(|_| {
-        anyhow::anyhow!("Update already in progress — another download or apply is already running")
+        anyhow::anyhow!("another update operation (download or apply) is already running")
     })?;
     let staging_dir = data_dir.join("update-staging");
     if !staging_dir.exists() {
-        anyhow::bail!("Update not staged — download it first, then apply.");
+        anyhow::bail!("No staged update found. Download first.");
     }
 
     // Gate 1: the completion marker is written only after EVERY component
@@ -1531,7 +1541,7 @@ pub async fn apply_update(data_dir: &Path) -> Result<()> {
     // or in-flight download — exactly what got installed on .198.
     if !has_staged_update(data_dir).await {
         anyhow::bail!(
-            "Update download was incomplete (no completion marker) — download the update again before applying"
+            "Staged update is incomplete (no completion marker) — download the update again before applying"
         );
     }
 
@@ -1540,7 +1550,9 @@ pub async fn apply_update(data_dir: &Path) -> Result<()> {
         .await?
         .available_update
         .ok_or_else(|| {
-            anyhow::anyhow!("Update manifest missing from state — re-download the update")
+            anyhow::anyhow!(
+                "no update manifest in state to verify staged files against — re-download the update"
+            )
         })?;
     verify_staged_components(&staging_dir, &manifest).await?;
 
@@ -1576,83 +1588,41 @@ pub async fn apply_update(data_dir: &Path) -> Result<()> {
         info!("Current binary backed up");
     }
 
-    // Apply staged components in a DETERMINISTIC order, binary LAST.
-    // read_dir order is filesystem-arbitrary, and each component used to be
-    // consumed destructively — so a mid-apply failure could leave staging
-    // half-emptied and un-reappliable (Gate 2 re-verifies EVERY manifest
-    // component against staging, so a missing one wedges every retry:
-    // "doesn't apply, still says install, can never apply again"). Two
-    // guards against that now: (a) nothing is removed from staging here —
-    // the binary is copied, not moved (see its block) — so a failed apply
-    // is always retryable from the same staged files; (b) the binary, the
-    // one component whose swap changes what runs after restart, is applied
-    // only after the frontend/runtime succeed, so a frontend failure never
-    // leaves a new binary staged to run against an old frontend on the next
-    // restart.
-    let mut names: Vec<String> = Vec::new();
-    {
-        let mut entries = fs::read_dir(&staging_dir)
-            .await
-            .context("Failed to read staging dir")?;
-        while let Some(entry) = entries.next_entry().await? {
-            names.push(entry.file_name().to_string_lossy().to_string());
-        }
-    }
-    names.sort_by_key(|n| match n.as_str() {
-        "archipelago" => 2, // binary last
-        n if n.contains("runtime") && n.ends_with(".tar.gz") => 1,
-        _ => 0, // frontend and everything else first
-    });
+    // Apply staged components
+    let mut entries = fs::read_dir(&staging_dir)
+        .await
+        .context("Failed to read staging dir")?;
 
-    for name in &names {
-        let name = name.as_str();
-        let src = staging_dir.join(name);
+    while let Some(entry) = entries.next_entry().await? {
+        let name = entry.file_name().to_string_lossy().to_string();
+        let src = entry.path();
 
-        match name {
+        match name.as_str() {
             "archipelago" => {
-                // Three constraints this block works around:
+                // Two namespace gotchas this block works around:
                 //   1. We're running FROM /usr/local/bin/archipelago, so
                 //      `install`/`cp` (O_TRUNC + write) fail with ETXTBSY.
-                //      rename() over a busy destination is fine.
+                //      Use `mv`, which is atomic rename() and tolerates a
+                //      busy destination.
                 //   2. archipelago.service sets ProtectSystem=strict, so
                 //      even `sudo mv` into /usr/local/bin/ fails EROFS —
                 //      sudo inherits the service's mount namespace. Route
-                //      through host_sudo (systemd-run transient unit with
-                //      default protections).
-                //   3. The staged binary must SURVIVE this so a later
-                //      component's failure leaves the apply retryable. So we
-                //      COPY the staged file to a sibling temp in the target
-                //      dir, then atomic-rename the temp over the target —
-                //      the staging copy is never moved. (mv'ing the staged
-                //      file itself was the wedging bug: binary applied, then
-                //      frontend fails, staging now missing the binary, every
-                //      retry fails re-verification forever.)
+                //      the rename through systemd-run so it runs in a
+                //      transient unit with default protections.
                 let staged = src.to_string_lossy().to_string();
-                let tmp = format!(
-                    "/usr/local/bin/.archipelago.new.{}",
-                    chrono::Utc::now().timestamp_millis()
-                );
-                let cp = host_sudo(&["cp", "-f", &staged, &tmp])
-                    .await
-                    .with_context(|| format!("Failed to copy staged binary for {}", name))?;
-                if !cp.success() {
-                    let _ = host_sudo(&["rm", "-f", &tmp]).await;
-                    anyhow::bail!("copy of staged binary failed for {}", name);
-                }
-                let _ = host_sudo(&["chmod", "0755", &tmp]).await;
-                let _ = host_sudo(&["chown", "root:root", &tmp]).await;
-                let status = host_sudo(&["mv", &tmp, "/usr/local/bin/archipelago"])
+                let _ = host_sudo(&["chmod", "0755", &staged]).await;
+                let _ = host_sudo(&["chown", "root:root", &staged]).await;
+                let status = host_sudo(&["mv", &staged, "/usr/local/bin/archipelago"])
                     .await
                     .with_context(|| format!("Failed to spawn mv for {}", name))?;
                 if !status.success() {
-                    let _ = host_sudo(&["rm", "-f", &tmp]).await;
                     anyhow::bail!(
                         "mv into /usr/local/bin failed for {} (exit {:?})",
                         name,
                         status.code()
                     );
                 }
-                info!(name = %name, "Backend binary applied (staging preserved)");
+                info!(name = %name, "Backend binary applied");
             }
             _ if name.contains("frontend") && name.ends_with(".tar.gz") => {
                 // Tarball contents are the *inside* of web-ui/ (root entries
@@ -2458,10 +2428,10 @@ mod tests {
     async fn test_load_mirrors_returns_defaults_when_absent() {
         let dir = tempfile::tempdir().unwrap();
         let list = load_mirrors(dir.path()).await.unwrap();
-        // The named https origin is the ONLY default since 2026-08-11:
-        // bare-IP origins were retired from the update registry (the IP
-        // twin bought DNS/TLS-broken recovery, deliberately given up).
-        assert_eq!(list.len(), 1);
+        // The named origin leads, its IP fallback follows. A node with broken
+        // DNS or a wrong clock (both break TLS) must still have a way to
+        // update; the signature is what makes either source trustworthy.
+        assert_eq!(list.len(), 2);
         assert!(
             list[0]
                 .url
@@ -2469,14 +2439,11 @@ mod tests {
             "the named origin must be primary, got {}",
             list[0].url
         );
+        assert!(list[1].url.contains("146.59.87.168"));
         assert!(
             !list.iter().any(|m| m.url.contains("git.tx1138.com")),
             "tx1138 was retired as a release server and must not be a default mirror"
         );
-        assert!(
-            !list.iter().any(|m| m.url.contains("146.59.87.168")),
-            "bare-IP origins were retired 2026-08-11 and must not be defaults"
-        );
     }
 
     #[tokio::test]
@@ -2504,11 +2471,7 @@ mod tests {
             "retired tx1138 mirror should be stripped on load; got {:?}",
             list
         );
-        assert!(
-            !list.iter().any(|m| m.url.contains("146.59.87.168")),
-            "the bare-IP twin is retired too and must be stripped on load; got {:?}",
-            list
-        );
+        assert!(list.iter().any(|m| m.url.contains("146.59.87.168")));
     }
 
     #[tokio::test]
@@ -2778,20 +2741,9 @@ mod tests {
         save_state(dir.path(), &state).await.unwrap();
         let err = apply_update(dir.path()).await.unwrap_err();
         assert!(
-            err.to_string().contains("re-download before applying"),
+            err.to_string().contains("refusing to apply"),
             "got: {err:#}"
         );
-        // Resilience: a refused apply must leave the update still available and
-        // still staged, so the user can re-download and retry — never a wedge.
-        let loaded = load_state(dir.path()).await.unwrap();
-        assert!(
-            loaded.available_update.is_some(),
-            "a refused apply must not clear the available update"
-        );
-        assert!(
-            loaded.update_in_progress,
-            "a refused apply must leave the staged-update flag set for retry"
-        );
     }
 
     #[tokio::test]

demo/aiui/BUILD-INFO

@@ -1,3 +0,0 @@
-commit=7b82dfc779f94e068ed4d7b2ada39d6fd8f77dce
-built_at=2026-08-09T19:43:11Z
-base_path=/aiui/

demo/aiui/assets/ChatPage-B49DA8RU.css

@@ -1 +0,0 @@
-.magazine[data-v-02741b8c]{font-family:Georgia,Times New Roman,Times,serif}.magazine-light[data-v-02741b8c]{background-color:#faf9f6}.magazine-dark[data-v-02741b8c]{background-color:#0a0a0a}iframe[data-v-0f5111f5]::-webkit-scrollbar{display:none}.code-detail table[data-v-7f40c0bc]{font-variant-numeric:tabular-nums}.animate-cell-pulse[data-v-ce9be807]{animation:cell-pulse-ce9be807 1.8s cubic-bezier(.4,0,.2,1) infinite}.animate-shimmer-sweep[data-v-ce9be807]{animation:shimmer-sweep-ce9be807 2.2s cubic-bezier(.4,0,.2,1) infinite}.animate-progress-sweep[data-v-ce9be807]{animation:progress-sweep-ce9be807 1.6s cubic-bezier(.4,0,.2,1) infinite}@keyframes cell-pulse-ce9be807{0%,to{opacity:.6;transform:scale(.96)}50%{opacity:1;transform:scale(1.02)}}@keyframes shimmer-sweep-ce9be807{0%{transform:translate(-100%)}60%{transform:translate(200%)}to{transform:translate(200%)}}@keyframes progress-sweep-ce9be807{0%{width:0;margin-left:0}45%{width:60%;margin-left:20%}90%{width:0;margin-left:100%}to{width:0;margin-left:0}}.content-fade-enter-active[data-v-30760816],.content-fade-leave-active[data-v-30760816]{transition:opacity .2s ease}.content-fade-enter-from[data-v-30760816],.content-fade-leave-to[data-v-30760816]{opacity:0}.detail-active[data-v-30760816]{border-color:transparent!important}.detail-persistent[data-v-30760816] button[class*=absolute][class*=top-3][class*=left-3]{display:none!important}

demo/aiui/assets/ChatPage-UEkXBR6z.css

@@ -0,0 +1 @@
+.magazine[data-v-02741b8c]{font-family:Georgia,Times New Roman,Times,serif}.magazine-light[data-v-02741b8c]{background-color:#faf9f6}.magazine-dark[data-v-02741b8c]{background-color:#0a0a0a}iframe[data-v-0f5111f5]::-webkit-scrollbar{display:none}.code-detail table[data-v-7f40c0bc]{font-variant-numeric:tabular-nums}.animate-cell-pulse[data-v-f8eb31f3]{animation:cell-pulse-f8eb31f3 1.8s cubic-bezier(.4,0,.2,1) infinite}.animate-shimmer-sweep[data-v-f8eb31f3]{animation:shimmer-sweep-f8eb31f3 2.2s cubic-bezier(.4,0,.2,1) infinite}.animate-progress-sweep[data-v-f8eb31f3]{animation:progress-sweep-f8eb31f3 1.6s cubic-bezier(.4,0,.2,1) infinite}@keyframes cell-pulse-f8eb31f3{0%,to{opacity:.6;transform:scale(.96)}50%{opacity:1;transform:scale(1.02)}}@keyframes shimmer-sweep-f8eb31f3{0%{transform:translate(-100%)}60%{transform:translate(200%)}to{transform:translate(200%)}}@keyframes progress-sweep-f8eb31f3{0%{width:0;margin-left:0}45%{width:60%;margin-left:20%}90%{width:0;margin-left:100%}to{width:0;margin-left:0}}.content-fade-enter-active[data-v-e9c77de5],.content-fade-leave-active[data-v-e9c77de5]{transition:opacity .2s ease}.content-fade-enter-from[data-v-e9c77de5],.content-fade-leave-to[data-v-e9c77de5]{opacity:0}.detail-active[data-v-e9c77de5]{border-color:transparent!important}.detail-persistent[data-v-e9c77de5] button[class*=absolute][class*=top-3][class*=left-3]{display:none!important}

demo/aiui/assets/ChatWindow-CHiy55Bk.css

@@ -1 +0,0 @@
-.header-overlay-panel[data-v-cce6627c]{background:#000000e0}.picker-enter-active[data-v-cce6627c]{transition:all .2s cubic-bezier(.22,1,.36,1)}.picker-leave-active[data-v-cce6627c]{transition:all .15s ease-in}.picker-enter-from[data-v-cce6627c],.picker-leave-to[data-v-cce6627c]{opacity:0;transform:translateY(-8px)}.context-menu-enter-active[data-v-13d6c372]{transition:all .15s cubic-bezier(.22,1,.36,1)}.context-menu-leave-active[data-v-13d6c372]{transition:all .1s ease-in}.context-menu-enter-from[data-v-13d6c372],.context-menu-leave-to[data-v-13d6c372]{opacity:0;transform:scale(.95)}.settings-modal-enter-active[data-v-c97db749]{transition:opacity .2s ease-out}.settings-modal-enter-active .glass-card[data-v-c97db749]{transition:all .25s cubic-bezier(.22,1,.36,1)}.settings-modal-leave-active[data-v-c97db749]{transition:opacity .15s ease-in}.settings-modal-enter-from[data-v-c97db749],.settings-modal-leave-to[data-v-c97db749]{opacity:0}

demo/aiui/assets/ChatWindow-D6NcMh5O.css

@@ -0,0 +1 @@
+.picker-enter-active[data-v-02d91cf7]{transition:all .2s cubic-bezier(.22,1,.36,1)}.picker-leave-active[data-v-02d91cf7]{transition:all .15s ease-in}.picker-enter-from[data-v-02d91cf7],.picker-leave-to[data-v-02d91cf7]{opacity:0;transform:translateY(-8px)}.context-menu-enter-active[data-v-13d6c372]{transition:all .15s cubic-bezier(.22,1,.36,1)}.context-menu-leave-active[data-v-13d6c372]{transition:all .1s ease-in}.context-menu-enter-from[data-v-13d6c372],.context-menu-leave-to[data-v-13d6c372]{opacity:0;transform:scale(.95)}.settings-modal-enter-active[data-v-c97db749]{transition:opacity .2s ease-out}.settings-modal-enter-active .glass-card[data-v-c97db749]{transition:all .25s cubic-bezier(.22,1,.36,1)}.settings-modal-leave-active[data-v-c97db749]{transition:opacity .15s ease-in}.settings-modal-enter-from[data-v-c97db749],.settings-modal-leave-to[data-v-c97db749]{opacity:0}

demo/aiui/assets/ConversationViewerPage-1f3wXZHu.js

@@ -1,4 +1,4 @@
-import{a as S,D as V,c as r,e as s,E as y,G as g,t as c,F as p,H as h,i as b,g as j,I as B,r as u,k as T,J as U,b as l,n as k}from"./index-8cIrvc8q.js";import{useNostr as E}from"./useNostr-XONW-p_l.js";const F={class:"min-h-screen bg-[#0a0a0a] text-white"},H={class:"sticky top-0 z-10 glass border-b border-white/5"},L={class:"max-w-3xl mx-auto px-4 py-3 flex items-center gap-3"},R={class:"flex-1 min-w-0"},z={class:"text-sm font-semibold text-white/90 truncate"},G={class:"text-xs text-white/40"},P={key:0,class:"flex items-center justify-center h-64"},J={key:1,class:"max-w-3xl mx-auto px-4 py-12 text-center"},Y={class:"text-white/40 text-sm"},q={key:2,class:"max-w-3xl mx-auto px-4 py-6 space-y-4"},K={class:"flex items-center gap-2 mb-2"},O=["textContent"],Z=S({__name:"ConversationViewerPage",setup(Q){const C=B(),{connect:N,fetchNote:A}=E(),v=u(!0),i=u(null),f=u("Shared Conversation"),x=u(null),d=u(null),w=u([]),I=T(()=>d.value?new Date(d.value*1e3).toLocaleDateString("en-US",{year:"numeric",month:"long",day:"numeric"}):"");function D(n){const t=[],o=n.split(`
-`);let e="",a=[];for(const m of o){const _=m.match(/^##?\s*(?:Human|User|You)/),M=m.match(/^##?\s*(?:Assistant|AI|Claude)/);_||M?(e&&a.length>0&&t.push({role:e,content:a.join(`
+import{a as V,K as j,c as r,e as s,L as y,M as g,t as c,F as p,N as h,i as b,g as B,O as D,r as u,k as L,P as T,b as l,n as k}from"./index-Lh5NfTCq.js";import{useNostr as U}from"./useNostr-DYbkCQxC.js";const F={class:"min-h-screen bg-[#0a0a0a] text-white"},P={class:"sticky top-0 z-10 glass border-b border-white/5"},R={class:"max-w-3xl mx-auto px-4 py-3 flex items-center gap-3"},z={class:"flex-1 min-w-0"},E={class:"text-sm font-semibold text-white/90 truncate"},H={class:"text-xs text-white/40"},G={key:0,class:"flex items-center justify-center h-64"},K={key:1,class:"max-w-3xl mx-auto px-4 py-12 text-center"},O={class:"text-white/40 text-sm"},Y={key:2,class:"max-w-3xl mx-auto px-4 py-6 space-y-4"},q={class:"flex items-center gap-2 mb-2"},J=["textContent"],Z=V({__name:"ConversationViewerPage",setup(Q){const C=D(),{connect:N,fetchNote:A}=U(),v=u(!0),i=u(null),f=u("Shared Conversation"),x=u(null),d=u(null),w=u([]),I=L(()=>d.value?new Date(d.value*1e3).toLocaleDateString("en-US",{year:"numeric",month:"long",day:"numeric"}):"");function M(n){const t=[],o=n.split(`
+`);let e="",a=[];for(const m of o){const _=m.match(/^##?\s*(?:Human|User|You)/),S=m.match(/^##?\s*(?:Assistant|AI|Claude)/);_||S?(e&&a.length>0&&t.push({role:e,content:a.join(`
 `).trim()}),e=_?"user":"assistant",a=[]):a.push(m)}return e&&a.length>0&&t.push({role:e,content:a.join(`
-`).trim()}),t.length===0&&n.trim()&&t.push({role:"assistant",content:n.trim()}),t}return V(async()=>{try{const n=C.params.nostrAddr;if(!n){i.value="No Nostr address provided.";return}await N();let t=null;try{const e=atob(n).split(":");e.length>=2&&(t={dTag:e[0],pubkey:e[1]})}catch{}if(t){const o=await A(t.dTag);if(o){const e=o.tags.find(a=>a[0]==="title");e&&(f.value=e[1]),x.value=o.authorName??null,d.value=o.created_at,w.value=D(o.content)}else i.value="Conversation not found on relays."}else i.value="Invalid Nostr address format."}catch(n){i.value=n instanceof Error?n.message:"Failed to load conversation."}finally{v.value=!1}}),(n,t)=>{const o=U("router-link");return l(),r("div",F,[s("header",H,[s("div",L,[y(o,{to:"/",class:"text-white/40 hover:text-white/70 transition-colors"},{default:g(()=>[...t[0]||(t[0]=[s("svg",{class:"w-5 h-5",fill:"none",viewBox:"0 0 24 24",stroke:"currentColor","stroke-width":"2"},[s("path",{"stroke-linecap":"round","stroke-linejoin":"round",d:"M10 19l-7-7m0 0l7-7m-7 7h18"})],-1)])]),_:1}),s("div",R,[s("h1",z,c(f.value),1),s("p",G,[x.value?(l(),r(p,{key:0},[h("by "+c(x.value),1)],64)):b("",!0),d.value?(l(),r(p,{key:1},[h(" · "+c(I.value),1)],64)):b("",!0)])]),t[1]||(t[1]=s("span",{class:"text-xs px-2 py-1 rounded-full bg-white/5 text-white/40"},"Read-only",-1))])]),v.value?(l(),r("div",P,[...t[2]||(t[2]=[s("div",{class:"w-6 h-6 rounded-full border-2 border-accent/30 border-t-accent animate-spin"},null,-1)])])):i.value?(l(),r("div",J,[s("p",Y,c(i.value),1),y(o,{to:"/",class:"mt-4 inline-block text-accent text-sm hover:underline"},{default:g(()=>[...t[3]||(t[3]=[h(" Go to AIUI ",-1)])]),_:1})])):(l(),r("main",q,[(l(!0),r(p,null,j(w.value,(e,a)=>(l(),r("div",{key:a,class:k(["rounded-xl p-4",e.role==="user"?"bg-white/[0.03] border border-white/5 ml-8":"mr-8"])},[s("div",K,[s("span",{class:k(["text-xs font-bold uppercase tracking-wider",e.role==="user"?"text-accent/70":"text-white/30"])},c(e.role==="user"?"Human":"Assistant"),3)]),s("div",{class:"text-sm text-white/80 leading-relaxed whitespace-pre-wrap break-words",textContent:c(e.content)},null,8,O)],2))),128))])),t[4]||(t[4]=s("footer",{class:"max-w-3xl mx-auto px-4 py-8 text-center"},[s("p",{class:"text-xs text-white/20"}," Shared via AIUI · Powered by Nostr ")],-1))])}}});export{Z as default};
+`).trim()}),t.length===0&&n.trim()&&t.push({role:"assistant",content:n.trim()}),t}return j(async()=>{try{const n=C.params.nostrAddr;if(!n){i.value="No Nostr address provided.";return}await N();let t=null;try{const e=atob(n).split(":");e.length>=2&&(t={dTag:e[0],pubkey:e[1]})}catch{}if(t){const o=await A(t.dTag);if(o){const e=o.tags.find(a=>a[0]==="title");e&&(f.value=e[1]),x.value=o.authorName??null,d.value=o.created_at,w.value=M(o.content)}else i.value="Conversation not found on relays."}else i.value="Invalid Nostr address format."}catch(n){i.value=n instanceof Error?n.message:"Failed to load conversation."}finally{v.value=!1}}),(n,t)=>{const o=T("router-link");return l(),r("div",F,[s("header",P,[s("div",R,[y(o,{to:"/",class:"text-white/40 hover:text-white/70 transition-colors"},{default:g(()=>[...t[0]||(t[0]=[s("svg",{class:"w-5 h-5",fill:"none",viewBox:"0 0 24 24",stroke:"currentColor","stroke-width":"2"},[s("path",{"stroke-linecap":"round","stroke-linejoin":"round",d:"M10 19l-7-7m0 0l7-7m-7 7h18"})],-1)])]),_:1}),s("div",z,[s("h1",E,c(f.value),1),s("p",H,[x.value?(l(),r(p,{key:0},[h("by "+c(x.value),1)],64)):b("",!0),d.value?(l(),r(p,{key:1},[h(" · "+c(I.value),1)],64)):b("",!0)])]),t[1]||(t[1]=s("span",{class:"text-xs px-2 py-1 rounded-full bg-white/5 text-white/40"},"Read-only",-1))])]),v.value?(l(),r("div",G,[...t[2]||(t[2]=[s("div",{class:"w-6 h-6 rounded-full border-2 border-accent/30 border-t-accent animate-spin"},null,-1)])])):i.value?(l(),r("div",K,[s("p",O,c(i.value),1),y(o,{to:"/",class:"mt-4 inline-block text-accent text-sm hover:underline"},{default:g(()=>[...t[3]||(t[3]=[h(" Go to AIUI ",-1)])]),_:1})])):(l(),r("main",Y,[(l(!0),r(p,null,B(w.value,(e,a)=>(l(),r("div",{key:a,class:k(["rounded-xl p-4",e.role==="user"?"bg-white/[0.03] border border-white/5 ml-8":"mr-8"])},[s("div",q,[s("span",{class:k(["text-xs font-bold uppercase tracking-wider",e.role==="user"?"text-accent/70":"text-white/30"])},c(e.role==="user"?"Human":"Assistant"),3)]),s("div",{class:"text-sm text-white/80 leading-relaxed whitespace-pre-wrap break-words",textContent:c(e.content)},null,8,J)],2))),128))])),t[4]||(t[4]=s("footer",{class:"max-w-3xl mx-auto px-4 py-8 text-center"},[s("p",{class:"text-xs text-white/20"}," Shared via AIUI · Powered by Nostr ")],-1))])}}});export{Z as default};

demo/aiui/assets/FilmDetail-XFjPooKR.js

@@ -1 +1 @@
-import{_ as m}from"./FilmDetail.vue_vue_type_script_setup_true_lang-BhKlPG3Y.js";import"./index-8cIrvc8q.js";export{m as default};
+import{_ as m}from"./FilmDetail.vue_vue_type_script_setup_true_lang-Cg4zvjy1.js";import"./index-Lh5NfTCq.js";export{m as default};

demo/aiui/assets/FilmGrid-BM-3a1vS.js

@@ -1 +0,0 @@
-import{_ as o}from"./FilmGrid.vue_vue_type_script_setup_true_lang-Dj0SEfcW.js";import"./index-8cIrvc8q.js";import"./useContentImages-7wLVntsF.js";export{o as default};

demo/aiui/assets/FilmGrid-EKTg8OUS.js

@@ -0,0 +1 @@
+import{_ as o}from"./FilmGrid.vue_vue_type_script_setup_true_lang-CWkUdZ32.js";import"./index-Lh5NfTCq.js";import"./useContentImages-CagIZs4M.js";export{o as default};

demo/aiui/assets/FilmGrid.vue_vue_type_script_setup_true_lang-CWkUdZ32.js

@@ -0,0 +1 @@
+import{a as F,b as a,c as r,e as s,n as d,u as l,t as c,f as L,w as S,v as j,F as v,g as m,h as U,i as x,j as E,r as y,k as w,l as z,m as B,p as D}from"./index-Lh5NfTCq.js";import{u as G}from"./useContentImages-CagIZs4M.js";const N={class:"h-full flex flex-col"},V={class:"flex items-center justify-between gap-2"},I={class:"flex items-center gap-2 shrink-0"},M={class:"flex flex-wrap gap-1.5"},R=["onClick"],T={class:"flex-1 overflow-y-auto custom-scrollbar px-4 pt-4 pb-16"},q={class:"grid grid-cols-2 sm:grid-cols-3 gap-4"},P=["aria-label","onClick"],A={class:"poster-card flex-1 min-h-0"},H={key:0,class:"absolute inset-0 animate-shimmer"},J=["src","alt","onError"],K=["src","alt"],O={key:3,class:"absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent pointer-events-none"},Q={class:"absolute bottom-0 left-0 right-0 p-2"},W={class:"text-xs font-semibold text-white/90 leading-tight truncate"},X={class:"flex items-center gap-1 mt-0.5"},Y={class:"text-xs text-accent font-bold"},Z={class:"text-xs text-white/40"},ee={class:"absolute top-1.5 right-1.5 flex gap-0.5"},te={key:0,class:"flex items-center justify-center py-12"},le=F({__name:"FilmGrid",props:{films:{},title:{default:"Recommended Films"}},emits:["selectFilm"],setup(f){const b=f,{isDark:n}=E(),h=y(""),u=y(null),{coverSrc:p,fallbackSrc:k,onError:C,isLoading:_}=G({items:D(b,"films"),id:t=>t.id,existingUrl:t=>t.posterUrl||t.backdropUrl,fetch:t=>B(t.title,t.year).then(o=>o.posterUrl),fallback:t=>z(t.title,t.year)}),$=w(()=>{const t=new Map;for(const o of b.films)for(const e of o.genres)t.set(e,(t.get(e)??0)+1);return[...t.entries()].sort((o,e)=>e[1]-o[1]).slice(0,8).map(([o])=>o)}),g=w(()=>{let t=b.films;if(h.value){const o=h.value.toLowerCase();t=t.filter(e=>e.title.toLowerCase().includes(o)||e.director.toLowerCase().includes(o)||e.cast.some(i=>i.toLowerCase().includes(o)))}return u.value&&(t=t.filter(o=>o.genres.includes(u.value))),t});return(t,o)=>(a(),r("div",N,[s("div",{class:"p-4 space-y-3",style:U(l(n)?"border-bottom: 1px solid rgba(255, 255, 255, 0.08)":"border-bottom: 1px solid rgba(0, 0, 0, 0.06)")},[s("div",V,[s("h3",{class:d(["text-sm font-bold",l(n)?"text-white/90":"text-gray-900"])},c(f.title),3),s("div",I,[s("span",{class:d(["text-xs font-mono",l(n)?"text-white/30":"text-gray-400"])},c(g.value.length)+" films ",3),L(t.$slots,"header-actions")])]),S(s("input",{"onUpdate:modelValue":o[0]||(o[0]=e=>h.value=e),type:"text",placeholder:"Search films...",class:d(["w-full px-3 py-2 rounded-lg text-base outline-none transition-colors",l(n)?"bg-white/5 text-white/80 placeholder:text-white/25 focus:bg-white/10":"bg-black/3 text-gray-800 placeholder:text-gray-400 focus:bg-black/5"])},null,2),[[j,h.value]]),s("div",M,[(a(!0),r(v,null,m($.value,e=>(a(),r("button",{key:e,class:d(["text-xs px-2 py-1 rounded-md transition-all duration-150",u.value===e?"nav-tab-active":l(n)?"text-white/40 hover:text-white/70 hover:bg-white/5":"text-gray-500 hover:text-gray-800 hover:bg-black/5"]),onClick:i=>u.value=u.value===e?null:e},c(e),11,R))),128))])],4),s("div",T,[s("div",q,[(a(!0),r(v,null,m(g.value,e=>(a(),r("button",{key:e.id,class:"group flex flex-col items-stretch text-left w-full path-glass-bubble rounded-2xl overflow-hidden transition-all duration-200 hover:brightness-105","aria-label":`${e.title} (${e.year})`,onClick:i=>t.$emit("selectFilm",e)},[s("div",A,[s("div",{class:d(["aspect-[2/3] relative w-full overflow-hidden rounded-[10px]",l(p)(e)?"":l(n)?"bg-white/[0.06]":"bg-black/[0.04]"])},[l(_)(e)?(a(),r("div",H)):x("",!0),l(p)(e)?(a(),r("img",{key:1,src:l(p)(e),alt:`${e.title} (${e.year}) directed by ${e.director}`,class:"w-full h-full object-cover transition-transform duration-300 group-hover:scale-110",loading:"lazy",onError:i=>l(C)(e)},null,40,J)):l(_)(e)?x("",!0):(a(),r("img",{key:2,src:l(k)(e),alt:e.title,class:"w-full h-full object-cover"},null,8,K)),l(p)(e)?(a(),r("div",O)):x("",!0),s("div",Q,[s("p",W,c(e.title),1),s("div",X,[s("span",Y,"★ "+c(e.rating),1),s("span",Z,c(e.year),1)])]),s("div",ee,[(a(!0),r(v,null,m(e.sources.slice(0,2),i=>(a(),r("span",{key:i.type,class:"text-xs px-1 py-0.5 rounded bg-black/60 text-white/70 backdrop-blur-sm"},c(i.type),1))),128))])],2)])],8,P))),128))]),g.value.length===0?(a(),r("div",te,[s("p",{class:d(["text-sm",l(n)?"text-white/30":"text-gray-400"])}," No films match your search ",2)])):x("",!0)])]))}});export{le as _};

demo/aiui/assets/FilmGrid.vue_vue_type_script_setup_true_lang-Dj0SEfcW.js

@@ -1 +0,0 @@
-import{a as F,b as l,c as r,e as o,n as d,u as a,t as c,f as L,w as S,v as j,F as v,g as m,h as U,i as u,j as E,r as y,k as w,l as z,m as B,p as D}from"./index-8cIrvc8q.js";import{u as G}from"./useContentImages-7wLVntsF.js";const N={class:"h-full flex flex-col"},V={class:"flex items-center justify-between gap-2"},I={class:"flex items-center gap-2 shrink-0"},M={class:"flex flex-wrap gap-1.5"},R=["onClick"],T={class:"flex-1 overflow-y-auto custom-scrollbar px-4 pt-4 pb-16"},q={class:"grid grid-cols-2 sm:grid-cols-3 gap-4"},P=["aria-label","onClick"],A={class:"poster-card flex-1 min-h-0"},H={key:0,class:"absolute inset-0 animate-shimmer"},J=["src","alt","onError"],K=["src","alt"],O={key:3,class:"absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent pointer-events-none"},Q={class:"absolute bottom-0 left-0 right-0 p-2"},W={class:"text-xs font-semibold text-white/90 leading-tight truncate"},X={class:"flex items-center gap-1 mt-0.5"},Y={key:0,class:"text-xs text-accent font-bold"},Z={key:1,class:"text-xs text-white/40"},ee={class:"absolute top-1.5 right-1.5 flex gap-0.5"},te={key:0,class:"flex items-center justify-center py-12"},ae=F({__name:"FilmGrid",props:{films:{},title:{default:"Recommended Films"}},emits:["selectFilm"],setup(_){const b=_,{isDark:n}=E(),p=y(""),h=y(null),{coverSrc:x,fallbackSrc:k,onError:C,isLoading:f}=G({items:D(b,"films"),id:t=>t.id,existingUrl:t=>t.posterUrl||t.backdropUrl,fetch:t=>B(t.title,t.year).then(s=>s.posterUrl),fallback:t=>z(t.title,t.year)}),$=w(()=>{const t=new Map;for(const s of b.films)for(const e of s.genres)t.set(e,(t.get(e)??0)+1);return[...t.entries()].sort((s,e)=>e[1]-s[1]).slice(0,8).map(([s])=>s)}),g=w(()=>{let t=b.films;if(p.value){const s=p.value.toLowerCase();t=t.filter(e=>e.title.toLowerCase().includes(s)||e.director.toLowerCase().includes(s)||e.cast.some(i=>i.toLowerCase().includes(s)))}return h.value&&(t=t.filter(s=>s.genres.includes(h.value))),t});return(t,s)=>(l(),r("div",N,[o("div",{class:"p-4 space-y-3",style:U(a(n)?"border-bottom: 1px solid rgba(255, 255, 255, 0.08)":"border-bottom: 1px solid rgba(0, 0, 0, 0.06)")},[o("div",V,[o("h3",{class:d(["text-sm font-bold",a(n)?"text-white/90":"text-gray-900"])},c(_.title),3),o("div",I,[o("span",{class:d(["text-xs font-mono",a(n)?"text-white/30":"text-gray-400"])},c(g.value.length)+" films ",3),L(t.$slots,"header-actions")])]),S(o("input",{"onUpdate:modelValue":s[0]||(s[0]=e=>p.value=e),type:"text",placeholder:"Search films...",class:d(["w-full px-3 py-2 rounded-lg text-base outline-none transition-colors",a(n)?"bg-white/5 text-white/80 placeholder:text-white/25 focus:bg-white/10":"bg-black/3 text-gray-800 placeholder:text-gray-400 focus:bg-black/5"])},null,2),[[j,p.value]]),o("div",M,[(l(!0),r(v,null,m($.value,e=>(l(),r("button",{key:e,class:d(["text-xs px-2 py-1 rounded-md transition-all duration-150",h.value===e?"nav-tab-active":a(n)?"text-white/40 hover:text-white/70 hover:bg-white/5":"text-gray-500 hover:text-gray-800 hover:bg-black/5"]),onClick:i=>h.value=h.value===e?null:e},c(e),11,R))),128))])],4),o("div",T,[o("div",q,[(l(!0),r(v,null,m(g.value,e=>(l(),r("button",{key:e.id,class:"group flex flex-col items-stretch text-left w-full path-glass-bubble rounded-2xl overflow-hidden transition-all duration-200 hover:brightness-105","aria-label":`${e.title} (${e.year})`,onClick:i=>t.$emit("selectFilm",e)},[o("div",A,[o("div",{class:d(["aspect-[2/3] relative w-full overflow-hidden rounded-[10px]",a(x)(e)?"":a(n)?"bg-white/[0.06]":"bg-black/[0.04]"])},[a(f)(e)?(l(),r("div",H)):u("",!0),a(x)(e)?(l(),r("img",{key:1,src:a(x)(e),alt:`${e.title} (${e.year}) directed by ${e.director}`,class:"w-full h-full object-cover transition-transform duration-300 group-hover:scale-110",loading:"lazy",onError:i=>a(C)(e)},null,40,J)):a(f)(e)?u("",!0):(l(),r("img",{key:2,src:a(k)(e),alt:e.title,class:"w-full h-full object-cover"},null,8,K)),a(x)(e)?(l(),r("div",O)):u("",!0),o("div",Q,[o("p",W,c(e.title),1),o("div",X,[e.rating>0?(l(),r("span",Y,"★ "+c(e.rating),1)):u("",!0),e.year>0?(l(),r("span",Z,c(e.year),1)):u("",!0)])]),o("div",ee,[(l(!0),r(v,null,m(e.sources.slice(0,2),i=>(l(),r("span",{key:i.type,class:"text-xs px-1 py-0.5 rounded bg-black/60 text-white/70 backdrop-blur-sm"},c(i.type),1))),128))])],2)])],8,P))),128))]),g.value.length===0?(l(),r("div",te,[o("p",{class:d(["text-sm",a(n)?"text-white/30":"text-gray-400"])}," No films match your search ",2)])):u("",!0)])]))}});export{ae as _};

demo/aiui/assets/GuidePage-BvYaLEzG.css

@@ -0,0 +1 @@
+.guide-page[data-v-881f73b8]{min-height:100vh;background:#0a0a0a;color:#ffffffe6;font-family:Inter,-apple-system,BlinkMacSystemFont,sans-serif}.guide-header[data-v-881f73b8]{position:sticky;top:0;z-index:10;display:flex;align-items:center;gap:12px;padding:16px 20px;background:#0009;backdrop-filter:blur(24px);-webkit-backdrop-filter:blur(24px);border-bottom:1px solid rgba(255,255,255,.08)}.back-btn[data-v-881f73b8]{display:flex;align-items:center;justify-content:center;width:36px;height:36px;border-radius:10px;border:1px solid rgba(255,255,255,.12);background:#ffffff0f;color:#ffffffb3;cursor:pointer;transition:all .2s ease}.back-btn[data-v-881f73b8]:hover{background:#ffffff1a;color:#fff}.guide-title[data-v-881f73b8]{font-size:18px;font-weight:600;flex:1}.guide-version[data-v-881f73b8]{font-size:12px;color:#fff6;padding:2px 8px;border-radius:6px;background:#ffffff0f}.guide-content[data-v-881f73b8]{max-width:680px;margin:0 auto;padding:24px 20px 80px}.guide-intro[data-v-881f73b8]{font-size:15px;line-height:1.7;color:#ffffffb3}.guide-section[data-v-881f73b8]{margin-bottom:36px}.section-title[data-v-881f73b8]{display:flex;align-items:center;gap:10px;font-size:17px;font-weight:600;margin-bottom:12px;color:#fffffff2}.section-icon[data-v-881f73b8]{font-size:20px}.section-desc[data-v-881f73b8]{font-size:14px;line-height:1.7;color:#fff9;margin-bottom:16px}.section-desc code[data-v-881f73b8]{background:#ffffff14;padding:2px 6px;border-radius:4px;font-size:13px;font-family:Menlo,monospace;color:#fffc}.example-box[data-v-881f73b8]{display:flex;flex-direction:column;gap:8px;margin-bottom:12px}.example-prompt[data-v-881f73b8]{padding:10px 14px;background:#ffffff0a;border:1px solid rgba(255,255,255,.08);border-radius:10px;font-size:13px;color:#ffffffbf;font-style:italic}.info-note[data-v-881f73b8]{padding:12px 16px;background:#f7931a14;border:1px solid rgba(247,147,26,.2);border-radius:10px;font-size:13px;line-height:1.6;color:#fff9}.feature-grid[data-v-881f73b8]{display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px}.feature-card[data-v-881f73b8]{padding:16px;background:#ffffff0a;border:1px solid rgba(255,255,255,.08);border-radius:12px}.feature-card h3[data-v-881f73b8]{font-size:14px;font-weight:600;margin-bottom:6px;color:#ffffffe6}.feature-card p[data-v-881f73b8]{font-size:13px;line-height:1.5;color:#ffffff80}.tips-list[data-v-881f73b8]{list-style:none;padding:0;display:flex;flex-direction:column;gap:10px}.tips-list li[data-v-881f73b8]{padding:10px 14px 10px 28px;position:relative;background:#ffffff08;border:1px solid rgba(255,255,255,.06);border-radius:10px;font-size:13px;line-height:1.5;color:#fff9}.tips-list li[data-v-881f73b8]:before{content:"•";position:absolute;left:14px;color:#f7931a}.demo-button[data-v-881f73b8]{display:flex;align-items:center;justify-content:center;gap:8px;width:100%;padding:14px 20px;border-radius:12px;border:1px solid rgba(247,147,26,.3);background:#f7931a1a;color:#f7931a;font-size:15px;font-weight:600;cursor:pointer;transition:all .2s ease}.demo-button[data-v-881f73b8]:hover:not(:disabled){background:#f7931a2e;border-color:#f7931a80;transform:translateY(-1px)}.demo-button[data-v-881f73b8]:disabled{opacity:.6;cursor:not-allowed}.demo-spinner[data-v-881f73b8]{width:18px;height:18px;border:2px solid rgba(247,147,26,.3);border-top-color:#f7931a;border-radius:50%;animation:spin-881f73b8 .8s linear infinite}@keyframes spin-881f73b8{to{transform:rotate(360deg)}}

demo/aiui/assets/GuidePage-CXT-xcyj.css

@@ -1 +0,0 @@
-.guide-page[data-v-f6611b72]{min-height:100vh;background:#0a0a0a;color:#ffffffe6;font-family:Inter,-apple-system,BlinkMacSystemFont,sans-serif}.guide-header[data-v-f6611b72]{position:sticky;top:0;z-index:10;display:flex;align-items:center;gap:12px;padding:16px 20px;background:#0009;backdrop-filter:blur(24px);-webkit-backdrop-filter:blur(24px);border-bottom:1px solid rgba(255,255,255,.08)}.back-btn[data-v-f6611b72]{display:flex;align-items:center;justify-content:center;width:36px;height:36px;border-radius:10px;border:1px solid rgba(255,255,255,.12);background:#ffffff0f;color:#ffffffb3;cursor:pointer;transition:all .2s ease}.back-btn[data-v-f6611b72]:hover{background:#ffffff1a;color:#fff}.guide-title[data-v-f6611b72]{font-size:18px;font-weight:600;flex:1}.guide-version[data-v-f6611b72]{font-size:12px;color:#fff6;padding:2px 8px;border-radius:6px;background:#ffffff0f}.guide-content[data-v-f6611b72]{max-width:680px;margin:0 auto;padding:24px 20px 80px}.guide-intro[data-v-f6611b72]{font-size:15px;line-height:1.7;color:#ffffffb3}.guide-section[data-v-f6611b72]{margin-bottom:36px}.section-title[data-v-f6611b72]{display:flex;align-items:center;gap:10px;font-size:17px;font-weight:600;margin-bottom:12px;color:#fffffff2}.section-icon[data-v-f6611b72]{font-size:20px}.section-desc[data-v-f6611b72]{font-size:14px;line-height:1.7;color:#fff9;margin-bottom:16px}.section-desc code[data-v-f6611b72]{background:#ffffff14;padding:2px 6px;border-radius:4px;font-size:13px;font-family:Menlo,monospace;color:#fffc}.example-box[data-v-f6611b72]{display:flex;flex-direction:column;gap:8px;margin-bottom:12px}.example-prompt[data-v-f6611b72]{padding:10px 14px;background:#ffffff0a;border:1px solid rgba(255,255,255,.08);border-radius:10px;font-size:13px;color:#ffffffbf;font-style:italic}.info-note[data-v-f6611b72]{padding:12px 16px;background:#f7931a14;border:1px solid rgba(247,147,26,.2);border-radius:10px;font-size:13px;line-height:1.6;color:#fff9}.feature-grid[data-v-f6611b72]{display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px}.feature-card[data-v-f6611b72]{padding:16px;background:#ffffff0a;border:1px solid rgba(255,255,255,.08);border-radius:12px}.feature-card h3[data-v-f6611b72]{font-size:14px;font-weight:600;margin-bottom:6px;color:#ffffffe6}.feature-card p[data-v-f6611b72]{font-size:13px;line-height:1.5;color:#ffffff80}.tips-list[data-v-f6611b72]{list-style:none;padding:0;display:flex;flex-direction:column;gap:10px}.tips-list li[data-v-f6611b72]{padding:10px 14px 10px 28px;position:relative;background:#ffffff08;border:1px solid rgba(255,255,255,.06);border-radius:10px;font-size:13px;line-height:1.5;color:#fff9}.tips-list li[data-v-f6611b72]:before{content:"•";position:absolute;left:14px;color:#f7931a}.demo-button[data-v-f6611b72]{display:flex;align-items:center;justify-content:center;gap:8px;width:100%;padding:14px 20px;border-radius:12px;border:1px solid rgba(247,147,26,.3);background:#f7931a1a;color:#f7931a;font-size:15px;font-weight:600;cursor:pointer;transition:all .2s ease}.demo-button[data-v-f6611b72]:hover:not(:disabled){background:#f7931a2e;border-color:#f7931a80;transform:translateY(-1px)}.demo-button[data-v-f6611b72]:disabled{opacity:.6;cursor:not-allowed}.demo-spinner[data-v-f6611b72]{width:18px;height:18px;border:2px solid rgba(247,147,26,.3);border-top-color:#f7931a;border-radius:50%;animation:spin-f6611b72 .8s linear infinite}@keyframes spin-f6611b72{to{transform:rotate(360deg)}}

demo/aiui/assets/SongDetail-DCzBBkzH.js

@@ -1 +1 @@
-import{_ as m}from"./SongDetail.vue_vue_type_script_setup_true_lang-B3om3Z8v.js";import"./index-8cIrvc8q.js";export{m as default};
+import{_ as m}from"./SongDetail.vue_vue_type_script_setup_true_lang-CvC0ROCb.js";import"./index-Lh5NfTCq.js";export{m as default};

demo/aiui/assets/SongGrid-BgCYmw2O.js

@@ -0,0 +1 @@
+import{_ as o}from"./SongGrid.vue_vue_type_script_setup_true_lang-CW1T9zpX.js";import"./index-Lh5NfTCq.js";import"./useContentImages-CagIZs4M.js";export{o as default};

demo/aiui/assets/SongGrid-C568K-c_.js

@@ -1 +0,0 @@
-import{_ as o}from"./SongGrid.vue_vue_type_script_setup_true_lang-IvAOIQYW.js";import"./index-8cIrvc8q.js";import"./useContentImages-7wLVntsF.js";export{o as default};

demo/aiui/assets/SongGrid.vue_vue_type_script_setup_true_lang-CW1T9zpX.js

@@ -0,0 +1 @@
+import{a as z,q as M,x as B,y as E,p as q,b as o,c as r,e as s,n as c,u as a,t as u,f as D,w as F,v as G,F as v,g as m,h as N,i as f,z as U,j as V,r as _,k}from"./index-Lh5NfTCq.js";import{u as P}from"./useContentImages-CagIZs4M.js";const R={class:"h-full flex flex-col"},T={class:"flex items-center justify-between gap-2"},I={class:"flex items-center gap-2 shrink-0"},A={class:"flex flex-wrap gap-1.5"},H=["onClick"],J={class:"flex-1 overflow-y-auto custom-scrollbar px-4 pt-4 pb-16"},K={class:"grid grid-cols-2 sm:grid-cols-3 gap-4"},O=["aria-label","onClick"],Q={class:"cover-card flex-1 min-h-0 relative flex items-center justify-center"},W={key:0,class:"absolute inset-0 animate-shimmer"},X=["onClick"],Y=["src","alt","onError"],Z=["src","alt"],tt={key:3,class:"absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent pointer-events-none"},et={class:"absolute bottom-0 left-0 right-0 p-2"},st={class:"text-xs font-semibold text-white/90 leading-tight truncate"},lt={class:"text-xs text-white/40 truncate mt-0.5"},at={class:"absolute top-1.5 right-1.5 flex gap-0.5 flex-wrap justify-end max-w-[60%]"},ot={key:0,class:"flex items-center justify-center py-12"},nt=z({__name:"SongGrid",props:{songs:{},title:{default:"Recommended Songs"}},emits:["selectSong"],setup(g,{emit:C}){const x=g,y=C,{isDark:i}=V(),{play:S}=M(),h=_(""),d=_(null),{coverSrc:p,fallbackSrc:j,onError:$,isLoading:w}=P({items:q(x,"songs"),id:e=>e.id,existingUrl:e=>e.coverUrl,fetch:e=>E(e.title,e.artist,e.album),fallback:e=>B(e.title,e.artist)}),L=k(()=>{const e=new Map;for(const l of x.songs)for(const t of l.genres??[])e.set(t,(e.get(t)??0)+1);return[...e.entries()].sort((l,t)=>t[1]-l[1]).slice(0,8).map(([l])=>l)}),b=k(()=>{let e=x.songs;if(h.value){const l=h.value.toLowerCase();e=e.filter(t=>t.title.toLowerCase().includes(l)||t.artist.toLowerCase().includes(l)||(t.album??"").toLowerCase().includes(l))}return d.value&&(e=e.filter(l=>(l.genres??[]).includes(d.value))),e});return(e,l)=>(o(),r("div",R,[s("div",{class:"p-4 space-y-3",style:N(a(i)?"border-bottom: 1px solid rgba(255, 255, 255, 0.08)":"border-bottom: 1px solid rgba(0, 0, 0, 0.06)")},[s("div",T,[s("h3",{class:c(["text-sm font-bold",a(i)?"text-white/90":"text-gray-900"])},u(g.title),3),s("div",I,[s("span",{class:c(["text-xs font-mono",a(i)?"text-white/30":"text-gray-400"])},u(b.value.length)+" songs ",3),D(e.$slots,"header-actions")])]),F(s("input",{"onUpdate:modelValue":l[0]||(l[0]=t=>h.value=t),type:"text",placeholder:"Search songs...",class:c(["w-full px-3 py-2 rounded-lg text-base outline-none transition-colors",a(i)?"bg-white/5 text-white/80 placeholder:text-white/25 focus:bg-white/10":"bg-black/3 text-gray-800 placeholder:text-gray-400 focus:bg-black/5"])},null,2),[[G,h.value]]),s("div",A,[(o(!0),r(v,null,m(L.value,t=>(o(),r("button",{key:t,class:c(["text-xs px-2 py-1 rounded-md transition-all duration-150",d.value===t?"nav-tab-active":a(i)?"text-white/40 hover:text-white/70 hover:bg-white/5":"text-gray-500 hover:text-gray-800 hover:bg-black/5"]),onClick:n=>d.value=d.value===t?null:t},u(t),11,H))),128))])],4),s("div",J,[s("div",K,[(o(!0),r(v,null,m(b.value,t=>(o(),r("button",{key:t.id,class:"group flex flex-col items-stretch text-left w-full path-glass-bubble rounded-2xl overflow-hidden transition-all duration-200 hover:brightness-105","aria-label":`${t.title} by ${t.artist}`,onClick:n=>y("selectSong",t)},[s("div",Q,[s("div",{class:c(["aspect-square relative w-full overflow-hidden rounded-[10px]",a(p)(t)?"":a(i)?"bg-white/[0.06]":"bg-black/[0.04]"])},[a(w)(t)?(o(),r("div",W)):f("",!0),s("button",{class:"absolute inset-0 flex items-center justify-center z-10 backdrop-blur-sm bg-black/30 opacity-0 group-hover:opacity-100 transition-all duration-200","aria-label":"Play",onClick:U(n=>{a(S)(t),y("selectSong",t)},["stop"])},[...l[1]||(l[1]=[s("span",{class:"w-16 h-16 rounded-full flex items-center justify-center path-glass-icon"},[s("svg",{class:"w-8 h-8 text-white",fill:"currentColor",viewBox:"0 0 24 24"},[s("path",{d:"M8 5v14l11-7L8 5z"})])],-1)])],8,X),a(p)(t)?(o(),r("img",{key:1,src:a(p)(t),alt:`${t.title} by ${t.artist}`,class:"w-full h-full object-cover transition-transform duration-300 group-hover:scale-110",loading:"lazy",onError:n=>a($)(t)},null,40,Y)):a(w)(t)?f("",!0):(o(),r("img",{key:2,src:a(j)(t),alt:t.title,class:"w-full h-full object-cover"},null,8,Z)),a(p)(t)?(o(),r("div",tt)):f("",!0),s("div",et,[s("p",st,u(t.title),1),s("p",lt,u(t.artist),1)]),s("div",at,[(o(!0),r(v,null,m((t.sources??[]).slice(0,2),n=>(o(),r("span",{key:n.type,class:"text-xs px-1 py-0.5 rounded bg-black/60 text-white/70 backdrop-blur-sm"},u(n.type),1))),128))])],2)])],8,O))),128))]),b.value.length===0?(o(),r("div",ot,[s("p",{class:c(["text-sm",a(i)?"text-white/30":"text-gray-400"])}," No songs match your search ",2)])):f("",!0)])]))}});export{nt as _};

demo/aiui/assets/SongGrid.vue_vue_type_script_setup_true_lang-IvAOIQYW.js

@@ -1 +0,0 @@
-import{a as z,q as M,x as B,y as E,p as q,b as o,c as r,e as s,n as c,u as a,t as u,f as D,w as F,v as G,F as v,g as m,h as N,i as h,z as U,j as V,r as _,k}from"./index-8cIrvc8q.js";import{u as P}from"./useContentImages-7wLVntsF.js";const R={class:"h-full flex flex-col"},T={class:"flex items-center justify-between gap-2"},I={class:"flex items-center gap-2 shrink-0"},A={class:"flex flex-wrap gap-1.5"},H=["onClick"],J={class:"flex-1 overflow-y-auto custom-scrollbar px-4 pt-4 pb-16"},K={class:"grid grid-cols-2 sm:grid-cols-3 gap-4"},O=["aria-label","onClick"],Q={class:"cover-card flex-1 min-h-0 relative flex items-center justify-center"},W={key:0,class:"absolute inset-0 animate-shimmer"},X=["onClick"],Y=["src","alt","onError"],Z=["src","alt"],tt={key:3,class:"absolute inset-0 bg-gradient-to-t from-black/60 via-transparent to-transparent pointer-events-none"},et={class:"absolute bottom-0 left-0 right-0 p-2"},st={class:"text-xs font-semibold text-white/90 leading-tight truncate"},lt={key:0,class:"text-xs text-white/40 truncate mt-0.5"},at={class:"absolute top-1.5 right-1.5 flex gap-0.5 flex-wrap justify-end max-w-[60%]"},ot={key:0,class:"flex items-center justify-center py-12"},nt=z({__name:"SongGrid",props:{songs:{},title:{default:"Recommended Songs"}},emits:["selectSong"],setup(g,{emit:C}){const x=g,y=C,{isDark:i}=V(),{play:S}=M(),p=_(""),d=_(null),{coverSrc:f,fallbackSrc:j,onError:$,isLoading:w}=P({items:q(x,"songs"),id:e=>e.id,existingUrl:e=>e.coverUrl,fetch:e=>E(e.title,e.artist,e.album),fallback:e=>B(e.title,e.artist)}),L=k(()=>{const e=new Map;for(const l of x.songs)for(const t of l.genres??[])e.set(t,(e.get(t)??0)+1);return[...e.entries()].sort((l,t)=>t[1]-l[1]).slice(0,8).map(([l])=>l)}),b=k(()=>{let e=x.songs;if(p.value){const l=p.value.toLowerCase();e=e.filter(t=>t.title.toLowerCase().includes(l)||t.artist.toLowerCase().includes(l)||(t.album??"").toLowerCase().includes(l))}return d.value&&(e=e.filter(l=>(l.genres??[]).includes(d.value))),e});return(e,l)=>(o(),r("div",R,[s("div",{class:"p-4 space-y-3",style:N(a(i)?"border-bottom: 1px solid rgba(255, 255, 255, 0.08)":"border-bottom: 1px solid rgba(0, 0, 0, 0.06)")},[s("div",T,[s("h3",{class:c(["text-sm font-bold",a(i)?"text-white/90":"text-gray-900"])},u(g.title),3),s("div",I,[s("span",{class:c(["text-xs font-mono",a(i)?"text-white/30":"text-gray-400"])},u(b.value.length)+" songs ",3),D(e.$slots,"header-actions")])]),F(s("input",{"onUpdate:modelValue":l[0]||(l[0]=t=>p.value=t),type:"text",placeholder:"Search songs...",class:c(["w-full px-3 py-2 rounded-lg text-base outline-none transition-colors",a(i)?"bg-white/5 text-white/80 placeholder:text-white/25 focus:bg-white/10":"bg-black/3 text-gray-800 placeholder:text-gray-400 focus:bg-black/5"])},null,2),[[G,p.value]]),s("div",A,[(o(!0),r(v,null,m(L.value,t=>(o(),r("button",{key:t,class:c(["text-xs px-2 py-1 rounded-md transition-all duration-150",d.value===t?"nav-tab-active":a(i)?"text-white/40 hover:text-white/70 hover:bg-white/5":"text-gray-500 hover:text-gray-800 hover:bg-black/5"]),onClick:n=>d.value=d.value===t?null:t},u(t),11,H))),128))])],4),s("div",J,[s("div",K,[(o(!0),r(v,null,m(b.value,t=>(o(),r("button",{key:t.id,class:"group flex flex-col items-stretch text-left w-full path-glass-bubble rounded-2xl overflow-hidden transition-all duration-200 hover:brightness-105","aria-label":`${t.title} by ${t.artist}`,onClick:n=>y("selectSong",t)},[s("div",Q,[s("div",{class:c(["aspect-square relative w-full overflow-hidden rounded-[10px]",a(f)(t)?"":a(i)?"bg-white/[0.06]":"bg-black/[0.04]"])},[a(w)(t)?(o(),r("div",W)):h("",!0),s("button",{class:"absolute inset-0 flex items-center justify-center z-10 backdrop-blur-sm bg-black/30 opacity-0 group-hover:opacity-100 transition-all duration-200","aria-label":"Play",onClick:U(n=>{a(S)(t),y("selectSong",t)},["stop"])},[...l[1]||(l[1]=[s("span",{class:"w-16 h-16 rounded-full flex items-center justify-center path-glass-icon"},[s("svg",{class:"w-8 h-8 text-white",fill:"currentColor",viewBox:"0 0 24 24"},[s("path",{d:"M8 5v14l11-7L8 5z"})])],-1)])],8,X),a(f)(t)?(o(),r("img",{key:1,src:a(f)(t),alt:`${t.title} by ${t.artist}`,class:"w-full h-full object-cover transition-transform duration-300 group-hover:scale-110",loading:"lazy",onError:n=>a($)(t)},null,40,Y)):a(w)(t)?h("",!0):(o(),r("img",{key:2,src:a(j)(t),alt:t.title,class:"w-full h-full object-cover"},null,8,Z)),a(f)(t)?(o(),r("div",tt)):h("",!0),s("div",et,[s("p",st,u(t.title),1),t.artist?(o(),r("p",lt,u(t.artist),1)):h("",!0)]),s("div",at,[(o(!0),r(v,null,m((t.sources??[]).slice(0,2),n=>(o(),r("span",{key:n.type,class:"text-xs px-1 py-0.5 rounded bg-black/60 text-white/70 backdrop-blur-sm"},u(n.type),1))),128))])],2)])],8,O))),128))]),b.value.length===0?(o(),r("div",ot,[s("p",{class:c(["text-sm",a(i)?"text-white/30":"text-gray-400"])}," No songs match your search ",2)])):h("",!0)])]))}});export{nt as _};

demo/aiui/assets/ThreadNode-Bt5yTyUn.js

@@ -1 +1 @@
-import{a as h,J as m,b as d,c as r,e as t,t as s,F as u,g as p,K as x,h as f}from"./index-8cIrvc8q.js";const g={class:"rounded-lg bg-white/[0.03] border border-white/5 p-2.5 mb-1"},b={class:"flex items-center gap-1.5 mb-1"},w={class:"w-5 h-5 rounded-full shrink-0 flex items-center justify-center text-xs font-bold bg-purple-500/20 text-purple-400"},y={class:"text-xs font-semibold text-white/70"},v={class:"text-xs ml-auto text-white/20"},k={class:"text-xs text-white/60 leading-relaxed whitespace-pre-wrap"},T=h({__name:"ThreadNode",props:{node:{},depth:{}},emits:["reply"],setup(e){function i(o){return new Date(o*1e3).toLocaleTimeString("en",{hour:"2-digit",minute:"2-digit"})}return(o,n)=>{const l=m("ThreadNode",!0);return d(),r("div",{style:f({paddingLeft:`${Math.min(e.depth,4)*16}px`})},[t("div",g,[t("div",b,[t("div",w,s(e.node.note.authorName?.charAt(0)?.toUpperCase()??"?"),1),t("span",y,s(e.node.note.authorName??"anon"),1),t("span",v,s(i(e.node.note.created_at)),1)]),t("p",k,s(e.node.note.content),1),t("button",{class:"text-xs text-white/25 hover:text-accent/60 mt-1 transition-colors",onClick:n[0]||(n[0]=a=>o.$emit("reply",e.node.note))}," Reply ")]),(d(!0),r(u,null,p(e.node.children,a=>(d(),x(l,{key:a.note.id,node:a,depth:e.depth+1,onReply:n[1]||(n[1]=c=>o.$emit("reply",c))},null,8,["node","depth"]))),128))],4)}}});export{T as default};
+import{a as h,P as m,b as d,c as r,e as t,t as s,F as u,g as p,Q as x,h as f}from"./index-Lh5NfTCq.js";const g={class:"rounded-lg bg-white/[0.03] border border-white/5 p-2.5 mb-1"},b={class:"flex items-center gap-1.5 mb-1"},w={class:"w-5 h-5 rounded-full shrink-0 flex items-center justify-center text-xs font-bold bg-purple-500/20 text-purple-400"},y={class:"text-xs font-semibold text-white/70"},v={class:"text-xs ml-auto text-white/20"},k={class:"text-xs text-white/60 leading-relaxed whitespace-pre-wrap"},T=h({__name:"ThreadNode",props:{node:{},depth:{}},emits:["reply"],setup(e){function i(o){return new Date(o*1e3).toLocaleTimeString("en",{hour:"2-digit",minute:"2-digit"})}return(o,n)=>{const l=m("ThreadNode",!0);return d(),r("div",{style:f({paddingLeft:`${Math.min(e.depth,4)*16}px`})},[t("div",g,[t("div",b,[t("div",w,s(e.node.note.authorName?.charAt(0)?.toUpperCase()??"?"),1),t("span",y,s(e.node.note.authorName??"anon"),1),t("span",v,s(i(e.node.note.created_at)),1)]),t("p",k,s(e.node.note.content),1),t("button",{class:"text-xs text-white/25 hover:text-accent/60 mt-1 transition-colors",onClick:n[0]||(n[0]=a=>o.$emit("reply",e.node.note))}," Reply ")]),(d(!0),r(u,null,p(e.node.children,a=>(d(),x(l,{key:a.note.id,node:a,depth:e.depth+1,onReply:n[1]||(n[1]=c=>o.$emit("reply",c))},null,8,["node","depth"]))),128))],4)}}});export{T as default};