.gitea/workflows/build-iso.yml

@@ -1,62 +0,0 @@
-name: Build Archipelago release ISO (gated)
-
-# Resurrected from image-recipe/_archived/.gitea-workflows/build-iso-dev.yml.
-# Dispatch-only on purpose: the ISO is cut per release, not per push, and
-# the iso-builder runner is a live node — builds are deliberate events.
-on:
-  workflow_dispatch:
-
-jobs:
-  build-iso:
-    runs-on: iso-builder
-    timeout-minutes: 180
-    steps:
-      - name: Sync source to workspace
-        run: |
-          # Direct fetch + sync (actions/checkout token is broken on this Gitea)
-          REPO_DIR="$HOME/Projects/archy"
-          [ -d "$REPO_DIR" ] || REPO_DIR="$HOME/archy"
-          cd "$REPO_DIR" && git fetch origin main && git reset --hard origin/main
-          echo "=== Source at commit: $(git log --oneline -1) ==="
-
-      - name: Install ISO build dependencies
-        run: |
-          if dpkg -s debootstrap squashfs-tools xorriso isolinux syslinux-common mtools \
-               grub-efi-amd64-bin grub-pc-bin grub-common >/dev/null 2>&1; then
-            echo "ISO build deps already installed, skipping apt"
-          else
-            sudo apt-get update -qq
-            sudo apt-get install -y -qq \
-              debootstrap squashfs-tools xorriso \
-              isolinux syslinux-common mtools \
-              grub-efi-amd64-bin grub-pc-bin grub-common
-          fi
-
-      - name: Build backend + frontend if stale
-        run: |
-          REPO_DIR="$HOME/Projects/archy"
-          [ -d "$REPO_DIR" ] || REPO_DIR="$HOME/archy"
-          cd "$REPO_DIR"
-          . "$HOME/.cargo/env" 2>/dev/null || true
-          VERSION=$(grep -m1 '^version' core/archipelago/Cargo.toml | sed 's/.*"\(.*\)".*/\1/')
-          if ! strings core/target/release/archipelago 2>/dev/null | grep -qF "$VERSION"; then
-            cargo build --release --manifest-path core/Cargo.toml -p archipelago
-          fi
-          if ! grep -rqoF "$VERSION" web/dist/neode-ui/assets/*.js 2>/dev/null; then
-            (cd neode-ui && npm ci && npm run build)
-          fi
-
-      - name: Gated ISO build (gates + build + smoke + qemu)
-        run: |
-          REPO_DIR="$HOME/Projects/archy"
-          [ -d "$REPO_DIR" ] || REPO_DIR="$HOME/archy"
-          cd "$REPO_DIR"
-          . "$HOME/.cargo/env" 2>/dev/null || true
-          bash scripts/build-iso-release.sh
-
-      - name: Report artifacts
-        if: always()
-        run: |
-          REPO_DIR="$HOME/Projects/archy"
-          [ -d "$REPO_DIR" ] || REPO_DIR="$HOME/archy"
-          ls -lh "$REPO_DIR"/image-recipe/results/*.iso 2>/dev/null | tail -3 || echo "no ISO produced"

.gitea/workflows/demo-images.yml

@@ -18,7 +18,7 @@ on:
     paths:
       - 'neode-ui/**'
       - 'docker-compose.demo.yml'
-      - '.gitea/workflows/demo-images.yml'
+      - '.github/workflows/demo-images.yml'
   workflow_dispatch:
 
 jobs:

.github/pull_request_template.md

@@ -1,16 +1,16 @@
 ## Summary
 
-<!-- What changed and why? -->
+<!-- Brief description of what this PR does -->
 
-## Verification
+## Changes
 
-<!-- Commands run, devices tested, screenshots, or reason testing was not run. -->
+-
 
 ## Checklist
 
-- [ ] Rust formatting/clippy/tests pass when backend code changed.
-- [ ] Frontend type-check/build/tests pass when frontend code changed.
-- [ ] App manifests validate when app packaging changed.
-- [ ] Generated catalogs are updated when manifest-owned catalog fields changed.
-- [ ] Docs are updated for user-facing or developer-facing behavior changes.
-- [ ] No secrets, generated build outputs, local screenshots, or private host details are included.
+- [ ] TypeScript type-check passes (`npm run type-check`)
+- [ ] Frontend builds (`npm run build`)
+- [ ] Tests pass (`npm test`)
+- [ ] Rust clippy clean (if backend changes)
+- [ ] No new compiler warnings
+- [ ] Tested on live server

.github/workflows/ci.yml

@@ -8,11 +8,11 @@ on:
 
 env:
   RUST_VERSION: stable
-  NODE_VERSION: 20
+  NODE_VERSION: 18
 
 jobs:
   rust:
-    name: Rust
+    name: Rust (fmt + clippy + test)
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -28,17 +28,17 @@ jobs:
           toolchain: ${{ env.RUST_VERSION }}
           components: rustfmt, clippy
 
-      - name: Format
+      - name: Check formatting
         run: cargo fmt --all -- --check
 
       - name: Clippy
         run: cargo clippy --all-targets --all-features -- -D warnings
 
-      - name: Test
+      - name: Tests
         run: cargo test --all-features
 
   frontend:
-    name: Frontend
+    name: Frontend (type-check + lint)
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -52,31 +52,14 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: npm
+          cache: 'npm'
           cache-dependency-path: neode-ui/package-lock.json
 
-      - name: Install
+      - name: Install dependencies
         run: npm ci
 
       - name: Type check
         run: npm run type-check
 
-      - name: Test
-        run: npm test
-
       - name: Build
         run: npm run build
-
-  manifests:
-    name: App Manifests
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Validate manifests
-        run: |
-          for manifest in apps/*/manifest.yml; do
-            ./scripts/validate-app-manifest.sh --repo-audit "$manifest"
-          done

.gitignore

@@ -1,9 +1,10 @@
-# SSH keys and sandbox copies
+# SSH keys (sandbox copies)
 .ssh/
 
 # Rust build output
 target/
 **/target/
+Cargo.lock
 
 # Node.js
 node_modules/
@@ -11,6 +12,7 @@ node_modules/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+package-lock.json
 pnpm-debug.log*
 
 # Build outputs
@@ -26,46 +28,49 @@ build/
 *.swo
 *~
 .DS_Store
-._*
-Thumbs.db
 
 # Environment and local overrides
 .env
 .env.local
 .env.*.local
-.env.production
-core/.env.production
 scripts/deploy-config.sh
 
 # Logs
 logs/
 *.log
 
+# OS
+.DS_Store
+Thumbs.db
+
 # Testing
 coverage/
 .nyc_output/
 
-# Image / release artifacts
+# Temporary files
+*.tmp
+*.temp
+
+# Build artifacts
 *.iso
 *.img
 *.dmg
 *.app
-*.apk
-*.keystore
-*.s9pk
-*.tar.gz
 
-# Release artifacts live in release attachments, not Git history.
+# Release artifacts live in Gitea Release attachments, not Git history.
 releases/**
 !releases/
 !releases/manifest.json
 
+# macOS build output
+build/macos/
+
 # Image recipe output
 image-recipe/output/
 image-recipe/*.iso
 image-recipe/*.img
 
-# Loop tool artifacts
+# Loop tool artifacts (created in every subdirectory)
 */loop/
 loop/loop/
 loop/loop.log.bak
@@ -73,17 +78,19 @@ loop/loop.log.bak
 # Separate repos nested in tree
 web/
 
-# Resilience harness reports contain session cookies.
+._*
+
+# Resilience harness reports (generated, contains session cookies)
 scripts/resilience/reports/
 
 # Codex / pnpm / python caches / editor backups
 .codex
 .codex-target-*/
 .codex-tmp/
-.claude/
 .pnpm-store/
 **/__pycache__/
 *.bak
+.claude/scheduled_tasks.lock
 
 # Local evidence screenshots; intentional UI screenshots should live under an
 # app/docs asset path with a descriptive filename.

Android/.gitignore

@@ -19,7 +19,3 @@ local.properties
 # updates then install over the top without an uninstall. Debug keys are not
 # secret (well-known password "android"); never commit a real release keystore.
 !/app/debug.keystore
-
-# Rust build outputs (archy-fips-core → jniLibs via buildRustArm64)
-/rust/archy-fips-core/target
-/app/src/main/jniLibs

Android/COMPANION_RELEASE.md

@@ -23,10 +23,6 @@ used by the `.githooks/pre-push` hook), which:
    **aborts** if any is missing.
 5. Stages the signed APK at `neode-ui/public/packages/archipelago-companion.apk`,
    commits, and pushes with `SHIP_COMPANION=1` (the sanctioned pre-push bypass).
-6. The first-launch companion modal and Android "Share this app" QR point at
-   `http://146.59.87.168:2100/packages/archipelago-companion.apk`. After the
-   repo artifact is built, mirror that exact APK to the VPS2-served path before
-   calling the release done.
 
 **Never** hand-roll `gradlew assembleDebug` + `cp` to the served path. That path
 skips the clean build and the signature enforcement and is exactly how a broken
@@ -86,16 +82,13 @@ home-screen app layouts wiped by an over-broad action.
 
 ## Verify the published download after shipping
 
-The checked-in artifact is Gitea raw-on-main. The QR/App Store download served
-to users is the VPS2 `:2100` URL. Confirm both live byte streams match what you
-built and signed:
+The download served to nodes is Gitea raw-on-main. Confirm the live bytes match
+what you built and signed:
 
 ```bash
 SERVED=neode-ui/public/packages/archipelago-companion.apk
-GITEA_URL=http://146.59.87.168:3000/lfg2025/archy/raw/branch/main/$SERVED
-QR_URL=http://146.59.87.168:2100/packages/archipelago-companion.apk
-curl -sS -o /tmp/live-gitea.apk "$GITEA_URL"
-curl -sS -o /tmp/live-qr.apk "$QR_URL"
-shasum -a 256 "$SERVED" /tmp/live-gitea.apk /tmp/live-qr.apk  # all must match
-apksigner verify -v --min-sdk-version 21 /tmp/live-qr.apk | grep -i "scheme"  # v1/v2/v3 = true
+URL=http://146.59.87.168:3000/lfg2025/archy/raw/branch/main/$SERVED
+curl -sS -o /tmp/live.apk "$URL"
+shasum -a 256 "$SERVED" /tmp/live.apk          # must match
+apksigner verify -v --min-sdk-version 21 /tmp/live.apk | grep -i "scheme"  # v1/v2/v3 = true
 ```

Android/app/build.gradle.kts

@@ -11,17 +11,12 @@ android {
         applicationId = "com.archipelago.app"
         minSdk = 26
         targetSdk = 35
-        versionCode = 45
-        versionName = "0.5.25"
+        versionCode = 16
+        versionName = "0.4.12"
 
         vectorDrawables {
             useSupportLibrary = true
         }
-
-        // The embedded FIPS mesh (libarchy_fips_core.so) is built arm64-only,
-        // matching real handsets. FipsNative.available gates every call, so
-        // the app still runs as a plain companion elsewhere (e.g. x86 emu).
-        ndk { abiFilters += "arm64-v8a" }
     }
 
     signingConfigs {
@@ -85,44 +80,6 @@ android {
     }
 }
 
-// ---------------------------------------------------------------------------
-// Embedded FIPS mesh: cross-compile Android/rust/archy-fips-core via cargo-ndk
-// into jniLibs before the native-libs merge, so a plain `gradlew assembleDebug`
-// builds the Rust too. Requires rustup target aarch64-linux-android, cargo-ndk,
-// and an NDK (ANDROID_NDK_HOME or the SDK's ndk/ dir).
-// ---------------------------------------------------------------------------
-val rustCrateDir = layout.projectDirectory.dir("../rust/archy-fips-core")
-val jniLibsDir = layout.projectDirectory.dir("src/main/jniLibs")
-
-tasks.register<Exec>("buildRustArm64") {
-    workingDir = rustCrateDir.asFile
-    inputs.dir(rustCrateDir.dir("src"))
-    inputs.file(rustCrateDir.file("Cargo.toml"))
-    outputs.dir(jniLibsDir)
-    // cargo/cargo-ndk live in ~/.cargo/bin, which Gradle's env may not have.
-    val home = System.getProperty("user.home")
-    environment("PATH", "$home/.cargo/bin:${System.getenv("PATH")}")
-    if (System.getenv("ANDROID_NDK_HOME") == null) {
-        val sdkNdk = file("$home/Library/Android/sdk/ndk")
-            .listFiles()?.maxByOrNull { it.name }
-        if (sdkNdk != null) environment("ANDROID_NDK_HOME", sdkNdk.absolutePath)
-    }
-    commandLine(
-        "cargo", "ndk",
-        "-t", "arm64-v8a",
-        "--platform", "26",
-        "-o", jniLibsDir.asFile.absolutePath,
-        "build", "--release",
-    )
-}
-
-tasks.matching {
-    it.name in listOf(
-        "mergeDebugNativeLibs", "mergeReleaseNativeLibs",
-        "mergeDebugJniLibFolders", "mergeReleaseJniLibFolders",
-    )
-}.configureEach { dependsOn("buildRustArm64") }
-
 dependencies {
     val composeBom = platform("androidx.compose:compose-bom:2024.05.00")
     implementation(composeBom)
@@ -154,12 +111,6 @@ dependencies {
     // OkHttp for WebSocket (remote input)
     implementation("com.squareup.okhttp3:okhttp:4.12.0")
 
-    // CameraX + ZXing (Apache-2.0, on-device, no telemetry) for pairing-QR scanning
-    implementation("androidx.camera:camera-camera2:1.3.4")
-    implementation("androidx.camera:camera-lifecycle:1.3.4")
-    implementation("androidx.camera:camera-view:1.3.4")
-    implementation("com.google.zxing:core:3.5.3")
-
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 }

Android/app/src/main/AndroidManifest.xml

@@ -4,13 +4,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- Pairing-QR scanner. Camera is optional: manual entry still works without one. -->
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-feature android:name="android.hardware.camera.any" android:required="false" />
-    <!-- Embedded FIPS mesh tunnel (ArchyVpnService) runs as a foreground service. -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".ArchipelagoApp"
@@ -23,22 +16,9 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="35">
 
-        <!-- Party-screen "Share this app": exposes the copied APK from
-             cache/share/ to the system share sheet, nothing else. -->
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:launchMode="singleTask"
             android:theme="@style/Theme.Archipelago.Splash"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden">
@@ -46,30 +26,7 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <!-- Pairing deep link from the web UI's Companion popup:
-                 archipelago://pair?v=1&url=...[&pw=...] (docs/companion-pairing-qr.md) -->
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="archipelago" android:host="pair" />
-            </intent-filter>
         </activity>
-
-        <!-- Embedded FIPS mesh node: split-tunnel VpnService (fd00::/8 only),
-             configured entirely by scanning the node's pairing QR. -->
-        <service
-            android:name=".fips.ArchyVpnService"
-            android:exported="false"
-            android:foregroundServiceType="specialUse"
-            android:permission="android.permission.BIND_VPN_SERVICE">
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="mesh-vpn-tunnel" />
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-        </service>
     </application>
 
 </manifest>

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

@@ -1,41 +1,22 @@
 package com.archipelago.app
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-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.theme.ArchipelagoTheme
-import kotlinx.coroutines.flow.MutableStateFlow
 
 class MainActivity : ComponentActivity() {
-
-    // Pairing deep link (archipelago://pair?...) from the launch intent or a
-    // later one (launchMode=singleTask). Consumed by AppNavHost.
-    private val pendingPairUri = MutableStateFlow<String?>(null)
-
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
-        pendingPairUri.value = intent?.dataString
         setContent {
             ArchipelagoTheme {
-                val pairUri by pendingPairUri.collectAsState()
-                AppNavHost(
-                    pairUri = pairUri,
-                    onPairUriConsumed = { pendingPairUri.value = null },
-                )
+                AppNavHost()
             }
         }
     }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        pendingPairUri.value = intent.dataString
-    }
 }

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

@@ -19,45 +19,25 @@ data class ServerEntry(
     val port: String = "",
     val password: String = "",
     val name: String = "",
-    /** Node's FIPS mesh ULA (IPv6) — reachable from anywhere once meshed. */
-    val meshIp: String = "",
-    /** Node's FIPS npub — the durable identity. When present it, not the
-     *  address, is what identifies the entry: FIPS peers on npubs, IPs are
-     *  only dial hints (docs/companion-pairing-qr.md, npub-first contract). */
-    val npub: String = "",
 ) {
     /** Label to show in lists — the user-given name, or the address if unnamed. */
     fun displayName(): String = name.ifBlank { address }
 
-    /** 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
-
     fun toUrl(): String {
         val scheme = if (useHttps) "https" else "http"
         val portSuffix = if (port.isNotBlank()) ":$port" else ""
-        return "$scheme://${urlHost(address)}$portSuffix"
+        return "$scheme://$address$portSuffix"
     }
 
     fun toWsUrl(): String {
         val scheme = if (useHttps) "wss" else "ws"
         val portSuffix = if (port.isNotBlank()) ":$port" else ""
-        return "$scheme://${urlHost(address)}$portSuffix"
+        return "$scheme://$address$portSuffix"
     }
 
-    /** Mesh-address UI URL, or null when the node never advertised one. */
-    fun toMeshUrl(): String? =
-        meshIp.takeIf { it.isNotBlank() }?.let { "http://${urlHost(it)}" }
-
-    // name/meshIp/npub are trailing fields so entries saved before they
-    // existed (4/5/6 fields) still deserialize, defaulting to "".
-    fun serialize(): String = "$address|$useHttps|$port|$password|$name|$meshIp|$npub"
-
-    /** Same node as [other]? npub identity wins; address/port/scheme is the
-     *  fallback for LAN-only entries that never advertised FIPS. */
-    fun sameNode(other: ServerEntry): Boolean =
-        (npub.isNotBlank() && npub == other.npub) ||
-            (address == other.address && port == other.port && useHttps == other.useHttps)
+    // name is the trailing field so entries saved before naming existed
+    // (4 fields) still deserialize, with name defaulting to "".
+    fun serialize(): String = "$address|$useHttps|$port|$password|$name"
 
     companion object {
         fun deserialize(raw: String): ServerEntry? {
@@ -69,8 +49,6 @@ data class ServerEntry(
                 port = parts.getOrElse(2) { "" },
                 password = parts.getOrElse(3) { "" },
                 name = parts.getOrElse(4) { "" },
-                meshIp = parts.getOrElse(5) { "" },
-                npub = parts.getOrElse(6) { "" },
             )
         }
     }
@@ -83,11 +61,8 @@ class ServerPreferences(private val context: Context) {
     private val activePortKey = stringPreferencesKey("active_port")
     private val activePasswordKey = stringPreferencesKey("active_password")
     private val activeNameKey = stringPreferencesKey("active_name")
-    private val activeMeshIpKey = stringPreferencesKey("active_mesh_ip")
-    private val activeNpubKey = stringPreferencesKey("active_npub")
     private val savedServersKey = stringSetPreferencesKey("saved_servers")
     private val introSeenKey = booleanPreferencesKey("intro_seen")
-    private val gestureHintSeenKey = booleanPreferencesKey("gesture_hint_seen")
 
     val activeServer: Flow<ServerEntry?> = context.dataStore.data.map { prefs ->
         val address = prefs[activeAddressKey] ?: return@map null
@@ -97,8 +72,6 @@ class ServerPreferences(private val context: Context) {
             port = prefs[activePortKey] ?: "",
             password = prefs[activePasswordKey] ?: "",
             name = prefs[activeNameKey] ?: "",
-            meshIp = prefs[activeMeshIpKey] ?: "",
-            npub = prefs[activeNpubKey] ?: "",
         )
     }
 
@@ -111,11 +84,6 @@ class ServerPreferences(private val context: Context) {
         prefs[introSeenKey] ?: false
     }
 
-    /** One-shot flag for the three-finger-hold teaching overlay. */
-    val gestureHintSeen: Flow<Boolean> = context.dataStore.data.map { prefs ->
-        prefs[gestureHintSeenKey] ?: false
-    }
-
     suspend fun setActiveServer(server: ServerEntry) {
         context.dataStore.edit { prefs ->
             prefs[activeAddressKey] = server.address
@@ -123,8 +91,6 @@ class ServerPreferences(private val context: Context) {
             prefs[activePortKey] = server.port
             prefs[activePasswordKey] = server.password
             prefs[activeNameKey] = server.name
-            prefs[activeMeshIpKey] = server.meshIp
-            prefs[activeNpubKey] = server.npub
         }
         addSavedServer(server)
     }
@@ -136,8 +102,6 @@ class ServerPreferences(private val context: Context) {
             prefs.remove(activePortKey)
             prefs.remove(activePasswordKey)
             prefs.remove(activeNameKey)
-            prefs.remove(activeMeshIpKey)
-            prefs.remove(activeNpubKey)
         }
     }
 
@@ -149,80 +113,48 @@ class ServerPreferences(private val context: Context) {
     }
 
     /**
-     * Replace a saved server in place. Matches the existing entry by node
-     * identity — npub first, address/port/scheme as the LAN-only fallback
-     * (ServerEntry.sameNode) — so edits that change the name, password or even
-     * every address still update the right record. An edit form that doesn't
-     * carry the npub keeps the stored one. If the edited server is also the
-     * active one, the active record is kept in sync.
+     * Replace a saved server in place. Matches the existing entry by connection
+     * identity (address/port/scheme) so edits that change the name or password —
+     * or that touch a legacy 4-field entry — still update the right record. If the
+     * edited server is also the active one, the active record is kept in sync.
      */
     suspend fun updateSavedServer(original: ServerEntry, updated: ServerEntry) {
-        val toStore = updated.copy(npub = updated.npub.ifBlank { original.npub })
         context.dataStore.edit { prefs ->
             val current = prefs[savedServersKey] ?: emptySet()
             val filtered = current.filterNot { raw ->
-                ServerEntry.deserialize(raw)?.sameNode(original) == true
+                val e = ServerEntry.deserialize(raw)
+                e != null &&
+                    e.address == original.address &&
+                    e.port == original.port &&
+                    e.useHttps == original.useHttps
             }.toSet()
-            prefs[savedServersKey] = filtered + toStore.serialize()
+            prefs[savedServersKey] = filtered + updated.serialize()
 
-            val activeNpub = prefs[activeNpubKey] ?: ""
-            val isActive = (activeNpub.isNotBlank() && activeNpub == original.npub) ||
-                (
-                    prefs[activeAddressKey] == original.address &&
-                        (prefs[activePortKey] ?: "") == original.port &&
-                        (prefs[activeHttpsKey] ?: false) == original.useHttps
-                    )
+            val isActive = prefs[activeAddressKey] == original.address &&
+                (prefs[activePortKey] ?: "") == original.port &&
+                (prefs[activeHttpsKey] ?: false) == original.useHttps
             if (isActive) {
-                prefs[activeAddressKey] = toStore.address
-                prefs[activeHttpsKey] = toStore.useHttps
-                prefs[activePortKey] = toStore.port
-                prefs[activePasswordKey] = toStore.password
-                prefs[activeNameKey] = toStore.name
-                prefs[activeMeshIpKey] = toStore.meshIp
-                prefs[activeNpubKey] = toStore.npub
+                prefs[activeAddressKey] = updated.address
+                prefs[activeHttpsKey] = updated.useHttps
+                prefs[activePortKey] = updated.port
+                prefs[activePasswordKey] = updated.password
+                prefs[activeNameKey] = updated.name
             }
         }
     }
 
-    /**
-     * Add a server, or update the entry for the same node — npub first,
-     * address/port/scheme as the LAN-only fallback (ServerEntry.sameNode) —
-     * used by QR pairing so re-scanning a node never duplicates it, even after
-     * the LAN renumbered and every address changed (npub-first contract in
-     * docs/companion-pairing-qr.md). A blank incoming password/name keeps the
-     * stored value (a real node's QR never carries the password). Returns the
-     * merged entry.
-     */
-    suspend fun upsertServer(server: ServerEntry): ServerEntry {
-        var merged = server
-        context.dataStore.edit { prefs ->
-            val current = prefs[savedServersKey] ?: emptySet()
-            val existing = current.mapNotNull { ServerEntry.deserialize(it) }
-                .firstOrNull { it.sameNode(server) }
-            if (existing != null) {
-                merged = server.copy(
-                    password = server.password.ifBlank { existing.password },
-                    name = server.name.ifBlank { existing.name },
-                    meshIp = server.meshIp.ifBlank { existing.meshIp },
-                    npub = server.npub.ifBlank { existing.npub },
-                )
-            }
-            val filtered = current.filterNot { raw ->
-                ServerEntry.deserialize(raw)?.sameNode(merged) == true
-            }.toSet()
-            prefs[savedServersKey] = filtered + merged.serialize()
-        }
-        return merged
-    }
-
     suspend fun removeSavedServer(server: ServerEntry) {
         context.dataStore.edit { prefs ->
             val current = prefs[savedServersKey] ?: emptySet()
-            // Match by node identity (npub, else address/port/scheme) rather
-            // than the exact serialized string, so a rename — or a legacy
-            // short-format entry — still removes the right record.
+            // Match by connection identity (address/port/scheme) rather than the
+            // exact serialized string, so a rename — or the legacy 4-field format
+            // saved before names existed — still removes the right entry.
             prefs[savedServersKey] = current.filterNot { raw ->
-                ServerEntry.deserialize(raw)?.sameNode(server) == true
+                val e = ServerEntry.deserialize(raw)
+                e != null &&
+                    e.address == server.address &&
+                    e.port == server.port &&
+                    e.useHttps == server.useHttps
             }.toSet()
         }
     }
@@ -232,10 +164,4 @@ class ServerPreferences(private val context: Context) {
             prefs[introSeenKey] = true
         }
     }
-
-    suspend fun markGestureHintSeen() {
-        context.dataStore.edit { prefs ->
-            prefs[gestureHintSeenKey] = true
-        }
-    }
 }

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

@@ -1,128 +0,0 @@
-package com.archipelago.app.data
-
-import android.net.Uri
-import com.archipelago.app.fips.AnchorPeer
-import com.archipelago.app.fips.FipsPairInfo
-
-/**
- * Result of parsing a pairing QR / deep link.
- *
- * UnsupportedVersion means the payload is structurally a pairing URI but its
- * major version is newer than this app understands — the UI should tell the
- * user to update the app rather than call the code invalid.
- */
-sealed class PairResult {
-    data class Success(
-        val server: ServerEntry,
-        /** Mesh info when the node advertises FIPS (fnpub present). */
-        val fips: FipsPairInfo? = null,
-    ) : PairResult()
-    object UnsupportedVersion : PairResult()
-    object Invalid : PairResult()
-}
-
-/**
- * Parser for the companion pairing QR / OS deep link. Contract:
- * docs/companion-pairing-qr.md (repo root).
- *
- *   archipelago://pair?v=1&url=<origin>&name=…[&tok=…][&pw=…][&fnpub=…&fip=…&fhost=…&fudp=…&ftcp=…]
- *
- * - `url` is a full origin including scheme (http for LAN/mDNS nodes, https
- *   for the public demo); trailing slashes are normalized away.
- * - `tok` is a device token minted by the node; it goes through the password
- *   field on purpose — the whole password auto-login path (WebSocket auth +
- *   WebView form injection) then works unchanged, and the backend accepts
- *   device tokens wherever it accepts the password. `pw` (demo only) wins if
- *   both are ever present.
- * - `fnpub`/`fip`/`fhost`/`fudp`/`ftcp` describe the node's FIPS mesh; their
- *   absence just means LAN-only pairing (older node, or FIPS not provisioned).
- * - Unknown extra query params are tolerated (forward compat under v=1).
- */
-object ServerQrParser {
-    private const val SUPPORTED_MAJOR = 1
-
-    fun parse(raw: String): PairResult {
-        val uri = try {
-            Uri.parse(raw.trim())
-        } catch (_: Exception) {
-            return PairResult.Invalid
-        }
-        if (!"archipelago".equals(uri.scheme, ignoreCase = true)) return PairResult.Invalid
-        if (uri.isOpaque || !"pair".equals(uri.host, ignoreCase = true)) return PairResult.Invalid
-
-        val major = uri.getQueryParameter("v")
-            ?.trim()
-            ?.takeWhile { it.isDigit() }
-            ?.toIntOrNull()
-            ?: return PairResult.Invalid
-        if (major != SUPPORTED_MAJOR) return PairResult.UnsupportedVersion
-
-        val serverUrl = uri.getQueryParameter("url")?.trim()?.trimEnd('/')
-        if (serverUrl.isNullOrBlank()) return PairResult.Invalid
-        val server = Uri.parse(serverUrl)
-        val scheme = server.scheme?.lowercase()
-        if (scheme != "http" && scheme != "https") return PairResult.Invalid
-        val host = server.host
-        if (host.isNullOrBlank()) return PairResult.Invalid
-
-        val fips = parseFips(uri)
-        val credential = uri.getQueryParameter("pw")?.takeIf { it.isNotBlank() }
-            ?: uri.getQueryParameter("tok")
-            ?: ""
-
-        return PairResult.Success(
-            server = ServerEntry(
-                address = host,
-                useHttps = scheme == "https",
-                port = if (server.port != -1) server.port.toString() else "",
-                password = credential,
-                name = uri.getQueryParameter("name") ?: "",
-                meshIp = fips?.ula ?: "",
-                // npub is the durable identity — saved-server upserts match on
-                // it, so re-scanning after a LAN renumber updates in place.
-                npub = fips?.npub ?: "",
-            ),
-            fips = fips,
-        )
-    }
-
-    private fun parseFips(uri: Uri): FipsPairInfo? {
-        val npub = uri.getQueryParameter("fnpub")?.trim()
-        var host = uri.getQueryParameter("fhost")?.trim()
-        if (npub.isNullOrBlank() || host.isNullOrBlank()) return null
-        // A .fips fhost is a dead dial hint: Android's system DNS can't
-        // resolve .fips, so every handshake send fails and first connect
-        // falls back to slow anchor discovery. If the QR's `url` host is a
-        // real address, dial that instead (QRs minted while the node UI was
-        // browsed over the mesh carry npub….fips here).
-        if (host.endsWith(".fips")) {
-            val urlHost = uri.getQueryParameter("url")
-                ?.let { runCatching { Uri.parse(it).host }.getOrNull() }
-            if (!urlHost.isNullOrBlank() && !urlHost.endsWith(".fips")) host = urlHost
-        }
-        return FipsPairInfo(
-            npub = npub,
-            ula = uri.getQueryParameter("fip")?.trim().orEmpty(),
-            host = host,
-            udpPort = uri.getQueryParameter("fudp")?.toIntOrNull() ?: 2121,
-            tcpPort = uri.getQueryParameter("ftcp")?.toIntOrNull() ?: 8443,
-            anchors = parseAnchors(uri.getQueryParameter("fanchors")),
-        )
-    }
-
-    /** `fanchors` = comma-joined `npub@host:port/transport`; bad items skipped. */
-    private fun parseAnchors(raw: String?): List<AnchorPeer> {
-        if (raw.isNullOrBlank()) return emptyList()
-        return raw.split(",").mapNotNull { item ->
-            val at = item.indexOf('@')
-            val slash = item.lastIndexOf('/')
-            if (at <= 0 || slash <= at) return@mapNotNull null
-            val npub = item.substring(0, at).trim()
-            val addr = item.substring(at + 1, slash).trim()
-            val transport = item.substring(slash + 1).trim().lowercase()
-            if (npub.isBlank() || !addr.contains(":")) return@mapNotNull null
-            if (transport != "udp" && transport != "tcp") return@mapNotNull null
-            AnchorPeer(npub = npub, addr = addr, transport = transport)
-        }
-    }
-}

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

@@ -1,324 +0,0 @@
-package com.archipelago.app.fips
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Intent
-import android.net.ConnectivityManager
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.net.NetworkRequest
-import android.net.VpnService
-import android.os.Build
-import android.util.Log
-import com.archipelago.app.MainActivity
-import com.archipelago.app.R
-import com.archipelago.app.data.ServerPreferences
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-
-/**
- * VpnService hosting the embedded FIPS mesh node.
- *
- * Split tunnel: only fd00::/8 (the FIPS ULA space) routes into the TUN, so
- * normal phone traffic is untouched — this is mesh reachability, not a
- * default-route VPN. The established fd is detached and handed to the Rust
- * node (Node::start_with_tun_fd); the node owns it until stop.
- */
-class ArchyVpnService : VpnService() {
-
-    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-    private var warmerJob: Job? = null
-
-    // Seamless transport handoff (Wi-Fi ⇄ 5G ⇄ future BLE). Without this the
-    // tunnel's underlying network stays pinned to the interface that was
-    // default when the VPN came up; when the phone leaves Wi-Fi for 5G the
-    // mesh sockets ride a dead network and sessions never recover until the
-    // app is restarted (user-reported 2026-07-27). The callback (a) re-pins
-    // the tunnel to the new default network via setUnderlyingNetworks and
-    // (b) forces an immediate mesh re-home so discovery + sessions rebuild
-    // on the new path within seconds instead of waiting out dead-link
-    // timeouts.
-    private var connectivityManager: ConnectivityManager? = null
-    private var networkCallback: ConnectivityManager.NetworkCallback? = null
-    @Volatile
-    private var currentUnderlying: Network? = null
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (intent?.action == ACTION_STOP) {
-            shutdown()
-            return START_NOT_STICKY
-        }
-        startForeground(NOTIFICATION_ID, buildNotification())
-        scope.launch { startMesh() }
-        return START_STICKY
-    }
-
-    private suspend fun startMesh() {
-        if (!FipsNative.available) {
-            shutdown()
-            return
-        }
-        val prefs = FipsPreferences(this)
-        val identity = FipsManager.ensureIdentity(prefs)
-        val peersJson = prefs.combinedPeersJson()
-        if (identity == null || peersJson == "[]") {
-            Log.w(TAG, "mesh not configured — stopping")
-            shutdown()
-            return
-        }
-        // Party mode: fixed inbound UDP bind so a nearby phone can dial us
-        // directly over a shared LAN/hotspot (no internet required).
-        val listenPort = if (prefs.partyListen()) PartyQr.PARTY_UDP_PORT else 0
-
-        // A fresh app open re-triggers the service. Tearing a HEALTHY mesh
-        // down to rebuild it costs ~8s of anchor+session bring-up on every
-        // launch (observed live: stop 00:34:38 → session back 00:34:49) and
-        // is what made "freshly loading the app" slow. Keep a running node;
-        // restart only when it's dead or a pairing changed the peer set.
-        if (FipsNative.isRunning() && !FipsManager.peersDirty) {
-            Log.i(TAG, "mesh already running — keeping warm sessions")
-            startSessionWarmer()
-            return
-        }
-        FipsManager.peersDirty = false
-        // Re-establishing while running would strand the old fd; restart clean.
-        if (FipsNative.isRunning()) FipsNative.stop()
-
-        val pfd = try {
-            Builder()
-                .setSession("Archipelago Mesh")
-                .setMtu(1280)
-                .addAddress(identity.address, 128)
-                .addRoute("fd00::", 8)
-                // The TUN is IPv6-only. Android blocks every address family
-                // the VPN has no address for — without this, bringing the
-                // mesh up cut ALL of the phone's IPv4 internet.
-                .allowFamily(android.system.OsConstants.AF_INET)
-                // And let apps that bind their own network skip the TUN
-                // entirely — this is mesh reachability, not a privacy VPN.
-                .allowBypass()
-                .apply {
-                    // Android 10+ treats VPN networks as METERED by default,
-                    // which flips the whole phone into data-saver behaviour
-                    // (background sync off, "metered" warnings) while the
-                    // mesh is up. It inherits the underlying network's real
-                    // metered state instead.
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) setMetered(false)
-                }
-                .establish()
-        } catch (e: Exception) {
-            Log.e(TAG, "VPN establish failed", e)
-            null
-        }
-        if (pfd == null) {
-            shutdown()
-            return
-        }
-
-        val fd = pfd.detachFd()
-        val result = FipsNative.start(identity.secret, peersJson, fd, listenPort)
-        Log.i(TAG, "mesh start: $result (listen=$listenPort)")
-        if (result.contains("\"error\"")) {
-            shutdown()
-        } else {
-            startSessionWarmer()
-            registerNetworkHandoff()
-            // Phone-to-phone chat/beam + the phone's own mesh-served page.
-            FlareServer.start(this, identity.address, identity.npub, prefs.partyName())
-            // Mutual pairing: when a phone that scanned OUR QR announces
-            // itself, store it as a party peer and re-run the mesh config so
-            // this side gets the peer + chat entry without scanning back.
-            FlareServer.onHello = { peer ->
-                scope.launch {
-                    prefs.upsertPartyPeer(peer)
-                    FipsManager.requestMeshRestart(this@ArchyVpnService)
-                }
-            }
-        }
-    }
-
-    /**
-     * Pre-warm + keep-warm mesh sessions to every known node ULA.
-     *
-     * Discovery + first session through the public tree can take 15s+
-     * (HANDOFF-2026-07-23 node diagnosis) — paying that cost here, the
-     * moment the tunnel is up, means the connect probe and WebView hit an
-     * established session instead of timing out on a cold one. The periodic
-     * touch afterwards keeps the session from idling out. Failed connects
-     * are expected and cheap; the attempt itself is what drives discovery.
-     */
-    private fun startSessionWarmer() {
-        warmerJob?.cancel()
-        warmerJob = scope.launch {
-            val prefs = ServerPreferences(this@ArchyVpnService)
-            val fipsPrefs = FipsPreferences(this@ArchyVpnService)
-            var round = 0
-            while (isActive && FipsNative.isRunning()) {
-                val targets = try {
-                    prefs.savedServers.first()
-                        .mapNotNull { it.meshIp.ifBlank { null } }
-                        .map { it to 80 } +
-                        // Party phones answer on the flare port, not :80.
-                        fipsPrefs.partyPeers().map { it.ula to PartyQr.FLARE_PORT }
-                } catch (_: Exception) {
-                    emptyList()
-                }.distinct()
-                if (round == 0) Log.i(TAG, "session warmer: ${targets.map { it.first }}")
-                // Probe all targets CONCURRENTLY with a short timeout — the
-                // old sequential 20s-per-target loop let one cold node starve
-                // every other target for the whole aggressive window.
-                targets.map { (ula, port) ->
-                    launch {
-                        try {
-                            java.net.Socket().use { s ->
-                                s.connect(
-                                    java.net.InetSocketAddress(
-                                        java.net.InetAddress.getByName(ula),
-                                        port,
-                                    ),
-                                    5_000,
-                                )
-                            }
-                        } catch (_: Exception) {
-                            // Cold path / node away — the attempt still drove
-                            // session establishment; try again next round.
-                        }
-                    }
-                }.forEach { it.join() }
-                round++
-                // Aggressive for the first ~minute (session bring-up), then a
-                // slow keep-warm tick that costs nearly nothing.
-                delay(if (round < 12) 5_000 else 60_000)
-            }
-        }
-    }
-
-    /**
-     * Track the phone's default network and hand the mesh over to it as the
-     * 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 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.
-     */
-    private fun registerNetworkHandoff() {
-        if (networkCallback != null) return
-        val cm = getSystemService(ConnectivityManager::class.java) ?: return
-        connectivityManager = cm
-        val request = NetworkRequest.Builder()
-            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-            .build()
-        val cb = object : ConnectivityManager.NetworkCallback() {
-            override fun onAvailable(network: Network) {
-                handoffTo(network)
-            }
-
-            override fun onLost(network: Network) {
-                // The lost network was our underlying one — clear the pin so
-                // the system falls back to whatever default remains; the next
-                // onAvailable re-pins explicitly.
-                if (network == currentUnderlying) {
-                    currentUnderlying = null
-                    runCatching { setUnderlyingNetworks(null) }
-                }
-            }
-        }
-        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) }
-    }
-
-    private fun handoffTo(network: Network) {
-        val changed = network != currentUnderlying
-        currentUnderlying = network
-        // Always re-assert; cheap and covers capability changes on the same
-        // Network object.
-        runCatching { setUnderlyingNetworks(arrayOf(network)) }
-        if (changed && FipsNative.isRunning()) {
-            Log.i(TAG, "network handoff → re-homing mesh on new default network")
-            // Fresh warmer pass drives immediate rediscovery/session rebuild
-            // on the new path instead of waiting out dead-link timeouts.
-            startSessionWarmer()
-        }
-    }
-
-    private fun unregisterNetworkHandoff() {
-        val cm = connectivityManager
-        val cb = networkCallback
-        if (cm != null && cb != null) {
-            runCatching { cm.unregisterNetworkCallback(cb) }
-        }
-        networkCallback = null
-        connectivityManager = null
-        currentUnderlying = null
-    }
-
-    private fun shutdown() {
-        warmerJob?.cancel()
-        unregisterNetworkHandoff()
-        FlareServer.stop()
-        FipsNative.stop()
-        stopForeground(STOP_FOREGROUND_REMOVE)
-        stopSelf()
-    }
-
-    override fun onDestroy() {
-        unregisterNetworkHandoff()
-        FipsNative.stop()
-        scope.cancel()
-        super.onDestroy()
-    }
-
-    override fun onRevoke() {
-        // User pulled VPN permission from system settings.
-        shutdown()
-    }
-
-    private fun buildNotification(): Notification {
-        val manager = getSystemService(NotificationManager::class.java)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            manager.createNotificationChannel(
-                NotificationChannel(
-                    CHANNEL_ID,
-                    "Mesh connection",
-                    NotificationManager.IMPORTANCE_MIN,
-                ).apply { description = "Keeps the node reachable from anywhere" }
-            )
-        }
-        val tapIntent = PendingIntent.getActivity(
-            this,
-            0,
-            Intent(this, MainActivity::class.java),
-            PendingIntent.FLAG_IMMUTABLE,
-        )
-        return Notification.Builder(this, CHANNEL_ID)
-            .setContentTitle("Connected to your Archipelago")
-            .setContentText("Secure mesh link active")
-            .setSmallIcon(R.mipmap.ic_launcher)
-            .setContentIntent(tapIntent)
-            .setOngoing(true)
-            .build()
-    }
-
-    companion object {
-        const val ACTION_STOP = "com.archipelago.app.fips.STOP"
-        private const val CHANNEL_ID = "archy_mesh"
-        private const val NOTIFICATION_ID = 4841
-        private const val TAG = "ArchyVpnService"
-    }
-}

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

@@ -1,103 +0,0 @@
-package com.archipelago.app.fips
-
-import android.content.Context
-import android.content.Intent
-import android.net.VpnService
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-/**
- * Glue between pairing and the mesh: persists the node peer from a scanned
- * QR and asks the UI to bring the tunnel up. There is deliberately no
- * settings surface — scanning a node's QR is the entire configuration.
- *
- * The one unavoidable interaction is Android's VPN consent dialog
- * (VpnService.prepare), which only an Activity can launch; [consentNeeded]
- * signals AppNavHost to run it, once, on first pairing.
- */
-object FipsManager {
-
-    /** Set when a pairing registered mesh info and the VPN needs starting. */
-    private val _consentNeeded = MutableStateFlow(false)
-    val consentNeeded: StateFlow<Boolean> = _consentNeeded
-
-    /** True after a pairing changed the peer set while the node was running —
-     *  tells the service a restart is genuinely needed (the ONLY case; a
-     *  routine app open must keep the warm mesh, not rebuild it). */
-    @Volatile
-    var peersDirty: Boolean = false
-
-    fun consentHandled() {
-        _consentNeeded.value = false
-    }
-
-    /**
-     * Persist mesh info from a pairing scan and request tunnel start.
-     * No-op on devices without the native lib (non-arm64).
-     */
-    suspend fun registerNode(context: Context, info: FipsPairInfo?, alias: String) {
-        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. */
-    suspend fun ensureIdentity(prefs: FipsPreferences): FipsNative.Identity? {
-        prefs.identity()?.let { return it }
-        val generated = FipsNative.parseIdentity(FipsNative.generateIdentity()) ?: return null
-        prefs.saveIdentity(generated)
-        return generated
-    }
-
-    /**
-     * Start the mesh service if this device is paired and the user has already
-     * consented to the VPN (prepare() == null). Called on app start so the
-     * tunnel comes back without any interaction; first-time consent goes
-     * through AppNavHost instead.
-     */
-    suspend fun autoStartIfReady(context: 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) {
-        val intent = Intent(context, ArchyVpnService::class.java)
-        context.startForegroundService(intent)
-    }
-
-    /**
-     * Re-run the mesh with current prefs (party listen toggled, peer added).
-     * Marks the peer set dirty so startMesh genuinely restarts the node —
-     * otherwise the keep-warm fast path would skip the new config.
-     * First-timers go through the consent flow.
-     */
-    fun requestMeshRestart(context: Context) {
-        if (!FipsNative.available) return
-        peersDirty = true
-        if (VpnService.prepare(context) == null) {
-            startService(context)
-        } else {
-            _consentNeeded.value = true
-        }
-    }
-
-    fun stopService(context: Context) {
-        val intent = Intent(context, ArchyVpnService::class.java)
-            .setAction(ArchyVpnService.ACTION_STOP)
-        context.startService(intent)
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.archipelago.app.fips
-
-import org.json.JSONObject
-
-/**
- * JNI binding to the embedded FIPS mesh node (Android/rust/archy-fips-core,
- * built into libarchy_fips_core.so by the buildRustArm64 gradle task).
- *
- * All calls return JSON strings; failures come back as {"error": "…"} rather
- * than exceptions. [available] is false on ABIs the .so isn't built for
- * (anything but arm64) — every caller must gate on it so the app still runs
- * as a plain companion there.
- */
-object FipsNative {
-    val available: Boolean = try {
-        System.loadLibrary("archy_fips_core")
-        true
-    } catch (_: Throwable) {
-        false
-    }
-
-    external fun generateIdentity(): String
-    external fun deriveIdentity(secret: String): String
-
-    /**
-     * [listenPort] 0 = outbound-only (default posture). Non-zero binds UDP on
-     * that port so a nearby phone can dial us directly (party mode); the node
-     * stays leaf-only either way.
-     */
-    external fun start(secret: String, peersJson: String, tunFd: Int, listenPort: Int): String
-    external fun stop()
-    external fun isRunning(): Boolean
-    external fun statusJson(): String
-
-    data class Identity(val secret: String, val npub: String, val address: String)
-
-    /** Parse an identity JSON reply; null on {"error": …} or malformed. */
-    fun parseIdentity(json: String): Identity? = try {
-        val obj = JSONObject(json)
-        if (obj.has("error")) null
-        else Identity(
-            secret = obj.getString("secret"),
-            npub = obj.getString("npub"),
-            address = obj.getString("address"),
-        )
-    } catch (_: Exception) {
-        null
-    }
-}

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

@@ -1,29 +0,0 @@
-package com.archipelago.app.fips
-
-/**
- * Node mesh parameters carried by the pairing QR (fnpub/fip/fhost/fudp/ftcp —
- * docs/companion-pairing-qr.md). The phone's embedded FIPS node dials
- * host:udpPort / host:tcpPort claiming nothing; the mesh accepts inbound peers
- * without registration, so possession of these params is all pairing takes.
- */
-data class FipsPairInfo(
-    val npub: String,
-    /** Node's fips0 ULA — where its UI stays reachable once meshed. May be empty. */
-    val ula: String,
-    val host: String,
-    val udpPort: Int,
-    val tcpPort: Int,
-    /**
-     * Public rendezvous anchors (the node's seed-anchor list). The phone
-     * peers with these too, so it can route to the node via the mesh when
-     * the node's LAN endpoint isn't directly dialable.
-     */
-    val anchors: List<AnchorPeer> = emptyList(),
-)
-
-/** One rendezvous anchor from the QR's `fanchors` param (npub@addr/transport). */
-data class AnchorPeer(
-    val npub: String,
-    val addr: String,
-    val transport: String,
-)

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

@@ -1,341 +0,0 @@
-package com.archipelago.app.fips
-
-import android.content.Context
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.booleanPreferencesKey
-import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.stringPreferencesKey
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import org.json.JSONArray
-import org.json.JSONObject
-import androidx.datastore.preferences.preferencesDataStore
-
-private val Context.fipsDataStore: DataStore<Preferences> by preferencesDataStore(name = "fips_prefs")
-
-// Archipelago-operated public anchor (vps2). Baked in so EVERY pairing yields
-// both paths — direct LAN p2p to the node AND a public rendezvous for
-// away-from-home — even when the scanned node is old enough that its QR
-// carries no fanchors. Keep in lockstep with
-// core/archipelago/src/fips/anchors.rs (ARCHY_ANCHOR_*).
-internal const val ARCHY_ANCHOR_NPUB =
-    "npub1dptaktwxv0mm245g2lqjykwm5ll0jpc6m3r4242ydfa9z7qe6urs3jvrak"
-internal const val ARCHY_ANCHOR_ADDR = "146.59.87.168:8444"
-internal const val ARCHY_ANCHOR_TRANSPORT = "tcp"
-
-/**
- * Public FIPS network anchors (join.fips.network — the dual-transport TCP
- * pair; keep in lockstep with core/archipelago/src/fips/anchors.rs
- * fips_network_anchors()). Baked into every pairing at trailing priority so
- * a degraded/unreachable vps2 anchor can never strand the phone: the mesh
- * still joins the public tree and routes to the node through it.
- */
-internal val PUBLIC_FIPS_ANCHORS = listOf(
-    Triple(
-        "npub10yffd020a4ag8zcy75f9pruq3rnghvvhd5hphl9s62zgp35s560qrksp9u",
-        "23.182.128.74:443",
-        "tcp",
-    ),
-    Triple(
-        "npub1qmc3cvfz0yu2hx96nq3gp55zdan2qclealn7xshgr448d3nh6lks7zel98",
-        "217.77.8.91:443",
-        "tcp",
-    ),
-)
-
-/**
- * Mesh identity + known node peers. Follows the same plaintext-DataStore
- * storage model as ServerPreferences (the server password lives there the
- * same way); the mesh secret only grants mesh membership, not node login.
- */
-class FipsPreferences(private val context: Context) {
-
-    private val secretKey = stringPreferencesKey("fips_secret")
-    private val npubKey = stringPreferencesKey("fips_npub")
-    private val addressKey = stringPreferencesKey("fips_address")
-    /** JSON array of node peers in fips PeerConfig shape (see NodePeer). */
-    private val peersKey = stringPreferencesKey("fips_node_peers")
-    /** JSON array of phone party peers (PartyPeer shape, NOT PeerConfig). */
-    private val partyPeersKey = stringPreferencesKey("fips_party_peers")
-    /** Party mode: accept a direct inbound mesh link (UDP 2121). */
-    private val partyListenKey = booleanPreferencesKey("fips_party_listen")
-    /** Name shown in this phone's party QR and outgoing flares. */
-    private val partyNameKey = stringPreferencesKey("fips_party_name")
-
-    suspend fun identity(): FipsNative.Identity? {
-        val prefs = context.fipsDataStore.data.first()
-        val secret = prefs[secretKey] ?: return null
-        return FipsNative.Identity(
-            secret = secret,
-            npub = prefs[npubKey] ?: "",
-            address = prefs[addressKey] ?: "",
-        )
-    }
-
-    suspend fun saveIdentity(identity: FipsNative.Identity) {
-        context.fipsDataStore.edit { prefs ->
-            prefs[secretKey] = identity.secret
-            prefs[npubKey] = identity.npub
-            prefs[addressKey] = identity.address
-        }
-    }
-
-    suspend fun peersJson(): String {
-        val prefs = context.fipsDataStore.data.first()
-        return prefs[peersKey] ?: "[]"
-    }
-
-    suspend fun hasPeers(): Boolean = JSONArray(peersJson()).length() > 0
-
-    // ── Mesh Party (phone↔phone) ────────────────────────────────────────────
-
-    suspend fun partyListen(): Boolean =
-        context.fipsDataStore.data.first()[partyListenKey] ?: false
-
-    val partyListenFlow: Flow<Boolean>
-        get() = context.fipsDataStore.data.map { it[partyListenKey] ?: false }
-
-    suspend fun setPartyListen(enabled: Boolean) {
-        context.fipsDataStore.edit { it[partyListenKey] = enabled }
-    }
-
-    suspend fun partyName(): String =
-        context.fipsDataStore.data.first()[partyNameKey]
-            ?: android.os.Build.MODEL.orEmpty().ifBlank { "Phone" }
-
-    suspend fun setPartyName(name: String) {
-        context.fipsDataStore.edit { it[partyNameKey] = name.trim() }
-    }
-
-    val partyPeersFlow: Flow<List<PartyPeer>>
-        get() = context.fipsDataStore.data.map { parsePartyPeers(it[partyPeersKey] ?: "[]") }
-
-    suspend fun partyPeers(): List<PartyPeer> =
-        parsePartyPeers(context.fipsDataStore.data.first()[partyPeersKey] ?: "[]")
-
-    /** Matched by npub, so re-scanning updates the direct-dial address in place. */
-    suspend fun upsertPartyPeer(peer: PartyPeer) {
-        context.fipsDataStore.edit { prefs ->
-            val kept = parsePartyPeers(prefs[partyPeersKey] ?: "[]").filter { it.npub != peer.npub }
-            prefs[partyPeersKey] = toJson(kept + peer)
-        }
-    }
-
-    suspend fun removePartyPeer(npub: String) {
-        context.fipsDataStore.edit { prefs ->
-            val kept = parsePartyPeers(prefs[partyPeersKey] ?: "[]").filter { it.npub != npub }
-            prefs[partyPeersKey] = toJson(kept)
-        }
-    }
-
-    /**
-     * Node peers + direct-dial party peers, in the fips PeerConfig JSON the
-     * Rust node deserializes. Party peers get the best priority: on a shared
-     * LAN/hotspot the direct link beats every anchor path, and while off-LAN
-     * the failed dial is cheap (auto-reconnect keeps retrying, which is
-     * exactly what makes the link snap up the moment both phones share WiFi).
-     * Party peers without an underlay address are mesh-routed and need no
-     * entry here at all.
-     */
-    suspend fun combinedPeersJson(): String {
-        val merged = JSONArray(peersJson())
-        val party = partyPeers()
-        for (peer in party) {
-            if (peer.ip.isBlank() || peer.port <= 0) continue
-            merged.put(JSONObject().apply {
-                put("npub", peer.npub)
-                put("alias", hostSafeAlias(peer.name.ifBlank { "party-phone" }))
-                put("addresses", JSONArray().put(JSONObject().apply {
-                    put("transport", "udp")
-                    put("addr", "${peer.ip}:${peer.port}")
-                    put("priority", 5)
-                }))
-            })
-        }
-        // A party-only phone (never paired with a node) still needs a public
-        // rendezvous to reach its peers ACROSS the internet — without it, two
-        // bare phones would be hotspot/LAN-only. Node pairing normally bakes
-        // this anchor in; do the same when there are party peers.
-        if (party.isNotEmpty() &&
-            (0 until merged.length()).none {
-                merged.optJSONObject(it)?.optString("npub") == ARCHY_ANCHOR_NPUB
-            }
-        ) {
-            merged.put(JSONObject().apply {
-                put("npub", ARCHY_ANCHOR_NPUB)
-                put("alias", "archipelago-anchor")
-                put("addresses", JSONArray().put(JSONObject().apply {
-                    put("transport", ARCHY_ANCHOR_TRANSPORT)
-                    put("addr", ARCHY_ANCHOR_ADDR)
-                    put("priority", 40)
-                }))
-            })
-        }
-        // Backfill anchor peers for entries paired before newer QR/app
-        // releases added them. `upsertNodePeer` persists these on re-scan, but
-        // startup must also self-heal old DataStore state so updating the APK is
-        // enough to get off-LAN redundancy.
-        if (merged.length() > 0) {
-            addAnchorIfMissing(merged, ARCHY_ANCHOR_NPUB, "archipelago-anchor", ARCHY_ANCHOR_ADDR, ARCHY_ANCHOR_TRANSPORT, 40)
-            for ((i, anchor) in PUBLIC_FIPS_ANCHORS.withIndex()) {
-                val (npub, addr, transport) = anchor
-                addAnchorIfMissing(merged, npub, "fips-network-anchor-${i + 1}", addr, transport, 50 + i * 10)
-            }
-        }
-        return merged.toString()
-    }
-
-    private fun addAnchorIfMissing(
-        peers: JSONArray,
-        npub: String,
-        alias: String,
-        addr: String,
-        transport: String,
-        priority: Int,
-    ) {
-        if ((0 until peers.length()).any { peers.optJSONObject(it)?.optString("npub") == npub }) return
-        peers.put(JSONObject().apply {
-            put("npub", npub)
-            put("alias", alias)
-            put("addresses", JSONArray().put(JSONObject().apply {
-                put("transport", transport)
-                put("addr", addr)
-                put("priority", priority)
-            }))
-        })
-    }
-
-    private fun parsePartyPeers(json: String): List<PartyPeer> = try {
-        val arr = JSONArray(json)
-        (0 until arr.length()).mapNotNull { i ->
-            val o = arr.optJSONObject(i) ?: return@mapNotNull null
-            val npub = o.optString("npub")
-            val ula = o.optString("ula")
-            if (npub.isBlank() || ula.isBlank()) return@mapNotNull null
-            PartyPeer(
-                npub = npub,
-                ula = ula,
-                name = o.optString("name").ifBlank { "Phone" },
-                ip = o.optString("ip"),
-                port = o.optInt("port"),
-            )
-        }
-    } catch (_: Exception) {
-        emptyList()
-    }
-
-    private fun toJson(peers: List<PartyPeer>): String {
-        val arr = JSONArray()
-        for (p in peers) {
-            arr.put(JSONObject().apply {
-                put("npub", p.npub)
-                put("ula", p.ula)
-                put("name", p.name)
-                put("ip", p.ip)
-                put("port", p.port)
-            })
-        }
-        return arr.toString()
-    }
-
-    /**
-     * Add or update the node peer plus its rendezvous anchors (each matched
-     * by npub, so re-pairing updates addresses instead of duplicating).
-     * Stored directly in the fips PeerConfig JSON shape the Rust side
-     * deserializes. The node's direct addresses get the best priorities;
-     * anchors trail so the mesh prefers the direct path when it works.
-     */
-    suspend fun upsertNodePeer(info: FipsPairInfo, alias: String) {
-        val incoming = mutableListOf<JSONObject>()
-        incoming += JSONObject().apply {
-            put("npub", info.npub)
-            put("alias", hostSafeAlias(alias.ifBlank { "Archipelago" }))
-            val addresses = JSONArray()
-            // .fips hosts are unresolvable on Android (no system .fips DNS):
-            // storing one gives the mesh a dial target that fails every
-            // handshake and stalls first connect on anchor discovery.
-            if (info.udpPort > 0 && !info.host.endsWith(".fips")) {
-                addresses.put(JSONObject().apply {
-                    put("transport", "udp")
-                    put("addr", "${info.host}:${info.udpPort}")
-                    put("priority", 10)
-                })
-            }
-            if (info.tcpPort > 0 && !info.host.endsWith(".fips")) {
-                addresses.put(JSONObject().apply {
-                    put("transport", "tcp")
-                    put("addr", "${info.host}:${info.tcpPort}")
-                    put("priority", 20)
-                })
-            }
-            put("addresses", addresses)
-        }
-        for (anchor in info.anchors) {
-            if (anchor.npub == info.npub) continue
-            if (anchor.addr.substringBeforeLast(":").endsWith(".fips")) continue
-            incoming += JSONObject().apply {
-                put("npub", anchor.npub)
-                put("alias", "mesh-anchor")
-                put("addresses", JSONArray().put(JSONObject().apply {
-                    put("transport", anchor.transport)
-                    put("addr", anchor.addr)
-                    put("priority", 30)
-                }))
-            }
-        }
-        // Guarantee the public anchor: without it, a QR from an older node
-        // leaves the phone LAN-only and pairing/connecting dies off-LAN.
-        if (info.npub != ARCHY_ANCHOR_NPUB &&
-            incoming.none { it.optString("npub") == ARCHY_ANCHOR_NPUB }
-        ) {
-            incoming += JSONObject().apply {
-                put("npub", ARCHY_ANCHOR_NPUB)
-                put("alias", "archipelago-anchor")
-                put("addresses", JSONArray().put(JSONObject().apply {
-                    put("transport", ARCHY_ANCHOR_TRANSPORT)
-                    put("addr", ARCHY_ANCHOR_ADDR)
-                    put("priority", 40)
-                }))
-            }
-        }
-        // And the public FIPS network anchors at trailing priority, so one
-        // degraded rendezvous (vps2, 2026-07-24) can never strand the phone.
-        for ((i, anchor) in PUBLIC_FIPS_ANCHORS.withIndex()) {
-            val (npub, addr, transport) = anchor
-            if (info.npub == npub || incoming.any { it.optString("npub") == npub }) continue
-            incoming += JSONObject().apply {
-                put("npub", npub)
-                put("alias", "fips-network-anchor-${i + 1}")
-                put("addresses", JSONArray().put(JSONObject().apply {
-                    put("transport", transport)
-                    put("addr", addr)
-                    put("priority", 50 + i * 10)
-                }))
-            }
-        }
-        val incomingNpubs = incoming.map { it.optString("npub") }.toSet()
-        context.fipsDataStore.edit { prefs ->
-            val current = JSONArray(prefs[peersKey] ?: "[]")
-            val merged = JSONArray()
-            for (i in 0 until current.length()) {
-                val existing = current.optJSONObject(i) ?: continue
-                if (existing.optString("npub") !in incomingNpubs) merged.put(existing)
-            }
-            incoming.forEach { merged.put(it) }
-            prefs[peersKey] = merged.toString()
-        }
-    }
-}
-
-/**
- * Peer aliases feed the fips host map as `<alias>.fips` hostnames; anything
- * that isn't a valid DNS label ("Framework PT" — the space) gets rejected and
- * silently drops the peer from name resolution. Slug it instead of losing it.
- */
-internal fun hostSafeAlias(alias: String): String =
-    alias.lowercase()
-        .replace(Regex("[^a-z0-9.-]+"), "-")
-        .trim('-', '.')
-        .ifBlank { "archipelago" }

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

@@ -1,398 +0,0 @@
-package com.archipelago.app.fips
-
-import android.content.Context
-import android.util.Log
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import org.json.JSONObject
-import java.io.BufferedInputStream
-import java.io.File
-import java.io.InputStream
-import java.net.InetAddress
-import java.net.InetSocketAddress
-import java.net.ServerSocket
-import java.net.Socket
-import java.util.UUID
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-/** One chat/photo message in a party conversation, keyed by the peer's npub. */
-data class FlareMessage(
-    val id: String,
-    val peerNpub: String,
-    val fromMe: Boolean,
-    val name: String,
-    val text: String = "",
-    val photoPath: String = "",
-    val ts: Long,
-    val status: Status = Status.RECEIVED,
-) {
-    enum class Status { SENDING, SENT, FAILED, RECEIVED }
-}
-
-/** In-memory conversation store (demo scope — nothing persists across restarts). */
-object FlareStore {
-    private val _messages = MutableStateFlow<List<FlareMessage>>(emptyList())
-    val messages: StateFlow<List<FlareMessage>> = _messages
-
-    fun add(message: FlareMessage) {
-        _messages.value = _messages.value + message
-    }
-
-    fun setStatus(id: String, status: FlareMessage.Status) {
-        _messages.value = _messages.value.map { if (it.id == id) it.copy(status = status) else it }
-    }
-}
-
-/**
- * Minimal HTTP listener bound ONLY on this phone's mesh ULA — plain HTTP is
- * fine there because FIPS is the encryption + peer-identity layer (same
- * stance as the node's ULA-only peer listener). This is what makes the phone
- * a *server* on the mesh: another phone (or `curl -6` from any mesh node)
- * reaches it by npub-derived address with no port forwarding, DNS, or CA.
- *
- * FIPS authenticates the node, not the request (project doctrine), so inputs
- * are still validated at this boundary: size caps, JSON shape, no
- * client-controlled paths.
- */
-object FlareServer {
-    private const val TAG = "FlareServer"
-    private const val MAX_PHOTO_BYTES = 8 * 1024 * 1024
-    private const val MAX_TEXT_CHARS = 4_000
-    private const val MAX_HEADER_BYTES = 16 * 1024
-
-    private var socket: ServerSocket? = null
-    private var pool: ExecutorService? = null
-    @Volatile private var identityName = "Phone"
-    @Volatile private var identityNpub = ""
-    @Volatile private var photoDir: File? = null
-
-    /** Invoked when a peer announces itself (POST /hello) — pairing used to
-     *  be one-way: only the SCANNING phone learned the other side, so the
-     *  scanned phone had no peer, no chat entry, no way in. The VPN service
-     *  wires this to upsert the peer + restart the mesh config. */
-    @Volatile var onHello: ((PartyPeer) -> Unit)? = null
-
-    @Synchronized
-    fun start(context: Context, ula: String, myNpub: String, myName: String) {
-        stop()
-        identityNpub = myNpub
-        identityName = myName
-        photoDir = File(context.cacheDir, "flare").apply { mkdirs() }
-        val pool = Executors.newCachedThreadPool().also { this.pool = it }
-        pool.execute {
-            try {
-                val server = ServerSocket().apply {
-                    reuseAddress = true
-                    bind(InetSocketAddress(InetAddress.getByName(ula), PartyQr.FLARE_PORT))
-                }
-                socket = server
-                Log.i(TAG, "flare listening on [$ula]:${PartyQr.FLARE_PORT}")
-                while (!server.isClosed) {
-                    val client = try {
-                        server.accept()
-                    } catch (_: Exception) {
-                        break
-                    }
-                    pool.execute { handle(client) }
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "flare server died: $e")
-            }
-        }
-    }
-
-    @Synchronized
-    fun stop() {
-        try {
-            socket?.close()
-        } catch (_: Exception) {
-        }
-        socket = null
-        pool?.shutdownNow()
-        pool = null
-    }
-
-    private fun handle(client: Socket) {
-        client.use { sock ->
-            sock.soTimeout = 30_000
-            try {
-                val input = BufferedInputStream(sock.getInputStream())
-                val requestLine = readLine(input) ?: return
-                val parts = requestLine.trim().split(" ")
-                if (parts.size < 2) return respond(sock, 400, json("bad_request"))
-                val (method, path) = parts[0] to parts[1]
-
-                var contentLength = 0
-                var from = ""
-                var fromName = ""
-                var headerBytes = requestLine.length
-                while (true) {
-                    val line = readLine(input) ?: return
-                    if (line.isEmpty()) break
-                    headerBytes += line.length
-                    if (headerBytes > MAX_HEADER_BYTES) return respond(sock, 431, json("headers_too_large"))
-                    val idx = line.indexOf(':')
-                    if (idx <= 0) continue
-                    val key = line.substring(0, idx).trim().lowercase()
-                    val value = line.substring(idx + 1).trim()
-                    when (key) {
-                        "content-length" -> contentLength = value.toIntOrNull() ?: 0
-                        "x-from" -> from = value.take(80)
-                        "x-name" -> fromName = value.take(80)
-                    }
-                }
-
-                when {
-                    method == "GET" && (path == "/" || path.startsWith("/?")) ->
-                        respondHtml(sock, profilePage())
-                    method == "POST" && path == "/hello" -> {
-                        if (contentLength !in 1..MAX_HEADER_BYTES) return respond(sock, 413, json("too_large"))
-                        val body = readExactly(input, contentLength) ?: return
-                        receiveHello(String(body, Charsets.UTF_8))
-                        respond(sock, 200, """{"ok":true}""")
-                    }
-                    method == "POST" && path == "/flare" -> {
-                        if (contentLength !in 1..MAX_HEADER_BYTES) return respond(sock, 413, json("too_large"))
-                        val body = readExactly(input, contentLength) ?: return
-                        receiveFlare(String(body, Charsets.UTF_8))
-                        respond(sock, 200, """{"ok":true}""")
-                    }
-                    method == "POST" && path == "/photo" -> {
-                        if (contentLength !in 1..MAX_PHOTO_BYTES) return respond(sock, 413, json("too_large"))
-                        if (!from.startsWith("npub1")) return respond(sock, 400, json("bad_request"))
-                        val body = readExactly(input, contentLength) ?: return
-                        receivePhoto(from, fromName, body)
-                        respond(sock, 200, """{"ok":true}""")
-                    }
-                    else -> respond(sock, 404, json("not_found"))
-                }
-            } catch (e: Exception) {
-                Log.w(TAG, "request failed: $e")
-            }
-        }
-    }
-
-    /** A peer that scanned OUR QR announces itself — mutual pairing. */
-    private fun receiveHello(body: String) {
-        val o = try {
-            JSONObject(body)
-        } catch (_: Exception) {
-            return
-        }
-        val from = o.optString("from")
-        val ula = o.optString("ula")
-        if (!from.startsWith("npub1") || !ula.startsWith("fd")) return
-        if (from == identityNpub) return
-        val peer = PartyPeer(
-            npub = from.take(80),
-            ula = ula.take(64),
-            name = o.optString("name").take(24).ifBlank { "Phone" },
-            ip = o.optString("ip").take(40),
-            port = o.optInt("port", 0),
-        )
-        onHello?.invoke(peer)
-        // Seed the conversation so the chat has a visible entry on this side.
-        FlareStore.add(
-            FlareMessage(
-                id = UUID.randomUUID().toString(),
-                peerNpub = peer.npub,
-                fromMe = false,
-                name = peer.name,
-                text = "👋 ${peer.name} joined the party",
-                ts = System.currentTimeMillis(),
-            )
-        )
-    }
-
-    private fun receiveFlare(body: String) {
-        val o = try {
-            JSONObject(body)
-        } catch (_: Exception) {
-            return
-        }
-        val from = o.optString("from")
-        if (!from.startsWith("npub1")) return
-        val text = o.optString("text").take(MAX_TEXT_CHARS)
-        if (text.isBlank()) return
-        FlareStore.add(
-            FlareMessage(
-                id = UUID.randomUUID().toString(),
-                peerNpub = from,
-                fromMe = false,
-                name = o.optString("name").take(80).ifBlank { "Phone" },
-                text = text,
-                ts = System.currentTimeMillis(),
-            )
-        )
-    }
-
-    private fun receivePhoto(from: String, fromName: String, bytes: ByteArray) {
-        // Server-generated filename — the sender never controls the path.
-        val dir = photoDir ?: return
-        val file = File(dir, "${UUID.randomUUID()}.jpg")
-        file.writeBytes(bytes)
-        FlareStore.add(
-            FlareMessage(
-                id = UUID.randomUUID().toString(),
-                peerNpub = from,
-                fromMe = false,
-                name = fromName.ifBlank { "Phone" },
-                photoPath = file.absolutePath,
-                ts = System.currentTimeMillis(),
-            )
-        )
-    }
-
-    private fun profilePage(): String {
-        val npub = identityNpub
-        val name = identityName
-        return """
-            <!doctype html><html><head><meta charset="utf-8">
-            <meta name="viewport" content="width=device-width,initial-scale=1">
-            <title>$name — on the mesh</title>
-            <style>
-              body{background:#0a0a0a;color:#eee;font-family:monospace;
-                   display:flex;min-height:100vh;align-items:center;justify-content:center;margin:0}
-              .card{border:1px solid rgba(255,255,255,.12);border-radius:20px;padding:32px;
-                    max-width:560px;background:rgba(255,255,255,.04)}
-              h1{color:#f7931a;margin:0 0 8px;font-size:22px}
-              .npub{word-break:break-all;color:#888;font-size:12px;margin:12px 0}
-              p{line-height:1.5}
-            </style></head><body><div class="card">
-            <h1>⚡ $name</h1>
-            <div class="npub">$npub</div>
-            <p>This page is being served <b>by a phone</b>, addressed by its
-            cryptographic identity over the FIPS mesh.</p>
-            <p>No port forwarding. No DNS. No certificate authority. No cloud.
-            The key <i>is</i> the address — and the transport underneath can be
-            5G, WiFi, or a hotspot with no internet at all.</p>
-            </div></body></html>
-        """.trimIndent()
-    }
-
-    // ── tiny HTTP plumbing ──────────────────────────────────────────────────
-
-    /** Read one CRLF-terminated header line as ISO-8859-1; null on EOF. */
-    private fun readLine(input: InputStream): String? {
-        val sb = StringBuilder()
-        while (true) {
-            val b = input.read()
-            if (b == -1) return if (sb.isEmpty()) null else sb.toString()
-            if (b == '\n'.code) return sb.toString().trimEnd('\r')
-            sb.append(b.toChar())
-            if (sb.length > MAX_HEADER_BYTES) return null
-        }
-    }
-
-    private fun readExactly(input: InputStream, length: Int): ByteArray? {
-        val buf = ByteArray(length)
-        var off = 0
-        while (off < length) {
-            val n = input.read(buf, off, length - off)
-            if (n == -1) return null
-            off += n
-        }
-        return buf
-    }
-
-    private fun json(code: String) = """{"error":{"code":"$code","message":"request rejected"}}"""
-
-    private fun respond(sock: Socket, status: Int, body: String) =
-        writeResponse(sock, status, "application/json", body.toByteArray(Charsets.UTF_8))
-
-    private fun respondHtml(sock: Socket, body: String) =
-        writeResponse(sock, 200, "text/html; charset=utf-8", body.toByteArray(Charsets.UTF_8))
-
-    private fun writeResponse(sock: Socket, status: Int, contentType: String, body: ByteArray) {
-        val reason = when (status) {
-            200 -> "OK"; 400 -> "Bad Request"; 404 -> "Not Found"
-            413 -> "Payload Too Large"; 431 -> "Headers Too Large"
-            else -> "Error"
-        }
-        val head = "HTTP/1.1 $status $reason\r\n" +
-            "Content-Type: $contentType\r\n" +
-            "Content-Length: ${body.size}\r\n" +
-            "Connection: close\r\n\r\n"
-        sock.getOutputStream().apply {
-            write(head.toByteArray(Charsets.ISO_8859_1))
-            write(body)
-            flush()
-        }
-    }
-}
-
-/** Outbound flares: plain HTTP to the peer's ULA — FIPS encrypts underneath. */
-object FlareClient {
-    // Connect timeout must outlive cold mesh-session establishment (~15s via
-    // the public tree per HANDOFF-2026-07-23); the attempt itself drives
-    // session setup, same trick as the VPN service's session warmer.
-    private val http = OkHttpClient.Builder()
-        .connectTimeout(25, TimeUnit.SECONDS)
-        .readTimeout(15, TimeUnit.SECONDS)
-        .writeTimeout(60, TimeUnit.SECONDS)
-        .build()
-
-    private fun base(peer: PartyPeer) = "http://[${peer.ula}]:${PartyQr.FLARE_PORT}"
-
-    /** Announce myself to a freshly scanned peer so pairing becomes MUTUAL —
-     *  their phone gets me as a peer + a chat entry without scanning back.
-     *  Blocking — call from Dispatchers.IO. */
-    fun sendHello(
-        peer: PartyPeer,
-        myNpub: String,
-        myName: String,
-        myUla: String,
-        myIp: String?,
-        myPort: Int,
-    ): Boolean = try {
-        val body = JSONObject()
-            .put("from", myNpub)
-            .put("name", myName)
-            .put("ula", myUla)
-            .put("ip", myIp ?: "")
-            .put("port", if (myIp != null) myPort else 0)
-            .toString()
-            .toRequestBody("application/json".toMediaType())
-        http.newCall(
-            Request.Builder().url("${base(peer)}/hello").post(body).build()
-        ).execute().use { it.isSuccessful }
-    } catch (_: Exception) {
-        false
-    }
-
-    /** Blocking — call from Dispatchers.IO. */
-    fun sendText(peer: PartyPeer, myNpub: String, myName: String, text: String): Boolean = try {
-        val body = JSONObject()
-            .put("from", myNpub)
-            .put("name", myName)
-            .put("text", text)
-            .put("ts", System.currentTimeMillis())
-            .toString()
-            .toRequestBody("application/json".toMediaType())
-        http.newCall(
-            Request.Builder().url("${base(peer)}/flare").post(body).build()
-        ).execute().use { it.isSuccessful }
-    } catch (_: Exception) {
-        false
-    }
-
-    /** Blocking — call from Dispatchers.IO. */
-    fun sendPhoto(peer: PartyPeer, myNpub: String, myName: String, jpeg: ByteArray): Boolean = try {
-        http.newCall(
-            Request.Builder()
-                .url("${base(peer)}/photo")
-                .header("X-From", myNpub)
-                .header("X-Name", myName)
-                .post(jpeg.toRequestBody("image/jpeg".toMediaType()))
-                .build()
-        ).execute().use { it.isSuccessful }
-    } catch (_: Exception) {
-        false
-    }
-}

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

@@ -1,102 +0,0 @@
-package com.archipelago.app.fips
-
-import android.net.Uri
-import java.net.Inet4Address
-import java.net.NetworkInterface
-
-/**
- * Phone↔phone mesh pairing ("Mesh Party") QR contract:
- *
- *   archipelago://party?v=1&npub=<npub>&ula=<fd..>&name=<name>[&ip=<v4>&port=<udp>]
- *
- * npub + ula alone are enough to chat *through* the mesh (anchors route by
- * node address, no underlay info needed). ip/port are present only while the
- * showing phone has its inbound UDP listener up (party mode) — the scanner
- * then also gets a direct-dial link that works on a shared LAN/hotspot with
- * no internet at all. Same versioning stance as the node pairing QR
- * (docs/companion-pairing-qr.md): unknown params tolerated under v=1.
- */
-data class PartyPeer(
-    val npub: String,
-    val ula: String,
-    val name: String,
-    /** Direct-dial underlay endpoint; empty when the peer wasn't listening. */
-    val ip: String = "",
-    val port: Int = 0,
-)
-
-object PartyQr {
-    const val SCHEME_HOST = "party"
-    private const val SUPPORTED_MAJOR = 1
-
-    /** UDP port a party-mode phone listens on (matches the node's mesh port). */
-    const val PARTY_UDP_PORT = 2121
-
-    /** Application-layer chat/beam port, bound only on the mesh ULA. */
-    const val FLARE_PORT = 5680
-
-    fun build(npub: String, ula: String, name: String, ip: String?, port: Int): String {
-        val b = Uri.Builder()
-            .scheme("archipelago")
-            .authority(SCHEME_HOST)
-            .appendQueryParameter("v", "1")
-            .appendQueryParameter("npub", npub)
-            .appendQueryParameter("ula", ula)
-            .appendQueryParameter("name", name)
-        if (!ip.isNullOrBlank() && port > 0) {
-            b.appendQueryParameter("ip", ip)
-            b.appendQueryParameter("port", port.toString())
-        }
-        return b.build().toString()
-    }
-
-    /** Null when [raw] is not a valid party QR (foreign codes just keep scanning). */
-    fun parse(raw: String): PartyPeer? {
-        val uri = try {
-            Uri.parse(raw.trim())
-        } catch (_: Exception) {
-            return null
-        }
-        if (!"archipelago".equals(uri.scheme, ignoreCase = true)) return null
-        if (uri.isOpaque || !SCHEME_HOST.equals(uri.host, ignoreCase = true)) return null
-        val major = uri.getQueryParameter("v")?.takeWhile { it.isDigit() }?.toIntOrNull() ?: return null
-        if (major != SUPPORTED_MAJOR) return null
-
-        val npub = uri.getQueryParameter("npub")?.trim().orEmpty()
-        val ula = uri.getQueryParameter("ula")?.trim().orEmpty()
-        if (!npub.startsWith("npub1") || !ula.startsWith("fd")) return null
-        return PartyPeer(
-            npub = npub,
-            ula = ula,
-            name = uri.getQueryParameter("name")?.trim().orEmpty().ifBlank { "Phone" },
-            ip = uri.getQueryParameter("ip")?.trim().orEmpty(),
-            port = uri.getQueryParameter("port")?.toIntOrNull() ?: 0,
-        )
-    }
-
-    /**
-     * This phone's private IPv4 on WiFi or its own hotspot, for the QR's
-     * direct-dial hint. Hotspot interfaces (ap/swlan/softap) win over wlan so
-     * the hotspot-host phone advertises the address its guests can reach.
-     */
-    fun localWifiIpv4(): String? {
-        val candidates = mutableListOf<Pair<String, String>>() // ifname → addr
-        try {
-            for (nif in NetworkInterface.getNetworkInterfaces()) {
-                if (!nif.isUp || nif.isLoopback) continue
-                for (addr in nif.inetAddresses) {
-                    if (addr is Inet4Address && addr.isSiteLocalAddress) {
-                        candidates += nif.name to addr.hostAddress.orEmpty()
-                    }
-                }
-            }
-        } catch (_: Exception) {
-            return null
-        }
-        val hotspot = candidates.firstOrNull {
-            it.first.startsWith("ap") || it.first.startsWith("swlan") || it.first.startsWith("softap")
-        }
-        return (hotspot ?: candidates.firstOrNull { it.first.startsWith("wlan") } ?: candidates.firstOrNull())
-            ?.second
-    }
-}

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

@@ -38,7 +38,7 @@ import com.archipelago.app.ui.theme.neoRaised
 @Composable
 fun GamepadLayout(
     onKey: (String) -> Unit,
-    onThreeFingerHold: () -> Unit,
+    onTwoFingerHold: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val surface = Neo.surface()
@@ -54,9 +54,9 @@ fun GamepadLayout(
                     do {
                         val ev = awaitPointerEvent()
                         val a = ev.changes.filter { !it.changedToUp() }
-                        if (a.size >= 3 && t == 0L) t = System.currentTimeMillis()
-                        if (a.size >= 3 && !fired && t > 0 && System.currentTimeMillis() - t > 500) { fired = true; onThreeFingerHold() }
-                        if (a.size < 3) t = 0L
+                        if (a.size >= 2 && t == 0L) t = System.currentTimeMillis()
+                        if (a.size >= 2 && !fired && t > 0 && System.currentTimeMillis() - t > 500) { fired = true; onTwoFingerHold() }
+                        if (a.size < 2) t = 0L
                     } while (ev.changes.any { it.pressed })
                 }
             }

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

@@ -1,147 +0,0 @@
-package com.archipelago.app.ui.components
-
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
-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.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.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-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.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.scale
-import androidx.compose.ui.graphics.Color
-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 com.archipelago.app.R
-import com.archipelago.app.ui.theme.BitcoinOrange
-import kotlinx.coroutines.delay
-
-/**
- * First-launch teaching overlay for the three-finger hold gesture. Three
- * fingertip dots pulse in a "press" rhythm with an expanding ring while a
- * short caption explains what the gesture opens. Dismissed by tapping
- * anywhere (or automatically after a few seconds) — shown once, ever.
- */
-@Composable
-fun GestureHintOverlay(onDismiss: () -> Unit) {
-    // Auto-dismiss so a user who taps nothing is never stuck behind the scrim.
-    LaunchedEffect(Unit) {
-        delay(6500)
-        onDismiss()
-    }
-
-    val transition = rememberInfiniteTransition(label = "gesture-hint")
-    // Fingertips press down together…
-    val press by transition.animateFloat(
-        initialValue = 1f,
-        targetValue = 0.86f,
-        animationSpec = infiniteRepeatable(tween(650), RepeatMode.Reverse),
-        label = "press",
-    )
-    // …while a ring ripples outward on each press cycle.
-    val ripple by transition.animateFloat(
-        initialValue = 0f,
-        targetValue = 1f,
-        animationSpec = infiniteRepeatable(tween(1300, easing = LinearEasing)),
-        label = "ripple",
-    )
-
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(Color.Black.copy(alpha = 0.72f))
-            .clickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = null,
-                onClick = onDismiss,
-            ),
-        contentAlignment = Alignment.Center,
-    ) {
-        Column(horizontalAlignment = Alignment.CenterHorizontally) {
-            // Hand: three fingertip dots in a natural arc + ripple ring.
-            Box(Modifier.size(160.dp), contentAlignment = Alignment.Center) {
-                Box(
-                    Modifier
-                        .size(150.dp)
-                        .scale(0.4f + ripple * 0.6f)
-                        .border(
-                            2.dp,
-                            BitcoinOrange.copy(alpha = (1f - ripple) * 0.8f),
-                            CircleShape,
-                        ),
-                )
-                FingerDot(x = (-44).dp, y = 14.dp, scale = press)
-                FingerDot(x = 0.dp, y = (-12).dp, scale = press)
-                FingerDot(x = 44.dp, y = 8.dp, scale = press)
-            }
-
-            Spacer(Modifier.height(28.dp))
-
-            Text(
-                text = stringResource(R.string.gesture_hint_title),
-                style = MaterialTheme.typography.headlineSmall,
-                fontWeight = FontWeight.Bold,
-                color = Color.White,
-                textAlign = TextAlign.Center,
-            )
-            Spacer(Modifier.height(10.dp))
-            Text(
-                text = stringResource(R.string.gesture_hint_body),
-                style = MaterialTheme.typography.bodyMedium,
-                color = Color.White.copy(alpha = 0.7f),
-                textAlign = TextAlign.Center,
-                modifier = Modifier.padding(horizontal = 48.dp),
-            )
-
-            Spacer(Modifier.height(32.dp))
-
-            Box(
-                modifier = Modifier
-                    .clip(RoundedCornerShape(12.dp))
-                    .background(Color.White.copy(alpha = 0.12f))
-                    .clickable(onClick = onDismiss)
-                    .padding(horizontal = 28.dp, vertical = 12.dp),
-            ) {
-                Text(
-                    text = stringResource(R.string.gesture_hint_got_it),
-                    style = MaterialTheme.typography.labelLarge,
-                    color = Color.White,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun FingerDot(x: androidx.compose.ui.unit.Dp, y: androidx.compose.ui.unit.Dp, scale: Float) {
-    Box(
-        Modifier
-            .offset(x = x, y = y)
-            .size(26.dp)
-            .scale(scale)
-            .background(Color.White.copy(alpha = 0.92f), CircleShape),
-    )
-}

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

@@ -1,77 +0,0 @@
-package com.archipelago.app.ui.components
-
-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.size
-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.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.ui.screens.PixelArtLogo
-import com.archipelago.app.ui.theme.BitcoinOrange
-import com.archipelago.app.ui.theme.SurfaceBlack
-import com.archipelago.app.ui.theme.TextMuted
-
-/**
- * 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(message: String = "Dialing your node by its key — no IPs harmed") {
-    Box(
-        Modifier
-            .fillMaxSize()
-            .background(SurfaceBlack),
-        contentAlignment = Alignment.Center,
-    ) {
-        Column(horizontalAlignment = Alignment.CenterHorizontally) {
-            // 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 = "F*CK IPs MESH",
-                color = BitcoinOrange,
-                fontSize = 18.sp,
-                fontWeight = FontWeight.Bold,
-                letterSpacing = 4.sp,
-            )
-            Spacer(Modifier.height(8.dp))
-            Text(
-                text = message,
-                color = TextMuted,
-                fontSize = 13.sp,
-                textAlign = TextAlign.Center,
-            )
-            Spacer(Modifier.height(24.dp))
-            CircularProgressIndicator(color = BitcoinOrange)
-        }
-    }
-}

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

@@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Palette
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
@@ -109,7 +108,6 @@ fun NESController(
     onKey: (String) -> Unit,
     onMenu: () -> Unit,
     onPlayerToggle: () -> Unit = {},
-    onToggleStyle: (() -> Unit)? = null,
     modifier: Modifier = Modifier,
 ) {
     val c = paletteFor(style)
@@ -118,7 +116,7 @@ fun NESController(
     Box(
         modifier = modifier
             .fillMaxSize()
-            .threeFingerHold(onMenu)
+            .twoFingerHold(onMenu)
             .padding(horizontal = 40.dp, vertical = 24.dp),
         contentAlignment = Alignment.Center,
     ) {
@@ -207,7 +205,6 @@ fun NESController(
                 ) {
                     PlayerPill(c, playerId, onPlayerToggle)
                     SettingsBtn(c, Modifier, onMenu)
-                    onToggleStyle?.let { StyleBtn(c, Modifier, it) }
                 }
             }
         }
@@ -434,23 +431,6 @@ fun SettingsBtn(c: NESPalette, modifier: Modifier = Modifier, onClick: () -> Uni
     }
 }
 
-/** Dark/Classic style toggle — lives next to the settings gear (the menu hub
- *  no longer carries it). */
-@Composable
-fun StyleBtn(c: NESPalette, modifier: Modifier = Modifier, onClick: () -> Unit) {
-    var p by remember { mutableStateOf(false) }
-    Box(
-        modifier = modifier
-            .size(48.dp)
-            .clip(CircleShape)
-            .background(if (p) c.capsulePress else c.capsule)
-            .pointerInput(Unit) { detectTapGestures(onPress = { p = true; onClick(); tryAwaitRelease(); p = false }) },
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(Icons.Default.Palette, "Controller style", Modifier.size(26.dp), tint = c.labelMuted)
-    }
-}
-
 /** Player ID toggle pill (P1/P2/ALL) */
 @Composable
 fun PlayerPill(c: NESPalette, playerId: Int, onToggle: () -> Unit) {
@@ -471,17 +451,17 @@ fun PlayerPill(c: NESPalette, playerId: Int, onToggle: () -> Unit) {
     }
 }
 
-/** Three-finger hold gesture modifier (two fingers stay free for scrolling) */
-fun Modifier.threeFingerHold(onHold: () -> Unit) = this.pointerInput(Unit) {
+/** Two-finger hold gesture modifier */
+fun Modifier.twoFingerHold(onHold: () -> Unit) = this.pointerInput(Unit) {
     awaitEachGesture {
         awaitFirstDown(requireUnconsumed = false)
         var t = 0L; var fired = false
         do {
             val ev = awaitPointerEvent()
             val a = ev.changes.filter { !it.changedToUp() }
-            if (a.size >= 3 && t == 0L) t = System.currentTimeMillis()
-            if (a.size >= 3 && !fired && t > 0 && System.currentTimeMillis() - t > 500) { fired = true; onHold() }
-            if (a.size < 3) t = 0L
+            if (a.size >= 2 && t == 0L) t = System.currentTimeMillis()
+            if (a.size >= 2 && !fired && t > 0 && System.currentTimeMillis() - t > 500) { fired = true; onHold() }
+            if (a.size < 2) t = 0L
         } while (ev.changes.any { it.pressed })
     }
 }

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

@@ -21,45 +21,21 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Bolt
-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.SportsEsports
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.QrCodeScanner
-import androidx.compose.material3.Icon
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.OutlinedTextFieldDefaults
 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.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.AnnotatedString
-import com.archipelago.app.fips.FipsManager
-import com.archipelago.app.fips.FipsNative
-import com.archipelago.app.fips.FipsPreferences
 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.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
@@ -68,9 +44,9 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
 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.data.ServerEntry
 import com.archipelago.app.ui.theme.BitcoinOrange
+import com.archipelago.app.ui.theme.ControllerStyle
 import com.archipelago.app.ui.theme.SurfaceDark
 import com.archipelago.app.ui.theme.TextMuted
 import com.archipelago.app.ui.theme.TextPrimary
@@ -94,29 +70,25 @@ fun NESMenu(
     visible: Boolean,
     servers: List<ServerEntry>,
     activeServer: ServerEntry?,
+    isGamepadMode: Boolean,
+    controllerStyle: ControllerStyle,
     onDismiss: () -> Unit,
     onSelectServer: (ServerEntry) -> Unit,
     onAddServer: (ServerEntry) -> Unit,
-    onScanQr: (() -> Unit)? = null,
     onEditServer: (ServerEntry, ServerEntry) -> Unit,
     onRemoveServer: (ServerEntry) -> Unit,
-    onRemote: () -> Unit,
-    onKeyboard: () -> Unit,
+    onToggleMode: () -> Unit,
+    onToggleStyle: () -> Unit,
     onBackToWebView: (() -> Unit)? = null,
-    onMeshParty: (() -> Unit)? = null,
 ) {
     AnimatedVisibility(visible = visible, enter = fadeIn(), exit = fadeOut()) {
-        // Contained hub overlay: a centred glass panel (not full-screen) that
-        // holds the card page and its sub-pages (Nodes, FIPS) and scrolls
-        // inside its own bounds when content is tall. Tapping the dimmed
-        // backdrop dismisses.
         Box(
             Modifier.fillMaxSize().background(Color.Black.copy(alpha = 0.7f))
                 .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }) { onDismiss() },
             contentAlignment = Alignment.Center,
         ) {
             AnimatedVisibility(visible = visible, enter = fadeIn() + scaleIn(initialScale = 0.95f), exit = fadeOut() + scaleOut(targetScale = 0.95f)) {
-                MenuPanel(servers, activeServer, onDismiss, onSelectServer, onAddServer, onScanQr, onEditServer, onRemoveServer, onRemote, onKeyboard, onBackToWebView, onMeshParty)
+                MenuPanel(servers, activeServer, isGamepadMode, controllerStyle, onDismiss, onSelectServer, onAddServer, onEditServer, onRemoveServer, onToggleMode, onToggleStyle, onBackToWebView)
             }
         }
     }
@@ -126,16 +98,16 @@ fun NESMenu(
 private fun MenuPanel(
     servers: List<ServerEntry>,
     activeServer: ServerEntry?,
+    isGamepadMode: Boolean,
+    controllerStyle: ControllerStyle,
     onDismiss: () -> Unit,
     onSelectServer: (ServerEntry) -> Unit,
     onAddServer: (ServerEntry) -> Unit,
-    onScanQr: (() -> Unit)?,
     onEditServer: (ServerEntry, ServerEntry) -> Unit,
     onRemoveServer: (ServerEntry) -> Unit,
-    onRemote: () -> Unit,
-    onKeyboard: () -> Unit,
+    onToggleMode: () -> Unit,
+    onToggleStyle: () -> Unit,
     onBackToWebView: (() -> Unit)?,
-    onMeshParty: (() -> Unit)?,
 ) {
     var showAdd by remember { mutableStateOf(false) }
     // The saved server being edited, or null when adding a new one.
@@ -143,15 +115,14 @@ private fun MenuPanel(
     var nm by remember { mutableStateOf("") }
     var addr by remember { mutableStateOf("") }
     var pwd by remember { mutableStateOf("") }
-    var https by remember { mutableStateOf(false) }
 
     fun resetForm() {
-        nm = ""; addr = ""; pwd = ""; https = false; showAdd = false; editing = null
+        nm = ""; addr = ""; pwd = ""; showAdd = false; editing = null
     }
 
     fun startEdit(server: ServerEntry) {
         editing = server
-        nm = server.name; addr = server.address; pwd = server.password; https = server.useHttps
+        nm = server.name; addr = server.address; pwd = server.password
         showAdd = false
     }
 
@@ -159,381 +130,133 @@ private fun MenuPanel(
         if (addr.isBlank()) return
         val orig = editing
         if (orig != null) {
-            // Preserve port (compact form doesn't expose it); scheme is now editable.
-            onEditServer(orig, orig.copy(address = addr, useHttps = https, password = pwd, name = nm))
+            // Preserve fields the compact form doesn't expose (scheme, port).
+            onEditServer(orig, orig.copy(address = addr, password = pwd, name = nm))
         } else {
-            onAddServer(ServerEntry(addr, https, password = pwd, name = nm))
+            onAddServer(ServerEntry(addr, false, password = pwd, name = nm))
         }
         resetForm()
     }
 
-    var page by remember { mutableStateOf(HubPage.HUB) }
-
     Column(
         modifier = Modifier
             .widthIn(max = 420.dp)
-            .fillMaxWidth()
             .padding(horizontal = 20.dp)
-            // Cap height just short of the full screen; the panel wraps short
-            // content and only scrolls in the rare case it outgrows this.
-            .heightIn(max = (LocalConfiguration.current.screenHeightDp * 0.92f).dp)
             .clip(RoundedCornerShape(PANEL_R))
-            .background(PanelBg.copy(alpha = 0.86f))
+            .background(PanelBg)
             .border(1.dp, PanelBorder, RoundedCornerShape(PANEL_R))
             .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }) {}
-            .verticalScroll(rememberScrollState())
-            .padding(20.dp),
-        verticalArrangement = Arrangement.spacedBy(12.dp),
+            .padding(22.dp),
+        verticalArrangement = Arrangement.spacedBy(10.dp),
     ) {
-        // Header: back (on sub-pages) or title, and a close on the hub.
-        Row(
-            Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            if (page == HubPage.HUB) {
-                Text("Menu", color = TextPrimary, fontSize = 20.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 2.sp)
-                IconRound(Icons.Default.Close, "Close") { onDismiss() }
-            } else {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    IconRound(Icons.AutoMirrored.Filled.ArrowBack, "Back") { resetForm(); page = HubPage.HUB }
-                    Spacer(Modifier.width(12.dp))
-                    Text(
-                        if (page == HubPage.NODES) "Nodes" else "FIPS Mesh",
-                        color = TextPrimary, fontSize = 20.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.sp,
-                    )
-                }
-                IconRound(Icons.Default.Close, "Close") { onDismiss() }
-            }
-        }
-        Spacer(Modifier.height(4.dp))
+        // Title
+        Text(
+            "Menu",
+            color = TextPrimary,
+            fontSize = 18.sp,
+            fontWeight = FontWeight.SemiBold,
+            letterSpacing = 2.sp,
+            modifier = Modifier.fillMaxWidth(),
+            textAlign = TextAlign.Center,
+        )
+        Spacer(Modifier.height(2.dp))
 
-        when (page) {
-            HubPage.HUB -> {
-                // Card page — one card per destination. Dashboard first: it's a
-                // peer of the others so three-finger → hub → Dashboard returns
-                // to the node UI, same shape as every other option.
-                if (onBackToWebView != null) {
-                    HubCard(Icons.Default.Dashboard, "Dashboard", "The node's web interface") { onBackToWebView() }
-                }
-                HubCard(Icons.Default.SportsEsports, "Remote", "Game controller for the node") { onRemote() }
-                HubCard(Icons.Default.Keyboard, "Keyboard", "Type into the node") { onKeyboard() }
-                HubCard(Icons.Default.Dns, "Nodes", activeServer?.displayName() ?: "Add or switch servers") {
-                    page = HubPage.NODES
-                }
-                if (FipsNative.available) {
-                    HubCard(Icons.Default.Bolt, "FIPS Mesh", "Mesh identity & status") { page = HubPage.FIPS }
-                }
-                if (onMeshParty != null) {
-                    HubCard(Icons.Default.Groups, "Mesh Party", "Phone-to-phone chat & beam") { onMeshParty() }
-                }
-                // Dark/Classic style lives on the remote/keyboard screen next to
-                // the settings button — not here.
-            }
-
-            HubPage.NODES -> {
-                servers.forEach { server ->
-                    val active = server.serialize() == activeServer?.serialize()
-                    MenuItem(
-                        label = server.displayName(),
-                        selected = active,
-                        onClick = { onSelectServer(server) },
-                        onEdit = { startEdit(server) },
-                        onRemove = { onRemoveServer(server) },
-                    )
-                }
-                if (servers.isEmpty()) {
-                    Text("No servers", color = TextMuted, fontSize = 14.sp, modifier = Modifier.padding(vertical = 4.dp))
-                }
-
-                if (showAdd || editing != null) {
-                    Column(
-                        Modifier
-                            .fillMaxWidth()
-                            .clip(RoundedCornerShape(ROW_R))
-                            .background(FieldBg)
-                            .border(1.dp, RowBorder, RoundedCornerShape(ROW_R))
-                            .padding(12.dp),
-                        verticalArrangement = Arrangement.spacedBy(8.dp),
-                    ) {
-                        Row(
-                            Modifier.fillMaxWidth(),
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                        ) {
-                            Text(
-                                if (editing != null) "Edit Server" else "Add Server",
-                                color = TextMuted, fontSize = 13.sp, letterSpacing = 1.sp, fontWeight = FontWeight.Medium,
-                            )
-                            Text(
-                                "Cancel", color = TextMuted, fontSize = 13.sp,
-                                modifier = Modifier.clickable { resetForm() }.padding(start = 8.dp),
-                            )
-                        }
-                        GlassField(
-                            value = nm, onValueChange = { nm = it },
-                            placeholder = "Name (optional)",
-                            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text, imeAction = ImeAction.Next),
-                        )
-                        GlassField(
-                            value = addr, onValueChange = { addr = it.trim() },
-                            placeholder = "192.168.1.100",
-                            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Next),
-                        )
-                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) {
-                            GlassField(
-                                value = pwd, onValueChange = { pwd = it },
-                                placeholder = "Password",
-                                modifier = Modifier.weight(1f),
-                                visualTransformation = PasswordVisualTransformation(),
-                                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),
-                                keyboardActions = KeyboardActions(onGo = { submit() }),
-                            )
-                            Box(
-                                Modifier.size(FIELD_H).clip(RoundedCornerShape(12.dp)).background(BitcoinOrange.copy(alpha = 0.15f))
-                                    .border(1.dp, BitcoinOrange.copy(alpha = 0.4f), RoundedCornerShape(12.dp))
-                                    .clickable { submit() },
-                                contentAlignment = Alignment.Center,
-                            ) { Text("OK", color = BitcoinOrange, fontSize = 14.sp, fontWeight = FontWeight.Bold) }
-                        }
-                        // HTTPS scheme toggle (available on both add and edit).
-                        Row(
-                            Modifier
-                                .fillMaxWidth()
-                                .clip(RoundedCornerShape(ROW_R))
-                                .clickable { https = !https }
-                                .padding(vertical = 2.dp),
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                        ) {
-                            Text("Use HTTPS", color = TextMuted, fontSize = 13.sp)
-                            Box(
-                                Modifier
-                                    .width(46.dp).height(26.dp)
-                                    .clip(RoundedCornerShape(13.dp))
-                                    .background(if (https) BitcoinOrange.copy(alpha = 0.9f) else RowBg)
-                                    .border(1.dp, if (https) BitcoinOrange else RowBorder, RoundedCornerShape(13.dp)),
-                                contentAlignment = if (https) Alignment.CenterEnd else Alignment.CenterStart,
-                            ) {
-                                Box(
-                                    Modifier
-                                        .padding(horizontal = 3.dp)
-                                        .size(20.dp)
-                                        .clip(RoundedCornerShape(10.dp))
-                                        .background(if (https) Color.White else TextMuted),
-                                )
-                            }
-                        }
-                    }
-                } else {
-                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(10.dp)) {
-                        Box(Modifier.weight(1f)) {
-                            MenuItem(label = "Add Server", labelColor = BitcoinOrange, onClick = { showAdd = true })
-                        }
-                        if (onScanQr != null) {
-                            Box(
-                                Modifier
-                                    .size(ROW_H)
-                                    .clip(RoundedCornerShape(ROW_R))
-                                    .background(RowBg)
-                                    .border(1.dp, RowBorder, RoundedCornerShape(ROW_R))
-                                    .clickable { onScanQr() },
-                                contentAlignment = Alignment.Center,
-                            ) {
-                                Icon(
-                                    Icons.Default.QrCodeScanner,
-                                    contentDescription = stringResource(R.string.add_server_qr),
-                                    tint = BitcoinOrange,
-                                    modifier = Modifier.size(24.dp),
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-
-            HubPage.FIPS -> {
-                FipsSection(embedded = true)
-            }
-        }
-    }
-}
-
-private enum class HubPage { HUB, NODES, FIPS }
-
-/** Big tappable destination card for the hub page: icon + title + subtitle. */
-@Composable
-private fun HubCard(
-    icon: androidx.compose.ui.graphics.vector.ImageVector,
-    title: String,
-    subtitle: String,
-    onClick: () -> Unit,
-) {
-    Row(
-        Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(ROW_R))
-            .background(RowBg)
-            .border(1.dp, RowBorder, RoundedCornerShape(ROW_R))
-            .clickable { onClick() }
-            .padding(16.dp),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(14.dp),
-    ) {
-        Box(
-            Modifier.size(40.dp).clip(RoundedCornerShape(12.dp)).background(BitcoinOrange.copy(alpha = 0.14f)),
-            contentAlignment = Alignment.Center,
-        ) {
-            Icon(icon, contentDescription = title, tint = BitcoinOrange, modifier = Modifier.size(22.dp))
-        }
-        Column(Modifier.weight(1f)) {
-            Text(title, color = TextPrimary, fontSize = 16.sp, fontWeight = FontWeight.SemiBold)
-            Text(subtitle, color = TextMuted, fontSize = 12.sp, maxLines = 1)
-        }
-    }
-}
-
-/** Small circular icon button used in the hub header. */
-@Composable
-private fun IconRound(
-    icon: androidx.compose.ui.graphics.vector.ImageVector,
-    desc: String,
-    onClick: () -> Unit,
-) {
-    Box(
-        Modifier
-            .size(40.dp)
-            .clip(RoundedCornerShape(20.dp))
-            .background(RowBg)
-            .border(1.dp, RowBorder, RoundedCornerShape(20.dp))
-            .clickable { onClick() },
-        contentAlignment = Alignment.Center,
-    ) {
-        Icon(icon, contentDescription = desc, tint = TextPrimary, modifier = Modifier.size(20.dp))
-    }
-}
-
-/** Snapshot of the phone's mesh identity + state for the FIPS menu section. */
-private data class FipsInfo(
-    val available: Boolean,
-    val running: Boolean,
-    val npub: String,
-    val meshAddress: String,
-    val peerCount: Int,
-)
-
-/**
- * FIPS mesh oversight: shows what the phone's embedded mesh node is doing —
- * running state, its mesh identity (npub), its mesh address (fd…ULA), how
- * many peers/anchors it's configured with — and a one-tap Reconnect that
- * re-homes the mesh (also the manual fix if a network handoff ever misses).
- * Collapsed by default so the menu stays compact.
- */
-@Composable
-private fun FipsSection(embedded: Boolean = false) {
-    if (!FipsNative.available) return
-    val context = LocalContext.current
-    val clipboard = LocalClipboardManager.current
-    var expanded by remember { mutableStateOf(embedded) }
-    var info by remember { mutableStateOf<FipsInfo?>(null) }
-
-    // Load identity/state when the section opens (cheap DataStore + JSON read).
-    LaunchedEffect(expanded) {
-        if (expanded && info == null) {
-            val prefs = FipsPreferences(context)
-            val id = prefs.identity()
-            val peers = runCatching {
-                org.json.JSONArray(prefs.peersJson()).length()
-            }.getOrDefault(0)
-            info = FipsInfo(
-                available = true,
-                running = FipsNative.isRunning(),
-                npub = id?.npub.orEmpty(),
-                meshAddress = id?.address.orEmpty(),
-                peerCount = peers,
+        // Servers
+        servers.forEach { server ->
+            val active = server.serialize() == activeServer?.serialize()
+            MenuItem(
+                label = server.displayName(),
+                selected = active,
+                onClick = { onSelectServer(server) },
+                onEdit = { startEdit(server) },
+                onRemove = { onRemoveServer(server) },
             )
         }
-    }
 
-    Column(Modifier.fillMaxWidth()) {
-        // Embedded in the hub's FIPS sub-page the header row would duplicate
-        // the page title, so only the standalone (collapsible) form shows it.
-        if (!embedded) MenuItem(
-            label = "FIPS Mesh",
-            labelColor = BitcoinOrange,
-            onClick = { expanded = !expanded },
-        )
-        if (expanded) {
-            val i = info
+        if (servers.isEmpty()) {
+            Text("No servers", color = TextMuted, fontSize = 14.sp, modifier = Modifier.padding(vertical = 4.dp))
+        }
+
+        // Add / edit server
+        if (showAdd || editing != null) {
             Column(
                 Modifier
                     .fillMaxWidth()
-                    .padding(top = 6.dp)
                     .clip(RoundedCornerShape(ROW_R))
                     .background(FieldBg)
                     .border(1.dp, RowBorder, RoundedCornerShape(ROW_R))
-                    .padding(14.dp),
-                verticalArrangement = Arrangement.spacedBy(10.dp),
+                    .padding(12.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
             ) {
-                if (i == null) {
-                    Text("Loading…", color = TextMuted, fontSize = 13.sp)
-                } else {
-                    FipsRow("Status", if (i.running) "Connected" else "Stopped",
-                        valueColor = if (i.running) BitcoinOrange else TextMuted)
-                    if (i.meshAddress.isNotBlank()) {
-                        FipsRow("Mesh address", i.meshAddress, mono = true,
-                            onCopy = { clipboard.setText(AnnotatedString(i.meshAddress)) })
-                    }
-                    if (i.npub.isNotBlank()) {
-                        FipsRow("Identity (npub)", i.npub, mono = true,
-                            onCopy = { clipboard.setText(AnnotatedString(i.npub)) })
-                    }
-                    FipsRow("Peers & anchors", i.peerCount.toString())
+                Row(
+                    Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                ) {
                     Text(
-                        "Your node reaches this phone over the mesh by its npub — no ports opened to the internet.",
-                        color = TextMuted, fontSize = 11.sp,
+                        if (editing != null) "Edit Server" else "Add Server",
+                        color = TextMuted,
+                        fontSize = 13.sp,
+                        letterSpacing = 1.sp,
+                        fontWeight = FontWeight.Medium,
                     )
-                    MenuItem(
-                        label = "Reconnect mesh",
-                        labelColor = BitcoinOrange,
-                        onClick = {
-                            FipsManager.requestMeshRestart(context)
-                            info = null
-                            if (!embedded) expanded = false
-                        },
+                    Text(
+                        "Cancel",
+                        color = TextMuted,
+                        fontSize = 13.sp,
+                        modifier = Modifier.clickable { resetForm() }.padding(start = 8.dp),
                     )
                 }
+                GlassField(
+                    value = nm, onValueChange = { nm = it },
+                    placeholder = "Name (optional)",
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text, imeAction = ImeAction.Next),
+                )
+                GlassField(
+                    value = addr, onValueChange = { addr = it.trim() },
+                    placeholder = "192.168.1.100",
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Next),
+                )
+                Row(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically) {
+                    GlassField(
+                        value = pwd, onValueChange = { pwd = it },
+                        placeholder = "Password",
+                        modifier = Modifier.weight(1f),
+                        visualTransformation = PasswordVisualTransformation(),
+                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),
+                        keyboardActions = KeyboardActions(onGo = { submit() }),
+                    )
+                    Box(
+                        Modifier.size(FIELD_H).clip(RoundedCornerShape(12.dp)).background(BitcoinOrange.copy(alpha = 0.15f))
+                            .border(1.dp, BitcoinOrange.copy(alpha = 0.4f), RoundedCornerShape(12.dp))
+                            .clickable { submit() },
+                        contentAlignment = Alignment.Center,
+                    ) { Text("OK", color = BitcoinOrange, fontSize = 14.sp, fontWeight = FontWeight.Bold) }
+                }
             }
+        } else {
+            MenuItem(label = "Add Server", labelColor = BitcoinOrange, onClick = { showAdd = true })
         }
-    }
-}
 
-@Composable
-private fun FipsRow(
-    label: String,
-    value: String,
-    valueColor: Color = TextPrimary,
-    mono: Boolean = false,
-    onCopy: (() -> Unit)? = null,
-) {
-    Row(
-        Modifier
-            .fillMaxWidth()
-            .then(if (onCopy != null) Modifier.clickable { onCopy() } else Modifier),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween,
-    ) {
-        Text(label, color = TextMuted, fontSize = 12.sp, modifier = Modifier.width(120.dp))
-        Text(
-            value,
-            color = valueColor,
-            fontSize = if (mono) 11.sp else 13.sp,
-            fontWeight = FontWeight.Medium,
-            modifier = Modifier.weight(1f),
-            textAlign = TextAlign.End,
+        Spacer(Modifier.height(2.dp))
+        Box(Modifier.fillMaxWidth().height(1.dp).background(PanelBorder))
+        Spacer(Modifier.height(2.dp))
+
+        // Mode toggle
+        MenuItem(
+            label = if (isGamepadMode) "Switch to Keyboard" else "Switch to Gamepad",
+            onClick = onToggleMode,
         )
-        if (onCopy != null) {
-            Text("⧉", color = TextMuted, fontSize = 13.sp, modifier = Modifier.padding(start = 8.dp))
+
+        // Style toggle
+        MenuItem(
+            label = if (controllerStyle == ControllerStyle.CLASSIC) "Style: Classic" else "Style: Dark",
+            onClick = onToggleStyle,
+        )
+
+        // Back to dashboard
+        if (onBackToWebView != null) {
+            MenuItem(label = "Back to Dashboard", onClick = onBackToWebView)
         }
     }
 }

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

@@ -43,7 +43,6 @@ fun NESPortraitController(
     onMouseScroll: (Int) -> Unit = { _ -> },
     onMenu: () -> Unit,
     onPlayerToggle: () -> Unit = {},
-    onToggleStyle: (() -> Unit)? = null,
 ) {
     val c = paletteFor(style)
     val isClassic = style == ControllerStyle.CLASSIC
@@ -51,7 +50,7 @@ fun NESPortraitController(
     Box(
         Modifier
             .fillMaxSize()
-            .threeFingerHold(onMenu)
+            .twoFingerHold(onMenu)
             .padding(horizontal = 40.dp, vertical = 24.dp),
         contentAlignment = Alignment.Center,
     ) {
@@ -88,7 +87,7 @@ fun NESPortraitController(
                     onMove = { dx, dy -> onMouseMove(dx, dy) },
                     onClick = { onMouseClick(it) },
                     onScroll = { dy -> onMouseScroll(dy) },
-                    onThreeFingerHold = onMenu,
+                    onTwoFingerHold = onMenu,
                     modifier = Modifier
                         .fillMaxWidth()
                         .weight(1f),
@@ -152,10 +151,6 @@ fun NESPortraitController(
                     PlayerPill(c, playerId, onPlayerToggle)
                     Spacer(Modifier.width(10.dp))
                     SettingsBtn(c, Modifier, onMenu)
-                    onToggleStyle?.let {
-                        Spacer(Modifier.width(10.dp))
-                        StyleBtn(c, Modifier, it)
-                    }
                 }
             }
         }

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

@@ -1,352 +0,0 @@
-package com.archipelago.app.ui.components
-
-import android.Manifest
-import android.content.pm.PackageManager
-import androidx.activity.compose.BackHandler
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.camera.core.CameraSelector
-import androidx.camera.core.ImageAnalysis
-import androidx.camera.core.ImageProxy
-import androidx.camera.core.Preview
-import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.camera.view.PreviewView
-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.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.windowInsetsPadding
-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.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.content.ContextCompat
-import com.archipelago.app.R
-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.HybridBinarizer
-import kotlinx.coroutines.delay
-import java.util.concurrent.Executors
-
-/**
- * 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(
-    visible: Boolean,
-    onDismiss: () -> Unit,
-    onServerScanned: (PairResult.Success) -> Unit,
-) {
-    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)
-        }
-    }
-
-    // Foreign-code hint fades after a moment so scanning feels live again.
-    LaunchedEffect(hintRes) {
-        if (hintRes != null) {
-            delay(2500)
-            hintRes = null
-        }
-    }
-
-    AnimatedVisibility(visible = visible, enter = fadeIn(), exit = fadeOut()) {
-        BackHandler { onDismiss() }
-        Box(
-            Modifier
-                .fillMaxSize()
-                .background(Color.Black),
-        ) {
-            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
-                            }
-                        }
-                    },
-                )
-                // Aim frame
-                Box(
-                    Modifier
-                        .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 = 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,
-                    )
-                }
-            }
-        }
-    }
-}
-
-/** Shared by the pairing scanner and the wallet scan modal. */
-@Composable
-internal fun CameraQrPreview(onDecoded: (String) -> Unit) {
-    val context = LocalContext.current
-    val lifecycleOwner = LocalLifecycleOwner.current
-    val currentOnDecoded by rememberUpdatedState(onDecoded)
-    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 (wallet modal).
-            implementationMode = PreviewView.ImplementationMode.COMPATIBLE
-        }
-    }
-
-    DisposableEffect(Unit) {
-        val analysisExecutor = Executors.newSingleThreadExecutor()
-        val mainExecutor = ContextCompat.getMainExecutor(context)
-        val providerFuture = ProcessCameraProvider.getInstance(context)
-        var provider: ProcessCameraProvider? = null
-        val focusScheduler = Executors.newSingleThreadScheduledExecutor()
-
-        providerFuture.addListener({
-            val p = providerFuture.get()
-            provider = p
-            val preview = Preview.Builder().build().also {
-                it.setSurfaceProvider(previewView.surfaceProvider)
-            }
-            // Dense Lightning-invoice QRs need BOTH enough pixels per module and
-            // 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))
-                .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
-                .build()
-                .also {
-                    it.setAnalyzer(
-                        analysisExecutor,
-                        QrCodeAnalyzer { text -> mainExecutor.execute { currentOnDecoded(text) } },
-                    )
-                }
-            try {
-                p.unbindAll()
-                val cam = p.bindToLifecycle(lifecycleOwner, CameraSelector.DEFAULT_BACK_CAMERA, preview, analysis)
-                // 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({
-                    runCatching { cam.cameraControl.startFocusAndMetering(focusAction) }
-                }, 0, 2, java.util.concurrent.TimeUnit.SECONDS)
-            } catch (_: Exception) {
-                // Camera unavailable — the user can dismiss and enter details manually.
-            }
-        }, mainExecutor)
-
-        onDispose {
-            focusScheduler.shutdownNow()
-            provider?.unbindAll()
-            analysisExecutor.shutdown()
-        }
-    }
-
-    AndroidView(factory = { previewView }, modifier = Modifier.fillMaxSize())
-}
-
-/** ZXing-based QR decoder over the camera's Y (luminance) plane. */
-private class QrCodeAnalyzer(private val onDecoded: (String) -> Unit) : ImageAnalysis.Analyzer {
-    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,
-            )
-        )
-    }
-
-    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
-            // 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/Trackpad.kt

@@ -32,7 +32,7 @@ fun Trackpad(
     onMove: (dx: Int, dy: Int) -> Unit,
     onClick: (button: Int) -> Unit,
     onScroll: (dy: Int) -> Unit,
-    onThreeFingerHold: () -> Unit,
+    onTwoFingerHold: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     var fingers by remember { mutableIntStateOf(0) }
@@ -53,7 +53,7 @@ fun Trackpad(
                     val t0 = System.currentTimeMillis()
                     var maxPtrs = 1
                     var holdFired = false
-                    var threeStart = 0L
+                    var twoStart = 0L
                     var scrollAcc = 0f
                     fingers = 1
 
@@ -64,24 +64,19 @@ fun Trackpad(
                         fingers = active.size
 
                         when {
-                            // Three fingers = hold for menu; two = scroll. Kept
-                            // on separate counts so a long two-finger scroll can
-                            // never fire the menu mid-gesture.
-                            active.size >= 3 -> {
-                                if (threeStart == 0L) threeStart = System.currentTimeMillis()
-                                if (!holdFired && System.currentTimeMillis() - threeStart > 500) {
+                            active.size >= 2 -> {
+                                if (twoStart == 0L) twoStart = System.currentTimeMillis()
+                                if (!holdFired && System.currentTimeMillis() - twoStart > 500) {
                                     holdFired = true
-                                    onThreeFingerHold()
+                                    onTwoFingerHold()
                                 }
-                                ev.changes.forEach { it.consume() }
-                            }
-                            active.size == 2 -> {
-                                threeStart = 0L
-                                val dy = active.map { it.positionChange().y }.average().toFloat()
-                                scrollAcc += dy
-                                if (kotlin.math.abs(scrollAcc) > 12f) {
-                                    onScroll(if (scrollAcc > 0) 1 else -1)
-                                    scrollAcc = 0f
+                                if (!holdFired) {
+                                    val dy = active.map { it.positionChange().y }.average().toFloat()
+                                    scrollAcc += dy
+                                    if (kotlin.math.abs(scrollAcc) > 12f) {
+                                        onScroll(if (scrollAcc > 0) 1 else -1)
+                                        scrollAcc = 0f
+                                    }
                                 }
                                 ev.changes.forEach { it.consume() }
                             }
@@ -104,11 +99,7 @@ fun Trackpad(
         contentAlignment = Alignment.Center,
     ) {
         Text(
-            text = when {
-                fingers >= 3 -> "hold for menu"
-                fingers == 2 -> "scroll"
-                else -> ""
-            },
+            text = if (fingers >= 2) "hold for menu" else "",
             style = MaterialTheme.typography.labelSmall,
             color = muted.copy(alpha = 0.4f),
         )

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

@@ -1,294 +0,0 @@
-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.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-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
-import com.google.zxing.MultiFormatReader
-import com.google.zxing.NotFoundException
-import com.google.zxing.RGBLuminanceSource
-import com.google.zxing.common.HybridBinarizer
-
-/**
- * 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
- * progress, "not recognised" errors) back in via [status] and closes the
- * modal through the JS bridge once it accepts a code.
- */
-@Composable
-fun WalletQrScannerModal(
-    visible: Boolean,
-    status: Pair<String, Boolean>?, // message from the web page + isError
-    onDecoded: (String) -> Unit,
-    onDismiss: () -> Unit,
-) {
-    val context = LocalContext.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) }
-    val noQrMessage = stringResource(R.string.no_qr_in_image)
-    val imagePicker = rememberLauncherForActivityResult(
-        ActivityResultContracts.GetContent()
-    ) { uri ->
-        if (uri != null) {
-            val decoded = decodeQrFromUri(context, uri)
-            if (decoded != null) {
-                uploadError = null
-                onDecoded(decoded)
-            } else {
-                uploadError = noQrMessage
-            }
-        }
-    }
-
-    LaunchedEffect(visible) {
-        if (visible) {
-            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 }
-
-    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),
-                        )
-                    }
-                }
-
-                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),
-                )
-            }
-        }
-    }
-}
-
-/** Decode a QR from a picked image, downsampled so huge photos stay cheap. */
-private fun decodeQrFromUri(context: Context, uri: Uri): String? {
-    return try {
-        val resolver = context.contentResolver
-        val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-        resolver.openInputStream(uri)?.use { BitmapFactory.decodeStream(it, null, bounds) }
-        var sample = 1
-        val maxDim = maxOf(bounds.outWidth, bounds.outHeight)
-        while (maxDim / (sample * 2) >= 1600) sample *= 2
-        val opts = BitmapFactory.Options().apply { inSampleSize = sample }
-        val bmp = resolver.openInputStream(uri)?.use { BitmapFactory.decodeStream(it, null, opts) }
-            ?: return null
-        val pixels = IntArray(bmp.width * bmp.height)
-        bmp.getPixels(pixels, 0, bmp.width, 0, 0, bmp.width, bmp.height)
-        val source = RGBLuminanceSource(bmp.width, bmp.height, pixels)
-        val reader = MultiFormatReader().apply {
-            setHints(
-                mapOf(
-                    DecodeHintType.POSSIBLE_FORMATS to listOf(BarcodeFormat.QR_CODE),
-                    DecodeHintType.TRY_HARDER to true,
-                )
-            )
-        }
-        try {
-            reader.decodeWithState(BinaryBitmap(HybridBinarizer(source))).text
-        } catch (_: NotFoundException) {
-            // Light-on-dark QRs (dark-themed wallets) decode inverted.
-            reader.reset()
-            reader.decodeWithState(BinaryBitmap(HybridBinarizer(source.invert()))).text
-        }
-    } catch (_: Exception) {
-        null
-    }
-}

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

@@ -1,30 +1,16 @@
 package com.archipelago.app.ui.navigation
 
-import android.net.VpnService
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
-import com.archipelago.app.data.PairResult
-import com.archipelago.app.data.ServerEntry
 import com.archipelago.app.data.ServerPreferences
-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.PartyScreen
 import com.archipelago.app.ui.screens.RemoteInputScreen
 import com.archipelago.app.ui.screens.ServerConnectScreen
 import com.archipelago.app.ui.screens.WebViewScreen
@@ -35,15 +21,10 @@ object Routes {
     const val SERVER_CONNECT = "server_connect"
     const val WEB_VIEW = "web_view"
     const val REMOTE_INPUT = "remote_input"
-    const val MESH_PARTY = "mesh_party"
-    const val FLARE = "flare"
 }
 
 @Composable
-fun AppNavHost(
-    pairUri: String? = null,
-    onPairUriConsumed: () -> Unit = {},
-) {
+fun AppNavHost() {
     val context = LocalContext.current
     val prefs = remember { ServerPreferences(context) }
     val navController = rememberNavController()
@@ -52,70 +33,8 @@ fun AppNavHost(
     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.
-    var pairPrefill by remember { mutableStateOf<ServerEntry?>(null) }
-
-    // Mesh tunnel: Android's VPN consent dialog is the single unavoidable
-    // interaction — it can only be launched from an Activity, so pairing
-    // paths raise FipsManager.consentNeeded and it is handled here, once.
-    val consentNeeded by FipsManager.consentNeeded.collectAsState()
-    val vpnConsentLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) { result ->
-        FipsManager.consentHandled()
-        if (result.resultCode == android.app.Activity.RESULT_OK) {
-            FipsManager.startService(context)
-        }
-    }
-    LaunchedEffect(consentNeeded) {
-        if (!consentNeeded) return@LaunchedEffect
-        val consentIntent = VpnService.prepare(context)
-        if (consentIntent == null) {
-            FipsManager.consentHandled()
-            FipsManager.startService(context)
-        } else {
-            vpnConsentLauncher.launch(consentIntent)
-        }
-    }
-
-    // Paired + previously consented → the mesh comes back silently on launch.
-    LaunchedEffect(Unit) {
-        FipsManager.autoStartIfReady(context)
-    }
-
     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.
-    LaunchedEffect(pairUri) {
-        val raw = pairUri ?: return@LaunchedEffect
-        onPairUriConsumed()
-        when (val result = ServerQrParser.parse(raw)) {
-            is PairResult.Success -> {
-                // Pairing implies the app is installed and in use — skip the intro.
-                prefs.markIntroSeen()
-                val merged = prefs.upsertServer(result.server)
-                FipsManager.registerNode(context, result.fips, merged.displayName())
-                if (merged.password.isNotBlank()) {
-                    // Demo flow: password came with the link — connect in one step.
-                    prefs.setActiveServer(merged)
-                    navController.navigate(Routes.WEB_VIEW) {
-                        popUpTo(0) { inclusive = true }
-                    }
-                } else {
-                    pairPrefill = merged
-                    navController.navigate(Routes.SERVER_CONNECT) {
-                        popUpTo(0) { inclusive = true }
-                    }
-                }
-            }
-            else -> {
-                // Invalid or too-new pairing link — ignore; normal startup continues.
-            }
-        }
-    }
-
     val startDestination = when {
         introSeen == false -> Routes.INTRO
         activeServer != null -> Routes.WEB_VIEW
@@ -128,9 +47,6 @@ fun AppNavHost(
     ) {
         composable(Routes.INTRO) {
             IntroScreen(
-                onMeshParty = {
-                    navController.navigate(Routes.MESH_PARTY)
-                },
                 onContinue = {
                     scope.launch {
                         prefs.markIntroSeen()
@@ -149,7 +65,6 @@ fun AppNavHost(
                         popUpTo(Routes.SERVER_CONNECT) { inclusive = true }
                     }
                 },
-                initialServer = pairPrefill,
             )
         }
 
@@ -166,8 +81,6 @@ fun AppNavHost(
             } else {
                 WebViewScreen(
                     serverUrl = server.toUrl(),
-                    serverPassword = server.password,
-                    meshFallbackUrl = server.toMeshUrl(),
                     onDisconnect = {
                         scope.launch {
                             prefs.clearActiveServer()
@@ -179,46 +92,15 @@ fun AppNavHost(
                     onRemoteInput = {
                         navController.navigate(Routes.REMOTE_INPUT)
                     },
-                    onRemoteKeyboard = {
-                        navController.navigate("${Routes.REMOTE_INPUT}?keyboard=true")
-                    },
-                    onMeshParty = {
-                        navController.navigate(Routes.MESH_PARTY)
-                    },
                 )
             }
         }
 
-        composable(
-            "${Routes.REMOTE_INPUT}?keyboard={keyboard}",
-            arguments = listOf(
-                navArgument("keyboard") {
-                    type = NavType.BoolType
-                    defaultValue = false
-                },
-            ),
-        ) { entry ->
+        composable(Routes.REMOTE_INPUT) {
             RemoteInputScreen(
                 onBack = {
                     navController.popBackStack()
                 },
-                onMeshParty = {
-                    navController.navigate(Routes.MESH_PARTY)
-                },
-                startInKeyboard = entry.arguments?.getBoolean("keyboard") == true,
-            )
-        }
-
-        composable(Routes.MESH_PARTY) {
-            PartyScreen(
-                onBack = { navController.popBackStack() },
-                onOpenChat = { navController.navigate(Routes.FLARE) },
-            )
-        }
-
-        composable(Routes.FLARE) {
-            FlareScreen(
-                onBack = { navController.popBackStack() },
             )
         }
     }

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

@@ -1,359 +0,0 @@
-package com.archipelago.app.ui.screens
-
-import android.graphics.Bitmap
-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.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.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.layout.widthIn
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Image
-import androidx.compose.material3.Icon
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.OutlinedTextFieldDefaults
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-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.graphics.asImageBitmap
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.archipelago.app.fips.FipsManager
-import com.archipelago.app.fips.FipsNative
-import com.archipelago.app.fips.FipsPreferences
-import com.archipelago.app.fips.FlareClient
-import com.archipelago.app.fips.FlareMessage
-import com.archipelago.app.fips.FlareStore
-import com.archipelago.app.fips.PartyPeer
-import com.archipelago.app.ui.theme.BitcoinOrange
-import com.archipelago.app.ui.theme.SurfaceDark
-import com.archipelago.app.ui.theme.TextMuted
-import com.archipelago.app.ui.theme.TextPrimary
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.util.UUID
-
-private val BubbleTheirs = Color.White.copy(alpha = 0.07f)
-private val BubbleBorder = Color.White.copy(alpha = 0.08f)
-
-/**
- * Flare — phone↔phone chat and photo beam over the FIPS mesh. Every byte is
- * E2E encrypted by the mesh layer and addressed by npub; whether it travels
- * via a public anchor (5G) or a direct hotspot link is invisible up here —
- * which is the entire point.
- */
-@Composable
-fun FlareScreen(onBack: () -> Unit) {
-    val context = LocalContext.current
-    val prefs = remember { FipsPreferences(context) }
-    val scope = rememberCoroutineScope()
-
-    var identity by remember { mutableStateOf<FipsNative.Identity?>(null) }
-    var myName by remember { mutableStateOf("Phone") }
-    val peers by prefs.partyPeersFlow.collectAsState(initial = emptyList())
-    var selectedNpub by remember { mutableStateOf<String?>(null) }
-    val allMessages by FlareStore.messages.collectAsState()
-    var draft by remember { mutableStateOf("") }
-
-    LaunchedEffect(Unit) {
-        identity = FipsManager.ensureIdentity(prefs)
-        myName = prefs.partyName()
-    }
-    LaunchedEffect(peers) {
-        if (selectedNpub == null || peers.none { it.npub == selectedNpub }) {
-            selectedNpub = peers.firstOrNull()?.npub
-        }
-    }
-
-    val peer = peers.firstOrNull { it.npub == selectedNpub }
-    val messages = allMessages.filter { it.peerNpub == selectedNpub }
-    val listState = rememberLazyListState()
-    LaunchedEffect(messages.size) {
-        if (messages.isNotEmpty()) listState.animateScrollToItem(messages.size - 1)
-    }
-
-    fun sendText() {
-        val target = peer ?: return
-        val me = identity ?: return
-        val text = draft.trim()
-        if (text.isEmpty()) return
-        draft = ""
-        val msg = FlareMessage(
-            id = UUID.randomUUID().toString(),
-            peerNpub = target.npub,
-            fromMe = true,
-            name = myName,
-            text = text,
-            ts = System.currentTimeMillis(),
-            status = FlareMessage.Status.SENDING,
-        )
-        FlareStore.add(msg)
-        scope.launch(Dispatchers.IO) {
-            val ok = FlareClient.sendText(target, me.npub, myName, text)
-            FlareStore.setStatus(msg.id, if (ok) FlareMessage.Status.SENT else FlareMessage.Status.FAILED)
-        }
-    }
-
-    fun sendPhoto(uri: Uri) {
-        val target = peer ?: return
-        val me = identity ?: return
-        scope.launch(Dispatchers.IO) {
-            val jpeg = compressPhoto(context, uri) ?: return@launch
-            // Local copy so our own bubble renders the sent photo.
-            val dir = File(context.cacheDir, "flare").apply { mkdirs() }
-            val local = File(dir, "${UUID.randomUUID()}.jpg").apply { writeBytes(jpeg) }
-            val msg = FlareMessage(
-                id = UUID.randomUUID().toString(),
-                peerNpub = target.npub,
-                fromMe = true,
-                name = myName,
-                photoPath = local.absolutePath,
-                ts = System.currentTimeMillis(),
-                status = FlareMessage.Status.SENDING,
-            )
-            FlareStore.add(msg)
-            val ok = FlareClient.sendPhoto(target, me.npub, myName, jpeg)
-            FlareStore.setStatus(msg.id, if (ok) FlareMessage.Status.SENT else FlareMessage.Status.FAILED)
-        }
-    }
-
-    val photoPicker = rememberLauncherForActivityResult(
-        ActivityResultContracts.GetContent()
-    ) { uri -> uri?.let { sendPhoto(it) } }
-
-    BackHandler { onBack() }
-
-    Column(
-        Modifier
-            .fillMaxSize()
-            .background(SurfaceDark)
-            .statusBarsPadding()
-            .navigationBarsPadding()
-            .imePadding(),
-    ) {
-        // Header
-        Row(
-            Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 10.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            Text("‹ Back", color = TextMuted, fontSize = 15.sp, modifier = Modifier.clickable { onBack() }.padding(6.dp))
-            Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                Text("FLARE", color = TextPrimary, fontSize = 16.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 3.sp)
-                peer?.let {
-                    Text(
-                        it.name + if (it.ip.isNotBlank()) "  ·  direct+mesh" else "  ·  mesh",
-                        color = BitcoinOrange,
-                        fontSize = 11.sp,
-                    )
-                }
-            }
-            Spacer(Modifier.size(48.dp))
-        }
-
-        // Peer tabs when chatting with more than one phone
-        if (peers.size > 1) {
-            Row(
-                Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                peers.forEach { p ->
-                    val active = p.npub == selectedNpub
-                    Text(
-                        p.name,
-                        color = if (active) BitcoinOrange else TextMuted,
-                        fontSize = 13.sp,
-                        modifier = Modifier
-                            .clip(RoundedCornerShape(10.dp))
-                            .background(if (active) BitcoinOrange.copy(alpha = 0.12f) else Color.Transparent)
-                            .border(
-                                1.dp,
-                                if (active) BitcoinOrange.copy(alpha = 0.4f) else BubbleBorder,
-                                RoundedCornerShape(10.dp),
-                            )
-                            .clickable { selectedNpub = p.npub }
-                            .padding(horizontal = 12.dp, vertical = 6.dp),
-                    )
-                }
-            }
-        }
-
-        if (peer == null) {
-            Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) {
-                Text("No party peers yet — scan a phone first", color = TextMuted, fontSize = 14.sp)
-            }
-        } else {
-            LazyColumn(
-                state = listState,
-                modifier = Modifier.weight(1f).fillMaxWidth(),
-                contentPadding = androidx.compose.foundation.layout.PaddingValues(16.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                items(messages, key = { it.id }) { msg ->
-                    MessageBubble(msg)
-                }
-            }
-
-            // Composer
-            Row(
-                Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 8.dp),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                Box(
-                    Modifier
-                        .size(48.dp)
-                        .clip(RoundedCornerShape(12.dp))
-                        .background(BubbleTheirs)
-                        .border(1.dp, BubbleBorder, RoundedCornerShape(12.dp))
-                        .clickable { photoPicker.launch("image/*") },
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Icon(Icons.Default.Image, "Beam a photo", tint = BitcoinOrange, modifier = Modifier.size(22.dp))
-                }
-                OutlinedTextField(
-                    value = draft,
-                    onValueChange = { draft = it },
-                    placeholder = { Text("Send a flare…", color = TextMuted, fontSize = 14.sp) },
-                    modifier = Modifier.weight(1f),
-                    singleLine = true,
-                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send),
-                    keyboardActions = KeyboardActions(onSend = { sendText() }),
-                    textStyle = TextStyle(color = TextPrimary, fontSize = 15.sp),
-                    colors = OutlinedTextFieldDefaults.colors(
-                        focusedBorderColor = Color.White.copy(alpha = 0.3f),
-                        unfocusedBorderColor = Color.White.copy(alpha = 0.12f),
-                        cursorColor = BitcoinOrange,
-                        focusedTextColor = TextPrimary,
-                        unfocusedTextColor = TextPrimary,
-                    ),
-                    shape = RoundedCornerShape(12.dp),
-                )
-                Box(
-                    Modifier
-                        .size(48.dp)
-                        .clip(RoundedCornerShape(12.dp))
-                        .background(BitcoinOrange.copy(alpha = 0.15f))
-                        .border(1.dp, BitcoinOrange.copy(alpha = 0.4f), RoundedCornerShape(12.dp))
-                        .clickable { sendText() },
-                    contentAlignment = Alignment.Center,
-                ) {
-                    Text("➤", color = BitcoinOrange, fontSize = 18.sp)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun MessageBubble(msg: FlareMessage) {
-    Row(
-        Modifier.fillMaxWidth(),
-        horizontalArrangement = if (msg.fromMe) Arrangement.End else Arrangement.Start,
-    ) {
-        Column(
-            Modifier
-                .widthIn(max = 300.dp)
-                .clip(RoundedCornerShape(16.dp))
-                .background(if (msg.fromMe) BitcoinOrange.copy(alpha = 0.14f) else BubbleTheirs)
-                .border(
-                    1.dp,
-                    if (msg.fromMe) BitcoinOrange.copy(alpha = 0.35f) else BubbleBorder,
-                    RoundedCornerShape(16.dp),
-                )
-                .padding(horizontal = 12.dp, vertical = 8.dp),
-        ) {
-            if (msg.photoPath.isNotBlank()) {
-                val bmp = remember(msg.photoPath) { BitmapFactory.decodeFile(msg.photoPath) }
-                bmp?.let {
-                    Image(
-                        bitmap = it.asImageBitmap(),
-                        contentDescription = "Beamed photo",
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .clip(RoundedCornerShape(10.dp)),
-                        contentScale = ContentScale.FillWidth,
-                    )
-                }
-            }
-            if (msg.text.isNotBlank()) {
-                Text(msg.text, color = TextPrimary, fontSize = 15.sp)
-            }
-            Text(
-                when (msg.status) {
-                    FlareMessage.Status.SENDING -> "sending…"
-                    FlareMessage.Status.SENT -> "sent · E2E via mesh"
-                    FlareMessage.Status.FAILED -> "failed — tap to retry later"
-                    FlareMessage.Status.RECEIVED -> msg.name
-                },
-                color = if (msg.status == FlareMessage.Status.FAILED) BitcoinOrange else TextMuted,
-                fontSize = 10.sp,
-                modifier = Modifier.padding(top = 2.dp),
-            )
-        }
-    }
-}
-
-/** Decode, downscale (≤1600px) and JPEG-compress a picked photo off-main. */
-private suspend fun compressPhoto(context: android.content.Context, uri: Uri): ByteArray? =
-    withContext(Dispatchers.IO) {
-        try {
-            val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-            context.contentResolver.openInputStream(uri)?.use {
-                BitmapFactory.decodeStream(it, null, bounds)
-            }
-            var sample = 1
-            while (maxOf(bounds.outWidth, bounds.outHeight) / sample > 1600) sample *= 2
-            val opts = BitmapFactory.Options().apply { inSampleSize = sample }
-            val bitmap = context.contentResolver.openInputStream(uri)?.use {
-                BitmapFactory.decodeStream(it, null, opts)
-            } ?: return@withContext null
-            val out = ByteArrayOutputStream()
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 80, out)
-            bitmap.recycle()
-            out.toByteArray()
-        } catch (_: Exception) {
-            null
-        }
-    }

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

@@ -55,12 +55,7 @@ import com.archipelago.app.ui.theme.TextPrimary
 import kotlinx.coroutines.delay
 
 @Composable
-fun IntroScreen(
-    onContinue: () -> Unit,
-    // Mesh Party works with no node at all (phone↔phone) — offered right on
-    // the first screen so a friend who just got the app can join a party.
-    onMeshParty: () -> Unit = {},
-) {
+fun IntroScreen(onContinue: () -> Unit) {
     val logoAlpha = remember { Animatable(0f) }
     var showContent by remember { mutableStateOf(false) }
 
@@ -148,14 +143,6 @@ fun IntroScreen(
                         onClick = onContinue,
                         modifier = Modifier.fillMaxWidth().height(56.dp),
                     )
-
-                    Spacer(modifier = Modifier.height(12.dp))
-
-                    GlassButton(
-                        text = stringResource(R.string.mesh_party),
-                        onClick = onMeshParty,
-                        modifier = Modifier.fillMaxWidth().height(48.dp),
-                    )
                 }
             }
         }

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

@@ -1,519 +0,0 @@
-package com.archipelago.app.ui.screens
-
-import android.graphics.Bitmap
-import androidx.activity.compose.BackHandler
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-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.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.OutlinedTextFieldDefaults
-import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-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.graphics.asImageBitmap
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.archipelago.app.fips.FipsManager
-import com.archipelago.app.fips.FipsNative
-import com.archipelago.app.fips.FipsPreferences
-import com.archipelago.app.fips.FlareClient
-import com.archipelago.app.fips.PartyPeer
-import com.archipelago.app.fips.PartyQr
-import com.archipelago.app.ui.components.CameraQrPreview
-import com.archipelago.app.ui.theme.BitcoinOrange
-import com.archipelago.app.ui.theme.SurfaceDark
-import com.archipelago.app.ui.theme.TextMuted
-import com.archipelago.app.ui.theme.TextPrimary
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.EncodeHintType
-import com.google.zxing.qrcode.QRCodeWriter
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-private val CardBg = Color.White.copy(alpha = 0.05f)
-private val CardBorder = Color.White.copy(alpha = 0.08f)
-
-/** Public companion download (vps2 demo host — serves the same APK as the
- *  nodes' QR link). Rendered as the "Share this app" QR. */
-private const val APP_DOWNLOAD_URL =
-    "http://146.59.87.168:2100/packages/archipelago-companion.apk"
-
-/**
- * Mesh Party — phone↔phone FIPS pairing. Show your QR, scan theirs, and the
- * two embedded mesh nodes link up: through anchors when there's internet,
- * directly over any shared WiFi/hotspot when there isn't.
- */
-@Composable
-fun PartyScreen(
-    onBack: () -> Unit,
-    onOpenChat: () -> Unit,
-) {
-    val context = LocalContext.current
-    val prefs = remember { FipsPreferences(context) }
-    val scope = rememberCoroutineScope()
-
-    var identity by remember { mutableStateOf<FipsNative.Identity?>(null) }
-    var name by remember { mutableStateOf("") }
-    var localIp by remember { mutableStateOf<String?>(null) }
-    var showScanner by remember { mutableStateOf(false) }
-    var showShareQr by remember { mutableStateOf(false) }
-    var scanHint by remember { mutableStateOf<String?>(null) }
-
-    // Camera permission — fresh installs (and reinstalls: uninstall wipes
-    // grants) land here with no CAMERA grant, and the raw preview just showed
-    // black. Ask the moment the scanner opens.
-    var hasCamera by remember {
-        mutableStateOf(
-            androidx.core.content.ContextCompat.checkSelfPermission(
-                context, android.Manifest.permission.CAMERA,
-            ) == android.content.pm.PackageManager.PERMISSION_GRANTED
-        )
-    }
-    val cameraPermLauncher = androidx.activity.compose.rememberLauncherForActivityResult(
-        androidx.activity.result.contract.ActivityResultContracts.RequestPermission()
-    ) { hasCamera = it }
-    LaunchedEffect(showScanner) {
-        if (showScanner && !hasCamera) {
-            cameraPermLauncher.launch(android.Manifest.permission.CAMERA)
-        }
-    }
-    val listenOn by prefs.partyListenFlow.collectAsState(initial = false)
-    val peers by prefs.partyPeersFlow.collectAsState(initial = emptyList())
-
-    LaunchedEffect(Unit) {
-        identity = FipsManager.ensureIdentity(prefs)
-        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.
-        while (true) {
-            localIp = withContext(Dispatchers.IO) { PartyQr.localWifiIpv4() }
-            delay(3_000)
-        }
-    }
-
-    val qrPayload = identity?.let { id ->
-        PartyQr.build(
-            npub = id.npub,
-            ula = id.address,
-            name = name.ifBlank { "Phone" },
-            ip = if (listenOn) localIp else null,
-            port = PartyQr.PARTY_UDP_PORT,
-        )
-    }
-    val qrBitmap = remember(qrPayload) { qrPayload?.let { renderQr(it) } }
-
-    BackHandler {
-        when {
-            showScanner -> showScanner = false
-            showShareQr -> showShareQr = false
-            else -> onBack()
-        }
-    }
-
-    Box(Modifier.fillMaxSize().background(SurfaceDark)) {
-        Column(
-            Modifier
-                .fillMaxSize()
-                .statusBarsPadding()
-                .verticalScroll(rememberScrollState())
-                .padding(horizontal = 24.dp, vertical = 16.dp),
-            verticalArrangement = Arrangement.spacedBy(14.dp),
-        ) {
-            Row(
-                Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween,
-            ) {
-                Text("‹ Back", color = TextMuted, fontSize = 15.sp, modifier = Modifier.clickable { onBack() }.padding(8.dp))
-                Text("MESH PARTY", color = TextPrimary, fontSize = 17.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 3.sp)
-                Spacer(Modifier.size(56.dp))
-            }
-
-            // My QR card
-            Column(
-                Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(20.dp))
-                    .background(CardBg)
-                    .border(1.dp, CardBorder, RoundedCornerShape(20.dp))
-                    .padding(18.dp),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(12.dp),
-            ) {
-                qrBitmap?.let { bmp ->
-                    Box(
-                        Modifier
-                            .clip(RoundedCornerShape(16.dp))
-                            .background(Color.White)
-                            .padding(12.dp),
-                    ) {
-                        Image(
-                            bitmap = bmp.asImageBitmap(),
-                            contentDescription = "My mesh party QR",
-                            modifier = Modifier.size(220.dp),
-                        )
-                    }
-                } ?: Text("Mesh identity unavailable on this device", color = TextMuted, fontSize = 14.sp)
-
-                identity?.let {
-                    Text(
-                        it.npub.take(16) + "…" + it.npub.takeLast(6),
-                        color = TextMuted,
-                        fontSize = 12.sp,
-                        textAlign = TextAlign.Center,
-                    )
-                }
-
-                OutlinedTextField(
-                    value = name,
-                    onValueChange = {
-                        name = it.take(24)
-                        scope.launch { prefs.setPartyName(name) }
-                    },
-                    placeholder = { Text("Your name", color = TextMuted, textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth()) },
-                    modifier = Modifier.fillMaxWidth().height(56.dp),
-                    singleLine = true,
-                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-                    textStyle = TextStyle(color = TextPrimary, fontSize = 15.sp, textAlign = TextAlign.Center),
-                    colors = OutlinedTextFieldDefaults.colors(
-                        focusedBorderColor = Color.White.copy(alpha = 0.3f),
-                        unfocusedBorderColor = Color.White.copy(alpha = 0.12f),
-                        cursorColor = BitcoinOrange,
-                        focusedTextColor = TextPrimary,
-                        unfocusedTextColor = TextPrimary,
-                    ),
-                    shape = RoundedCornerShape(12.dp),
-                )
-
-                // Direct-link toggle (hotspot mode)
-                Row(
-                    Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    Column(Modifier.padding(end = 12.dp)) {
-                        Text("Accept direct links", color = TextPrimary, fontSize = 15.sp, fontWeight = FontWeight.Medium)
-                        Text(
-                            when {
-                                listenOn && localIp != null -> "Dialable at $localIp:${PartyQr.PARTY_UDP_PORT} — no internet needed"
-                                listenOn -> "Waiting for a WiFi/hotspot address…"
-                                else -> "Off — mesh routes via anchors only"
-                            },
-                            color = if (listenOn) BitcoinOrange else TextMuted,
-                            fontSize = 12.sp,
-                        )
-                    }
-                    Switch(
-                        checked = listenOn,
-                        onCheckedChange = { on ->
-                            scope.launch {
-                                prefs.setPartyListen(on)
-                                FipsManager.requestMeshRestart(context)
-                            }
-                        },
-                        colors = SwitchDefaults.colors(
-                            checkedTrackColor = BitcoinOrange,
-                            checkedThumbColor = Color.White,
-                        ),
-                    )
-                }
-            }
-
-            GlassButton(
-                text = "Scan a Phone",
-                onClick = { showScanner = true },
-                modifier = Modifier.fillMaxWidth().height(56.dp),
-            )
-
-            if (peers.isNotEmpty()) {
-                Text("PARTY PEERS", color = TextMuted, fontSize = 12.sp, letterSpacing = 2.sp)
-                peers.forEach { peer ->
-                    Row(
-                        Modifier
-                            .fillMaxWidth()
-                            .clip(RoundedCornerShape(14.dp))
-                            .background(CardBg)
-                            .border(1.dp, CardBorder, RoundedCornerShape(14.dp))
-                            .clickable { onOpenChat() }
-                            .padding(horizontal = 16.dp, vertical = 12.dp),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                    ) {
-                        Column(Modifier.padding(end = 8.dp)) {
-                            Text(peer.name, color = TextPrimary, fontSize = 15.sp, fontWeight = FontWeight.Medium)
-                            Text(
-                                peer.npub.take(14) + "…" + if (peer.ip.isNotBlank()) "  ·  direct ${peer.ip}" else "  ·  via mesh",
-                                color = TextMuted,
-                                fontSize = 11.sp,
-                            )
-                        }
-                        Text(
-                            "✕",
-                            color = TextMuted,
-                            fontSize = 16.sp,
-                            modifier = Modifier.clickable {
-                                scope.launch {
-                                    prefs.removePartyPeer(peer.npub)
-                                    FipsManager.requestMeshRestart(context)
-                                }
-                            }.padding(8.dp),
-                        )
-                    }
-                }
-                GlassButton(
-                    text = "Open Flare Chat",
-                    onClick = onOpenChat,
-                    modifier = Modifier.fillMaxWidth().height(56.dp),
-                )
-            } else {
-                Text(
-                    "Scan another phone's party QR (or let them scan yours) to link your mesh nodes — works over 5G via anchors, or over any shared WiFi/hotspot with zero internet.",
-                    color = TextMuted,
-                    fontSize = 13.sp,
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp),
-                )
-            }
-            Spacer(Modifier.height(12.dp))
-            // Hand the app itself to a friend: shares this install's own APK
-            // through the system sheet (Quick Share/Bluetooth), so a nearby
-            // phone gets the companion with zero internet — the whole party
-            // premise.
-            GlassButton(
-                text = "Share this app",
-                onClick = { showShareQr = true },
-                modifier = Modifier.fillMaxWidth().height(48.dp),
-            )
-            Spacer(Modifier.height(12.dp))
-        }
-
-        // "Share this app" — a QR of the public download link, so the other
-        // phone scans it with its normal camera and installs over any
-        // internet. (The vps2 demo host serves the same APK the nodes do.)
-        AnimatedVisibility(visible = showShareQr, enter = fadeIn(), exit = fadeOut()) {
-            Box(
-                Modifier
-                    .fillMaxSize()
-                    .background(Color.Black.copy(alpha = 0.94f))
-                    .clickable { showShareQr = false },
-                contentAlignment = Alignment.Center,
-            ) {
-                Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                    val dlQr = remember { renderQr(APP_DOWNLOAD_URL) }
-                    dlQr?.let { bmp ->
-                        Box(
-                            Modifier
-                                .clip(RoundedCornerShape(16.dp))
-                                .background(Color.White)
-                                .padding(14.dp),
-                        ) {
-                            Image(
-                                bitmap = bmp.asImageBitmap(),
-                                contentDescription = "Companion download QR",
-                                modifier = Modifier.size(240.dp),
-                            )
-                        }
-                    }
-                    Spacer(Modifier.height(18.dp))
-                    Text(
-                        "Scan with any camera to download\nthe Archipelago Companion",
-                        color = TextPrimary,
-                        fontSize = 15.sp,
-                        textAlign = TextAlign.Center,
-                    )
-                    Spacer(Modifier.height(10.dp))
-                    Text(
-                        "…or send the APK file directly",
-                        color = BitcoinOrange,
-                        fontSize = 13.sp,
-                        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))
-                }
-            }
-        }
-
-        // Party QR scanner overlay
-        AnimatedVisibility(visible = showScanner, enter = fadeIn(), exit = fadeOut()) {
-            Box(Modifier.fillMaxSize().background(Color.Black)) {
-                if (!hasCamera) {
-                    Column(
-                        Modifier.align(Alignment.Center).padding(horizontal = 32.dp),
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.spacedBy(14.dp),
-                    ) {
-                        Text(
-                            "Camera access is needed to scan a party QR.",
-                            color = TextPrimary,
-                            fontSize = 15.sp,
-                            textAlign = TextAlign.Center,
-                        )
-                        GlassButton(
-                            text = "Grant camera access",
-                            onClick = { cameraPermLauncher.launch(android.Manifest.permission.CAMERA) },
-                            modifier = Modifier.fillMaxWidth().height(48.dp),
-                        )
-                    }
-                } else CameraQrPreview(onDecoded = { text ->
-                    val peer = PartyQr.parse(text)
-                    when {
-                        peer == null -> scanHint = "Not a mesh party QR"
-                        peer.npub == identity?.npub -> scanHint = "That's your own QR"
-                        else -> {
-                            showScanner = false
-                            scanHint = null
-                            scope.launch {
-                                prefs.upsertPartyPeer(peer)
-                                // Pick up the direct-dial PeerConfig (and the
-                                // listener, if ours is on) immediately.
-                                FipsManager.requestMeshRestart(context)
-                                // Pairing must be MUTUAL: announce ourselves so
-                                // the scanned phone gets us as a peer + a chat
-                                // entry without scanning back. Retried while
-                                // the fresh link/session comes up.
-                                val me = identity
-                                if (me != null) {
-                                    launch(Dispatchers.IO) {
-                                        for (attempt in 0 until 6) {
-                                            val ok = FlareClient.sendHello(
-                                                peer = peer,
-                                                myNpub = me.npub,
-                                                myName = name.ifBlank { "Phone" },
-                                                myUla = me.address,
-                                                myIp = if (listenOn) localIp else null,
-                                                myPort = PartyQr.PARTY_UDP_PORT,
-                                            )
-                                            if (ok) break
-                                            delay(3_000)
-                                        }
-                                    }
-                                }
-                                onOpenChat()
-                            }
-                        }
-                    }
-                })
-                Box(
-                    Modifier
-                        .align(Alignment.Center)
-                        .size(260.dp)
-                        .border(2.dp, BitcoinOrange.copy(alpha = 0.85f), RoundedCornerShape(20.dp)),
-                )
-                Text(
-                    "Close",
-                    color = TextPrimary,
-                    fontSize = 16.sp,
-                    modifier = Modifier
-                        .align(Alignment.TopEnd)
-                        .statusBarsPadding()
-                        .clickable { showScanner = false }
-                        .padding(20.dp),
-                )
-                scanHint?.let {
-                    Text(
-                        it,
-                        color = BitcoinOrange,
-                        fontSize = 14.sp,
-                        textAlign = TextAlign.Center,
-                        modifier = Modifier
-                            .align(Alignment.BottomCenter)
-                            .padding(bottom = 48.dp)
-                            .fillMaxWidth(),
-                    )
-                }
-            }
-        }
-    }
-
-    // Scan hints fade so the camera feels live again.
-    LaunchedEffect(scanHint) {
-        if (scanHint != null) {
-            delay(2500)
-            scanHint = null
-        }
-    }
-}
-
-/** 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,
-        size,
-        size,
-        mapOf(EncodeHintType.MARGIN to 1),
-    )
-    val pixels = IntArray(size * size)
-    for (y in 0 until size) {
-        for (x in 0 until size) {
-            pixels[y * size + x] = if (matrix[x, y]) 0xFF0A0A0A.toInt() else 0xFFFFFFFF.toInt()
-        }
-    }
-    Bitmap.createBitmap(pixels, size, size, Bitmap.Config.ARGB_8888)
-} catch (_: Exception) {
-    null
-}
-
-/** 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). */
-private fun shareCompanionApk(context: android.content.Context) {
-    try {
-        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)
-            addFlags(android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION)
-        }
-        context.startActivity(
-            android.content.Intent.createChooser(send, "Share Archipelago Companion")
-                .addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK),
-        )
-    } catch (_: Exception) {
-        // No share targets / copy failed — nothing sensible to do here.
-    }
-}

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

@@ -4,10 +4,8 @@ import android.content.res.Configuration
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-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.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -39,14 +37,12 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.archipelago.app.R
 import com.archipelago.app.data.ServerPreferences
-import com.archipelago.app.fips.FipsManager
 import com.archipelago.app.network.ConnectionState
 import com.archipelago.app.network.InputWebSocket
 import com.archipelago.app.ui.components.NESController
 import com.archipelago.app.ui.components.NESKeyboard
 import com.archipelago.app.ui.components.NESMenu
 import com.archipelago.app.ui.components.NESPortraitController
-import com.archipelago.app.ui.components.QrScannerOverlay
 import com.archipelago.app.ui.components.Trackpad
 import com.archipelago.app.ui.theme.BitcoinOrange
 import com.archipelago.app.ui.theme.ControllerStyle
@@ -56,12 +52,7 @@ import com.archipelago.app.ui.theme.TextMuted
 import kotlinx.coroutines.launch
 
 @Composable
-fun RemoteInputScreen(
-    onBack: () -> Unit,
-    onMeshParty: (() -> Unit)? = null,
-    // Land on the keyboard instead of the gamepad (hub menu's Keyboard card).
-    startInKeyboard: Boolean = false,
-) {
+fun RemoteInputScreen(onBack: () -> Unit) {
     val context = LocalContext.current
     val prefs = remember { ServerPreferences(context) }
     val scope = rememberCoroutineScope()
@@ -70,9 +61,8 @@ fun RemoteInputScreen(
     val savedServers by prefs.savedServers.collectAsState(initial = emptyList())
     val activeServer by prefs.activeServer.collectAsState(initial = null)
 
-    var isGamepadMode by remember { mutableStateOf(!startInKeyboard) }
+    var isGamepadMode by remember { mutableStateOf(true) }
     var showModal by remember { mutableStateOf(false) }
-    var showQrScanner by remember { mutableStateOf(false) }
     var controllerStyle by remember { mutableStateOf(ControllerStyle.DARK) }
     var playerId by remember { mutableStateOf(0) }  // 0 = broadcast, 1 = P1, 2 = P2
 
@@ -97,9 +87,6 @@ fun RemoteInputScreen(
         playerId = when (playerId) { 0 -> 1; 1 -> 2; else -> 0 }
         ws.playerId = playerId
     }
-    fun toggleStyle() {
-        controllerStyle = if (controllerStyle == ControllerStyle.CLASSIC) ControllerStyle.DARK else ControllerStyle.CLASSIC
-    }
     val connectionState by ws.state.collectAsState()
     val lifecycleOwner = LocalLifecycleOwner.current
 
@@ -163,7 +150,6 @@ fun RemoteInputScreen(
                 onKey = { ws.sendKey(it) },
                 onMenu = { showModal = true },
                 onPlayerToggle = ::togglePlayer,
-                onToggleStyle = ::toggleStyle,
             )
             isGamepadMode && !isLandscape -> NESPortraitController(
                 style = controllerStyle,
@@ -174,7 +160,6 @@ fun RemoteInputScreen(
                 onMouseScroll = { ws.sendScroll(it) },
                 onMenu = { showModal = true },
                 onPlayerToggle = ::togglePlayer,
-                onToggleStyle = ::toggleStyle,
             )
             else -> {
                 // Keyboard mode: trackpad fills top, keyboard pinned bottom
@@ -184,7 +169,7 @@ fun RemoteInputScreen(
                             onMove = { dx, dy -> ws.sendMouseMove(dx, dy) },
                             onClick = { ws.sendClick(it) },
                             onScroll = { ws.sendScroll(it) },
-                            onThreeFingerHold = { showModal = true },
+                            onTwoFingerHold = { showModal = true },
                             modifier = Modifier.fillMaxWidth().weight(1f)
                                 .padding(horizontal = 16.dp, vertical = 8.dp),
                         )
@@ -194,20 +179,12 @@ fun RemoteInputScreen(
                             modifier = Modifier.fillMaxWidth(),
                         )
                     }
-                    // Settings + style icons top-right in keyboard mode
-                    Row(
-                        Modifier.align(Alignment.TopEnd).padding(8.dp),
-                        horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    ) {
-                        com.archipelago.app.ui.components.SettingsBtn(
-                            c = com.archipelago.app.ui.components.paletteFor(controllerStyle),
-                            onClick = { showModal = true },
-                        )
-                        com.archipelago.app.ui.components.StyleBtn(
-                            c = com.archipelago.app.ui.components.paletteFor(controllerStyle),
-                            onClick = ::toggleStyle,
-                        )
-                    }
+                    // Settings icon top-right in keyboard mode
+                    com.archipelago.app.ui.components.SettingsBtn(
+                        c = com.archipelago.app.ui.components.paletteFor(controllerStyle),
+                        modifier = Modifier.align(Alignment.TopEnd).padding(8.dp),
+                        onClick = { showModal = true },
+                    )
                 }
             }
         }
@@ -230,6 +207,8 @@ fun RemoteInputScreen(
             visible = showModal,
             servers = savedServers,
             activeServer = activeServer,
+            isGamepadMode = isGamepadMode,
+            controllerStyle = controllerStyle,
             onDismiss = { showModal = false },
             onSelectServer = { server ->
                 scope.launch { ws.disconnect(); prefs.setActiveServer(server) }; showModal = false
@@ -237,7 +216,6 @@ fun RemoteInputScreen(
             onAddServer = { server ->
                 scope.launch { prefs.addSavedServer(server); if (activeServer == null) prefs.setActiveServer(server) }
             },
-            onScanQr = { showQrScanner = true },
             onEditServer = { original, updated ->
                 scope.launch {
                     prefs.updateSavedServer(original, updated)
@@ -263,25 +241,11 @@ fun RemoteInputScreen(
                     }
                 }
             },
-            onRemote = { isGamepadMode = true; showModal = false },
-            onKeyboard = { isGamepadMode = false; showModal = false },
-            onBackToWebView = { showModal = false; onBack() },
-            onMeshParty = onMeshParty?.let { open -> { showModal = false; open() } },
-        )
-
-        // Pairing-QR scan launched from the menu's Add Server row. The menu stays
-        // open behind the scanner so the new entry appears as soon as it closes.
-        QrScannerOverlay(
-            visible = showQrScanner,
-            onDismiss = { showQrScanner = false },
-            onServerScanned = { scan ->
-                showQrScanner = false
-                scope.launch {
-                    val merged = prefs.upsertServer(scan.server)
-                    FipsManager.registerNode(context, scan.fips, merged.displayName())
-                    if (activeServer == null) prefs.setActiveServer(merged)
-                }
+            onToggleMode = { isGamepadMode = !isGamepadMode; showModal = false },
+            onToggleStyle = {
+                controllerStyle = if (controllerStyle == ControllerStyle.CLASSIC) ControllerStyle.DARK else ControllerStyle.CLASSIC
             },
+            onBackToWebView = { showModal = false; onBack() },
         )
     }
 }

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

@@ -43,7 +43,6 @@ import androidx.compose.material3.Switch
 import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -71,12 +70,8 @@ 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.PairResult
 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.QrScannerOverlay
 import com.archipelago.app.ui.theme.BitcoinOrange
 import com.archipelago.app.ui.theme.ErrorRed
 import com.archipelago.app.ui.theme.SurfaceBlack
@@ -86,7 +81,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.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.net.HttpURLConnection
@@ -99,9 +93,6 @@ import javax.net.ssl.X509TrustManager
 fun ServerConnectScreen(
     onConnected: (String) -> Unit,
     onRemoteInput: () -> Unit = {},
-    // Prefill from a pairing deep link (archipelago://pair) that carried no
-    // password — opens the manual form on the password prompt for that server.
-    initialServer: ServerEntry? = null,
 ) {
     val context = LocalContext.current
     val prefs = remember { ServerPreferences(context) }
@@ -118,9 +109,6 @@ fun ServerConnectScreen(
     var errorMessage by remember { mutableStateOf<String?>(null) }
     // The saved server currently being edited, or null when adding/connecting.
     var editingServer by remember { mutableStateOf<ServerEntry?>(null) }
-    // 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) }
 
     val savedServers by prefs.savedServers.collectAsState(initial = emptyList())
 
@@ -173,35 +161,10 @@ fun ServerConnectScreen(
         errorMessage = null
 
         scope.launch {
-            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. Bring the tunnel up and probe the ULA before failing.
-            if (!reachable && server.meshIp.isNotBlank()) {
-                FipsManager.autoStartIfReady(context)
-                val meshServer = server.copy(
-                    address = server.meshIp,
-                    useHttps = false,
-                    port = "",
-                )
-                // Mesh discovery + first session can take 15s+ through the
-                // public tree (HANDOFF-2026-07-23 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)
-                }
-            }
+            val result = testConnection(server)
             isConnecting = false
 
-            if (reachable) {
+            if (result) {
                 prefs.setActiveServer(server)
                 onConnected(server.toUrl())
             } else {
@@ -210,39 +173,6 @@ fun ServerConnectScreen(
         }
     }
 
-    fun prefill(server: ServerEntry) {
-        name = server.name
-        address = server.address
-        port = server.port
-        password = server.password
-        useHttps = server.useHttps
-    }
-
-    // Pairing QR scanned: dedupe against saved servers, then either auto-connect
-    // (payload carried a credential — demo password or a real node's device
-    // token) or land on the password prompt with everything else filled in.
-    // Mesh info (when present) is registered so the FIPS tunnel comes up too.
-    fun onQrScanned(scan: PairResult.Success) {
-        showScanner = false
-        scope.launch {
-            val merged = prefs.upsertServer(scan.server)
-            FipsManager.registerNode(context, scan.fips, merged.displayName())
-            prefill(merged)
-            if (merged.password.isNotBlank()) {
-                connect(merged)
-            } else {
-                manualMode = true
-            }
-        }
-    }
-
-    LaunchedEffect(initialServer) {
-        if (initialServer != null) {
-            prefill(prefs.upsertServer(initialServer))
-            manualMode = true
-        }
-    }
-
     Box(
         modifier = Modifier
             .fillMaxSize()
@@ -278,10 +208,7 @@ fun ServerConnectScreen(
                 .padding(horizontal = 24.dp)
                 .padding(top = 48.dp, bottom = 32.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
-            // Center the content vertically — the landing (logo + two buttons) is
-            // short and looks stranded at the top otherwise. Taller content (the
-            // manual form, saved servers) still scrolls from the top as normal.
-            verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically),
+            verticalArrangement = Arrangement.spacedBy(16.dp),
         ) {
             // Circular badge logo
             Image(
@@ -299,10 +226,8 @@ fun ServerConnectScreen(
                 textAlign = TextAlign.Center,
             )
 
-            val showForm = manualMode || editingServer != null
-
             Text(
-                text = if (showForm) stringResource(R.string.server_address_hint) else stringResource(R.string.connect_landing_hint),
+                text = stringResource(R.string.server_address_hint),
                 style = MaterialTheme.typography.bodyMedium,
                 color = TextMuted,
                 textAlign = TextAlign.Center,
@@ -310,25 +235,8 @@ fun ServerConnectScreen(
 
             Spacer(modifier = Modifier.height(4.dp))
 
-            if (!showForm) {
-                // Landing: scan the pairing QR, or fall back to manual entry
-                GlassButton(
-                    text = stringResource(R.string.scan_node_qr),
-                    onClick = { showScanner = true },
-                    modifier = Modifier.fillMaxWidth().height(56.dp),
-                )
-                GlassButton(
-                    text = stringResource(R.string.enter_manually),
-                    onClick = {
-                        errorMessage = null
-                        manualMode = true
-                    },
-                    modifier = Modifier.fillMaxWidth().height(56.dp),
-                )
-            }
-
             // Glass card with form
-            if (showForm) Box(
+            Box(
                 modifier = Modifier
                     .fillMaxWidth()
                     .clip(RoundedCornerShape(16.dp))
@@ -550,30 +458,16 @@ fun ServerConnectScreen(
                         modifier = Modifier.weight(1f).height(56.dp),
                     )
                 }
-            } else if (manualMode) {
-                // Back to the Scan/Manual landing + Connect
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(12.dp),
-                ) {
-                    GlassButton(
-                        text = stringResource(R.string.back),
-                        onClick = {
-                            keyboard?.hide()
-                            manualMode = false
-                            clearForm()
-                        },
-                        modifier = Modifier.weight(1f).height(56.dp),
-                    )
-                    GlassButton(
-                        text = if (isConnecting) stringResource(R.string.connecting) else stringResource(R.string.connect),
-                        onClick = {
-                            keyboard?.hide()
-                            connect(ServerEntry(address, useHttps, port, password, name))
-                        },
-                        modifier = Modifier.weight(2f).height(56.dp),
-                    )
-                }
+            } else {
+                // Connect button — glass style
+                GlassButton(
+                    text = if (isConnecting) stringResource(R.string.connecting) else stringResource(R.string.connect),
+                    onClick = {
+                        keyboard?.hide()
+                        connect(ServerEntry(address, useHttps, port, password, name))
+                    },
+                    modifier = Modifier.fillMaxWidth().height(56.dp),
+                )
             }
 
             if (isConnecting) {
@@ -605,20 +499,6 @@ fun ServerConnectScreen(
                 }
             }
         }
-
-        QrScannerOverlay(
-            visible = showScanner,
-            onDismiss = { showScanner = false },
-            onServerScanned = { onQrScanned(it) },
-        )
-
-        // Full-screen branded loader while the first connect runs — most
-        // visibly right after a pairing-QR scan, when the mesh may still be
-        // 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()
-        }
     }
 }
 
@@ -686,10 +566,8 @@ private fun sanitizeAddress(input: String): String {
         .trimEnd('/')
 }
 
-/** 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+). */
-private suspend fun testConnection(server: ServerEntry, timeoutMs: Int = 5000): Boolean {
+/** Test RPC connectivity. Accepts self-signed certs for local LAN servers. */
+private suspend fun testConnection(server: ServerEntry): Boolean {
     return withContext(Dispatchers.IO) {
         try {
             val url = URL("${server.toUrl()}/rpc/v1")
@@ -709,8 +587,8 @@ private suspend fun testConnection(server: ServerEntry, timeoutMs: Int = 5000):
             }
 
             connection.requestMethod = "POST"
-            connection.connectTimeout = timeoutMs
-            connection.readTimeout = timeoutMs
+            connection.connectTimeout = 5000
+            connection.readTimeout = 5000
             connection.setRequestProperty("Content-Type", "application/json")
             connection.doOutput = true
             val body = """{"method":"server.echo","params":{"message":"ping"}}"""

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

@@ -11,7 +11,6 @@
     <string name="welcome_title">Your Sovereign\nPersonal Server</string>
     <string name="welcome_subtitle">Bitcoin node, app platform, and private cloud — all in one box you control.</string>
     <string name="get_started">Get Started</string>
-    <string name="mesh_party">Mesh Party</string>
     <string name="use_https">Use HTTPS</string>
     <string name="port_label">Port (optional)</string>
     <string name="saved_servers">Saved Servers</string>
@@ -30,23 +29,7 @@
     <string name="server_name_label">Server Name (optional)</string>
     <string name="server_name_placeholder">My Archipelago</string>
     <string name="edit_server">Edit</string>
-    <string name="scan_node_qr">Scan Node\'s QR</string>
-    <string name="enter_manually">Enter Manually</string>
-    <string name="connect_landing_hint">Scan the pairing QR from your node\'s Companion popup, or enter the address manually</string>
-    <string name="scan_qr_hint">Point the camera at the pairing QR shown in the Companion popup</string>
-    <string name="camera_permission_needed">Camera access is needed to scan the pairing QR. You can also enter the server details manually.</string>
-    <string name="grant_camera_access">Grant Camera Access</string>
-    <string name="invalid_pairing_qr">Not an Archipelago pairing code</string>
-    <string name="update_app_for_qr">This pairing code needs a newer app version — please update the companion app</string>
-    <string name="add_server_qr">Add server by QR</string>
     <string name="edit_server_title">Edit Server</string>
     <string name="save_changes">Save Changes</string>
     <string name="cancel">Cancel</string>
-    <string name="gesture_hint_title">Hold with three fingers</string>
-    <string name="gesture_hint_body">Anywhere in the app — opens the remote control and menu</string>
-    <string name="gesture_hint_got_it">Got it</string>
-    <string name="scan_to_send">Scan to send</string>
-    <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>
 </resources>

Android/app/src/main/res/xml/file_paths.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- FileProvider scope for the party-screen "Share this app" APK handoff. -->
-<paths>
-    <cache-path name="share" path="share/" />
-</paths>

Android/rust/archy-fips-core/Cargo.toml

@@ -1,48 +0,0 @@
-# Embedded FIPS mesh node for the Archipelago companion app.
-#
-# Built for Android via cargo-ndk (see Android/app/build.gradle.kts, task
-# buildRustArm64) into app/src/main/jniLibs/arm64-v8a/libarchy_fips_core.so.
-# Also builds on the host so `cargo test` covers the non-JNI logic.
-#
-# `fips` is pinned to the fips-native fork rev that this integration was
-# developed against — the fork carries Android support upstream lacks
-# (Tun::from_fd for a VpnService-owned fd, cfg(target_os = "android") paths).
-# Override with a local checkout when hacking on fips itself:
-#   CARGO_NET_OFFLINE=false cargo ndk ... --config 'patch."https://github.com/9qeklajc/fips-native".fips.path="/path/to/fips-native/fips"'
-[package]
-name = "archy-fips-core"
-version = "0.1.0"
-edition = "2021"
-license = "MIT"
-publish = false
-
-[lib]
-name = "archy_fips_core"
-# rlib for host tests; cdylib for the Android shared library.
-crate-type = ["lib", "cdylib"]
-
-[dependencies]
-# default-features drops the ratatui TUI; tun-support enables Node::start_with_tun_fd.
-# Zazawowow/fips-native `fast-join-pinned` = upstream pinned rev 46494a74 +
-# discovery re-fire on topology change (fresh 5G join: first route no longer
-# waits out doomed pre-join lookups). Upstream 9qeklajc denies pushes.
-fips = { git = "https://github.com/Zazawowow/fips-native", rev = "07d21d4482be56b14295d2525e41f8386d1bfe6f", default-features = false, features = ["tun-support"] }
-anyhow = "1.0"
-serde_json = "1.0"
-hex = "0.4"
-# OS CSPRNG for identity generation (crypto rule: no thread-local RNG for keys).
-getrandom = "0.2"
-tokio = { version = "1", features = ["rt-multi-thread", "sync", "time", "macros"] }
-tracing = "0.1"
-# fcntl: force the VpnService TUN fd into blocking mode (see mesh::start).
-libc = "0.2"
-
-# The JNI surface only exists on Android; host builds skip it and drive the
-# mesh module directly (tests).
-[target.'cfg(target_os = "android")'.dependencies]
-jni = "0.21"
-# Bridge `tracing` (ours + fips) to logcat: `adb logcat -s archy-fips`.
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-paranoid-android = "0.2"
-
-[workspace]

Android/rust/archy-fips-core/src/jni_glue.rs

@@ -1,129 +0,0 @@
-//! JNI surface for `com.archipelago.app.fips.FipsNative` — JSON over strings,
-//! no codegen (the myco / nostr-vpn embedding pattern). Errors come back as
-//! `{"error": "…"}` so Kotlin never sees a raw exception from native code.
-
-use std::sync::Once;
-
-use jni::objects::{JClass, JString};
-use jni::sys::{jboolean, jint, jstring};
-use jni::JNIEnv;
-
-use crate::mesh;
-
-static LOG_INIT: Once = Once::new();
-
-fn init_logging() {
-    LOG_INIT.call_once(|| {
-        use tracing_subscriber::layer::SubscriberExt;
-        use tracing_subscriber::util::SubscriberInitExt;
-        let _ = tracing_subscriber::registry()
-            .with(tracing_subscriber::EnvFilter::new("info"))
-            .with(paranoid_android::layer("archy-fips"))
-            .try_init();
-    });
-}
-
-fn jstr(env: &mut JNIEnv, s: &JString) -> String {
-    env.get_string(s).map(|s| s.into()).unwrap_or_default()
-}
-
-fn out(env: &JNIEnv, s: String) -> jstring {
-    env.new_string(s)
-        .map(|s| s.into_raw())
-        .unwrap_or(std::ptr::null_mut())
-}
-
-fn err_json(e: impl std::fmt::Display) -> String {
-    serde_json::json!({ "error": e.to_string() }).to_string()
-}
-
-fn identity_json(info: &mesh::IdentityInfo) -> String {
-    serde_json::json!({
-        "secret": info.secret_hex,
-        "npub": info.npub,
-        "address": info.address,
-    })
-    .to_string()
-}
-
-/// Kotlin: `external fun generateIdentity(): String`
-#[no_mangle]
-pub extern "system" fn Java_com_archipelago_app_fips_FipsNative_generateIdentity(
-    env: JNIEnv,
-    _class: JClass,
-) -> jstring {
-    init_logging();
-    let json = match mesh::generate_identity() {
-        Ok(info) => identity_json(&info),
-        Err(e) => err_json(e),
-    };
-    out(&env, json)
-}
-
-/// Kotlin: `external fun deriveIdentity(secret: String): String`
-#[no_mangle]
-pub extern "system" fn Java_com_archipelago_app_fips_FipsNative_deriveIdentity(
-    mut env: JNIEnv,
-    _class: JClass,
-    secret: JString,
-) -> jstring {
-    init_logging();
-    let secret = jstr(&mut env, &secret);
-    let json = match mesh::derive_identity(&secret) {
-        Ok(info) => identity_json(&info),
-        Err(e) => err_json(e),
-    };
-    out(&env, json)
-}
-
-/// Kotlin: `external fun start(secret: String, peersJson: String, tunFd: Int, listenPort: Int): String`
-/// Returns `{"npub": "...", "address": "..."}` or `{"error": "..."}`.
-/// `listenPort` 0 = outbound-only; non-zero = fixed UDP bind (party mode).
-#[no_mangle]
-pub extern "system" fn Java_com_archipelago_app_fips_FipsNative_start(
-    mut env: JNIEnv,
-    _class: JClass,
-    secret: JString,
-    peers_json: JString,
-    tun_fd: jint,
-    listen_port: jint,
-) -> jstring {
-    init_logging();
-    let secret = jstr(&mut env, &secret);
-    let peers = jstr(&mut env, &peers_json);
-    let listen_port = u16::try_from(listen_port).unwrap_or(0);
-    let json = match mesh::start(&secret, &peers, tun_fd, listen_port) {
-        Ok((npub, address)) => {
-            serde_json::json!({ "npub": npub, "address": address }).to_string()
-        }
-        Err(e) => err_json(e),
-    };
-    out(&env, json)
-}
-
-/// Kotlin: `external fun stop()`
-#[no_mangle]
-pub extern "system" fn Java_com_archipelago_app_fips_FipsNative_stop(
-    _env: JNIEnv,
-    _class: JClass,
-) {
-    mesh::stop();
-}
-
-/// Kotlin: `external fun isRunning(): Boolean`
-#[no_mangle]
-pub extern "system" fn Java_com_archipelago_app_fips_FipsNative_isRunning(
-    _env: JNIEnv,
-    _class: JClass,
-) -> jboolean {
-    mesh::is_running() as jboolean
-}
-
-/// Kotlin: `external fun statusJson(): String`
-#[no_mangle]
-pub extern "system" fn Java_com_archipelago_app_fips_FipsNative_statusJson(
-    env: JNIEnv,
-    _class: JClass,
-) -> jstring {
-    out(&env, mesh::status_json())
-}

Android/rust/archy-fips-core/src/lib.rs

@@ -1,17 +0,0 @@
-//! Embedded FIPS mesh node for the Archipelago companion app.
-//!
-//! The phone runs a real, leaf-only FIPS node in-process: Android's
-//! `VpnService` owns the TUN fd (routing only `fd00::/8`, so normal traffic
-//! never touches the tunnel) and hands it to [`fips::Node::start_with_tun_fd`].
-//! Peering is outbound-only — the pairing QR carries the node's npub and
-//! transport endpoints, and FIPS nodes accept inbound peers without prior
-//! registration, so no server-side enrollment step exists.
-//!
-//! The JNI surface (`jni_glue`, Android-only) is deliberately tiny and
-//! JSON-over-strings, mirroring the myco / nostr-vpn embedding pattern:
-//! `generateIdentity`, `deriveIdentity`, `start`, `stop`, `isRunning`.
-
-pub mod mesh;
-
-#[cfg(target_os = "android")]
-mod jni_glue;

Android/rust/archy-fips-core/src/mesh.rs

@@ -1,295 +0,0 @@
-//! Mesh lifecycle: identity, config assembly, and the node task.
-//!
-//! Host-buildable (no JNI) so the config/identity logic is unit-testable;
-//! only [`start`] needs a real TUN fd and therefore only runs on-device.
-
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, Mutex};
-use std::time::Duration;
-
-use anyhow::{anyhow, Context, Result};
-use fips::config::{PeerConfig, TransportInstances, UdpConfig};
-use fips::{Config, Identity, Node};
-use tokio::sync::Notify;
-
-/// How long `start` waits for the node to come up (TUN attach + transports).
-const START_TIMEOUT: Duration = Duration::from_secs(15);
-
-/// How long `stop` waits for the node task to drain.
-const STOP_TIMEOUT: Duration = Duration::from_secs(5);
-
-struct MeshHandle {
-    runtime: tokio::runtime::Runtime,
-    task: Option<tokio::task::JoinHandle<()>>,
-    shutdown: Arc<Notify>,
-    running: Arc<AtomicBool>,
-    npub: String,
-    address: String,
-}
-
-static MESH: Mutex<Option<MeshHandle>> = Mutex::new(None);
-
-#[derive(Debug, Clone)]
-pub struct IdentityInfo {
-    pub secret_hex: String,
-    pub npub: String,
-    /// The phone's own ULA on the mesh (fd::/8), for VpnService.addAddress.
-    pub address: String,
-}
-
-/// Generate a fresh mesh identity from the OS CSPRNG.
-pub fn generate_identity() -> Result<IdentityInfo> {
-    // ~1 in 2^128 chance a candidate is off the curve; loop regardless.
-    loop {
-        let mut bytes = [0u8; 32];
-        getrandom::getrandom(&mut bytes).context("OS RNG")?;
-        if let Ok(id) = Identity::from_secret_bytes(&bytes) {
-            return Ok(IdentityInfo {
-                secret_hex: hex::encode(bytes),
-                npub: id.npub(),
-                address: id.address().to_ipv6().to_string(),
-            });
-        }
-    }
-}
-
-/// Re-derive npub + ULA from a stored secret.
-pub fn derive_identity(secret: &str) -> Result<IdentityInfo> {
-    let id = Identity::from_secret_str(secret).map_err(|e| anyhow!("bad secret: {e}"))?;
-    Ok(IdentityInfo {
-        secret_hex: secret.to_string(),
-        npub: id.npub(),
-        address: id.address().to_ipv6().to_string(),
-    })
-}
-
-/// Build the phone-side node config: leaf-only (never routes third-party
-/// traffic — battery), no DNS responder, TUN enabled but attached to the
-/// VpnService fd rather than created.
-///
-/// `listen_port` 0 = ephemeral UDP (outbound-only, the default posture).
-/// Non-zero = fixed UDP bind so a nearby phone can dial us directly over a
-/// local link (party mode); leaf_only still guarantees we never carry
-/// third-party transit even while accepting an inbound link.
-pub fn build_config(secret: &str, peers: Vec<PeerConfig>, listen_port: u16) -> Config {
-    let mut cfg = Config::default();
-    cfg.node.identity.nsec = Some(secret.to_string());
-    cfg.node.identity.persistent = false;
-    cfg.node.leaf_only = true;
-    cfg.tun.enabled = true;
-    cfg.tun.mtu = Some(1280);
-    cfg.dns.enabled = false;
-    cfg.transports.udp = TransportInstances::Single(UdpConfig {
-        bind_addr: Some(format!("0.0.0.0:{listen_port}")),
-        ..Default::default()
-    });
-    // TCP with no bind_addr = outbound-only (fallback when UDP is blocked).
-    cfg.transports.tcp = TransportInstances::Single(Default::default());
-    // Fast-connect profile — a phone opens the app and expects the node NOW.
-    // Stock pacing is tuned for always-on routers: a failed discovery backs
-    // off 30s, session resends gap out to 8-16s, dead links redial at
-    // 5s→300s. Over 5G that stacked into a ~40s first connect (observed
-    // 2026-07-24: anchor +10s, session +40s). Retries only fire while a
-    // link/session is down, so steady-state traffic is unchanged.
-    cfg.node.retry.base_interval_secs = 1; // dead-link redial 1s,2s,4s…
-    cfg.node.retry.max_backoff_secs = 30; // …capped at 30s, not 5 min
-    cfg.node.retry.max_retries = 30;
-    cfg.node.rate_limit.handshake_resend_interval_ms = 400;
-    cfg.node.rate_limit.handshake_resend_backoff = 1.5;
-    cfg.node.rate_limit.handshake_max_resends = 10;
-    cfg.node.discovery.backoff_base_secs = 1; // failed lookup retries fast
-    cfg.node.discovery.backoff_max_secs = 30;
-    cfg.node.discovery.retry_interval_secs = 2;
-    cfg.node.discovery.max_attempts = 3;
-    // Lookups launched before the tree position settles are doomed; a 10s
-    // completion timeout made each one cost 10s before the 1s retry could
-    // fire (observed: 19s to a route on a fresh join). Fail fast instead —
-    // the resend-within-window above still gives each attempt two shots.
-    cfg.node.discovery.timeout_secs = 5;
-    cfg.peers = peers;
-    cfg
-}
-
-/// Parse the peers JSON handed over from Kotlin. Shape = fips `PeerConfig`:
-/// `[{"npub":"…","alias":"…","addresses":[{"transport":"udp","addr":"host:2121","priority":10},…]}]`
-pub fn parse_peers(peers_json: &str) -> Result<Vec<PeerConfig>> {
-    serde_json::from_str(peers_json).context("peers JSON")
-}
-
-/// Start the mesh node on the given TUN fd (from `VpnService.establish()`,
-/// detached — the node owns it from here). Returns (npub, ula) on success.
-/// Any previously running node is stopped first.
-pub fn start(secret: &str, peers_json: &str, tun_fd: i32, listen_port: u16) -> Result<(String, String)> {
-    stop();
-
-    // Android hands the VpnService TUN fd over in non-blocking mode on some
-    // OS builds. The fips TUN reader is a dedicated blocking-read thread that
-    // treats EAGAIN as fatal — the loop died at startup ("TUN read error …
-    // Try again (os error 11)" on-device), so sessions came up but no packet
-    // ever entered the mesh. Force the fd into the blocking mode the reader
-    // is designed for.
-    unsafe {
-        let flags = libc::fcntl(tun_fd, libc::F_GETFL);
-        if flags >= 0 && (flags & libc::O_NONBLOCK) != 0 {
-            libc::fcntl(tun_fd, libc::F_SETFL, flags & !libc::O_NONBLOCK);
-        }
-    }
-
-    let peers = parse_peers(peers_json)?;
-    let config = build_config(secret, peers, listen_port);
-    let mut node = Node::new(config).map_err(|e| anyhow!("node init: {e}"))?;
-    let npub = node.npub();
-    let address = node.identity().address().to_ipv6().to_string();
-
-    let runtime = tokio::runtime::Builder::new_multi_thread()
-        .worker_threads(2)
-        .enable_all()
-        .thread_name("archy-fips")
-        .build()
-        .context("tokio runtime")?;
-
-    let shutdown = Arc::new(Notify::new());
-    let running = Arc::new(AtomicBool::new(false));
-    let (started_tx, started_rx) = tokio::sync::oneshot::channel::<Result<()>>();
-
-    let task = {
-        let shutdown = shutdown.clone();
-        let running = running.clone();
-        runtime.spawn(async move {
-            match node.start_with_tun_fd(tun_fd).await {
-                Ok(()) => {
-                    running.store(true, Ordering::SeqCst);
-                    let _ = started_tx.send(Ok(()));
-                }
-                Err(e) => {
-                    let _ = started_tx.send(Err(anyhow!("node start: {e}")));
-                    return;
-                }
-            }
-            tokio::select! {
-                result = node.run_rx_loop() => {
-                    if let Err(e) = result {
-                        tracing::error!("mesh rx loop error: {e}");
-                    }
-                }
-                _ = shutdown.notified() => {}
-            }
-            if let Err(e) = node.stop().await {
-                tracing::warn!("mesh stop: {e}");
-            }
-            running.store(false, Ordering::SeqCst);
-        })
-    };
-
-    let started = runtime
-        .block_on(async { tokio::time::timeout(START_TIMEOUT, started_rx).await })
-        .map_err(|_| anyhow!("node start timed out"))?
-        .map_err(|_| anyhow!("node task died during start"))?;
-    if let Err(e) = started {
-        runtime.shutdown_background();
-        return Err(e);
-    }
-
-    *MESH.lock().unwrap() = Some(MeshHandle {
-        runtime,
-        task: Some(task),
-        shutdown,
-        running,
-        npub: npub.clone(),
-        address: address.clone(),
-    });
-    Ok((npub, address))
-}
-
-/// Stop the mesh node if running. Idempotent.
-pub fn stop() {
-    let Some(mut handle) = MESH.lock().unwrap().take() else {
-        return;
-    };
-    handle.shutdown.notify_waiters();
-    if let Some(task) = handle.task.take() {
-        let _ = handle
-            .runtime
-            .block_on(async { tokio::time::timeout(STOP_TIMEOUT, task).await });
-    }
-    handle.runtime.shutdown_background();
-}
-
-pub fn is_running() -> bool {
-    MESH.lock()
-        .unwrap()
-        .as_ref()
-        .map(|h| h.running.load(Ordering::SeqCst))
-        .unwrap_or(false)
-}
-
-/// `{running, npub, address}` for the Kotlin status surface.
-pub fn status_json() -> String {
-    let guard = MESH.lock().unwrap();
-    match guard.as_ref() {
-        Some(h) => serde_json::json!({
-            "running": h.running.load(Ordering::SeqCst),
-            "npub": h.npub,
-            "address": h.address,
-        })
-        .to_string(),
-        None => serde_json::json!({ "running": false }).to_string(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn identity_roundtrip() {
-        let a = generate_identity().unwrap();
-        let b = derive_identity(&a.secret_hex).unwrap();
-        assert_eq!(a.npub, b.npub);
-        assert_eq!(a.address, b.address);
-        // ULA in fd::/8
-        assert!(a.address.starts_with("fd"));
-    }
-
-    #[test]
-    fn peers_json_parses_into_peer_config() {
-        let peers = parse_peers(
-            r#"[{
-                "npub": "npub1abc",
-                "alias": "My Archipelago",
-                "addresses": [
-                    {"transport": "udp", "addr": "192.168.1.228:2121", "priority": 10},
-                    {"transport": "tcp", "addr": "192.168.1.228:8443", "priority": 20}
-                ]
-            }]"#,
-        )
-        .unwrap();
-        assert_eq!(peers.len(), 1);
-        assert_eq!(peers[0].addresses.len(), 2);
-        assert!(peers[0].is_auto_connect());
-    }
-
-    #[test]
-    fn config_is_leaf_only_with_tun() {
-        let id = generate_identity().unwrap();
-        let cfg = build_config(&id.secret_hex, vec![], 0);
-        assert!(cfg.node.leaf_only);
-        assert!(cfg.tun.enabled);
-        assert_eq!(cfg.tun.mtu(), 1280);
-        assert!(!cfg.dns.enabled);
-        assert!(!cfg.transports.udp.is_empty());
-        assert!(!cfg.transports.tcp.is_empty());
-    }
-
-    #[test]
-    fn listen_port_sets_fixed_udp_bind() {
-        let id = generate_identity().unwrap();
-        let cfg = build_config(&id.secret_hex, vec![], 2121);
-        // Party mode keeps leaf_only — accepting a link is not routing transit.
-        assert!(cfg.node.leaf_only);
-        let TransportInstances::Single(udp) = &cfg.transports.udp else {
-            panic!("expected single UDP transport");
-        };
-        assert_eq!(udp.bind_addr.as_deref(), Some("0.0.0.0:2121"));
-    }
-}

CHANGELOG.md

@@ -1,172 +1,5 @@
 # Changelog
 
-## v1.7.117-alpha (2026-07-27)
-
-- FIPS startup is more reliable on nodes that have the packaged `fips.service` instead of Archipelago's `archipelago-fips.service`. Startup self-heal, onboarding, dashboard Start, and reconnect now use the systemd unit the node actually has, so FIPS no longer looks like it needs to be installed when it only needs to be started.
-- App screens over the FIPS mesh now bind their relay only to the node's FIPS address instead of reserving the same host ports Podman needs. This keeps apps such as FileBrowser and Botfights from restart-looping because the backend was already holding their published ports.
-- Companion WebView safe-area handling now also moves fixed and sticky top bars below the phone status bar, including headers mounted after page load by single-page apps.
-- Public-source preparation now includes a Nostr Git hosting plan using `ngit`, NIP-34, and GRASP: anyone can clone, fork, review, and propose changes from their Archipelago node, while canonical merge authority stays with a small signed maintainer set in the style of Bitcoin Core.
-- Node OS release notes for v1.7.117 are still open; add any installer, service, kernel, firewall, or package changes here before cutting the release.
-
-## v1.7.116-alpha (2026-07-27)
-
-- Nodes no longer get stuck on "server starting up" after an update or reboot. On a node running many apps, the backend used to spend minutes recovering containers before it told the system it was ready, and anything that touched it during that window could leave it down for good. It now reports ready immediately and recovers in the background, and it always restarts itself if it ever does go down.
-- Installing apps no longer crashes the node. A change that made app screens reachable over the mesh was accidentally holding onto every app's network port in advance — so installing an app like Grafana, Photoprism, Uptime Kuma, or Jellyfin collided with it and the port-cleanup step took the whole backend down, rolling the install back. Installs are now clean and the backend can never be caught by that cleanup.
-- Rolls up everything from v1.7.115: app screens and the dashboard load over the mesh out of the box (firewall openings shipped automatically, IPv6 support end to end), and nodes rejoin the mesh in seconds after their rendezvous point restarts.
-
-## v1.7.115-alpha (2026-07-26)
-
-- The companion app can reach your node's screen from anywhere again. The recent security hardening locked down the node's mesh interface so tightly that the dashboard itself was blocked — the phone would pair and connect, then sit on a blank screen. The node now explicitly opens its own web interface (and only that) through the mesh firewall on every install and upgrade, so the phone's view of your node works out of the box, on any network, and can't silently break in a future update.
-- The node's web interface also answers on IPv6 everywhere it answers on IPv4 — the mesh runs entirely on IPv6, and one v4-only listener was enough to make a working connection show nothing.
-- Nodes now come back onto the mesh in seconds instead of minutes after their rendezvous anchor restarts: the fast-reconnect tuning proven on the phone this week is now baked into every node's mesh configuration, and it survives upgrades.
-
-## v1.7.114-alpha (2026-07-26)
-
-- Plugging in a mesh radio no longer traps it in an endless reboot loop. The device detector itself was causing it: every scan pulsed the radio's reset line, the same board was probed twice under two names, and retries came so fast the radio never finished booting before the next reset hit. Detection now gives the board real time to boot, probes it once, backs off properly between attempts, and no longer fights the "device detected" popup for the port. Radios that could never connect now come up within a minute of being plugged in.
-- The Lightning channels screen now has All / Active / Pending / Closed tabs. Pending gathers everything in motion (opening, closing, force-closing — each with its own status dot and a link to the closing transaction), and Closed is a real history: how each channel ended, what settled back to you, and the closing transaction for each.
-- Sending bitcoin on-chain now puts you in charge of the network fee: pick Fast, Standard, or Slow (Standard is the default), or set your own target blocks or sats-per-vByte. The confirmation step shows the estimated fee for your chosen speed before any money moves.
-- Type on-chain amounts in whichever unit you think in — a sats/BTC switch on the amount field converts as you type.
-- Back up your seed by scanning it. Every recovery-phrase screen (onboarding, Settings, and the Lightning wallet seed) now has Words and QR code tabs — words always shown first. The QR for your node's recovery phrase uses the SeedQR standard, so hardware wallets like Passport Prime, SeedSigner, and Keystone can import it with a single scan (a plain-text option remains for wallets that read the phrase as text). The Lightning seed's QR is plain text with an honest note: it's an LND-format seed that restores into Lightning wallets like Zeus or Blixt, not into hardware wallets.
-
-## v1.7.113-alpha (2026-07-25)
-
-- Fixed a money bug in Cashu ecash sends: the token you handed a recipient could carry your own change proofs along with it, letting the same sats be credited twice. Change now stays in your wallet — only the amount you meant to send leaves it.
-- Closing a Lightning channel is no longer a leap of faith. The close used to hang (or time out with an error) even though it had actually gone through; it now comes back within seconds with the closing transaction ID. Channels mid-close appear in the channel list as Closing or Force-closing with their transaction attached, and a new closed-channels history keeps past closes visible instead of letting them vanish from the list.
-- The wallet card now leads with your total bitcoin across everything, and the on-chain balance gets its own chain icon so the rows read at a glance.
-- The companion phone app (0.5.15) connects dramatically faster away from home: a cold connect over 5G dropped from 40+ seconds to about 5. First connects no longer stall on unreachable mesh dial hints, fresh joins fail fast and retry instead of waiting out long timeouts, and the phone re-announces itself the moment the network around it changes. The node side's mesh-join handling was hardened to match.
-
-## v1.7.112-alpha (2026-07-23)
-
-- Sound works on TVs out of the box. Fresh installs were missing the audio system entirely, and even when present a boot-time race left HDMI silent until the cable was unplugged and replugged. Both are fixed: installer images now ship the full audio stack, and a small background helper detects the silent-HDMI state and heals it automatically.
-- Plug in a game controller and drive the whole TV interface with it — navigation, menus, and media playback all respond to the gamepad, and dialogs that pop up are controller-navigable too.
-- The companion phone app took a huge leap (0.5.9). Your node and its apps now work from anywhere — on 5G or any internet connection, the phone reaches the node over the encrypted mesh with zero port forwarding or VPN setup. Startup away from home is instant, apps on your node open inside the app, the phone's native camera handles QR scanning, and a branded full-screen loader shows while the mesh connects.
-- Mesh Party: two phones scan each other's QR and instantly get a direct encrypted chat and app sharing between them — plus a "Share this app" QR that anyone can scan with a normal camera to install the companion app.
-- Pairing a second phone no longer silently logs out the first. Every device now keeps its own named access credential, ending the mystery reconnects when a household paired more than one phone.
-- The companion pairing QR is scannable again (it had grown too dense for phone cameras) and now identifies your node by its identity key, so the app recognizes your node even after it moves or gets a new address.
-- Every app your node serves on your home network is now also reachable over the mesh — remote access covers the apps themselves, not just the dashboard.
-- Selling files: you now choose which payment methods you accept (Lightning, ecash, …) and buyers are only offered those — enforced by the node itself, not just the buttons. Paying twice for the same file is impossible now, purchases file themselves into a new Paid Files tab, purchased music always plays in the bottom-bar player, and videos get picture-in-picture.
-- Sending Lightning is invoice-first: paste or scan an invoice and the amount fills in and locks by itself. An expired invoice now tells you plainly to ask for a fresh one instead of failing cryptically, and payment errors always reach your screen.
-- Sending to a pasted address gets a confirmation step showing exactly what will happen before any money moves, and buying ecash is an explicit two-step — no more accidental purchases.
-- Apps keep running when you change how they're displayed. Switching an app between windowed and fullscreen used to reload it from scratch (stopping any playing media); the app now stays live through the switch, and each app remembers its own preferred display mode.
-- A watchdog notices when the Lightning (LND) node wedges and revives it before you do; Fedi ecash gets its own send option with scannable token QR codes.
-- Fedimint's Lightning gateway and guardian now follow whichever bitcoin version is actually running instead of pointing at a stale address — switching bitcoin versions no longer strands them.
-- If your router starts handing out different addresses, the Pine voice speaker re-links itself automatically instead of staying silent until someone re-configures it.
-- Polish: mesh radios never show garbled device names anymore, the TV kiosk uses slim overlay scrollbars instead of fat grey bars, and the AI chat's background artwork shows through again.
-- Your mesh messages now survive restarts. Chat history — channels and DMs alike — used to live only in memory, so a reboot or update wiped every conversation; worse, other nodes silently discarded the first messages you sent after a reboot. Everything is now saved on the node and restored on startup, and post-reboot messages deliver reliably.
-- Plug in any LoRa radio and the node walks you through it. A setup window appears every time a radio is connected, shows what firmware is already on it (MeshCore, Meshtastic, or Reticulum RNode — with its current name, region, and channels where available), and offers two honest choices: "Set Up with Archipelago Settings" (a preview screen shows exactly what will be written before anything touches the radio) or "Keep As Is" (the radio is used untouched, and you can hot-swap radios freely). Swapping sticks mid-session now just works — including Reticulum RNodes, which fresh installer images now support out of the box.
-- Incoming bitcoin appears in your wallet within seconds of being sent — balance and the yellow "unconfirmed" entry update live, no refresh, no waiting for the next poll.
-- The speaker now announces the very first mesh message a node ever receives, and DMs announce just like channel messages (a safety guard against announcement storms was quietly swallowing them). Announcements also react about twice as fast.
-- Opening a Lightning channel right after the node starts no longer fails with a scary red error. The node quietly retries while Lightning finishes waking up, and if it's still not ready you get a calm "still finishing its startup — try again shortly" notice instead.
-- Viewing a transaction works on every node now, including small ones. Nodes with pruned bitcoin storage can't run the Mempool explorer app; transaction links now open your choice of external explorer instead (tx1138.com by default) — after a clear one-time warning that a third-party server will see which transaction you looked up. Set your preferred explorer in Wallet Settings → the new On-chain tab.
-- Voice commands respond noticeably faster: speech recognition now transcribes in roughly half the time, with identical accuracy on short commands.
-- Scanning a Lightning invoice with your phone's camera is far more reliable — dense invoice QR codes that the photo scanner missed are now read by the phone's native barcode engine.
-- The companion app's pairing QR always contains an address your phone can actually reach. If you manage your node over a VPN (Tailscale), the QR used to embed the VPN address, and pairing silently failed; it now advertises the node's home-network address.
-- Peer requests sent from Nostr discovery now actually arrive: your node checks for incoming requests every five minutes by itself (previously they sat unseen until someone manually pressed "Poll"), requests publish to all your configured relays instead of two hardcoded ones, and a failed send tells you instead of pretending it worked.
-- The Connected Nodes list refreshes instantly. It previously froze for up to 30 seconds per offline peer while checking who's reachable, one peer at a time; the checks now run all at once in the background while the list shows immediately.
-- Apps opened from inside a window (like a transaction from the wallet) now animate smoothly on top instead of loading invisibly underneath.
-- Settings-style windows keep their tabs pinned at the top and their buttons pinned at the bottom; only the middle scrolls. The wallet's tabs are now Channels / Cashu / Fedi / Ark / On-chain so all five fit.
-- On the TV screen, menus no longer flash open and instantly close. And the interface never follows your computer's light/dark preference anymore — dropdowns and other native controls stay dark on every device.
-- Error messages tell you what's actually wrong: "Insufficient balance: need 80 sats, have 0 sats" now reaches your screen instead of "Operation failed. Check server logs."
-- Installing Mempool no longer refuses to start while ElectrumX is mid-resync (it connects by itself once ElectrumX is ready), and installs no longer fail just because the system was momentarily busy.
-- Much quieter logs: the node no longer tries to start containers that are already running (hundreds of harmless-but-alarming errors per day), and a node that's offline stops hammering unreachable servers every 30 seconds with rebuild attempts.
-- Phones pairing with the companion app connect over the node's embedded mesh for remote access, with instant QR pairing and per-device access tokens (contributed alongside this release).
-
-## v1.7.111-alpha (2026-07-22)
-
-- Ask your node anything, out loud. Install Pine (the voice assistant app) alongside Home Assistant and everything wires itself automatically: speech recognition, the speaking voice, and a Claude-powered brain. Questions about your node — "what's the block height?", "how many peers am I connected to?", "is bitcoin synced?", "what's my Lightning balance?" — are answered instantly from the node itself without costing anything; anything else goes to Claude for a real conversation. New mesh radio messages are read out on your speaker as they arrive.
-- Pine now ships a wake-word listener, so a paired speaker can sit on standby and activate when it hears its wake word instead of needing a button press. (A custom "Yo Archy" wake word is in the works.)
-- Pine's launcher page shows your node's live status at a glance: software version, uptime, bitcoin sync progress, and mesh peers.
-- Fixed: installing Pine could send Home Assistant into a crash loop on startup (a record the installer wrote was missing a timestamp field Home Assistant requires). Two noisy warnings that repeated in Home Assistant's log every half minute are silenced too.
-- The companion phone app opens every app in its fast built-in browser view again, with native back/forward/reload controls, instead of embedding some apps inside the page where they scroll and render worse. This had quietly regressed.
-- Turning on federation discovery now shows you exactly what you're about to sign: a panel explains the announcement before your key signs it, you can review the signing details any time from the discoverability strip, and the panel fits and scrolls properly on small phones.
-- Fixed a bug on nodes using the newer app-management engine where Bitcoin's access credentials were written out incorrectly (a placeholder leaked through as the literal text "/bin/bash"), which broke the node's Bitcoin status display, Lightning's connection to the chain, and any app that reads Bitcoin data.
-- Bitcoin's access credentials also moved out of the process command line into a protected file, so they're no longer visible to other software on the node.
-- Desktop app windows have one-click buttons to switch between side panel, overlay, and fullscreen viewing.
-- On the phone home screen, the wallet card moved up to sit right under My Apps.
-- Home Assistant updated to 2026.7.3, which keeps voice satellites (like Pine's speaker) connected reliably.
-
-## v1.7.110-alpha (2026-07-21)
-
-- Pay by pointing your camera: the wallet has a new Scan button (on the wallet card and inside both the Send and Receive windows) that reads any payment QR code — Lightning invoices, Bitcoin addresses, Cashu tokens, and Fedimint invites — and takes you straight to the right send or redeem screen with everything filled in. It also understands the animated, multi-part QR codes some wallets show for long payloads. If your browser can't open a live camera preview (common when reaching the node over plain http), a "Take photo of QR" button snaps a picture with your phone's camera and reads the code from the photo instead.
-- The TV screen got a complete overhaul. A deep bug made the display freeze on the intro artwork on 4K TVs — that's fixed, and along the way: the interface now picks a comfortable, sharp size for big screens (a 4K TV gets a full desktop layout at double sharpness), the artwork behind every page shows again instead of a black void, switching between tabs animates smoothly, the built-in AI assistant stays in its dark theme, and the Cashu and Ark wallet icons no longer render as empty squares.
-- You can now choose how big the interface renders on your node's attached screen: Settings → Display offers Auto (recommended), Large UI, Balanced, and Native — changing it applies immediately.
-- The companion phone app can steer the TV again. Remote input from the phone was being silently ignored on kiosk displays; the remote-control relay now runs there like everywhere else.
-- The companion app is also ready to grant its built-in browser camera access, so the wallet scanner can work inside the app (ships with the next companion app build).
-- Zero-amount Lightning invoices can now be paid: the wallet asks you for the amount and sends it along, instead of failing on invoices that leave the amount up to the payer.
-- The Lightning setup guidance now reads the same everywhere: "Open a channel with Zeus Olympus node and start sending and receiving Lightning payments. Minimum 150,000 · maximum 1,500,000 on-chain sats required."
-- Installer images now bundle a color-emoji font, so emoji anywhere in the interface render properly on the TV screen.
-
-## v1.7.109-alpha (2026-07-21)
-
-- Meet Pine, your node's voice assistant: a new app in the App Store that gives your node ears and a voice — speech-to-text and text-to-speech engines that run entirely on your own hardware, ready to wire into Home Assistant for private, offline voice control. Install it like any other app; nothing you say leaves your node.
-- Your node can now program its MeshCore radio's RF settings — frequency, bandwidth, spreading factor, and coding rate — from Mesh → Device settings. Radios that were flashed with mismatched settings could hear that other radios exist but never decode their messages, and until now the only fix was a separate phone app. Set the values once and the node programs the radio automatically (it restarts once to apply); every radio on your mesh must use the same values to talk to each other.
-- The Device settings panel is tidier: values you can edit (name, region, channel) are no longer also shown as separate read-only rows.
-
-## v1.7.108-alpha (2026-07-20)
-
-- Your node connects to the private mesh far more reliably. Nodes rely on a public rendezvous point to find each other, and the only one available was unreachable from many home and office networks — leaving some nodes unable to join the mesh at all. There is now a second, always-reachable rendezvous point, and your node tries every one it knows, so it joins the mesh in seconds instead of being stranded.
-- Wi-Fi setup now heals itself on older nodes. Some nodes set up before a mid-year fix couldn't connect to a Wi-Fi network from the screen — it failed with a permissions error — because the piece that lets the node manage networking on your behalf was missing. Nodes now put that piece in place automatically on startup, so "scan, pick a network, type the password, connect" works without reinstalling.
-- Your node rejoins the mesh within seconds after an update. Applying an update briefly restarts the mesh service, and previously a node could sit disconnected from other nodes for up to five minutes before it retried.
-- The TV screen now fits your television. On a large or 4K TV the interface rendered tiny with no way to zoom on a keyboard-less screen; it now sizes itself to a comfortable, readable scale automatically (and small laptop panels are left unchanged).
-- More TV-screen polish: the built-in assistant shows its dark theme instead of bright white panels, the on-screen hint for switching between the kiosk and a terminal now points at the right keys, the welcome logo no longer occasionally renders as garbled characters, and an accidental tap of the power button no longer shuts the node down — hold it to power off on purpose.
-- Behind the scenes: fixed the installer image build so it no longer stops on a component that was removed from the product, and so it correctly includes the private relay it was meant to bundle.
-
-## v1.7.106-alpha (2026-07-20)
-
-- Nodes on the same network now find each other directly. Your node announces itself on your local network and connects straight to other Archipelago nodes nearby, instead of every connection having to be introduced by a public rendezvous server out on the internet. Peers in the same home or office stay connected to each other even when that server is unreachable, and they reach each other faster.
-- On a phone, the peer files screen tells you how you're connected again. The badge showing whether a peer's files are arriving over the fast mesh or over Tor was only visible on desktop — on narrow screens it disappeared entirely. It now appears next to the peer name on mobile too.
-- Your node's mesh settings can no longer be written in a way that breaks the mesh. The configuration file used to be assembled as free-form text, where one wrong setting would stop the mesh service from starting and quietly drop your node off the network. It's now generated from a checked description of the file, with tests that verify the exact output.
-- When your node has trouble reaching another node, the logs now record the real reason instead of a generic summary. A failure to open a peer's files previously logged only "Failed to connect to peer" and threw away the actual cause, which made these problems very hard to diagnose. Nothing changes on screen, and no internal detail is exposed.
-- Behind the scenes: the installer image now builds its mesh component at a fixed, known version instead of whatever upstream had published that day, so two images built from the same source are identical.
-
-## v1.7.105-alpha (2026-07-20)
-
-- Fixed a failure loop where a node that lost power or was moved could get stuck on a blank "can't reach your node" screen forever: startup recovery no longer spends minutes retrying containers that no longer exist, and a genuinely large recovery is no longer cut off half-way and forced to start over. The node now reaches its login screen even after the messiest shutdown.
-- Phone tunnel setup (WireGuard) is now dependable: the QR screen automatically retries while a fresh install is still settling instead of dead-ending at "failed to fetch", and if your node has moved to a different network the QR and downloadable config now carry the node's current address instead of the old one.
-- Fixed the white screen some laptop displays showed right after the intro on v1.7.104.
-- The companion phone app no longer suggests installing the companion app from inside itself.
-- The Tor page now lists onion addresses only for apps you actually have installed — fresh installs no longer come with six pre-made addresses for apps that were never set up.
-- Running `archipelago --version` or `--help` on the command line now prints and exits instead of silently starting a second copy of the node, which could briefly disrupt running apps.
-- Behind the scenes: installer image builds now stop loudly if VPN components are missing instead of producing a broken image, and a background file-permission sweep runs far less often, reducing disk churn on busy nodes.
-
-## v1.7.104-alpha (2026-07-19)
-
-- Software updates are now much safer to receive: the node will never install an update that isn't completely downloaded and verified byte-for-byte, closing a rare bug where an interrupted or cancelled download could leave a node unable to start.
-- If a freshly installed update does fail to start, the node now notices and automatically restores the previous working version by itself — no manual rescue needed.
-- The Electrum server now works with whichever Bitcoin you run: it finds Bitcoin Knots or Bitcoin Core automatically instead of assuming Knots.
-- While the Electrum server is first building its index, its waiting screen now shows the ElectrumX app icon and live progress.
-
-## v1.7.103-alpha (2026-07-18)
-
-- Connecting from the phone app no longer replays the intro cinematic on a loop: signing in after scanning the pairing QR could accidentally trigger "Replay Intro" instead of logging you in. The companion app now lands you straight on your dashboard, and the Android app waits for the login screen to be ready before it types your password.
-- Pressing Enter in any password box now does what you expect — it signs you in or moves to the next field, and can no longer "click" a nearby button by mistake when using a controller or the companion app.
-- The public demo no longer interrupts you with an "Update Available" popup that reset the site back to the intro — demo visitors simply get the newest version on their next visit.
-
-## v1.7.102-alpha (2026-07-17)
-
-- The password you choose during setup is now truly your node's password: it also becomes the system login for console and SSH access, instead of leaving the factory default in place. If you ever renamed your node and the TV screen went black on the next boot, that's fixed too — renaming no longer breaks the kiosk display.
-- Setting up Lightning is now a guided journey: a fund-your-wallet step that shows a live countdown while Bitcoin syncs, suggested channels you can open straight into the Zeus mobile wallet with one tap, and a "finish setup" prompt that walks you to the end — goals now complete when you've actually done the steps, not just when apps happen to be running.
-- Pair your phone by pointing it at the screen: the companion app now connects by scanning a QR code — scan, and it fills in your node's address and logs you in. The App Store has a banner to grab the Android app, and the pairing flow can now also set up secure remote access so your phone reaches home from anywhere.
-- First installs are far more dependable: app downloads that stall now retry instead of hanging forever (the old "first install fails, the second works" pattern), big multi-part apps show their real download progress instead of sitting at "Preparing", Lightning no longer fails its first install over temporary hiccups, and a brand-new node now comes up with its core apps — file cloud and ecash wallet — even with no internet connection.
-- The installer image is about 160MB smaller and gets to a working screen faster, because the apps bundled for offline setup are now compressed.
-- The first-run experience keeps its magic: the typing intro is back on fresh installs and can no longer be cut short by a mid-play refresh — updates now politely wait for the cinematic to finish — and dark backgrounds stay dark instead of flashing black or white.
-- Your backups now include your secrets — including the key that protects your Lightning wallet's recovery seed — and there's a Download button to take a copy off the node; the seed-backup reminder now actually opens the backup flow when you tap it.
-- Networking Profits grew into a full dashboard, network cards keep their action buttons in reach on every screen size, "Connect to Mesh" goes to the right page instead of a dead end, and the identity pages got a round of mobile polish.
-- Behind the scenes: apps that report their own health are no longer second-guessed by a port probe (fewer false "restarting" states), and pressing arrow keys or a gamepad is once again the only thing that shows the controller focus ring.
-
-## v1.7.101-alpha (2026-07-15)
-
-- The wallet speaks Ark: a new Ark tab shows your Ark balance and history, you can send and receive over the Ark protocol, pay Lightning invoices from your Ark balance, and Ark payments appear in the transactions view with their own filter chip.
-- Every app you install now automatically gets its own private .onion address — your apps are reachable over Tor a few seconds after install, with no manual "Add Service" step.
-- "Add Service" in the Tor panel now works for every app, not just a fixed list — the node reads the app's actual web port, so apps like Gitea, Jellyfin, Nextcloud, and Uptime Kuma no longer fail with "see server logs".
-- Renaming your node now genuinely renames it everywhere: the machine's hostname, its .local network name (re-announced immediately), the local hosts file, and the HTTPS certificate all follow — so http and https links using your node's name keep working right after a rename.
-- The node no longer mistakes a VPN tunnel for its own address. On fresh installs with NetBird, apps could launch on an internal 10.x address instead of your LAN IP; the node now reads its address from the actual network route, fixing app launch links, generated app configs, and VPN setup.
-- Your cloud got a real layout: Apps-style tabs with categories for Folders, My Files, and Peer Files, readable file rows, a search that also finds files shared by your federated peer nodes — and music now opens in the bottom-bar player instead of a broken preview window.
-- The first-login experience flows again: the dashboard entrance animation is back — and you can actually hear it now (its sound was silently swallowed before, including on replays) — "Replay Intro" in Settings actually replays it, opening a direct link to an inner page no longer detours through the splash screen, the login screen keeps the intro video until your first login (switching to rotating backgrounds after), and the intro video streams three times lighter so it starts instantly.
-- Changing DNS settings no longer blanks the page, and the DNS and WiFi dialogs now cover the whole app instead of only the right panel.
-- The public demo is richer and truer: the intro plays on every fresh visit, Ark wallet flows, working DNS and Tor service management, and a library of peer content with previews that never break.
-- Assorted fixes: failed installs clean up after themselves properly, and the transactions view fits mobile screens (capped at 60% of the visible viewport).
-
 ## v1.7.100-alpha (2026-07-14)
 
 - Bitcoin now supports multiple versions of both Bitcoin Core and Bitcoin Knots: install the version you want, switch between them, pin a version, or let it auto-update — and switching is designed to be safe, with no surprise resyncs.

CODE_OF_CONDUCT.md

@@ -1,19 +0,0 @@
-# Code of Conduct
-
-## Our standard
-
-Be direct, respectful, and focused on the work. Healthy disagreement is welcome;
-harassment, personal attacks, and discriminatory language are not.
-
-## Scope
-
-This code of conduct applies to project repositories, issue trackers, pull
-requests, documentation, chat, and community spaces connected to Archipelago.
-
-## Enforcement
-
-Maintainers may edit, hide, or remove comments and may restrict participation
-for behavior that makes collaboration unsafe or unproductive.
-
-Report conduct concerns privately through the repository owner account or the
-private contact channel listed on the project homepage.

CONTRIBUTING.md

@@ -1,100 +1,161 @@
 # Contributing to Archipelago
 
-This project is preparing for public developer contribution. The highest-value
-contributions are focused fixes, tests, app manifests, documentation
-improvements, and clear bug reports with reproducible evidence.
+Thank you for your interest in contributing to Archipelago! This document covers the process for contributing code, reporting bugs, and submitting apps.
 
-## Development setup
+## Code of Conduct
 
-### Frontend
+Be respectful. We follow the [Contributor Covenant](https://www.contributor-covenant.org/version/2/1/code_of_conduct/).
+
+## Getting Started
+
+1. Fork the repository on the project's Gitea instance
+2. Clone your fork: `git clone <your-fork-url>/archy.git`
+3. Set up the dev environment (see `docs/developer-guide.md`)
+4. Create a feature branch: `git checkout -b feature/your-feature`
+
+## Development Setup
+
+### Frontend (Vue.js)
 
 ```bash
 cd neode-ui
 npm install
-npm start
-npm run type-check
-npm test
+npm start          # Dev server on :8100
+npm run type-check # TypeScript validation
+npm run build      # Production build
+npm test           # Run tests
 ```
 
-### Backend
+### Backend (Rust)
+
+Build on a Linux server (Debian 13), **not** macOS:
 
 ```bash
-cd core
-cargo fmt --all -- --check
-cargo clippy --all-targets --all-features -- -D warnings
+cargo clippy --all-targets --all-features
+cargo fmt --all
 cargo test --all-features
 ```
 
-Linux is required for host integration work involving Podman, systemd,
-networking, or image builds. Frontend development works locally with the mock
-backend.
-
-## App manifests
-
-App packages live under `apps/<app-id>/manifest.yml` and use the schema
-documented in [docs/app-manifest-spec.md](docs/app-manifest-spec.md). Validate
-before submitting:
+### Deploy to dev server
 
 ```bash
-./scripts/validate-app-manifest.sh apps/<app-id>/manifest.yml
-python3 scripts/generate-app-catalog.py
-python3 scripts/check-app-catalog-drift.py --release --strict
+./scripts/deploy-to-target.sh --live
 ```
 
-App submissions must:
+## Code Style
 
-- pin container image versions;
-- avoid hardcoded secrets;
-- use `security.no_new_privileges: true`;
-- use `security.readonly_root: true` unless the manifest explains why writable
-  root is required;
-- request only necessary Linux capabilities;
-- store durable data under `/var/lib/archipelago/<app-id>/`;
-- define truthful health checks and launch interfaces for user-facing UIs.
+### Frontend (TypeScript + Vue)
 
-## Code style
+- `<script setup lang="ts">` — always Composition API
+- TypeScript strict mode — no `any`, use `unknown` or proper types
+- Global CSS classes in `src/style.css` — never inline Tailwind in components
+- Pinia for state management — focused single-purpose stores
+- Use `@/api/rpc-client.ts` for RPC calls
 
-- Rust: prefer `?` over `unwrap()`/`expect()` in production paths.
-- Rust: use `tracing` for structured logs.
-- TypeScript: avoid `any`; use explicit types or `unknown`.
-- Vue: prefer `<script setup lang="ts">`.
-- Keep changes scoped; do not mix drive-by refactors with behavioral changes.
-- Remove dead code rather than commenting it out.
-- Add tests for new behavior and regression tests for bug fixes.
+### Backend (Rust)
 
-## Pull requests
+- No `unwrap()` or `expect()` in production code — use `?` operator
+- `thiserror` for library errors, `anyhow` for application errors
+- `tracing` for structured logging — never `println!`
+- Run `cargo clippy` and `cargo fmt` before commits
 
-1. Open one focused PR per behavior or documentation change.
-2. Explain what changed, why it changed, and how it was verified.
-3. Include screenshots for UI changes.
-4. Link relevant issues or docs.
-5. Keep generated catalog changes in sync with manifest changes.
+### General
 
-Suggested commit format:
+- Functions under 50 lines, single responsibility
+- Comment WHY not WHAT
+- Remove dead code — never comment it out
+- No `TODO`/`FIXME` in commits
 
-```text
-feat: add backup scheduling
-fix: reject unsafe manifest volume
-docs: clarify app deployment flow
-test: cover catalog drift check
+## Commit Format
+
+```
+type: description
 ```
 
-## Reporting bugs
+**Types**: `feat:`, `fix:`, `docs:`, `refactor:`, `test:`, `chore:`, `perf:`
 
-Include:
+Examples:
+- `feat: add backup scheduling to settings page`
+- `fix: handle WiFi connection timeout gracefully`
+- `test: add unit tests for RPC client retry logic`
 
-- exact version or commit;
-- host platform and architecture;
-- steps to reproduce;
-- expected and actual behavior;
-- logs from the relevant component;
-- screenshots for UI issues.
+## Pull Request Process
 
-## Security
+1. Ensure your branch is up to date with `main`
+2. All checks must pass: TypeScript, build, tests, clippy
+3. Include a clear description of what changed and why
+4. Link any related issues
+5. Request review from a maintainer
 
-Do not report vulnerabilities in public issues. Follow [SECURITY.md](SECURITY.md).
+### PR Checklist
+
+- [ ] TypeScript type-check passes (`npm run type-check`)
+- [ ] Frontend builds (`npm run build`)
+- [ ] Tests pass (`npm test`)
+- [ ] Rust clippy clean (`cargo clippy --all-targets --all-features`)
+- [ ] No new compiler warnings
+- [ ] Follows code style guidelines above
+
+## Testing Requirements
+
+- New features need tests
+- Bug fixes need a regression test
+- Frontend: Vitest + Vue Test Utils
+- Backend: `#[test]` and `#[tokio::test]`
+- Target: maintain or improve existing coverage
+
+## Reporting Bugs
+
+Use the **Bug Report** issue template. Include:
+
+1. Steps to reproduce
+2. Expected behavior
+3. Actual behavior
+4. System info (hardware, OS version, Archipelago version)
+5. Screenshots if applicable
+6. Relevant logs (`journalctl -u archipelago`)
+
+## Feature Requests
+
+Use the **Feature Request** issue template. Include:
+
+1. Problem description
+2. Proposed solution
+3. Alternatives considered
+4. Impact on existing users
+
+## App Submissions
+
+To submit an app for the Archipelago marketplace:
+
+1. Create a manifest following `docs/app-manifest-spec.md`
+2. Ensure the container image is published to a public registry
+3. Test on Archipelago hardware (x86_64 and ARM64 if possible)
+4. Open a PR adding the app to the curated list
+5. Include: app description, icon, resource requirements, dependencies
+
+### App Requirements
+
+- Container must run as non-root (UID > 1000)
+- `readonly_root: true` unless explicitly justified
+- Drop all capabilities except those required
+- `no-new-privileges: true`
+- Pin specific image versions (no `latest` tag)
+- No hardcoded secrets
+
+## Security Disclosure
+
+**Do NOT open public issues for security vulnerabilities.**
+
+Email security concerns to the maintainers directly. Include:
+
+1. Description of the vulnerability
+2. Steps to reproduce
+3. Potential impact
+4. Suggested fix (if any)
+
+We will acknowledge receipt within 48 hours and provide a timeline for a fix.
 
 ## License
 
-By contributing, you agree that your contribution is licensed under the
-project's MIT License.
+By contributing, you agree that your contributions will be licensed under the same license as the project.

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2026 Dorian and the Archipelago Project contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

NOTICE

@@ -1,73 +0,0 @@
-# Archipelago — Third-Party Notices
-
-Archipelago is licensed under the MIT License (see LICENSE).
-This file lists third-party components included in this repository and its
-release artifacts, with their licenses and required attributions.
-
-## Embedded / vendored components
-
-- **FIPS mesh networking** — https://github.com/jmcorgan/fips
-  Copyright (c) 2026 Johnathan Corgan. MIT License.
-  Used as the embedded mesh VPN in the OS (`fips` daemon, pinned v0.4.1) and
-  compiled into the Android companion app (`Android/rust/archy-fips-core`).
-
-- **QR Code Generator for JavaScript** — http://www.d-project.com/
-  Copyright (c) 2009 Kazuhiko Arase. MIT License.
-  Vendored at `docker/lnd-ui/qrcode.js` and `docker/electrs-ui/qrcode.js`
-  (original headers preserved).
-
-- **nostr-rs-relay** — https://github.com/scsibug/nostr-rs-relay — MIT License.
-  Binary extracted into the OS image at `/opt/archipelago/bin/`.
-
-- **Reticulum (RNS) and LXMF** — https://github.com/markqvist/Reticulum
-  Copyright Mark Qvist. Distributed under the Reticulum License (an MIT-style
-  license with field-of-use restrictions: no use in systems designed to harm
-  human beings, and no use in AI/ML training datasets). The optional
-  `archy-reticulum-daemon` binary bundles RNS 1.3.5 and LXMF 1.0.1. The
-  Reticulum License is NOT an OSI-approved open-source license; it applies
-  only to that optional component, not to Archipelago itself.
-
-## Fonts
-
-- **Montserrat** — SIL Open Font License 1.1
-  (`neode-ui/public/assets/fonts/Montserrat/OFL.txt`).
-- **Open Sans** — Apache License 2.0
-  (`neode-ui/public/assets/fonts/Open_Sans/LICENSE.txt`).
-
-## Artwork and icons
-
-- **Mesh device artwork** (`neode-ui/public/assets/img/mesh-devices/`):
-  device illustrations from the Meshtastic project — https://meshtastic.org
-  © Meshtastic contributors, GPL-3.0. Meshtastic® is a registered trademark
-  of Meshtastic LLC. See the ATTRIBUTION.md in that directory.
-- Some UI icons are derived from **game-icons.net** (CC BY 3.0 — see
-  ATTRIBUTION.md in `neode-ui/public/assets/icon/`) and **pixelarticons**
-  (MIT, https://github.com/halfmage/pixelarticons).
-- Third-party application logos under `neode-ui/public/assets/img/app-icons/`
-  and `service-icons/` are trademarks of their respective owners, used solely
-  to identify the corresponding applications. No endorsement is implied.
-
-## Original media
-
-All demo content (music, photos, posters in `demo/`), UI sound effects,
-background images, and intro video in `neode-ui/public/assets/` are original
-works created and owned by the Archipelago project author, released with the
-project. The welcome voice line (`welcome-noderunner.mp3`) was generated with
-ElevenLabs TTS under a commercial-use plan.
-
-## Redistributed software (ISO and container registry)
-
-The Archipelago OS image is based on Debian and redistributes Debian packages
-(including the Linux kernel, GRUB, and non-free firmware/microcode blobs
-required for hardware support); per-package license texts are preserved at
-`/usr/share/doc/*/copyright` in the installed system, and corresponding source
-is available via Debian (https://snapshot.debian.org) as referenced in each
-release's notes. Container images offered through the app catalog and mirror
-registry remain under their upstream licenses (including GPL/AGPL software
-such as mempool, Nextcloud, Vaultwarden, SearXNG, PhotoPrism, Immich,
-Jellyfin, MariaDB, AdGuard Home, and strfry); source links are provided in
-the app catalog. The modified mempool-frontend image is built from
-`docker/mempool-frontend/` in this repository (AGPL-3.0 corresponding source).
-
-Full per-crate and per-package license inventories for release binaries are
-generated at build time (see THIRD-PARTY-LICENSES files in release artifacts).

README.md

@@ -1,11 +1,8 @@
 # Archipelago
 
-> Self-sovereign Bitcoin node OS and manifest-driven app platform.
+> Self-Sovereign Bitcoin Node OS
 
-Archipelago is a bootable personal server OS for Bitcoin infrastructure,
-self-hosted apps, mesh communication, decentralized identity, and federation.
-Apps are packaged as declarative `manifest.yml` files and run as rootless
-Podman containers managed by the Rust backend.
+**Archipelago** is a bootable personal server OS. Flash it to a USB drive, install on any x86_64 or ARM64 machine, and manage Bitcoin infrastructure, self-hosted apps, mesh communication, and decentralized identity through a glassmorphism web UI.
 
 [![Debian 13](https://img.shields.io/badge/Debian-13%20Trixie-a80030)](https://www.debian.org/)
 [![License](https://img.shields.io/badge/license-MIT-green)](LICENSE)
@@ -13,101 +10,193 @@ Podman containers managed by the Rust backend.
 [![Vue.js](https://img.shields.io/badge/vue.js-3.5-brightgreen)](https://vuejs.org/)
 [![Version](https://img.shields.io/badge/version-1.8.0--alpha-blue)]()
 
-## What is here
+## Philosophy
 
-- `core/` - Rust workspace: backend API, container runtime, security, OpenWrt
-  helpers, and performance/resource management.
-- `neode-ui/` - Vue 3 + TypeScript frontend.
-- `apps/` - app manifests and custom app container sources.
-- `docker/` - supporting container build contexts for UI companion surfaces.
-- `image-recipe/` - bootable image/ISO build inputs.
-- `Android/` - Android companion app.
-- `scripts/` - development, release, deployment, and validation tooling.
-- `docs/` - architecture, app packaging, operations, API, and roadmap docs.
+Archipelago is being built as a **developer-ready app platform**, not a fixed appliance:
 
-## Platform model
+- **Manifest-driven apps.** Every app is declared in a single `manifest.yml` — image, ports, volumes, secrets, health checks, security policy. The orchestrator owns the entire lifecycle; there is no per-app installer code and no host-level provisioning.
+- **Signed distribution.** App manifests ship inside an Ed25519-signed catalog verified against a pinned release-root key, not as loose files on disk. OTA release manifests are signed the same way.
+- **Decentralized marketplace.** Third-party developers publish apps via Nostr-based discovery (NIP-78) with DID-signed manifests and federation-weighted trust scoring — no gatekept central store.
+- **Rootless and secure by default.** Rootless Podman only. Read-only root, no-new-privileges, capability allow-list, secrets materialised 0600 and never logged. Never rootful, never a Docker socket mount.
+- **100%-uptime-capable.** Every container is a systemd Quadlet unit under `user.slice` that survives backend restarts; a level-triggered reconciler self-heals drift every 30 seconds; migrations never destroy data.
 
-Archipelago is built as a developer-ready app platform, not a fixed appliance:
+## Features
 
-- Apps are declared in `apps/<app-id>/manifest.yml`.
-- The Rust parser in `core/container/src/manifest.rs` is the canonical schema.
-- The orchestrator compiles manifests to rootless Podman/Quadlet runtime state.
-- App data lives under `/var/lib/archipelago/<app-id>/`.
-- Secrets are generated or read from `/var/lib/archipelago/secrets/` and
-  injected through Podman secrets rather than static environment values.
-- Release and app catalogs are signed and verified against a pinned trust
-  anchor.
+### Bitcoin Infrastructure
+- **Bitcoin Core and Bitcoin Knots** full nodes with per-app version pinning and bulletproof version switching, automatic prune/full mode based on disk size
+- **LND** and **Core Lightning** with channel management
+- **ElectrumX** Electrum server for wallet connectivity
+- **BTCPay Server** for accepting Bitcoin payments
+- **Mempool** block explorer and fee estimator
+- **Fedimint** federation guardian, gateway, and client — plus Cashu ecash wallet support
 
-Start with:
+### Self-Hosted Apps (50+)
+Storage (FileBrowser, Immich, Nextcloud), Productivity (Vaultwarden), Media (Jellyfin, PhotoPrism, IndeeHub), Search (SearXNG), Network (NetBird, Tailscale), Home (Home Assistant), Nostr (nostr-rs-relay, strfry), Dev/Ops (Gitea, Grafana, Portainer, Uptime Kuma), and more — 27 curated in the store UI, 50+ packaged as manifests.
 
-- [Architecture](docs/architecture.md)
-- [Developer Guide](docs/developer-guide.md)
-- [App Developer Guide](docs/app-developer-guide.md)
-- [App Manifest Spec](docs/app-manifest-spec.md)
-- [Nostr Git Source Hosting Plan](docs/nostr-git-source-hosting.md)
-- [Operations Runbook](docs/operations-runbook.md)
-- [Troubleshooting](docs/troubleshooting.md)
+### Mesh Networking (tri-protocol)
+- **Meshtastic**, **MeshCore**, and **Reticulum (RNS/LXMF)** LoRa transports behind one mesh chat UI
+- End-to-end encryption with X3DH key agreement + double-ratchet
+- RNode radio support with an OS-level `archy-rnodeconf` tool; interop verified against Sideband
+- Image/voice attachments, mesh AI assistant (`!ai`), Bitcoin balance relay over mesh
 
-## Quick start
+### Decentralized Identity
+- Ed25519 node identity with DID Documents (did:key)
+- Multi-identity management (Personal/Business/Anonymous)
+- W3C Verifiable Credentials issuance and verification
+- Nostr integration: NIP-33 node discovery, NIP-44/NIP-04 encryption, NIP-07 signer bridge for iframe apps, relay hosting
+- Decentralized Web Node (DWN) record sync between federated nodes over Tor
 
-### Frontend
+### Multi-Node Federation
+- Invite-based node joining over Tor hidden services
+- Trust levels (Trusted/Verified/Untrusted) with DID-based auth
+- State sync and app deployment across federated nodes
+- File sharing with access controls (free/peers-only/paid via Lightning, on-chain, or ecash)
+
+### System Updates
+- OTA updates from a self-hosted Gitea release server, Ed25519-signature-verified against a pinned release-root key
+- Resumable downloads, automatic pre-update backup, rollback with a post-update self-verify window
+- Manual, scheduled-check, and auto-apply modes (auto-apply refuses unsigned manifests)
+
+### Security
+- Argon2id password hashing (transparent upgrade from legacy hashes), ChaCha20-Poly1305 encrypted secrets at rest
+- Rootless Podman: read-only root, cap-drop ALL with a reviewed allow-list, no-new-privileges
+- Signed release manifests and signed app catalog (Ed25519, pinned trust anchor)
+- TOTP two-factor authentication, per-endpoint rate limiting, CSRF protection
+- AppArmor profiles for container confinement; Tor hidden services for inter-node traffic
+- Independent security audit of an early version archived in [`docs/archive/`](docs/archive/security-code-audit-2026-03.md); top findings since remediated
+
+## Roadmap
+
+**Done**
+- Single-node production gate **green** — install / stop / start / restart / reinstall / reboot-survive / uninstall, 5 consecutive full runs with zero failures on real hardware
+- Quadlet migration validated (all backends as `user.slice` services on the canary node)
+- Release signing ceremony completed — release-root key pinned, catalog and OTA manifests signed
+- Reticulum third mesh transport (real-RF LoRa gates passed), Bitcoin Core/Knots multi-version switching, decentralized marketplace backend, public demo
+
+**In progress**
+- Multinode pass: the same production gate across the whole test fleet ([`docs/multinode-testing-plan.md`](docs/multinode-testing-plan.md))
+- Quadlet default flip fleet-wide + container-flapping elimination
+- 1.8.0 release hardening tail ([`docs/1.8.0-RELEASE-HARDENING-PLAN.md`](docs/1.8.0-RELEASE-HARDENING-PLAN.md)): OTA upgrade soak on real hardware, ISO/image hardening (per-device keys, no default creds, signed ISO)
+
+**Planned**
+- Developer CLI (`archy app validate/render/install/test`) to open third-party app publishing
+- External marketplace trust UX + publishing tooling ([`docs/marketplace-protocol.md`](docs/marketplace-protocol.md))
+- DHT/P2P distribution of releases and app images ([`docs/dht-distribution-design.md`](docs/dht-distribution-design.md))
+- P2P encrypted voice/video over Tor, dual-ecash (Fedimint + Cashu) phases, paid streaming, hardware signer support
+
+The live, priority-ordered task list is [`docs/UNIFIED-TASK-TRACKER.md`](docs/UNIFIED-TASK-TRACKER.md); the full narrative plan is [`docs/PRODUCTION-MASTER-PLAN.md`](docs/PRODUCTION-MASTER-PLAN.md).
+
+## Quick Start
+
+### Install from ISO
+
+1. Build or download the ISO for your architecture (x86_64 or ARM64) — see [`image-recipe/`](image-recipe/)
+2. Flash to USB drive with Balena Etcher or `dd`
+3. Boot from USB on target hardware and follow the automated installer
+4. Access the web UI at `http://<device-ip>`
+5. Set your password and complete the onboarding wizard (seed backup, DID identity)
+
+### Supported Hardware
+
+| Platform | Examples | Minimum |
+|----------|----------|---------|
+| **x86_64** | Intel NUC, mini PCs, any 64-bit PC | 4GB RAM, 32GB storage |
+| **ARM64** | Raspberry Pi 5, ARM64 SBCs | 4GB RAM, 32GB storage |
+
+**Recommended**: 8GB+ RAM, 1TB+ NVMe SSD (for a full Bitcoin node). Optional: an RNode-compatible LoRa radio for mesh networking.
+
+## Development
+
+### Prerequisites
+- macOS or Linux for frontend development
+- Linux dev server (Debian 13) for backend builds — **never build Rust on macOS for Linux**
+- Node.js 20+, Rust stable toolchain
+
+### Frontend Development
 
 ```bash
 cd neode-ui
 npm install
-npm start
+npm start          # Dev server on http://localhost:8100 (mock backend on :5959)
+npm run type-check # TypeScript validation
+npm run build      # Production build → web/dist/neode-ui/
 ```
 
-The dev UI runs at `http://localhost:8100` with a mock backend on `:5959`.
-
-### Backend
+### Backend Development
 
 ```bash
-cd core
+cd core            # Rust workspace root (no Cargo.toml at repo root)
 cargo build
-cargo test --all-features
+cargo test
 ```
 
-Linux is the supported backend runtime and release-build target. macOS is fine
-for frontend work and many Rust compile/test loops, but host integration tests
-that touch Podman, systemd, networking, or image build paths require Linux.
-
-### App manifests
+### Deploy to a Test Node
 
 ```bash
-./scripts/validate-app-manifest.sh apps/filebrowser/manifest.yml
-python3 scripts/generate-app-catalog.py
-python3 scripts/check-app-catalog-drift.py --release --strict
+./scripts/deploy-to-target.sh --live   # Deploy to primary dev server
+./scripts/deploy-to-target.sh --both   # Deploy to both LAN servers
 ```
 
-`scripts/generate-app-catalog.py` requires Python with PyYAML installed.
+### Release (tarball-only)
 
-## Documentation map
+Releases ship as a backend binary and a frontend tarball referenced by
+`releases/manifest.json`, published to the self-hosted Gitea release server.
+
+```bash
+./scripts/create-release.sh 1.2.3
+git push origin main --tags
+```
+
+## Architecture
+
+```
+Debian 13 (Trixie)
+  ├── Rootless Podman — every app a systemd Quadlet unit under user.slice
+  ├── Nginx (reverse proxy, security headers, rate limiting)
+  ├── Rust Backend (JSON-RPC API on 127.0.0.1:5678, ~380 RPC methods)
+  │     ├── core/archipelago/  — API, orchestrator + reconciler, mesh, identity,
+  │     │                        federation, wallet, updates, marketplace
+  │     ├── core/container/    — Podman client, manifest schema, Quadlet compiler,
+  │     │                        health monitor, signed app catalog
+  │     ├── core/security/     — AppArmor/seccomp policy, secrets manager
+  │     ├── core/openwrt/      — TollGate gateway provisioning (SSH/UCI)
+  │     └── core/performance/  — resource limits
+  ├── Vue 3 Frontend (Composition API + TypeScript strict + Pinia + Tailwind, PWA)
+  │     └── Three UI modes (Pro/Easy/Chat) + gamepad navigation + i18n
+  ├── Reticulum daemon (supervised Python/PyInstaller, one per LoRa radio)
+  └── System Tor (hidden services, SOCKS5 proxy)
+```
+
+~117,000 lines of Rust | ~69,000 lines of TypeScript/Vue | 51 packaged apps | Android companion app
+
+## Documentation
 
 | Doc | Purpose |
 |-----|---------|
-| [Architecture](docs/architecture.md) | System layers, crates, data paths, security model |
-| [Developer Guide](docs/developer-guide.md) | Local setup, code workflow, testing |
-| [API Reference](docs/api-reference.md) | JSON-RPC API overview |
-| [App Developer Guide](docs/app-developer-guide.md) | How to package and test apps |
-| [App Manifest Spec](docs/app-manifest-spec.md) | Manifest schema and validation rules |
-| [Nostr Git Source Hosting Plan](docs/nostr-git-source-hosting.md) | ngit/NIP-34 contribution workflow and maintainer model |
-| [Apps README](apps/README.md) | Packaged app catalog overview |
-| [Image Recipe](image-recipe/README.md) | Bootable image build flow |
-| [Operations Runbook](docs/operations-runbook.md) | Production operations and recovery |
-| [Open Source Readiness](docs/OPEN_SOURCE_READINESS.md) | Public-release cleanup checklist |
-| [Roadmap](docs/ROADMAP.md) | Shipped, in-progress, and planned work |
-| [Unified Task Tracker](docs/UNIFIED-TASK-TRACKER.md) | Launch hardening task list |
-| [Archive](docs/archive/) | Historical plans, audits, and handoffs |
+| [Architecture](docs/architecture.md) | System design, crate map, data paths |
+| [Developer Guide](docs/developer-guide.md) | Dev setup, workflow, code conventions |
+| [API Reference](docs/api-reference.md) | RPC endpoint reference |
+| [App Developer Guide](docs/app-developer-guide.md) | Building and publishing apps |
+| [App Manifest Spec](docs/app-manifest-spec.md) | The `manifest.yml` schema |
+| [User Walkthrough](docs/user-walkthrough.md) | End-user installation and usage guide |
+| [Troubleshooting](docs/troubleshooting.md) | Diagnostic scenarios and solutions |
+| [Operations Runbook](docs/operations-runbook.md) | Ops commands and emergency recovery |
+| [Production Master Plan](docs/PRODUCTION-MASTER-PLAN.md) | North star and workstream narrative |
+| [Unified Task Tracker](docs/UNIFIED-TASK-TRACKER.md) | Live, priority-ordered open items |
+| [Test Gate](tests/lifecycle/TESTING.md) | Production lifecycle test gate (definition of done) |
+| [Archive](docs/archive/) | Historical audits, session logs, shipped designs |
 
 ## Contributing
 
-Read [CONTRIBUTING.md](CONTRIBUTING.md) before opening a pull request. For
-security issues, follow [SECURITY.md](SECURITY.md) and do not open a public
-issue.
+1. Fork the repository
+2. Create a feature branch (`feature/description`)
+3. Follow the coding standards in [CONTRIBUTING.md](CONTRIBUTING.md) and [CLAUDE.md](CLAUDE.md)
+4. Submit a pull request
 
 ## License
 
-Archipelago is licensed under the [MIT License](LICENSE). Third-party notices
-are listed in [NOTICE](NOTICE) and generated license inventories in component
-release artifacts.
+[MIT License](LICENSE)
+
+## Acknowledgments
+
+Built with: [Rust](https://www.rust-lang.org/), [Vue.js](https://vuejs.org/), [Podman](https://podman.io/), [Bitcoin Core](https://bitcoin.org/), [LND](https://lightning.engineering/), [Reticulum](https://reticulum.network/), [Debian](https://www.debian.org/)

SECURITY.md

@@ -1,38 +0,0 @@
-# Security Policy
-
-## Reporting vulnerabilities
-
-Please do not open a public issue for a security vulnerability.
-
-Until a dedicated security intake address is published, report privately to the
-project maintainer through the repository owner account or the private contact
-channel listed on the project homepage.
-
-Include:
-
-- affected commit, version, or release;
-- affected component;
-- reproduction steps;
-- expected impact;
-- logs, proof of concept, or packet captures when relevant;
-- whether the issue is already public.
-
-We aim to acknowledge credible reports within 48 hours and coordinate fixes
-before public disclosure.
-
-## Scope
-
-Security-sensitive areas include:
-
-- authentication, session handling, CSRF, and rate limiting;
-- release and app-catalog signature verification;
-- container manifest validation and runtime compilation;
-- Podman/Quadlet isolation, capabilities, volumes, and secret injection;
-- backup encryption and key derivation;
-- federation, Tor, Nostr, mesh, DID, and credential flows;
-- Android companion pairing and device-token handling.
-
-## Supported versions
-
-Archipelago is currently pre-1.0 alpha software. Security fixes target the
-current `main` branch and the latest published alpha release.

app-catalog/catalog.json

@@ -351,12 +351,12 @@
     {
       "id": "homeassistant",
       "title": "Home Assistant",
-      "version": "2026.7.3",
+      "version": "2024.1.0",
       "description": "Open source home automation platform. Control and monitor your smart home devices.",
       "icon": "/assets/img/app-icons/homeassistant.png",
       "author": "Home Assistant",
       "category": "home",
-      "dockerImage": "146.59.87.168:3000/lfg2025/home-assistant:2026.7.3",
+      "dockerImage": "146.59.87.168:3000/lfg2025/home-assistant:2024.1",
       "repoUrl": "https://github.com/home-assistant/core",
       "containerConfig": {
         "ports": [
@@ -370,17 +370,6 @@
         ]
       }
     },
-    {
-      "id": "pine",
-      "title": "Pine",
-      "version": "1.3.0",
-      "description": "A private voice assistant for your home. Pine runs speech-to-text (Whisper), text-to-speech (Piper) and wake-word detection (openWakeWord) on your own node and pairs with a PineVoice satellite speaker, so Home Assistant Assist works locally with nothing sent to the cloud. Ask it about your node — block height, sync, peers, Lightning balance — and, when a Claude API key is set, anything else.",
-      "icon": "/assets/img/app-icons/pine.svg",
-      "author": "Archipelago",
-      "category": "home",
-      "dockerImage": "docker.io/library/nginx:1.27-alpine",
-      "repoUrl": "https://github.com/rhasspy/wyoming"
-    },
     {
       "id": "grafana",
       "title": "Grafana",

apps/DEVELOPMENT.md

@@ -76,17 +76,7 @@ podman run -p 18084:8080 \
 
 ## Integration Checklist
 
-Adding a new app requires updates in multiple places:
-
-- add `apps/<app-id>/manifest.yml`;
-- add a Dockerfile and source directory only when the app is built locally;
-- choose non-conflicting ports from [PORTS.md](./PORTS.md);
-- declare `interfaces.main` for user-facing web UIs;
-- declare generated secrets instead of hardcoding credentials;
-- run `./scripts/validate-app-manifest.sh apps/<app-id>/manifest.yml`;
-- regenerate catalogs with `python3 scripts/generate-app-catalog.py`;
-- verify drift with `python3 scripts/check-app-catalog-drift.py --release --strict`;
-- test install, launch, stop, start, restart, uninstall, and reinstall.
+Adding a new app requires updates in multiple places. See the full checklist in [CLAUDE.md](../CLAUDE.md) under "App Integration Checklist".
 
 ## Port Assignments
 

apps/bitcoin-core/manifest.yml

@@ -35,9 +35,6 @@ app:
         fi;
         RPC_USER="$(printenv BITCOIN_RPC_USER)";
         RPC_PASS="$(printenv BITCOIN_RPC_PASS)";
-        RPC_CONF="/tmp/rpc.conf";
-        umask 077;
-        { echo "rpcuser=$RPC_USER"; echo "rpcpassword=$RPC_PASS"; } > "$RPC_CONF";
         RPC_TXRELAY_AUTH="$(printenv BITCOIN_RPC_TXRELAY_RPCAUTH || true)";
         DISK_GB_VALUE="$(printenv DISK_GB || true)";
         RPC_HEADROOM="-rpcthreads=16 -rpcworkqueue=256";
@@ -46,9 +43,9 @@ app:
           RPC_TXRELAY_FLAGS="$RPC_TXRELAY_FLAGS -rpcauth=$RPC_TXRELAY_AUTH -rpcwhitelist=txrelay:sendrawtransaction,submitpackage,testmempoolaccept,getmempoolinfo,getrawmempool,getmempoolentry,getnetworkinfo,getblockchaininfo,getblockcount,getblockhash,getblock,getblockheader,getrawtransaction,gettxout,gettxspendingprevout,decoderawtransaction,decodescript,estimatesmartfee,uptime,ping,getconnectioncount,getpeerinfo,getindexinfo,getdeploymentinfo,getchaintips";
         fi;
         if [ "${DISK_GB_VALUE:-0}" -lt 1000 ]; then
-          exec "$BITCOIND" -datadir=/home/bitcoin/.bitcoin -conf="$RPC_CONF" -printtoconsole=0 -server=1 -prune=550 -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0:8332 -listen=1 -bind=0.0.0.0:8333 -dbcache=1024 -par=0 -maxconnections=125 $RPC_HEADROOM $RPC_TXRELAY_FLAGS;
+          exec "$BITCOIND" -datadir=/home/bitcoin/.bitcoin -noconf -printtoconsole=0 -server=1 -prune=550 -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0:8332 -listen=1 -bind=0.0.0.0:8333 -dbcache=1024 -par=0 -maxconnections=125 $RPC_HEADROOM $RPC_TXRELAY_FLAGS -rpcuser="$RPC_USER" -rpcpassword="$RPC_PASS";
         else
-          exec "$BITCOIND" -datadir=/home/bitcoin/.bitcoin -conf="$RPC_CONF" -printtoconsole=0 -server=1 -txindex=1 -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0:8332 -listen=1 -bind=0.0.0.0:8333 -dbcache=4096 -par=0 -maxconnections=125 $RPC_HEADROOM $RPC_TXRELAY_FLAGS;
+          exec "$BITCOIND" -datadir=/home/bitcoin/.bitcoin -noconf -printtoconsole=0 -server=1 -txindex=1 -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0:8332 -listen=1 -bind=0.0.0.0:8333 -dbcache=4096 -par=0 -maxconnections=125 $RPC_HEADROOM $RPC_TXRELAY_FLAGS -rpcuser="$RPC_USER" -rpcpassword="$RPC_PASS";
         fi
     derived_env:
       - key: DISK_GB

apps/bitcoin-knots/manifest.yml

@@ -35,9 +35,6 @@ app:
         fi;
         RPC_USER="$(printenv BITCOIN_RPC_USER)";
         RPC_PASS="$(printenv BITCOIN_RPC_PASS)";
-        RPC_CONF="/tmp/rpc.conf";
-        umask 077;
-        { echo "rpcuser=$RPC_USER"; echo "rpcpassword=$RPC_PASS"; } > "$RPC_CONF";
         RPC_TXRELAY_AUTH="$(printenv BITCOIN_RPC_TXRELAY_RPCAUTH || true)";
         DISK_GB_VALUE="$(printenv DISK_GB || true)";
         RPC_HEADROOM="-rpcthreads=16 -rpcworkqueue=256";
@@ -46,9 +43,9 @@ app:
           RPC_TXRELAY_FLAGS="$RPC_TXRELAY_FLAGS -rpcauth=$RPC_TXRELAY_AUTH -rpcwhitelist=txrelay:sendrawtransaction,submitpackage,testmempoolaccept,getmempoolinfo,getrawmempool,getmempoolentry,getnetworkinfo,getblockchaininfo,getblockcount,getblockhash,getblock,getblockheader,getrawtransaction,gettxout,gettxspendingprevout,decoderawtransaction,decodescript,estimatesmartfee,uptime,ping,getconnectioncount,getpeerinfo,getindexinfo,getdeploymentinfo,getchaintips";
         fi;
         if [ "${DISK_GB_VALUE:-0}" -lt 1000 ]; then
-          exec "$BITCOIND" -datadir=/home/bitcoin/.bitcoin -conf="$RPC_CONF" -printtoconsole=0 -server=1 -prune=550 -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0:8332 -listen=1 -bind=0.0.0.0:8333 -dbcache=2048 -par=0 -maxconnections=125 $RPC_HEADROOM $RPC_TXRELAY_FLAGS;
+          exec "$BITCOIND" -datadir=/home/bitcoin/.bitcoin -noconf -printtoconsole=0 -server=1 -prune=550 -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0:8332 -listen=1 -bind=0.0.0.0:8333 -dbcache=2048 -par=0 -maxconnections=125 $RPC_HEADROOM $RPC_TXRELAY_FLAGS -rpcuser="$RPC_USER" -rpcpassword="$RPC_PASS";
         else
-          exec "$BITCOIND" -datadir=/home/bitcoin/.bitcoin -conf="$RPC_CONF" -printtoconsole=0 -server=1 -txindex=1 -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0:8332 -listen=1 -bind=0.0.0.0:8333 -dbcache=4096 -par=0 -maxconnections=125 $RPC_HEADROOM $RPC_TXRELAY_FLAGS;
+          exec "$BITCOIND" -datadir=/home/bitcoin/.bitcoin -noconf -printtoconsole=0 -server=1 -txindex=1 -rpcallowip=0.0.0.0/0 -rpcbind=0.0.0.0:8332 -listen=1 -bind=0.0.0.0:8333 -dbcache=4096 -par=0 -maxconnections=125 $RPC_HEADROOM $RPC_TXRELAY_FLAGS -rpcuser="$RPC_USER" -rpcpassword="$RPC_PASS";
         fi
     derived_env:
       - key: DISK_GB

apps/electrumx/manifest.yml

@@ -10,16 +10,9 @@ app:
     network: archy-net
     data_uid: "1000:1000"
     entrypoint: ["sh", "-lc"]
-    # The bitcoin backend container is bitcoin-knots OR bitcoin-core depending
-    # on which version the node runs (multi-version switch) — probe which name
-    # resolves on archy-net instead of hardcoding knots, which left electrumx
-    # permanently disconnected (block index 0) on core nodes.
     custom_args:
       - >-
-        for h in bitcoin-knots bitcoin-core; do
-        if getent hosts "$h" >/dev/null 2>&1; then BTC_HOST="$h"; break; fi;
-        done;
-        export DAEMON_URL="http://archipelago:$(printenv BITCOIN_RPC_PASS)@${BTC_HOST:-bitcoin-knots}:8332/";
+        export DAEMON_URL="http://archipelago:$(printenv BITCOIN_RPC_PASS)@bitcoin-knots:8332/";
         exec electrumx_server
     secret_env:
       - key: BITCOIN_RPC_PASS

apps/fedimint-gateway/manifest.yml

@@ -9,22 +9,13 @@ app:
     pull_policy: if-not-present
     network: archy-net
     entrypoint: ["sh", "-lc"]
-    # The bitcoind host comes from $FM_BITCOIND_URL, filled by the
-    # {{BITCOIN_HOST}} derived-env below — it resolves to whichever bitcoin
-    # container is actually running (Knots, Core, or any future distro archy
-    # ships), so the gateway is never pinned to one node's container name.
-    # (Was hardcoded http://host.archipelago:8332 — the host gateway IP where
-    # bitcoind does not listen — which crash-looped the gateway, 2026-07-22.)
     custom_args:
       - >-
         if [ -f /lnd/tls.cert ] && [ -f /lnd/data/chain/bitcoin/mainnet/admin.macaroon ]; then
-          exec gatewayd --data-dir /data --listen 0.0.0.0:8176 --bcrypt-password-hash "$FEDI_HASH" --network bitcoin --bitcoind-url "$FM_BITCOIND_URL" --bitcoind-username "$FM_BITCOIND_USERNAME" --bitcoind-password "$FM_BITCOIND_PASSWORD" lnd --lnd-rpc-host lnd:10009 --lnd-tls-cert /lnd/tls.cert --lnd-macaroon /lnd/data/chain/bitcoin/mainnet/admin.macaroon;
+          exec gatewayd --data-dir /data --listen 0.0.0.0:8176 --bcrypt-password-hash "$FEDI_HASH" --network bitcoin --bitcoind-url http://host.archipelago:8332 --bitcoind-username "$FM_BITCOIND_USERNAME" --bitcoind-password "$FM_BITCOIND_PASSWORD" lnd --lnd-rpc-host lnd:10009 --lnd-tls-cert /lnd/tls.cert --lnd-macaroon /lnd/data/chain/bitcoin/mainnet/admin.macaroon;
         else
-          exec gatewayd --data-dir /data --listen 0.0.0.0:8176 --bcrypt-password-hash "$FEDI_HASH" --network bitcoin --bitcoind-url "$FM_BITCOIND_URL" --bitcoind-username "$FM_BITCOIND_USERNAME" --bitcoind-password "$FM_BITCOIND_PASSWORD" ldk --ldk-lightning-port 9737 --ldk-alias archipelago-gateway;
+          exec gatewayd --data-dir /data --listen 0.0.0.0:8176 --bcrypt-password-hash "$FEDI_HASH" --network bitcoin --bitcoind-url http://host.archipelago:8332 --bitcoind-username "$FM_BITCOIND_USERNAME" --bitcoind-password "$FM_BITCOIND_PASSWORD" ldk --ldk-lightning-port 9737 --ldk-alias archipelago-gateway;
         fi
-    derived_env:
-      - key: FM_BITCOIND_URL
-        template: "http://{{BITCOIN_HOST}}:8332"
     # The gateway's admin API is gated by a bcrypt password hash. Generate it on
     # first install (random password + its bcrypt hash, both 0600 rootless-owned)
     # so the app installs from its manifest alone — `fedimint-gateway-hash` holds

apps/fedimint/manifest.yml

@@ -21,11 +21,6 @@ app:
         template: fedimint://{{HOST_MDNS}}:8173
       - key: FM_API_URL
         template: ws://{{HOST_MDNS}}:8174
-      # Resolves to whichever bitcoin container is running (Knots/Core/future
-      # distro) instead of a hardcoded name — the guardian works on any node
-      # regardless of which Bitcoin software it runs.
-      - key: FM_BITCOIND_URL
-        template: "http://{{BITCOIN_HOST}}:8332"
     secret_env:
       - key: FM_BITCOIND_PASSWORD
         secret_file: bitcoin-rpc-password
@@ -67,8 +62,7 @@ app:
 
   environment:
     - FM_DATA_DIR=/data
-    # FM_BITCOIND_URL comes from derived_env ({{BITCOIN_HOST}}) above, not a
-    # hardcoded name — do not re-add it here.
+    - FM_BITCOIND_URL=http://bitcoin-knots:8332
     - FM_BITCOIND_USERNAME=archipelago
     - FM_BITCOIN_NETWORK=bitcoin
     - FM_BIND_P2P=0.0.0.0:8173

apps/home-assistant/Dockerfile

@@ -1,5 +1,5 @@
 # Home Assistant - uses official image
-FROM homeassistant/home-assistant:2026.7.3
+FROM homeassistant/home-assistant:2024.1
 
 # Default configuration is in the image
 # No additional setup needed

apps/home-assistant/manifest.yml

@@ -1,11 +1,11 @@
 app:
   id: homeassistant
   name: Home Assistant
-  version: 2026.7.3
+  version: 2024.1.0
   description: Open source home automation platform. Control and monitor your smart home devices.
   
   container:
-    image: 146.59.87.168:3000/lfg2025/home-assistant:2026.7.3
+    image: 146.59.87.168:3000/lfg2025/home-assistant:2024.1
     pull_policy: if-not-present
     network: pasta
     

apps/pine-openwakeword/manifest.yml

@@ -1,70 +0,0 @@
-app:
-  id: pine-openwakeword
-  name: Pine Wake Word (openWakeWord)
-  version: "2.1.0"
-  description: Wyoming-protocol openWakeWord wake-word engine. Internal Pine voice-assistant stack member — lets Assist pipelines run wake-word detection on the node (groundwork for the custom "Yo Archy" wake word; stock models like "ok nabu" ship with the image).
-  category: home
-
-  # Hyphen name matches the runtime references (stack member table / startup
-  # order) so the orchestrator adopts a matching running container instead of
-  # recreating it.
-  container_name: pine-openwakeword
-
-  container:
-    image: docker.io/rhasspy/wyoming-openwakeword:2.1.0
-    pull_policy: if-not-present
-    network: archy-net
-    network_aliases: [pine-openwakeword]
-    # The image entrypoint binds tcp://0.0.0.0:10400. Preload the stock
-    # "ok nabu" model; /custom is where a trained custom model (yo_archy)
-    # drops in later — the engine picks up new .tflite files on restart.
-    custom_args: ["--preload-model", "ok_nabu", "--custom-model-dir", "/custom"]
-
-  dependencies:
-    - storage: 512Mi
-
-  resources:
-    memory_limit: 512Mi
-
-  security:
-    # cap-drop=ALL is applied by the orchestrator. A plain Python Wyoming server
-    # on an unprivileged port needs no added capabilities.
-    capabilities: []
-    readonly_root: false
-    no_new_privileges: true
-    network_policy: isolated
-
-  ports:
-    # Published so Home Assistant (on the pasta net) can reach the engine via
-    # host.containers.internal:10400 (the Wyoming integration endpoint).
-    - host: 10400
-      container: 10400
-      protocol: tcp
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/pine-openwakeword
-      target: /custom
-      options: [rw]
-
-  environment: []
-
-  health_check:
-    type: tcp
-    endpoint: localhost:10400
-    interval: 30s
-    timeout: 5s
-    retries: 5
-    start_period: 30s
-
-  metadata:
-    author: Rhasspy / Home Assistant
-    icon: /assets/img/app-icons/pine.svg
-    website: https://github.com/rhasspy/wyoming-openwakeword
-    repo: https://github.com/rhasspy/wyoming-openwakeword
-    license: MIT
-    tags:
-      - home
-      - voice
-      - wake-word
-      - wyoming

apps/pine-piper/manifest.yml

@@ -1,70 +0,0 @@
-app:
-  id: pine-piper
-  name: Pine Piper (TTS)
-  version: "2.2.2"
-  description: Wyoming-protocol Piper text-to-speech engine. Internal Pine voice-assistant stack member — gives Home Assistant Assist a natural voice for spoken responses on the PineVoice satellite.
-  category: home
-
-  # Hyphen name matches the runtime references (stack member table / startup
-  # order) + the live container, so on an existing node the orchestrator ADOPTS
-  # the running engine rather than recreating it (downloaded voices under /data
-  # preserved).
-  container_name: pine-piper
-
-  container:
-    image: docker.io/rhasspy/wyoming-piper:2.2.2
-    pull_policy: if-not-present
-    network: archy-net
-    network_aliases: [pine-piper]
-    # The image entrypoint already binds tcp://0.0.0.0:10200; this arg only
-    # picks the voice (mirrors the pine ha-stack.yml compose command).
-    custom_args: ["--voice", "en_GB-alba-medium"]
-
-  dependencies:
-    - storage: 1Gi
-
-  resources:
-    memory_limit: 512Mi
-
-  security:
-    # cap-drop=ALL is applied by the orchestrator. A plain Python Wyoming server
-    # on an unprivileged port needs no added capabilities.
-    capabilities: []
-    readonly_root: false   # downloads the voice into /data on first run
-    no_new_privileges: true
-    network_policy: isolated
-
-  ports:
-    # Published so Home Assistant (on the pasta net) can reach the engine via
-    # host.containers.internal:10200 (the Wyoming integration endpoint).
-    - host: 10200
-      container: 10200
-      protocol: tcp
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/pine-piper
-      target: /data
-      options: [rw]
-
-  environment: []
-
-  health_check:
-    type: tcp
-    endpoint: localhost:10200
-    interval: 30s
-    timeout: 5s
-    retries: 5
-    start_period: 60s   # first start downloads the voice
-
-  metadata:
-    author: Rhasspy / Home Assistant
-    icon: /assets/img/app-icons/pine.svg
-    website: https://github.com/rhasspy/wyoming-piper
-    repo: https://github.com/rhasspy/wyoming-piper
-    license: MIT
-    tags:
-      - home
-      - voice
-      - text-to-speech
-      - wyoming

apps/pine-whisper/manifest.yml

@@ -1,78 +0,0 @@
-app:
-  id: pine-whisper
-  name: Pine Whisper (STT)
-  # App revision 3.4.2 = upstream wyoming-whisper 3.4.1 image + tuned args
-  # (--beam-size 1). Bumped past the image version so catalog-driven nodes
-  # pick up the args change; the pre-release form "3.4.1-1" would compare
-  # LOWER than 3.4.1 under semver and never roll out.
-  version: "3.4.2"
-  description: Wyoming-protocol faster-whisper speech-to-text engine. Internal Pine voice-assistant stack member — turns speech captured by a PineVoice satellite into text for Home Assistant Assist.
-  category: home
-
-  # Hyphen name matches the runtime references (stack member table / startup
-  # order) + the live container, so on an existing node the orchestrator ADOPTS
-  # the running engine rather than recreating it (downloaded models under /data
-  # preserved).
-  container_name: pine-whisper
-
-  container:
-    image: docker.io/rhasspy/wyoming-whisper:3.4.1
-    pull_policy: if-not-present
-    network: archy-net
-    network_aliases: [pine-whisper]
-    # The image entrypoint already binds tcp://0.0.0.0:10300; these args only
-    # pick the model + language (mirrors the pine ha-stack.yml compose command).
-    # --beam-size 1: the image default is 5 on x86 (1 on ARM). Benchmarked on
-    # framework-pt (i5-1135G7, base-int8): beam 1 transcribes the same text
-    # ~45% faster — the standard low-latency setting for short voice commands
-    # (HA's own whisper add-on defaults to 1).
-    custom_args: ["--model", "base-int8", "--language", "en", "--beam-size", "1"]
-
-  dependencies:
-    - storage: 2Gi
-
-  resources:
-    memory_limit: 2Gi
-
-  security:
-    # cap-drop=ALL is applied by the orchestrator. A plain Python Wyoming server
-    # on an unprivileged port needs no added capabilities.
-    capabilities: []
-    readonly_root: false   # downloads the whisper model into /data on first run
-    no_new_privileges: true
-    network_policy: isolated
-
-  ports:
-    # Published so Home Assistant (on the pasta net) can reach the engine via
-    # host.containers.internal:10300 (the Wyoming integration endpoint).
-    - host: 10300
-      container: 10300
-      protocol: tcp
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/pine-whisper
-      target: /data
-      options: [rw]
-
-  environment: []
-
-  health_check:
-    type: tcp
-    endpoint: localhost:10300
-    interval: 30s
-    timeout: 5s
-    retries: 5
-    start_period: 60s   # first start downloads the model
-
-  metadata:
-    author: Rhasspy / Home Assistant
-    icon: /assets/img/app-icons/pine.svg
-    website: https://github.com/rhasspy/wyoming-faster-whisper
-    repo: https://github.com/rhasspy/wyoming-faster-whisper
-    license: MIT
-    tags:
-      - home
-      - voice
-      - speech-to-text
-      - wyoming

apps/pine/manifest.yml

@@ -1,395 +0,0 @@
-app:
-  id: pine
-  name: Pine
-  version: "1.3.0"
-  description: A private voice assistant for your home. Pine runs speech-to-text (Whisper), text-to-speech (Piper) and wake-word detection (openWakeWord) on your own node and pairs with a PineVoice satellite speaker, so Home Assistant Assist works locally with nothing sent to the cloud. Ask it about your node — block height, sync, peers, Lightning balance — and, when a Claude API key is set, anything else.
-  category: home
-
-  # The user-facing launcher (app_id + container both "pine", matching the
-  # runtime references + the live container so the orchestrator adopts it). A
-  # tiny nginx that serves the "Connect Pine to WiFi" provisioner page for the
-  # voice stack. The two Wyoming engines (pine-whisper, pine-piper) are internal
-  # stack members.
-  container_name: pine
-
-  container:
-    image: docker.io/library/nginx:1.27-alpine
-    pull_policy: if-not-present
-    network: archy-net
-    network_aliases: [pine]
-    # The provisioner uses Web Bluetooth (Improv-over-BLE) to push WiFi creds to
-    # the PineVoice speaker. navigator.bluetooth only exists in a SECURE CONTEXT
-    # (https or localhost), so the launcher terminates TLS with a self-signed
-    # cert — otherwise the "Connect Pine to WiFi" button is inert on the LAN.
-    # Idempotent: kept as-is when crt+key already exist. Mirrors the netbird
-    # secure-context fix (#15).
-    generated_certs:
-      - crt: /var/lib/archipelago/pine/tls.crt
-        key: /var/lib/archipelago/pine/tls.key
-
-  dependencies:
-    - app_id: pine-whisper
-    - app_id: pine-piper
-    - app_id: pine-openwakeword
-    - storage: 128Mi
-
-  resources:
-    memory_limit: 64Mi
-
-  security:
-    # cap-drop=ALL is applied by the orchestrator. nginx (master as root, drops
-    # workers) binds :443 inside the container — needs the worker-drop caps +
-    # NET_BIND_SERVICE for the privileged port.
-    capabilities: [CHOWN, DAC_OVERRIDE, SETGID, SETUID, NET_BIND_SERVICE]
-    readonly_root: false
-    no_new_privileges: true
-    network_policy: isolated
-
-  ports:
-    # 10380 (http) is the Open target — the UI launches apps as
-    # http://host:10380 (resolveAppUrl). nginx there 301-redirects to the https
-    # listener on 10381, so the new tab lands on a secure context where
-    # navigator.bluetooth (the "Connect Pine to WiFi" provisioner) works.
-    - host: 10380
-      container: 80
-      protocol: tcp
-    - host: 10381
-      container: 443
-      protocol: tcp
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/pine/nginx.conf
-      target: /etc/nginx/conf.d/default.conf
-      options: [ro]
-    - type: bind
-      source: /var/lib/archipelago/pine/tls.crt
-      target: /etc/nginx/tls.crt
-      options: [ro]
-    - type: bind
-      source: /var/lib/archipelago/pine/tls.key
-      target: /etc/nginx/tls.key
-      options: [ro]
-    - type: bind
-      source: /var/lib/archipelago/pine/index.html
-      target: /usr/share/nginx/html/index.html
-      options: [ro]
-
-  environment: []
-
-  files:
-    - path: /var/lib/archipelago/pine/nginx.conf
-      overwrite: true
-      content: |
-        server {
-            listen 80;
-            server_name _;
-            return 301 https://$host:10381$request_uri;
-        }
-        server {
-            listen 443 ssl;
-            server_name _;
-            ssl_certificate /etc/nginx/tls.crt;
-            ssl_certificate_key /etc/nginx/tls.key;
-            root /usr/share/nginx/html;
-            index index.html;
-            # Live node facts for the status card — proxied to the node's
-            # public status tier so the (https) page can fetch same-origin.
-            location = /node-status {
-                proxy_pass http://host.containers.internal:80/api/pine/status;
-                proxy_http_version 1.1;
-                proxy_set_header Host $host;
-                proxy_connect_timeout 5s;
-                proxy_read_timeout 10s;
-            }
-            location / { try_files $uri $uri/ /index.html; }
-        }
-    - path: /var/lib/archipelago/pine/index.html
-      overwrite: true
-      content: |
-        <!doctype html>
-        <html lang="en">
-        <head>
-          <meta charset="utf-8">
-          <meta name="viewport" content="width=device-width, initial-scale=1">
-          <title>Pine — connect your speaker</title>
-          <style>
-            :root { color-scheme: dark; }
-            * { box-sizing: border-box; }
-            body { margin: 0; font: 16px/1.6 system-ui, -apple-system, sans-serif;
-                   background: #0f1512; color: #e7efe9; }
-            .wrap { max-width: 520px; margin: 0 auto; padding: 40px 22px 64px; }
-            header { display: flex; align-items: center; gap: 14px; margin-bottom: 6px; }
-            header svg { width: 52px; height: 52px; flex: 0 0 auto; }
-            h1 { font-size: 26px; margin: 0; }
-            .tag { color: #8fbfa5; font-size: 14px; margin: 2px 0 0; }
-            .card { background: #16201b; border: 1px solid #24332b;
-                    border-radius: 14px; padding: 20px; margin: 20px 0; }
-            .status .row { display: flex; gap: 10px; align-items: baseline; font-size: 14px; }
-            .status .row b { min-width: 84px; color: #9fd3b6; }
-            .status code { background: #0f1512; padding: 1px 6px; border-radius: 5px;
-                           font-size: 13px; color: #cfe9d9; }
-            label { display: block; font-size: 13px; color: #9fbfad; margin: 14px 0 5px; }
-            input { width: 100%; padding: 11px 12px; font-size: 15px; color: #e7efe9;
-                    background: #0f1512; border: 1px solid #2b3d33; border-radius: 9px;
-                    outline: none; }
-            input:focus { border-color: #4fae82; }
-            button { width: 100%; margin-top: 18px; padding: 13px; font-size: 15px;
-                     font-weight: 600; color: #06110b; background: #7fd6a6; border: 0;
-                     border-radius: 10px; cursor: pointer; transition: filter .15s; }
-            button:hover:not(:disabled) { filter: brightness(1.08); }
-            button:disabled { opacity: .45; cursor: default; }
-            #log { margin-top: 16px; padding: 12px; min-height: 68px; font-size: 13px;
-                   font-family: ui-monospace, monospace; white-space: pre-wrap;
-                   background: #0b100d; border: 1px solid #1e2a23; border-radius: 9px;
-                   color: #a9c6b6; max-height: 220px; overflow-y: auto; }
-            .ok { color: #7fd6a6; } .err { color: #ee8f8f; } .warn { color: #e8c878; }
-            .ha { color: #6d8578; font-size: 13px; margin-top: 22px; }
-            .ha b { color: #9fbfad; }
-            .insecure { display: none; background: #2a1f12; border-color: #4a3418;
-                        color: #e8c878; font-size: 13px; }
-          </style>
-        </head>
-        <body>
-          <div class="wrap">
-            <header>
-              <svg viewBox="0 0 512 512" aria-hidden="true"><g fill="#7fd6a6">
-                <rect x="236" y="396" width="40" height="72" rx="6"/>
-                <path d="M256 44 L336 168 L296 168 L256 108 L216 168 L176 168 Z"/>
-                <path d="M256 150 L360 300 L300 300 L256 236 L212 300 L152 300 Z"/>
-                <path d="M256 262 L392 430 L120 430 L256 262 Z"/>
-              </g></svg>
-              <div><h1>Pine</h1>
-                <p class="tag">Connect your speaker — everything stays on your node.</p></div>
-            </header>
-
-            <div class="card status">
-              <div class="row"><b>Whisper</b><span>speech-to-text ready on <code>:10300</code></span></div>
-              <div class="row"><b>Piper</b><span>text-to-speech ready on <code>:10200</code></span></div>
-              <div class="row"><b>Wake word</b><span>“Hey Jarvis” on the speaker (openWakeWord on <code>:10400</code>)</span></div>
-              <div class="row"><b>Speaker</b><span>put it in pairing mode — ring LED blinking yellow</span></div>
-            </div>
-
-            <div class="card status">
-              <div class="row"><b>Node</b><span id="ns-node">checking…</span></div>
-              <div class="row"><b>Bitcoin</b><span id="ns-btc">—</span></div>
-              <div class="row"><b>Peers</b><span id="ns-peers">—</span></div>
-            </div>
-
-            <div class="card insecure" id="insecure">
-              This page isn’t running over HTTPS, so the browser blocks Bluetooth.
-              Open it via its <b>https://…:10380</b> address (accept the self-signed
-              certificate) and the button below will work.
-            </div>
-
-            <div class="card">
-              <label for="ssid">WiFi network (SSID)</label>
-              <input id="ssid" autocomplete="off" spellcheck="false" placeholder="Your 2.4 GHz network">
-              <label for="pass">WiFi password — typed here, sent only over Bluetooth to the speaker</label>
-              <input id="pass" type="password" autocomplete="off">
-              <button id="go">Connect Pine to WiFi</button>
-              <div id="log">Ready. Click the button, then pick “PineVoice” in the Bluetooth popup.</div>
-            </div>
-
-            <p class="ha">After WiFi joins, one manual step remains — pair the
-              speaker in Home Assistant: <b>Settings → Devices &amp; services →
-              Add Wyoming Protocol</b>, host = the speaker’s IP, port
-              <b>10700</b>. Whisper, Piper, openWakeWord and the Assist pipeline
-              are wired up automatically when Pine installs. Wake word:
-              <b>“Hey Jarvis.”</b> Ask node things like <i>“what’s the block
-              height?”</i>, <i>“how many peers?”</i>, <i>“is the node
-              synced?”</i> or <i>“what’s my lightning balance?”</i> — and when a
-              Claude API key is set on the node, anything else gets answered by
-              Claude. New mesh messages are announced on the speaker too.</p>
-            <p class="ha">Troubleshooting: if it hears you (LED reacts) but answers
-              are silent, unplug and replug the speaker — an interrupted answer can
-              wedge its audio output until it reboots.</p>
-          </div>
-
-          <script>
-          "use strict";
-          // Improv-over-BLE (improv-wifi spec, verified vs improv-wifi-sdk 1.4.0).
-          const SVC   = "00467768-6228-2272-4663-277478268000";
-          const CHAR_STATE  = "00467768-6228-2272-4663-277478268001";
-          const CHAR_ERROR  = "00467768-6228-2272-4663-277478268002";
-          const CHAR_RPC    = "00467768-6228-2272-4663-277478268003";
-          const CHAR_RESULT = "00467768-6228-2272-4663-277478268004";
-          const STATES = {1:"authorization required",2:"authorized",3:"provisioning…",4:"PROVISIONED"};
-          const ERRORS = {1:"invalid RPC packet",2:"unknown RPC command",
-            3:"unable to connect — wrong password, or the SSID isn't reachable on 2.4 GHz",
-            4:"not authorized — press the button on the device",5:"bad hostname",
-            255:"unknown device error"};
-
-          const logEl = document.getElementById("log");
-          const log = (msg, cls) => { const l = document.createElement("div");
-            if (cls) l.className = cls; l.textContent = msg; logEl.appendChild(l);
-            logEl.scrollTop = logEl.scrollHeight; };
-          const hex = dv => [...new Uint8Array(dv.buffer, dv.byteOffset, dv.byteLength)]
-            .map(b => b.toString(16).padStart(2, "0")).join(" ");
-
-          const btn = document.getElementById("go");
-          if (!navigator.bluetooth) {
-            document.getElementById("insecure").style.display = "block";
-            logEl.textContent = "Web Bluetooth unavailable — open this page over https (see note above).";
-          }
-
-          btn.addEventListener("click", async () => {
-            const ssid = document.getElementById("ssid").value.trim();
-            const pass = document.getElementById("pass").value;
-            if (!ssid) { log("Enter your WiFi network name first.", "err"); return; }
-            if (!navigator.bluetooth) { log("No Web Bluetooth — open this page over https.", "err"); return; }
-            btn.disabled = true; logEl.textContent = "";
-            let device;
-            try {
-              log("Opening Bluetooth device chooser…");
-              device = await navigator.bluetooth.requestDevice({
-                filters: [{ services: [SVC] }, { namePrefix: "PineVoice" }],
-                optionalServices: [SVC],
-              });
-              log(`Selected: ${device.name || "(unnamed)"}`);
-              device.addEventListener("gattserverdisconnected", () => log("BLE disconnected."));
-              log("Connecting…");
-              const gatt = await device.gatt.connect();
-              const svc = await gatt.getPrimaryService(SVC);
-              const stateChar  = await svc.getCharacteristic(CHAR_STATE);
-              const errorChar  = await svc.getCharacteristic(CHAR_ERROR);
-              const rpcChar    = await svc.getCharacteristic(CHAR_RPC);
-              const resultChar = await svc.getCharacteristic(CHAR_RESULT);
-
-              let done, fail;
-              const outcome = new Promise((res, rej) => { done = res; fail = rej; });
-              let authorize; const authorized = new Promise(res => { authorize = res; });
-              let state = -1;
-              const onState = (s, via = "") => {
-                if (s === state) return; state = s;
-                log(`Device state${via}: ${STATES[s] || s}`, s === 4 ? "ok" : undefined);
-                if (s >= 2) authorize();
-                if (s === 4) done(null);
-              };
-              stateChar.addEventListener("characteristicvaluechanged",
-                e => onState(e.target.value.getUint8(0)));
-              errorChar.addEventListener("characteristicvaluechanged", e => {
-                const c = e.target.value.getUint8(0);
-                if (c !== 0) fail(new Error(ERRORS[c] || `error ${c}`)); });
-              resultChar.addEventListener("characteristicvaluechanged", e => {
-                const v = e.target.value; log(`RPC result: ${hex(v)}`);
-                if (v.byteLength > 2 && v.getUint8(1) > 0) {
-                  const n = v.getUint8(2); const b = new Uint8Array(n);
-                  for (let i = 0; i < n; i++) b[i] = v.getUint8(3 + i);
-                  done(new TextDecoder().decode(b)); } });
-              await stateChar.startNotifications();
-              await errorChar.startNotifications();
-              await resultChar.startNotifications();
-              onState((await stateChar.readValue()).getUint8(0));
-
-              const poller = setInterval(async () => {
-                try { onState((await stateChar.readValue()).getUint8(0), " (polled)");
-                  const ec = (await errorChar.readValue()).getUint8(0);
-                  if (ec !== 0) fail(new Error(ERRORS[ec] || `error ${ec}`)); } catch {} }, 2000);
-
-              let nextUrl;
-              try {
-                if (state === 1) {
-                  log("Authorization required — press the centre button on the speaker now.", "warn");
-                  await Promise.race([authorized, outcome,
-                    new Promise((_, rej) => setTimeout(
-                      () => rej(new Error("timed out waiting for the button press")), 60000))]);
-                  log("Authorized.", "ok");
-                }
-                const enc = new TextEncoder();
-                const sb = enc.encode(ssid), pb = enc.encode(pass);
-                const data = new Uint8Array([sb.length, ...sb, pb.length, ...pb]);
-                const pkt = new Uint8Array([1, data.length, ...data, 0]);
-                pkt[pkt.length - 1] = pkt.reduce((s, b) => s + b, 0);
-                log(`Sending WiFi credentials for “${ssid}”…`);
-                if (rpcChar.writeValueWithResponse) await rpcChar.writeValueWithResponse(pkt);
-                else await rpcChar.writeValue(pkt);
-                log("Credentials delivered — speaker acknowledged.", "ok");
-                log("Joining WiFi… (the speaker plays a sound within ~20s either way)");
-                const timeout = new Promise((_, rej) => setTimeout(
-                  () => rej(new Error("timed out after 60s waiting for the device")), 60000));
-                nextUrl = await Promise.race([outcome, timeout]);
-              } finally { clearInterval(poller); }
-
-              log("✓ PROVISIONED — the ring LED should breathe dim magenta.", "ok");
-              if (nextUrl) log(`Device reports next step: ${nextUrl}`, "ok");
-              try { gatt.disconnect(); } catch {}
-            } catch (err) {
-              log(`✗ ${err.name || "Error"}: ${err.message}`, "err");
-              if (err.name === "NotFoundError")
-                log("No speaker matched, or you closed the chooser. LED blinking yellow? "
-                  + "Hold the dot button 15s to reset.", "warn");
-              if (err.name === "NetworkError")
-                log("BLE link dropped — move closer, and make sure the Mac isn't already "
-                  + "paired to the speaker (it can hold the link exclusively).", "warn");
-              try { device?.gatt?.disconnect(); } catch {}
-            } finally { btn.disabled = false; }
-          });
-
-          // Live node status card — public tier of /api/pine/status via the
-          // same-origin /node-status proxy. Best-effort: failures just show
-          // "unavailable" and retry on the next tick.
-          const nsNode = document.getElementById("ns-node");
-          const nsBtc = document.getElementById("ns-btc");
-          const nsPeers = document.getElementById("ns-peers");
-          async function refreshNodeStatus() {
-            try {
-              const r = await fetch("/node-status", { cache: "no-store" });
-              if (!r.ok) throw new Error(String(r.status));
-              const s = await r.json();
-              const up = Math.floor((s.uptime_seconds || 0) / 3600);
-              nsNode.textContent = `Archipelago ${s.version || "?"} — up ${up}h`;
-              if (s.bitcoin && s.bitcoin.height != null) {
-                const pct = s.bitcoin.sync_percent;
-                nsBtc.textContent = `block ${s.bitcoin.height}` +
-                  (pct != null ? (pct >= 99.99 ? " — synced" : ` — ${pct}% synced`) : "");
-              } else {
-                nsBtc.textContent = "not running";
-              }
-              const btcPeers = s.bitcoin && s.bitcoin.peers != null ? s.bitcoin.peers : "?";
-              const meshPeers = s.mesh ? s.mesh.peers : 0;
-              nsPeers.textContent = `${btcPeers} bitcoin` +
-                (s.mesh && s.mesh.enabled ? `, ${meshPeers} mesh` : "");
-            } catch {
-              nsNode.textContent = "node status unavailable";
-              nsBtc.textContent = "—";
-              nsPeers.textContent = "—";
-            }
-          }
-          refreshNodeStatus();
-          setInterval(refreshNodeStatus, 30000);
-          </script>
-        </body>
-        </html>
-
-  health_check:
-    type: tcp
-    endpoint: localhost:443
-    interval: 30s
-    timeout: 5s
-    retries: 5
-    start_period: 10s
-
-  interfaces:
-    main:
-      name: Pine
-      description: Connect your speaker to WiFi and check the voice assistant
-      type: ui
-      port: 10380
-      protocol: http
-      path: /
-
-  metadata:
-    author: Archipelago
-    icon: /assets/img/app-icons/pine.svg
-    website: https://github.com/rhasspy/wyoming
-    repo: https://github.com/rhasspy/wyoming
-    license: MIT
-    category: home
-    launch:
-      open_in_new_tab: true
-    tags:
-      - home
-      - voice
-      - assistant
-      - privacy

core/.env.production

@@ -0,0 +1,33 @@
+# Archipelago Production Configuration
+# This file is bundled with the macOS app
+
+# Server Configuration
+ARCHIPELAGO_HOST=127.0.0.1
+ARCHIPELAGO_PORT=8100
+ARCHIPELAGO_BACKEND_PORT=3030
+
+# Data Directories (relative to ~/Library/Application Support/Archipelago)
+ARCHIPELAGO_DATA_DIR=data
+ARCHIPELAGO_LOG_DIR=logs
+
+# Frontend Configuration
+ARCHIPELAGO_FRONTEND_DIR=frontend
+
+# Docker UI Configuration
+ARCHIPELAGO_DOCKER_UI_DIR=docker-ui
+
+# Security
+ARCHIPELAGO_SESSION_SECRET=CHANGE_ME_ON_FIRST_RUN
+
+# Logging
+RUST_LOG=info
+
+# Production Mode
+NODE_ENV=production
+ARCHIPELAGO_MODE=production
+
+# Docker Configuration
+DOCKER_HOST=unix:///var/run/docker.sock
+
+# Disable External API Calls in Production
+ARCHIPELAGO_DISABLE_EXTERNAL_APIS=true

core/Cargo.lock

@@ -95,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "archipelago"
-version = "1.7.116-alpha"
+version = "1.7.100-alpha"
 dependencies = [
  "anyhow",
  "archipelago-container",
@@ -145,7 +145,6 @@ dependencies = [
  "serde_yaml",
  "serial2-tokio",
  "sha2 0.10.9",
- "socket2 0.5.10",
  "tar",
  "tempfile",
  "thiserror 1.0.69",

core/THIRD-PARTY-LICENSES.md

@@ -1,656 +0,0 @@
-# Third-Party Rust Crate Licenses — Archipelago core
-
-Generated from `cargo metadata` (all features) on 2026-07-23. 649 external crates.
-Full license texts ship with release artifacts (cargo-about; see docs/LICENSE-COMPLIANCE-AUDIT.md).
-
-| Crate | Version | License | Source |
-|---|---|---|---|
-| adler2 | 2.0.1 | 0BSD OR MIT OR Apache-2.0 | https://github.com/oyvindln/adler2 |
-| aead | 0.5.2 | MIT OR Apache-2.0 | https://github.com/RustCrypto/traits |
-| aes | 0.8.4 | MIT OR Apache-2.0 | https://github.com/RustCrypto/block-ciphers |
-| aes-gcm | 0.10.3 | Apache-2.0 OR MIT | https://github.com/RustCrypto/AEADs |
-| ahash | 0.7.8 | MIT OR Apache-2.0 | https://github.com/tkaitchuck/ahash |
-| aho-corasick | 1.1.4 | Unlicense OR MIT | https://github.com/BurntSushi/aho-corasick |
-| allocator-api2 | 0.2.21 | MIT OR Apache-2.0 | https://github.com/zakarumych/allocator-api2 |
-| android_system_properties | 0.1.5 | MIT/Apache-2.0 | https://github.com/nical/android_system_properties |
-| anyhow | 1.0.100 | MIT OR Apache-2.0 | https://github.com/dtolnay/anyhow |
-| arc-swap | 1.9.1 | MIT OR Apache-2.0 | https://github.com/vorner/arc-swap |
-| argon2 | 0.5.3 | MIT OR Apache-2.0 | https://github.com/RustCrypto/password-hashes/tree/master/argon2 |
-| arrayref | 0.3.9 | BSD-2-Clause | https://github.com/droundy/arrayref |
-| arrayvec | 0.7.6 | MIT OR Apache-2.0 | https://github.com/bluss/arrayvec |
-| asn1-rs | 0.7.2 | MIT OR Apache-2.0 | https://github.com/rusticata/asn1-rs.git |
-| asn1-rs-derive | 0.6.0 | MIT OR Apache-2.0 | https://github.com/rusticata/asn1-rs.git |
-| asn1-rs-impl | 0.2.0 | MIT/Apache-2.0 | https://github.com/rusticata/asn1-rs.git |
-| async-trait | 0.1.89 | MIT OR Apache-2.0 | https://github.com/dtolnay/async-trait |
-| async-utility | 0.3.1 | MIT | https://github.com/yukibtc/async-utility.git |
-| async-wsocket | 0.13.1 | MIT | https://github.com/yukibtc/async-wsocket.git |
-| async_io_stream | 0.3.3 | Unlicense | https://github.com/najamelan/async_io_stream |
-| atomic-destructor | 0.3.0 | MIT | https://github.com/yukibtc/atomic-destructor.git |
-| atomic-polyfill | 1.0.3 | MIT OR Apache-2.0 | https://github.com/embassy-rs/atomic-polyfill |
-| atomic-waker | 1.1.2 | Apache-2.0 OR MIT | https://github.com/smol-rs/atomic-waker |
-| attohttpc | 0.30.1 | MPL-2.0 | https://github.com/sbstp/attohttpc |
-| autocfg | 1.5.0 | Apache-2.0 OR MIT | https://github.com/cuviper/autocfg |
-| backon | 1.6.0 | Apache-2.0 | https://github.com/Xuanwo/backon |
-| bao-tree | 0.16.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/bao-tree |
-| base16ct | 1.0.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats |
-| base32 | 0.5.1 | MIT OR Apache-2.0 | https://github.com/andreasots/base32 |
-| base58ck | 0.1.0 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bitcoin/ |
-| base64 | 0.21.7 | MIT OR Apache-2.0 | https://github.com/marshallpierce/rust-base64 |
-| base64 | 0.22.1 | MIT OR Apache-2.0 | https://github.com/marshallpierce/rust-base64 |
-| base64ct | 1.8.3 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats |
-| bcrypt | 0.15.1 | MIT | https://github.com/Keats/rust-bcrypt |
-| bech32 | 0.11.1 | MIT | https://github.com/rust-bitcoin/rust-bech32 |
-| binary-merge | 0.1.2 | MIT OR Apache-2.0 | https://github.com/rklaehn/binary-merge |
-| bip39 | 2.1.0 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bip39/ |
-| bit-vec | 0.9.1 | Apache-2.0 OR MIT | https://github.com/contain-rs/bit-vec |
-| bitcoin | 0.32.5 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bitcoin/ |
-| bitcoin-internals | 0.2.0 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bitcoin/ |
-| bitcoin-internals | 0.3.0 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bitcoin/ |
-| bitcoin-io | 0.1.4 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bitcoin |
-| bitcoin-units | 0.1.2 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bitcoin/ |
-| bitcoin_hashes | 0.13.0 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bitcoin |
-| bitcoin_hashes | 0.14.1 | CC0-1.0 | https://github.com/rust-bitcoin/rust-bitcoin |
-| bitflags | 1.3.2 | MIT/Apache-2.0 | https://github.com/bitflags/bitflags |
-| bitflags | 2.13.0 | MIT OR Apache-2.0 | https://github.com/bitflags/bitflags |
-| blake2 | 0.10.6 | MIT OR Apache-2.0 | https://github.com/RustCrypto/hashes |
-| blake3 | 1.8.5 | CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception | https://github.com/BLAKE3-team/BLAKE3 |
-| block-buffer | 0.10.4 | MIT OR Apache-2.0 | https://github.com/RustCrypto/utils |
-| block-buffer | 0.12.1 | MIT OR Apache-2.0 | https://github.com/RustCrypto/utils |
-| block-padding | 0.3.3 | MIT OR Apache-2.0 | https://github.com/RustCrypto/utils |
-| block2 | 0.6.2 | MIT | https://github.com/madsmtm/objc2 |
-| blowfish | 0.9.1 | MIT OR Apache-2.0 | https://github.com/RustCrypto/block-ciphers |
-| bs58 | 0.5.1 | MIT/Apache-2.0 | https://github.com/Nullus157/bs58-rs |
-| bumpalo | 3.19.1 | MIT OR Apache-2.0 | https://github.com/fitzgen/bumpalo |
-| bytemuck | 1.25.0 | Zlib OR Apache-2.0 OR MIT | https://github.com/Lokathor/bytemuck |
-| byteorder | 1.5.0 | Unlicense OR MIT | https://github.com/BurntSushi/byteorder |
-| byteorder-lite | 0.1.0 | Unlicense OR MIT | https://github.com/image-rs/byteorder-lite |
-| bytes | 1.11.0 | MIT | https://github.com/tokio-rs/bytes |
-| cbc | 0.1.2 | MIT OR Apache-2.0 | https://github.com/RustCrypto/block-modes |
-| cc | 1.2.54 | MIT OR Apache-2.0 | https://github.com/rust-lang/cc-rs |
-| cesu8 | 1.1.0 | Apache-2.0/MIT | https://github.com/emk/cesu8-rs |
-| cfg-if | 1.0.4 | MIT OR Apache-2.0 | https://github.com/rust-lang/cfg-if |
-| cfg_aliases | 0.2.1 | MIT | https://github.com/katharostech/cfg_aliases |
-| chacha20 | 0.10.0 | MIT OR Apache-2.0 | https://github.com/RustCrypto/stream-ciphers |
-| chacha20 | 0.9.1 | Apache-2.0 OR MIT | https://github.com/RustCrypto/stream-ciphers |
-| chacha20poly1305 | 0.10.1 | Apache-2.0 OR MIT | https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305 |
-| chrono | 0.4.43 | MIT OR Apache-2.0 | https://github.com/chronotope/chrono |
-| ciborium | 0.2.2 | Apache-2.0 | https://github.com/enarx/ciborium |
-| ciborium-io | 0.2.2 | Apache-2.0 | https://github.com/enarx/ciborium |
-| ciborium-ll | 0.2.2 | Apache-2.0 | https://github.com/enarx/ciborium |
-| cipher | 0.4.4 | MIT OR Apache-2.0 | https://github.com/RustCrypto/traits |
-| cmov | 0.5.4 | Apache-2.0 OR MIT | https://github.com/RustCrypto/utils |
-| cobs | 0.3.0 | MIT OR Apache-2.0 | https://github.com/jamesmunns/cobs.rs |
-| combine | 4.6.7 | MIT | https://github.com/Marwes/combine |
-| const-oid | 0.10.2 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats |
-| const-oid | 0.9.6 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats/tree/master/const-oid |
-| constant_time_eq | 0.3.1 | CC0-1.0 OR MIT-0 OR Apache-2.0 | https://github.com/cesarb/constant_time_eq |
-| constant_time_eq | 0.4.2 | CC0-1.0 OR MIT-0 OR Apache-2.0 | https://github.com/cesarb/constant_time_eq |
-| convert_case | 0.10.0 | MIT | https://github.com/rutrum/convert-case |
-| cordyceps | 0.3.4 | MIT | https://github.com/hawkw/mycelium |
-| core-foundation | 0.10.1 | MIT OR Apache-2.0 | https://github.com/servo/core-foundation-rs |
-| core-foundation | 0.9.4 | MIT OR Apache-2.0 | https://github.com/servo/core-foundation-rs |
-| core-foundation-sys | 0.8.7 | MIT OR Apache-2.0 | https://github.com/servo/core-foundation-rs |
-| cpufeatures | 0.2.17 | MIT OR Apache-2.0 | https://github.com/RustCrypto/utils |
-| cpufeatures | 0.3.0 | MIT OR Apache-2.0 | https://github.com/RustCrypto/utils |
-| crc | 3.4.0 | MIT OR Apache-2.0 | https://github.com/mrhooray/crc-rs.git |
-| crc-catalog | 2.4.0 | MIT OR Apache-2.0 | https://github.com/akhilles/crc-catalog.git |
-| crc32fast | 1.5.0 | MIT OR Apache-2.0 | https://github.com/srijs/rust-crc32fast |
-| critical-section | 1.2.0 | MIT OR Apache-2.0 | https://github.com/rust-embedded/critical-section |
-| crossbeam-channel | 0.5.15 | MIT OR Apache-2.0 | https://github.com/crossbeam-rs/crossbeam |
-| crossbeam-epoch | 0.9.18 | MIT OR Apache-2.0 | https://github.com/crossbeam-rs/crossbeam |
-| crossbeam-utils | 0.8.21 | MIT OR Apache-2.0 | https://github.com/crossbeam-rs/crossbeam |
-| crunchy | 0.2.4 | MIT | https://github.com/eira-fransham/crunchy |
-| crypto-common | 0.1.7 | MIT OR Apache-2.0 | https://github.com/RustCrypto/traits |
-| crypto-common | 0.2.2 | MIT OR Apache-2.0 | https://github.com/RustCrypto/traits |
-| ctr | 0.9.2 | MIT OR Apache-2.0 | https://github.com/RustCrypto/block-modes |
-| ctutils | 0.4.2 | Apache-2.0 OR MIT | https://github.com/RustCrypto/utils |
-| curve25519-dalek | 4.1.3 | BSD-3-Clause | https://github.com/dalek-cryptography/curve25519-dalek/tree/main/curve25519-dalek |
-| curve25519-dalek | 5.0.0-rc.0 | BSD-3-Clause | https://github.com/dalek-cryptography/curve25519-dalek/tree/main/curve25519-dalek |
-| curve25519-dalek-derive | 0.1.1 | MIT/Apache-2.0 | https://github.com/dalek-cryptography/curve25519-dalek |
-| darling | 0.20.11 | MIT | https://github.com/TedDriggs/darling |
-| darling_core | 0.20.11 | MIT | https://github.com/TedDriggs/darling |
-| darling_macro | 0.20.11 | MIT | https://github.com/TedDriggs/darling |
-| data-encoding | 2.11.0 | MIT | https://github.com/ia0/data-encoding |
-| data-encoding-macro | 0.1.20 | MIT | https://github.com/ia0/data-encoding |
-| data-encoding-macro-internal | 0.1.18 | MIT | https://github.com/ia0/data-encoding |
-| der | 0.7.10 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats/tree/master/der |
-| der | 0.8.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats |
-| der-parser | 10.0.0 | MIT OR Apache-2.0 | https://github.com/rusticata/der-parser.git |
-| deranged | 0.5.8 | MIT OR Apache-2.0 | https://github.com/jhpratt/deranged |
-| derive_builder | 0.20.2 | MIT OR Apache-2.0 | https://github.com/colin-kiegel/rust-derive-builder |
-| derive_builder_core | 0.20.2 | MIT OR Apache-2.0 | https://github.com/colin-kiegel/rust-derive-builder |
-| derive_builder_macro | 0.20.2 | MIT OR Apache-2.0 | https://github.com/colin-kiegel/rust-derive-builder |
-| derive_more | 2.1.1 | MIT | https://github.com/JelteF/derive_more |
-| derive_more-impl | 2.1.1 | MIT | https://github.com/JelteF/derive_more |
-| diatomic-waker | 0.2.3 | MIT OR Apache-2.0 | https://github.com/asynchronics/diatomic-waker |
-| digest | 0.10.7 | MIT OR Apache-2.0 | https://github.com/RustCrypto/traits |
-| digest | 0.11.3 | MIT OR Apache-2.0 | https://github.com/RustCrypto/traits |
-| dispatch2 | 0.3.1 | Zlib OR Apache-2.0 OR MIT | https://github.com/madsmtm/objc2 |
-| displaydoc | 0.2.5 | MIT OR Apache-2.0 | https://github.com/yaahc/displaydoc |
-| dlopen2 | 0.8.2 | MIT | https://github.com/OpenByteDev/dlopen2 |
-| ed25519 | 2.2.3 | Apache-2.0 OR MIT | https://github.com/RustCrypto/signatures/tree/master/ed25519 |
-| ed25519 | 3.0.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/signatures |
-| ed25519-dalek | 2.2.0 | BSD-3-Clause | https://github.com/dalek-cryptography/curve25519-dalek/tree/main/ed25519-dalek |
-| ed25519-dalek | 3.0.0-rc.0 | BSD-3-Clause | https://github.com/dalek-cryptography/curve25519-dalek/tree/main/ed25519-dalek |
-| either | 1.15.0 | MIT OR Apache-2.0 | https://github.com/rayon-rs/either |
-| embedded-io | 0.4.0 | MIT OR Apache-2.0 | https://github.com/embassy-rs/embedded-io |
-| embedded-io | 0.6.1 | MIT OR Apache-2.0 | https://github.com/rust-embedded/embedded-hal |
-| encoding_rs | 0.8.35 | (Apache-2.0 OR MIT) AND BSD-3-Clause | https://github.com/hsivonen/encoding_rs |
-| enum-assoc | 1.3.0 | MIT OR Apache-2.0 | https://github.com/Eolu/enum-assoc |
-| env_logger | 0.10.2 | MIT OR Apache-2.0 | https://github.com/rust-cli/env_logger |
-| equivalent | 1.0.2 | Apache-2.0 OR MIT | https://github.com/indexmap-rs/equivalent |
-| errno | 0.3.14 | MIT OR Apache-2.0 | https://github.com/lambda-fairy/rust-errno |
-| fastbloom | 0.17.0 | MIT OR Apache-2.0 | https://github.com/tomtomwombat/fastbloom/ |
-| fastrand | 2.3.0 | Apache-2.0 OR MIT | https://github.com/smol-rs/fastrand |
-| fiat-crypto | 0.2.9 | MIT OR Apache-2.0 OR BSD-1-Clause | https://github.com/mit-plv/fiat-crypto |
-| fiat-crypto | 0.3.0 | MIT OR Apache-2.0 OR BSD-1-Clause | https://github.com/mit-plv/fiat-crypto |
-| filetime | 0.2.27 | MIT/Apache-2.0 | https://github.com/alexcrichton/filetime |
-| find-msvc-tools | 0.1.8 | MIT OR Apache-2.0 | https://github.com/rust-lang/cc-rs |
-| flate2 | 1.1.9 | MIT OR Apache-2.0 | https://github.com/rust-lang/flate2-rs |
-| flume | 0.11.1 | Apache-2.0/MIT | https://github.com/zesterer/flume |
-| fnv | 1.0.7 | Apache-2.0 / MIT | https://github.com/servo/rust-fnv |
-| foldhash | 0.1.5 | Zlib | https://github.com/orlp/foldhash |
-| foldhash | 0.2.0 | Zlib | https://github.com/orlp/foldhash |
-| form_urlencoded | 1.2.2 | MIT OR Apache-2.0 | https://github.com/servo/rust-url |
-| futures | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| futures-buffered | 0.2.13 | MIT | https://github.com/conradludgate/futures-buffered |
-| futures-channel | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| futures-core | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| futures-executor | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| futures-io | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| futures-lite | 2.6.1 | Apache-2.0 OR MIT | https://github.com/smol-rs/futures-lite |
-| futures-macro | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| futures-sink | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| futures-task | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| futures-util | 0.3.31 | MIT OR Apache-2.0 | https://github.com/rust-lang/futures-rs |
-| genawaiter | 0.99.1 | MIT | https://github.com/whatisaphone/genawaiter |
-| genawaiter-macro | 0.99.1 | MIT/Apache-2.0 | https://github.com/whatisaphone/genawaiter |
-| genawaiter-proc-macro | 0.99.1 | MIT/Apache-2.0 | https://github.com/whatisaphone/genawaiter |
-| generator | 0.8.9 | MIT/Apache-2.0 | https://github.com/Xudong-Huang/generator-rs.git |
-| generic-array | 0.14.7 | MIT | https://github.com/fizyk20/generic-array.git |
-| getrandom | 0.2.17 | MIT OR Apache-2.0 | https://github.com/rust-random/getrandom |
-| getrandom | 0.3.4 | MIT OR Apache-2.0 | https://github.com/rust-random/getrandom |
-| getrandom | 0.4.2 | MIT OR Apache-2.0 | https://github.com/rust-random/getrandom |
-| ghash | 0.5.1 | Apache-2.0 OR MIT | https://github.com/RustCrypto/universal-hashes |
-| gloo-timers | 0.3.0 | MIT OR Apache-2.0 | https://github.com/rustwasm/gloo/tree/master/crates/timers |
-| h2 | 0.3.27 | MIT | https://github.com/hyperium/h2 |
-| h2 | 0.4.13 | MIT | https://github.com/hyperium/h2 |
-| half | 2.7.1 | MIT OR Apache-2.0 | https://github.com/VoidStarKat/half-rs |
-| hash32 | 0.2.1 | MIT OR Apache-2.0 | https://github.com/japaric/hash32 |
-| hashbrown | 0.12.3 | MIT OR Apache-2.0 | https://github.com/rust-lang/hashbrown |
-| hashbrown | 0.15.5 | MIT OR Apache-2.0 | https://github.com/rust-lang/hashbrown |
-| hashbrown | 0.16.1 | MIT OR Apache-2.0 | https://github.com/rust-lang/hashbrown |
-| hashbrown | 0.17.1 | MIT OR Apache-2.0 | https://github.com/rust-lang/hashbrown |
-| heapless | 0.7.17 | MIT OR Apache-2.0 | https://github.com/japaric/heapless |
-| heck | 0.5.0 | MIT OR Apache-2.0 | https://github.com/withoutboats/heck |
-| hermit-abi | 0.5.2 | MIT OR Apache-2.0 | https://github.com/hermit-os/hermit-rs |
-| hex | 0.4.3 | MIT OR Apache-2.0 | https://github.com/KokaKiwi/rust-hex |
-| hex-conservative | 0.1.2 | CC0-1.0 | https://github.com/rust-bitcoin/hex-conservative |
-| hex-conservative | 0.2.2 | CC0-1.0 | https://github.com/rust-bitcoin/hex-conservative |
-| hex_lit | 0.1.1 | MITNFA | https://github.com/Kixunil/hex_lit |
-| hickory-net | 0.26.1 | MIT OR Apache-2.0 | https://github.com/hickory-dns/hickory-dns |
-| hickory-proto | 0.26.1 | MIT OR Apache-2.0 | https://github.com/hickory-dns/hickory-dns |
-| hickory-resolver | 0.26.1 | MIT OR Apache-2.0 | https://github.com/hickory-dns/hickory-dns |
-| hkdf | 0.12.4 | MIT OR Apache-2.0 | https://github.com/RustCrypto/KDFs/ |
-| hmac | 0.12.1 | MIT OR Apache-2.0 | https://github.com/RustCrypto/MACs |
-| http | 0.2.12 | MIT OR Apache-2.0 | https://github.com/hyperium/http |
-| http | 1.4.0 | MIT OR Apache-2.0 | https://github.com/hyperium/http |
-| http-body | 0.4.6 | MIT | https://github.com/hyperium/http-body |
-| http-body | 1.0.1 | MIT | https://github.com/hyperium/http-body |
-| http-body-util | 0.1.3 | MIT | https://github.com/hyperium/http-body |
-| httparse | 1.10.1 | MIT OR Apache-2.0 | https://github.com/seanmonstar/httparse |
-| httpdate | 1.0.3 | MIT OR Apache-2.0 | https://github.com/pyfisch/httpdate |
-| humantime | 2.3.0 | MIT OR Apache-2.0 | https://github.com/chronotope/humantime |
-| hybrid-array | 0.4.12 | MIT OR Apache-2.0 | https://github.com/RustCrypto/hybrid-array |
-| hyper | 0.14.32 | MIT | https://github.com/hyperium/hyper |
-| hyper | 1.8.1 | MIT | https://github.com/hyperium/hyper |
-| hyper-rustls | 0.24.2 | Apache-2.0 OR ISC OR MIT | https://github.com/rustls/hyper-rustls |
-| hyper-rustls | 0.27.9 | Apache-2.0 OR ISC OR MIT | https://github.com/rustls/hyper-rustls |
-| hyper-util | 0.1.19 | MIT | https://github.com/hyperium/hyper-util |
-| hyper-ws-listener | 0.3.0 | MIT |  |
-| iana-time-zone | 0.1.64 | MIT OR Apache-2.0 | https://github.com/strawlab/iana-time-zone |
-| iana-time-zone-haiku | 0.1.2 | MIT OR Apache-2.0 | https://github.com/strawlab/iana-time-zone |
-| icu_collections | 2.1.1 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| icu_locale_core | 2.1.1 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| icu_normalizer | 2.1.1 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| icu_normalizer_data | 2.1.1 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| icu_properties | 2.1.2 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| icu_properties_data | 2.1.2 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| icu_provider | 2.1.1 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| id-arena | 2.3.0 | MIT/Apache-2.0 | https://github.com/fitzgen/id-arena |
-| ident_case | 1.0.1 | MIT/Apache-2.0 | https://github.com/TedDriggs/ident_case |
-| identity-hash | 0.1.0 | Apache-2.0 OR MIT | https://github.com/offsetting/identity-hash |
-| idna | 1.1.0 | MIT OR Apache-2.0 | https://github.com/servo/rust-url/ |
-| idna_adapter | 1.2.1 | Apache-2.0 OR MIT | https://github.com/hsivonen/idna_adapter |
-| if-addrs | 0.15.0 | MIT OR BSD-3-Clause | https://github.com/messense/if-addrs |
-| igd-next | 0.17.1 | MIT | https://github.com/dariusc93/rust-igd |
-| image | 0.25.9 | MIT OR Apache-2.0 | https://github.com/image-rs/image |
-| indexmap | 2.13.0 | Apache-2.0 OR MIT | https://github.com/indexmap-rs/indexmap |
-| inout | 0.1.4 | MIT OR Apache-2.0 | https://github.com/RustCrypto/utils |
-| inplace-vec-builder | 0.1.1 | MIT OR Apache-2.0 | https://github.com/rklaehn/inplace-vec-builder |
-| instant | 0.1.13 | BSD-3-Clause | https://github.com/sebcrozet/instant |
-| ipconfig | 0.3.4 | MIT/Apache-2.0 | https://github.com/liranringel/ipconfig |
-| ipnet | 2.12.0 | MIT OR Apache-2.0 | https://github.com/krisprice/ipnet |
-| iri-string | 0.7.12 | MIT OR Apache-2.0 | https://github.com/lo48576/iri-string |
-| iroh | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh |
-| iroh-base | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh |
-| iroh-blobs | 0.103.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh-blobs |
-| iroh-dns | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh |
-| iroh-io | 0.6.2 | Apache-2.0 OR MIT | https://github.com/n0-computer/iroh |
-| iroh-metrics | 1.0.1 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh-metrics |
-| iroh-metrics-derive | 1.0.1 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh-metrics |
-| iroh-relay | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh |
-| iroh-tickets | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh-tickets |
-| iroh-util | 0.6.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh-util |
-| irpc | 0.17.0 | Apache-2.0/MIT | https://github.com/n0-computer/irpc |
-| irpc-derive | 0.17.0 | Apache-2.0/MIT | https://github.com/n0-computer/irpc |
-| is-terminal | 0.4.17 | MIT | https://github.com/sunfishcode/is-terminal |
-| itoa | 1.0.17 | MIT OR Apache-2.0 | https://github.com/dtolnay/itoa |
-| jni | 0.21.1 | MIT/Apache-2.0 | https://github.com/jni-rs/jni-rs |
-| jni | 0.22.4 | MIT OR Apache-2.0 | https://github.com/jni-rs/jni-rs |
-| jni-macros | 0.22.4 | MIT OR Apache-2.0 | https://github.com/jni-rs/jni-rs |
-| jni-sys | 0.3.1 | MIT OR Apache-2.0 | https://github.com/jni-rs/jni-sys |
-| jni-sys | 0.4.1 | MIT OR Apache-2.0 | https://github.com/jni-rs/jni-sys |
-| jni-sys-macros | 0.4.1 | MIT OR Apache-2.0 | https://github.com/jni-rs/jni-sys |
-| js-sys | 0.3.85 | MIT OR Apache-2.0 | https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/js-sys |
-| lazy_static | 1.5.0 | MIT OR Apache-2.0 | https://github.com/rust-lang-nursery/lazy-static.rs |
-| leb128fmt | 0.1.0 | MIT OR Apache-2.0 | https://github.com/bluk/leb128fmt |
-| libc | 0.2.180 | MIT OR Apache-2.0 | https://github.com/rust-lang/libc |
-| libm | 0.2.16 | MIT | https://github.com/rust-lang/compiler-builtins |
-| libredox | 0.1.14 | MIT | https://gitlab.redox-os.org/redox-os/libredox.git |
-| libssh2-sys | 0.3.1 | MIT OR Apache-2.0 | https://github.com/alexcrichton/ssh2-rs |
-| libz-sys | 1.1.29 | MIT OR Apache-2.0 | https://github.com/rust-lang/libz-sys |
-| linux-raw-sys | 0.11.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/sunfishcode/linux-raw-sys |
-| litemap | 0.8.1 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| lock_api | 0.4.14 | MIT OR Apache-2.0 | https://github.com/Amanieu/parking_lot |
-| log | 0.4.29 | MIT OR Apache-2.0 | https://github.com/rust-lang/log |
-| loom | 0.7.2 | MIT | https://github.com/tokio-rs/loom |
-| lru | 0.12.5 | MIT | https://github.com/jeromefroe/lru-rs.git |
-| lru | 0.16.3 | MIT | https://github.com/jeromefroe/lru-rs.git |
-| lru | 0.18.0 | MIT | https://github.com/jeromefroe/lru-rs.git |
-| lru | 0.7.8 | MIT | https://github.com/jeromefroe/lru-rs.git |
-| lru-slab | 0.1.2 | MIT OR Apache-2.0 OR Zlib | https://github.com/Ralith/lru-slab |
-| mac-addr | 0.3.0 | MIT | https://github.com/shellrow/mac-addr |
-| mainline | 2.0.1 | MIT | https://github.com/nuhvi/mainline |
-| matchers | 0.2.0 | MIT | https://github.com/hawkw/matchers |
-| mdns-sd | 0.18.2 | Apache-2.0 OR MIT | https://github.com/keepsimple1/mdns-sd |
-| memchr | 2.7.6 | Unlicense OR MIT | https://github.com/BurntSushi/memchr |
-| mime | 0.3.17 | MIT OR Apache-2.0 | https://github.com/hyperium/mime |
-| minimal-lexical | 0.2.1 | MIT/Apache-2.0 | https://github.com/Alexhuszagh/minimal-lexical |
-| miniz_oxide | 0.8.9 | MIT OR Zlib OR Apache-2.0 | https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide |
-| mio | 1.1.1 | MIT | https://github.com/tokio-rs/mio |
-| moka | 0.12.15 | (MIT OR Apache-2.0) AND Apache-2.0 | https://github.com/moka-rs/moka |
-| moxcms | 0.7.11 | BSD-3-Clause OR Apache-2.0 | https://github.com/awxkee/moxcms.git |
-| n0-error | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/n0-error |
-| n0-error-macros | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/n0-error |
-| n0-future | 0.3.2 | MIT OR Apache-2.0 | https://github.com/n0-computer/n0-future |
-| n0-watcher | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/n0-watcher |
-| ndk-context | 0.1.1 | MIT OR Apache-2.0 | https://github.com/rust-windowing/android-ndk-rs |
-| negentropy | 0.5.0 | MIT | https://github.com/rust-nostr/negentropy.git |
-| nested_enum_utils | 0.2.3 | MIT OR Apache-2.0 | https://github.com/n0-computer/nested-enum-utils |
-| netdev | 0.44.0 | MIT | https://github.com/shellrow/netdev |
-| netlink-packet-core | 0.8.1 | MIT | https://github.com/rust-netlink/netlink-packet-core |
-| netlink-packet-route | 0.29.0 | MIT | https://github.com/rust-netlink/netlink-packet-route |
-| netlink-packet-route | 0.31.0 | MIT | https://github.com/rust-netlink/netlink-packet-route |
-| netlink-proto | 0.12.0 | MIT | https://github.com/rust-netlink/netlink-proto |
-| netlink-sys | 0.8.8 | MIT | https://github.com/rust-netlink/netlink-sys |
-| netwatch | 0.19.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/net-tools |
-| nom | 7.1.3 | MIT | https://github.com/Geal/nom |
-| noq | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/noq |
-| noq-proto | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/noq |
-| noq-udp | 1.0.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/noq |
-| nostr | 0.44.2 | MIT | https://github.com/rust-nostr/nostr.git |
-| nostr-database | 0.44.0 | MIT | https://github.com/rust-nostr/nostr.git |
-| nostr-gossip | 0.44.0 | MIT | https://github.com/rust-nostr/nostr.git |
-| nostr-relay-pool | 0.44.0 | MIT | https://github.com/rust-nostr/nostr.git |
-| nostr-sdk | 0.44.1 | MIT | https://github.com/rust-nostr/nostr.git |
-| nu-ansi-term | 0.50.3 | MIT | https://github.com/nushell/nu-ansi-term |
-| num-bigint | 0.4.6 | MIT OR Apache-2.0 | https://github.com/rust-num/num-bigint |
-| num-conv | 0.2.2 | MIT OR Apache-2.0 | https://github.com/jhpratt/num-conv |
-| num-integer | 0.1.46 | MIT OR Apache-2.0 | https://github.com/rust-num/num-integer |
-| num-traits | 0.2.19 | MIT OR Apache-2.0 | https://github.com/rust-num/num-traits |
-| num_enum | 0.7.6 | BSD-3-Clause OR MIT OR Apache-2.0 | https://github.com/illicitonion/num_enum |
-| num_enum_derive | 0.7.6 | BSD-3-Clause OR MIT OR Apache-2.0 | https://github.com/illicitonion/num_enum |
-| num_threads | 0.1.7 | MIT OR Apache-2.0 | https://github.com/jhpratt/num_threads |
-| objc2 | 0.6.4 | MIT | https://github.com/madsmtm/objc2 |
-| objc2-core-foundation | 0.3.2 | Zlib OR Apache-2.0 OR MIT | https://github.com/madsmtm/objc2 |
-| objc2-core-wlan | 0.3.2 | Zlib OR Apache-2.0 OR MIT | https://github.com/madsmtm/objc2 |
-| objc2-encode | 4.1.0 | MIT | https://github.com/madsmtm/objc2 |
-| objc2-foundation | 0.3.2 | MIT | https://github.com/madsmtm/objc2 |
-| objc2-security | 0.3.2 | Zlib OR Apache-2.0 OR MIT | https://github.com/madsmtm/objc2 |
-| objc2-security-foundation | 0.3.2 | Zlib OR Apache-2.0 OR MIT | https://github.com/madsmtm/objc2 |
-| objc2-system-configuration | 0.3.2 | Zlib OR Apache-2.0 OR MIT | https://github.com/madsmtm/objc2 |
-| oid-registry | 0.8.1 | MIT OR Apache-2.0 | https://github.com/rusticata/oid-registry.git |
-| once_cell | 1.21.3 | MIT OR Apache-2.0 | https://github.com/matklad/once_cell |
-| opaque-debug | 0.3.1 | MIT OR Apache-2.0 | https://github.com/RustCrypto/utils |
-| openssl-probe | 0.2.1 | MIT OR Apache-2.0 | https://github.com/rustls/openssl-probe |
-| openssl-sys | 0.9.117 | MIT | https://github.com/rust-openssl/rust-openssl |
-| papaya | 0.2.4 | MIT | https://github.com/ibraheemdev/papaya |
-| parking | 2.2.1 | Apache-2.0 OR MIT | https://github.com/smol-rs/parking |
-| parking_lot | 0.11.2 | Apache-2.0/MIT | https://github.com/Amanieu/parking_lot |
-| parking_lot | 0.12.5 | MIT OR Apache-2.0 | https://github.com/Amanieu/parking_lot |
-| parking_lot_core | 0.8.6 | Apache-2.0/MIT | https://github.com/Amanieu/parking_lot |
-| parking_lot_core | 0.9.12 | MIT OR Apache-2.0 | https://github.com/Amanieu/parking_lot |
-| password-hash | 0.5.0 | MIT OR Apache-2.0 | https://github.com/RustCrypto/traits/tree/master/password-hash |
-| paste | 1.0.15 | MIT OR Apache-2.0 | https://github.com/dtolnay/paste |
-| pbkdf2 | 0.12.2 | MIT OR Apache-2.0 | https://github.com/RustCrypto/password-hashes/tree/master/pbkdf2 |
-| pem | 3.0.6 | MIT | https://github.com/jcreekmore/pem-rs.git |
-| pem-rfc7468 | 1.0.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats |
-| percent-encoding | 2.3.2 | MIT OR Apache-2.0 | https://github.com/servo/rust-url/ |
-| pharos | 0.5.3 | Unlicense | https://github.com/najamelan/pharos |
-| pin-project | 1.1.13 | Apache-2.0 OR MIT | https://github.com/taiki-e/pin-project |
-| pin-project-internal | 1.1.13 | Apache-2.0 OR MIT | https://github.com/taiki-e/pin-project |
-| pin-project-lite | 0.2.16 | Apache-2.0 OR MIT | https://github.com/taiki-e/pin-project-lite |
-| pin-utils | 0.1.0 | MIT OR Apache-2.0 | https://github.com/rust-lang-nursery/pin-utils |
-| pkcs8 | 0.10.2 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats/tree/master/pkcs8 |
-| pkcs8 | 0.11.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats |
-| pkg-config | 0.3.33 | MIT OR Apache-2.0 | https://github.com/rust-lang/pkg-config-rs |
-| plain | 0.2.3 | MIT/Apache-2.0 | https://github.com/randomites/plain |
-| plist | 1.9.0 | MIT | https://github.com/ebarnard/rust-plist/ |
-| poly1305 | 0.8.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/universal-hashes |
-| polyval | 0.6.2 | Apache-2.0 OR MIT | https://github.com/RustCrypto/universal-hashes |
-| portable-atomic | 1.13.1 | Apache-2.0 OR MIT | https://github.com/taiki-e/portable-atomic |
-| portmapper | 0.19.0 | MIT OR Apache-2.0 | https://github.com/n0-computer/net-tools |
-| positioned-io | 0.3.5 | MIT | https://github.com/vasi/positioned-io |
-| postcard | 1.1.3 | MIT OR Apache-2.0 | https://github.com/jamesmunns/postcard |
-| postcard-derive | 0.2.2 | MIT OR Apache-2.0 | https://github.com/jamesmunns/postcard |
-| potential_utf | 0.1.4 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| powerfmt | 0.2.0 | MIT OR Apache-2.0 | https://github.com/jhpratt/powerfmt |
-| ppv-lite86 | 0.2.21 | MIT OR Apache-2.0 | https://github.com/cryptocorrosion/cryptocorrosion |
-| prefix-trie | 0.8.4 | MIT OR Apache-2.0 | https://github.com/tiborschneider/prefix-trie |
-| prettyplease | 0.2.37 | MIT OR Apache-2.0 | https://github.com/dtolnay/prettyplease |
-| proc-macro-crate | 3.5.0 | MIT OR Apache-2.0 | https://github.com/bkchr/proc-macro-crate |
-| proc-macro-error | 0.4.12 | MIT OR Apache-2.0 | https://gitlab.com/CreepySkeleton/proc-macro-error |
-| proc-macro-error-attr | 0.4.12 | MIT OR Apache-2.0 | https://gitlab.com/CreepySkeleton/proc-macro-error |
-| proc-macro-hack | 0.5.20+deprecated | MIT OR Apache-2.0 | https://github.com/dtolnay/proc-macro-hack |
-| proc-macro2 | 1.0.106 | MIT OR Apache-2.0 | https://github.com/dtolnay/proc-macro2 |
-| pxfm | 0.1.28 | BSD-3-Clause OR Apache-2.0 | https://github.com/awxkee/pxfm |
-| qrcode | 0.14.1 | MIT OR Apache-2.0 | https://github.com/kennytm/qrcode-rust |
-| quick-xml | 0.39.4 | MIT | https://github.com/tafia/quick-xml |
-| quote | 1.0.44 | MIT OR Apache-2.0 | https://github.com/dtolnay/quote |
-| r-efi | 5.3.0 | MIT OR Apache-2.0 OR LGPL-2.1-or-later | https://github.com/r-efi/r-efi |
-| r-efi | 6.0.0 | MIT OR Apache-2.0 OR LGPL-2.1-or-later | https://github.com/r-efi/r-efi |
-| rand | 0.10.1 | MIT OR Apache-2.0 | https://github.com/rust-random/rand |
-| rand | 0.8.5 | MIT OR Apache-2.0 | https://github.com/rust-random/rand |
-| rand | 0.9.2 | MIT OR Apache-2.0 | https://github.com/rust-random/rand |
-| rand_chacha | 0.3.1 | MIT OR Apache-2.0 | https://github.com/rust-random/rand |
-| rand_chacha | 0.9.0 | MIT OR Apache-2.0 | https://github.com/rust-random/rand |
-| rand_core | 0.10.1 | MIT OR Apache-2.0 | https://github.com/rust-random/rand_core |
-| rand_core | 0.6.4 | MIT OR Apache-2.0 | https://github.com/rust-random/rand |
-| rand_core | 0.9.5 | MIT OR Apache-2.0 | https://github.com/rust-random/rand |
-| rand_pcg | 0.10.2 | MIT OR Apache-2.0 | https://github.com/rust-random/rngs |
-| range-collections | 0.4.6 | MIT OR Apache-2.0 | https://github.com/rklaehn/range-collections |
-| rcgen | 0.14.8 | MIT OR Apache-2.0 | https://github.com/rustls/rcgen |
-| redb | 4.1.0 | MIT OR Apache-2.0 | https://github.com/cberner/redb |
-| redox_syscall | 0.2.16 | MIT | https://gitlab.redox-os.org/redox-os/syscall |
-| redox_syscall | 0.5.18 | MIT | https://gitlab.redox-os.org/redox-os/syscall |
-| redox_syscall | 0.7.3 | MIT | https://gitlab.redox-os.org/redox-os/syscall |
-| reed-solomon-erasure | 6.0.0 | MIT | https://github.com/darrenldl/reed-solomon-erasure |
-| ref-cast | 1.0.25 | MIT OR Apache-2.0 | https://github.com/dtolnay/ref-cast |
-| ref-cast-impl | 1.0.25 | MIT OR Apache-2.0 | https://github.com/dtolnay/ref-cast |
-| reflink-copy | 0.1.29 | MIT/Apache-2.0 | https://github.com/cargo-bins/reflink-copy |
-| regex | 1.12.2 | MIT OR Apache-2.0 | https://github.com/rust-lang/regex |
-| regex-automata | 0.4.13 | MIT OR Apache-2.0 | https://github.com/rust-lang/regex |
-| regex-syntax | 0.8.8 | MIT OR Apache-2.0 | https://github.com/rust-lang/regex |
-| reqwest | 0.11.27 | MIT OR Apache-2.0 | https://github.com/seanmonstar/reqwest |
-| reqwest | 0.13.4 | MIT OR Apache-2.0 | https://github.com/seanmonstar/reqwest |
-| resolv-conf | 0.7.6 | MIT OR Apache-2.0 | https://github.com/hickory-dns/resolv-conf |
-| ring | 0.17.14 | Apache-2.0 AND ISC | https://github.com/briansmith/ring |
-| rustc-hash | 2.1.2 | Apache-2.0 OR MIT | https://github.com/rust-lang/rustc-hash |
-| rustc_version | 0.4.1 | MIT OR Apache-2.0 | https://github.com/djc/rustc-version-rs |
-| rusticata-macros | 4.1.0 | MIT/Apache-2.0 | https://github.com/rusticata/rusticata-macros.git |
-| rustix | 1.1.3 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/rustix |
-| rustls | 0.21.12 | Apache-2.0 OR ISC OR MIT | https://github.com/rustls/rustls |
-| rustls | 0.23.36 | Apache-2.0 OR ISC OR MIT | https://github.com/rustls/rustls |
-| rustls-native-certs | 0.8.4 | Apache-2.0 OR ISC OR MIT | https://github.com/rustls/rustls-native-certs |
-| rustls-pemfile | 1.0.4 | Apache-2.0 OR ISC OR MIT | https://github.com/rustls/pemfile |
-| rustls-pki-types | 1.14.0 | MIT OR Apache-2.0 | https://github.com/rustls/pki-types |
-| rustls-platform-verifier | 0.7.0 | MIT OR Apache-2.0 | https://github.com/rustls/rustls-platform-verifier |
-| rustls-platform-verifier-android | 0.1.1 | MIT OR Apache-2.0 | https://github.com/rustls/rustls-platform-verifier |
-| rustls-webpki | 0.101.7 | ISC | https://github.com/rustls/webpki |
-| rustls-webpki | 0.103.9 | ISC | https://github.com/rustls/webpki |
-| rustversion | 1.0.22 | MIT OR Apache-2.0 | https://github.com/dtolnay/rustversion |
-| ryu | 1.0.22 | Apache-2.0 OR BSL-1.0 | https://github.com/dtolnay/ryu |
-| salsa20 | 0.10.2 | MIT OR Apache-2.0 | https://github.com/RustCrypto/stream-ciphers |
-| same-file | 1.0.6 | Unlicense/MIT | https://github.com/BurntSushi/same-file |
-| schannel | 0.1.29 | MIT | https://github.com/steffengy/schannel-rs |
-| scoped-tls | 1.0.1 | MIT/Apache-2.0 | https://github.com/alexcrichton/scoped-tls |
-| scopeguard | 1.2.0 | MIT OR Apache-2.0 | https://github.com/bluss/scopeguard |
-| scrypt | 0.11.0 | MIT OR Apache-2.0 | https://github.com/RustCrypto/password-hashes/tree/master/scrypt |
-| sct | 0.7.1 | Apache-2.0 OR ISC OR MIT | https://github.com/rustls/sct.rs |
-| sd-notify | 0.4.5 | MIT OR Apache-2.0 | https://github.com/lnicola/sd-notify |
-| secp256k1 | 0.29.1 | CC0-1.0 | https://github.com/rust-bitcoin/rust-secp256k1/ |
-| secp256k1-sys | 0.10.1 | CC0-1.0 | https://github.com/rust-bitcoin/rust-secp256k1/ |
-| security-framework | 3.7.0 | MIT OR Apache-2.0 | https://github.com/kornelski/rust-security-framework |
-| security-framework-sys | 2.17.0 | MIT OR Apache-2.0 | https://github.com/kornelski/rust-security-framework |
-| seize | 0.5.1 | MIT | https://github.com/ibraheemdev/seize |
-| self_cell | 1.2.2 | Apache-2.0 OR GPL-2.0-only | https://github.com/Voultapher/self_cell |
-| semver | 1.0.27 | MIT OR Apache-2.0 | https://github.com/dtolnay/semver |
-| send_wrapper | 0.6.0 | MIT/Apache-2.0 | https://github.com/thk1/send_wrapper |
-| serde | 1.0.228 | MIT OR Apache-2.0 | https://github.com/serde-rs/serde |
-| serde_bencode | 0.2.4 | MIT | https://github.com/toby/serde-bencode |
-| serde_bytes | 0.11.19 | MIT OR Apache-2.0 | https://github.com/serde-rs/bytes |
-| serde_core | 1.0.228 | MIT OR Apache-2.0 | https://github.com/serde-rs/serde |
-| serde_derive | 1.0.228 | MIT OR Apache-2.0 | https://github.com/serde-rs/serde |
-| serde_json | 1.0.149 | MIT OR Apache-2.0 | https://github.com/serde-rs/json |
-| serde_spanned | 0.6.9 | MIT OR Apache-2.0 | https://github.com/toml-rs/toml |
-| serde_urlencoded | 0.7.1 | MIT/Apache-2.0 | https://github.com/nox/serde_urlencoded |
-| serde_yaml | 0.9.34+deprecated | MIT OR Apache-2.0 | https://github.com/dtolnay/serde-yaml |
-| serdect | 0.4.3 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats |
-| serial2 | 0.2.34 | BSD-2-Clause OR Apache-2.0 | https://github.com/de-vri-es/serial2-rs |
-| serial2-tokio | 0.1.21 | BSD-2-Clause OR Apache-2.0 | https://github.com/de-vri-es/serial2-tokio-rs |
-| sha-1 | 0.10.1 | MIT OR Apache-2.0 | https://github.com/RustCrypto/hashes |
-| sha1 | 0.10.6 | MIT OR Apache-2.0 | https://github.com/RustCrypto/hashes |
-| sha1_smol | 1.0.1 | BSD-3-Clause | https://github.com/mitsuhiko/sha1-smol |
-| sha2 | 0.10.9 | MIT OR Apache-2.0 | https://github.com/RustCrypto/hashes |
-| sha2 | 0.11.0 | MIT OR Apache-2.0 | https://github.com/RustCrypto/hashes |
-| sharded-slab | 0.1.7 | MIT | https://github.com/hawkw/sharded-slab |
-| shlex | 1.3.0 | MIT OR Apache-2.0 | https://github.com/comex/rust-shlex |
-| signal-hook-registry | 1.4.8 | MIT OR Apache-2.0 | https://github.com/vorner/signal-hook |
-| signature | 2.2.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/traits/tree/master/signature |
-| signature | 3.0.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/traits |
-| simd-adler32 | 0.3.8 | MIT | https://github.com/mcountryman/simd-adler32 |
-| simd_cesu8 | 1.1.1 | Apache-2.0 OR MIT | https://github.com/seancroach/simd_cesu8 |
-| simdutf8 | 0.1.5 | MIT OR Apache-2.0 | https://github.com/rusticstuff/simdutf8 |
-| simple-dns | 0.11.3 | MIT | https://github.com/balliegojr/simple-dns |
-| siphasher | 1.0.3 | MIT/Apache-2.0 | https://github.com/jedisct1/rust-siphash |
-| slab | 0.4.11 | MIT | https://github.com/tokio-rs/slab |
-| smallvec | 1.15.1 | MIT OR Apache-2.0 | https://github.com/servo/rust-smallvec |
-| socket-pktinfo | 0.3.2 | MIT | https://github.com/pixsper/socket-pktinfo |
-| socket2 | 0.5.10 | MIT OR Apache-2.0 | https://github.com/rust-lang/socket2 |
-| socket2 | 0.6.2 | MIT OR Apache-2.0 | https://github.com/rust-lang/socket2 |
-| sorted-index-buffer | 0.2.1 | MIT OR Apache-2.0 | https://github.com/n0-computer/iroh |
-| spez | 0.1.2 | BSD-2-Clause | https://github.com/m-ou-se/spez |
-| spin | 0.10.0 | MIT | https://github.com/mvdnes/spin-rs.git |
-| spin | 0.9.8 | MIT | https://github.com/mvdnes/spin-rs.git |
-| spki | 0.7.3 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats/tree/master/spki |
-| spki | 0.8.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/formats |
-| ssh2 | 0.9.5 | MIT OR Apache-2.0 | https://github.com/alexcrichton/ssh2-rs |
-| stable_deref_trait | 1.2.1 | MIT OR Apache-2.0 | https://github.com/storyyeller/stable_deref_trait |
-| strsim | 0.11.1 | MIT | https://github.com/rapidfuzz/strsim-rs |
-| strum | 0.28.0 | MIT | https://github.com/Peternator7/strum |
-| strum_macros | 0.28.0 | MIT | https://github.com/Peternator7/strum |
-| subtle | 2.6.1 | BSD-3-Clause | https://github.com/dalek-cryptography/subtle |
-| syn | 1.0.109 | MIT OR Apache-2.0 | https://github.com/dtolnay/syn |
-| syn | 2.0.114 | MIT OR Apache-2.0 | https://github.com/dtolnay/syn |
-| syn-mid | 0.5.4 | Apache-2.0 OR MIT | https://github.com/taiki-e/syn-mid |
-| sync_wrapper | 0.1.2 | Apache-2.0 | https://github.com/Actyx/sync_wrapper |
-| sync_wrapper | 1.0.2 | Apache-2.0 | https://github.com/Actyx/sync_wrapper |
-| synstructure | 0.13.2 | MIT | https://github.com/mystor/synstructure |
-| system-configuration | 0.5.1 | MIT OR Apache-2.0 | https://github.com/mullvad/system-configuration-rs |
-| system-configuration | 0.6.1 | MIT OR Apache-2.0 | https://github.com/mullvad/system-configuration-rs |
-| system-configuration | 0.7.0 | MIT OR Apache-2.0 | https://github.com/mullvad/system-configuration-rs |
-| system-configuration-sys | 0.5.0 | MIT OR Apache-2.0 | https://github.com/mullvad/system-configuration-rs |
-| system-configuration-sys | 0.6.0 | MIT OR Apache-2.0 | https://github.com/mullvad/system-configuration-rs |
-| tagptr | 0.2.0 | MIT/Apache-2.0 | https://github.com/oliver-giersch/tagptr.git |
-| tar | 0.4.44 | MIT OR Apache-2.0 | https://github.com/alexcrichton/tar-rs |
-| tempfile | 3.24.0 | MIT OR Apache-2.0 | https://github.com/Stebalien/tempfile |
-| termcolor | 1.4.1 | Unlicense OR MIT | https://github.com/BurntSushi/termcolor |
-| thiserror | 1.0.69 | MIT OR Apache-2.0 | https://github.com/dtolnay/thiserror |
-| thiserror | 2.0.18 | MIT OR Apache-2.0 | https://github.com/dtolnay/thiserror |
-| thiserror-impl | 1.0.69 | MIT OR Apache-2.0 | https://github.com/dtolnay/thiserror |
-| thiserror-impl | 2.0.18 | MIT OR Apache-2.0 | https://github.com/dtolnay/thiserror |
-| thread_local | 1.1.9 | MIT OR Apache-2.0 | https://github.com/Amanieu/thread_local-rs |
-| time | 0.3.49 | MIT OR Apache-2.0 | https://github.com/time-rs/time |
-| time-core | 0.1.9 | MIT OR Apache-2.0 | https://github.com/time-rs/time |
-| time-macros | 0.2.29 | MIT OR Apache-2.0 | https://github.com/time-rs/time |
-| tinystr | 0.8.2 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| tinyvec | 1.10.0 | Zlib OR Apache-2.0 OR MIT | https://github.com/Lokathor/tinyvec |
-| tinyvec_macros | 0.1.1 | MIT OR Apache-2.0 OR Zlib | https://github.com/Soveu/tinyvec_macros |
-| tokio | 1.49.0 | MIT | https://github.com/tokio-rs/tokio |
-| tokio-macros | 2.6.0 | MIT | https://github.com/tokio-rs/tokio |
-| tokio-rustls | 0.24.1 | MIT/Apache-2.0 | https://github.com/rustls/tokio-rustls |
-| tokio-rustls | 0.26.4 | MIT OR Apache-2.0 | https://github.com/rustls/tokio-rustls |
-| tokio-socks | 0.5.2 | MIT | https://github.com/sticnarf/tokio-socks |
-| tokio-stream | 0.1.18 | MIT | https://github.com/tokio-rs/tokio |
-| tokio-test | 0.4.5 | MIT | https://github.com/tokio-rs/tokio |
-| tokio-tungstenite | 0.20.1 | MIT | https://github.com/snapview/tokio-tungstenite |
-| tokio-tungstenite | 0.26.2 | MIT | https://github.com/snapview/tokio-tungstenite |
-| tokio-util | 0.7.18 | MIT | https://github.com/tokio-rs/tokio |
-| tokio-websockets | 0.13.2 | MIT | https://github.com/Gelbpunkt/tokio-websockets/ |
-| toml | 0.8.23 | MIT OR Apache-2.0 | https://github.com/toml-rs/toml |
-| toml_datetime | 0.6.11 | MIT OR Apache-2.0 | https://github.com/toml-rs/toml |
-| toml_datetime | 1.1.1+spec-1.1.0 | MIT OR Apache-2.0 | https://github.com/toml-rs/toml |
-| toml_edit | 0.22.27 | MIT OR Apache-2.0 | https://github.com/toml-rs/toml |
-| toml_edit | 0.25.12+spec-1.1.0 | MIT OR Apache-2.0 | https://github.com/toml-rs/toml |
-| toml_parser | 1.1.2+spec-1.1.0 | MIT OR Apache-2.0 | https://github.com/toml-rs/toml |
-| toml_write | 0.1.2 | MIT OR Apache-2.0 | https://github.com/toml-rs/toml |
-| totp-rs | 5.7.0 | MIT | https://github.com/constantoine/totp-rs |
-| tower | 0.5.3 | MIT | https://github.com/tower-rs/tower |
-| tower-http | 0.6.8 | MIT | https://github.com/tower-rs/tower-http |
-| tower-layer | 0.3.3 | MIT | https://github.com/tower-rs/tower |
-| tower-service | 0.3.3 | MIT | https://github.com/tower-rs/tower |
-| tracing | 0.1.44 | MIT | https://github.com/tokio-rs/tracing |
-| tracing-attributes | 0.1.31 | MIT | https://github.com/tokio-rs/tracing |
-| tracing-core | 0.1.36 | MIT | https://github.com/tokio-rs/tracing |
-| tracing-log | 0.2.0 | MIT | https://github.com/tokio-rs/tracing |
-| tracing-subscriber | 0.3.22 | MIT | https://github.com/tokio-rs/tracing |
-| try-lock | 0.2.5 | MIT | https://github.com/seanmonstar/try-lock |
-| tungstenite | 0.20.1 | MIT OR Apache-2.0 | https://github.com/snapview/tungstenite-rs |
-| tungstenite | 0.26.2 | MIT OR Apache-2.0 | https://github.com/snapview/tungstenite-rs |
-| typenum | 1.20.1 | MIT OR Apache-2.0 | https://github.com/paholg/typenum |
-| unicode-ident | 1.0.22 | (MIT OR Apache-2.0) AND Unicode-3.0 | https://github.com/dtolnay/unicode-ident |
-| unicode-normalization | 0.1.22 | MIT/Apache-2.0 | https://github.com/unicode-rs/unicode-normalization |
-| unicode-segmentation | 1.13.3 | MIT OR Apache-2.0 | https://github.com/unicode-rs/unicode-segmentation |
-| unicode-xid | 0.2.6 | MIT OR Apache-2.0 | https://github.com/unicode-rs/unicode-xid |
-| universal-hash | 0.5.1 | MIT OR Apache-2.0 | https://github.com/RustCrypto/traits |
-| unsafe-libyaml | 0.2.11 | MIT | https://github.com/dtolnay/unsafe-libyaml |
-| untrusted | 0.9.0 | ISC | https://github.com/briansmith/untrusted |
-| url | 2.5.8 | MIT OR Apache-2.0 | https://github.com/servo/rust-url |
-| urlencoding | 2.1.3 | MIT | https://github.com/kornelski/rust_urlencoding |
-| utf-8 | 0.7.6 | MIT OR Apache-2.0 | https://github.com/SimonSapin/rust-utf8 |
-| utf8_iter | 1.0.4 | Apache-2.0 OR MIT | https://github.com/hsivonen/utf8_iter |
-| uuid | 1.19.0 | Apache-2.0 OR MIT | https://github.com/uuid-rs/uuid |
-| valuable | 0.1.1 | MIT | https://github.com/tokio-rs/valuable |
-| vcpkg | 0.2.15 | MIT/Apache-2.0 | https://github.com/mcgoo/vcpkg-rs |
-| vergen | 9.1.0 | MIT OR Apache-2.0 | https://github.com/rustyhorde/vergen |
-| vergen-gitcl | 9.1.0 | MIT OR Apache-2.0 | https://github.com/rustyhorde/vergen |
-| vergen-lib | 9.1.0 | MIT OR Apache-2.0 | https://github.com/rustyhorde/vergen |
-| version_check | 0.9.5 | MIT/Apache-2.0 | https://github.com/SergioBenitez/version_check |
-| walkdir | 2.5.0 | Unlicense/MIT | https://github.com/BurntSushi/walkdir |
-| want | 0.3.1 | MIT | https://github.com/seanmonstar/want |
-| wasi | 0.11.1+wasi-snapshot-preview1 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wasi |
-| wasip2 | 1.0.2+wasi-0.2.9 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wasi-rs |
-| wasip3 | 0.4.0+wasi-0.3.0-rc-2026-01-06 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wasi-rs |
-| wasm-bindgen | 0.2.108 | MIT OR Apache-2.0 | https://github.com/wasm-bindgen/wasm-bindgen |
-| wasm-bindgen-futures | 0.4.58 | MIT OR Apache-2.0 | https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/futures |
-| wasm-bindgen-macro | 0.2.108 | MIT OR Apache-2.0 | https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/macro |
-| wasm-bindgen-macro-support | 0.2.108 | MIT OR Apache-2.0 | https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/macro-support |
-| wasm-bindgen-shared | 0.2.108 | MIT OR Apache-2.0 | https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/shared |
-| wasm-encoder | 0.244.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-encoder |
-| wasm-metadata | 0.244.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-metadata |
-| wasm-streams | 0.4.2 | MIT OR Apache-2.0 | https://github.com/MattiasBuelens/wasm-streams/ |
-| wasm-streams | 0.5.0 | MIT OR Apache-2.0 | https://github.com/MattiasBuelens/wasm-streams/ |
-| wasmparser | 0.244.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser |
-| web-sys | 0.3.85 | MIT OR Apache-2.0 | https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/web-sys |
-| web-time | 1.1.0 | MIT OR Apache-2.0 | https://github.com/daxpedda/web-time |
-| webpki-root-certs | 1.0.7 | CDLA-Permissive-2.0 | https://github.com/rustls/webpki-roots |
-| webpki-roots | 0.25.4 | MPL-2.0 | https://github.com/rustls/webpki-roots |
-| webpki-roots | 0.26.11 | CDLA-Permissive-2.0 | https://github.com/rustls/webpki-roots |
-| webpki-roots | 1.0.6 | CDLA-Permissive-2.0 | https://github.com/rustls/webpki-roots |
-| widestring | 1.2.1 | MIT OR Apache-2.0 | https://github.com/VoidStarKat/widestring-rs |
-| winapi | 0.3.9 | MIT/Apache-2.0 | https://github.com/retep998/winapi-rs |
-| winapi-i686-pc-windows-gnu | 0.4.0 | MIT/Apache-2.0 | https://github.com/retep998/winapi-rs |
-| winapi-util | 0.1.11 | Unlicense OR MIT | https://github.com/BurntSushi/winapi-util |
-| winapi-x86_64-pc-windows-gnu | 0.4.0 | MIT/Apache-2.0 | https://github.com/retep998/winapi-rs |
-| windows | 0.62.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-collections | 0.3.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-core | 0.62.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-future | 0.3.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-implement | 0.60.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-interface | 0.59.3 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-link | 0.2.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-numerics | 0.3.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-registry | 0.6.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-result | 0.4.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-strings | 0.5.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-sys | 0.45.0 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-sys | 0.48.0 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-sys | 0.52.0 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-sys | 0.60.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-sys | 0.61.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-targets | 0.42.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-targets | 0.48.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-targets | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-targets | 0.53.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows-threading | 0.2.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_aarch64_gnullvm | 0.42.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_aarch64_gnullvm | 0.48.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_aarch64_gnullvm | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_aarch64_gnullvm | 0.53.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_aarch64_msvc | 0.42.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_aarch64_msvc | 0.48.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_aarch64_msvc | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_aarch64_msvc | 0.53.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_gnu | 0.42.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_gnu | 0.48.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_gnu | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_gnu | 0.53.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_gnullvm | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_gnullvm | 0.53.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_msvc | 0.42.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_msvc | 0.48.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_msvc | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_i686_msvc | 0.53.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_gnu | 0.42.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_gnu | 0.48.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_gnu | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_gnu | 0.53.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_gnullvm | 0.42.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_gnullvm | 0.48.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_gnullvm | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_gnullvm | 0.53.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_msvc | 0.42.2 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_msvc | 0.48.5 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_msvc | 0.52.6 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| windows_x86_64_msvc | 0.53.1 | MIT OR Apache-2.0 | https://github.com/microsoft/windows-rs |
-| winnow | 0.7.14 | MIT | https://github.com/winnow-rs/winnow |
-| winnow | 1.0.3 | MIT | https://github.com/winnow-rs/winnow |
-| winreg | 0.50.0 | MIT | https://github.com/gentoo90/winreg-rs |
-| wit-bindgen | 0.51.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wit-bindgen |
-| wit-bindgen-core | 0.51.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wit-bindgen |
-| wit-bindgen-rust | 0.51.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wit-bindgen |
-| wit-bindgen-rust-macro | 0.51.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wit-bindgen |
-| wit-component | 0.244.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wit-component |
-| wit-parser | 0.244.0 | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT | https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wit-parser |
-| wmi | 0.18.4 | MIT OR Apache-2.0 | https://github.com/ohadravid/wmi-rs |
-| writeable | 0.6.2 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| ws_stream_wasm | 0.7.5 | Unlicense | https://github.com/najamelan/ws_stream_wasm |
-| x509-parser | 0.18.1 | MIT OR Apache-2.0 | https://github.com/rusticata/x509-parser.git |
-| xattr | 1.6.1 | MIT OR Apache-2.0 | https://github.com/Stebalien/xattr |
-| xml-rs | 0.8.28 | MIT | https://github.com/kornelski/xml-rs |
-| xmltree | 0.10.3 | MIT | https://github.com/eminence/xmltree-rs |
-| yasna | 0.6.0 | MIT OR Apache-2.0 | https://github.com/qnighy/yasna.rs |
-| yoke | 0.8.1 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| yoke-derive | 0.8.1 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| zbase32 | 0.1.2 | LGPL-3.0+ | https://gitlab.com/pgerber/zbase32-rust |
-| zerocopy | 0.8.33 | BSD-2-Clause OR Apache-2.0 OR MIT | https://github.com/google/zerocopy |
-| zerocopy-derive | 0.8.33 | BSD-2-Clause OR Apache-2.0 OR MIT | https://github.com/google/zerocopy |
-| zerofrom | 0.1.6 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| zerofrom-derive | 0.1.6 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| zeroize | 1.9.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/utils |
-| zeroize_derive | 1.5.0 | Apache-2.0 OR MIT | https://github.com/RustCrypto/utils |
-| zerotrie | 0.2.3 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| zerovec | 0.11.5 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| zerovec-derive | 0.11.2 | Unicode-3.0 | https://github.com/unicode-org/icu4x |
-| zmij | 1.0.16 | MIT | https://github.com/dtolnay/zmij |

core/archipelago/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "archipelago"
-version = "1.7.116-alpha"
+version = "1.7.100-alpha"
 edition = "2021"
 description = "Archipelago Bitcoin Node OS - Native backend"
 authors = ["Archipelago Team"]
@@ -22,9 +22,6 @@ iroh-swarm = ["dep:iroh", "dep:iroh-blobs"]
 [dependencies]
 # Core dependencies
 tokio = { version = "1", features = ["full"] }
-# Mesh port mirror: needs IPV6_V6ONLY on [::] listeners so they coexist with
-# the containers' own 0.0.0.0 binds (std/tokio don't expose the sockopt).
-socket2 = "0.5"
 libc = "0.2"   # process-group signalling for the supervised reticulum daemon
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

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

@@ -188,7 +188,7 @@ impl ApiHandler {
             }
         };
         let price_sats = match &item.access {
-            content_server::AccessControl::Paid { price_sats, .. } => *price_sats,
+            content_server::AccessControl::Paid { price_sats } => *price_sats,
             _ => {
                 // Not a paid item — no invoice to issue.
                 return Ok(build_response(
@@ -198,15 +198,6 @@ impl ApiHandler {
                 ));
             }
         };
-        if !content_server::method_accepted(&item.access, "lightning") {
-            return Ok(build_response(
-                StatusCode::BAD_REQUEST,
-                "application/json",
-                hyper::Body::from(
-                    r#"{"error":"The seller does not accept Lightning for this item"}"#,
-                ),
-            ));
-        }
 
         let memo = format!("Archipelago peer file {content_id}");
         match self
@@ -324,18 +315,7 @@ impl ApiHandler {
             .unwrap_or_default();
         let price_sats = match catalog.items.iter().find(|i| i.id == content_id) {
             Some(i) => match &i.access {
-                content_server::AccessControl::Paid { price_sats, .. } => {
-                    if !content_server::method_accepted(&i.access, "onchain") {
-                        return Ok(build_response(
-                            StatusCode::BAD_REQUEST,
-                            "application/json",
-                            hyper::Body::from(
-                                r#"{"error":"The seller does not accept on-chain payment for this item"}"#,
-                            ),
-                        ));
-                    }
-                    *price_sats
-                }
+                content_server::AccessControl::Paid { price_sats } => *price_sats,
                 _ => {
                     return Ok(build_response(
                         StatusCode::BAD_REQUEST,

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

@@ -194,43 +194,6 @@ impl ApiHandler {
         ))
     }
 
-    /// Serve an encrypted backup archive (`<data_dir>/backups/<id>.bak`) as a
-    /// browser download. The archive is passphrase-encrypted at rest; the
-    /// session gate at the route controls who can fetch it.
-    async fn handle_backup_download(&self, path: &str) -> Result<Response<hyper::Body>> {
-        let id = path.strip_prefix("/api/blob/backup/").unwrap_or("");
-        // Backup ids are UUIDs — reject anything that could traverse paths.
-        if id.is_empty() || !id.chars().all(|c| c.is_ascii_hexdigit() || c == '-') {
-            return Ok(build_response(
-                StatusCode::BAD_REQUEST,
-                "application/json",
-                hyper::Body::from(r#"{"error":"invalid backup id"}"#),
-            ));
-        }
-        let file = self
-            .config
-            .data_dir
-            .join("backups")
-            .join(format!("{id}.bak"));
-        match tokio::fs::read(&file).await {
-            Ok(bytes) => Ok(Response::builder()
-                .status(StatusCode::OK)
-                .header("Content-Type", "application/octet-stream")
-                .header(
-                    "Content-Disposition",
-                    format!("attachment; filename=\"archipelago-backup-{id}.bak\""),
-                )
-                .header("Content-Length", bytes.len())
-                .body(hyper::Body::from(bytes))
-                .unwrap_or_else(|_| Response::new(hyper::Body::from("Internal error")))),
-            Err(_) => Ok(build_response(
-                StatusCode::NOT_FOUND,
-                "application/json",
-                hyper::Body::from(r#"{"error":"backup not found"}"#),
-            )),
-        }
-    }
-
     /// Build a 401 Unauthorized JSON response.
     fn unauthorized() -> Response<hyper::Body> {
         let body = serde_json::json!({ "error": "Unauthorized" });
@@ -471,16 +434,6 @@ impl ApiHandler {
                 Self::handle_mesh_typed_relay(self.rpc_handler.clone(), body_bytes).await
             }
 
-            // Backup archive download — session-gated. Lives under /api/blob/
-            // so the existing nginx `location /api/blob` prefix proxies it on
-            // every fleet node without a config change.
-            (Method::GET, p) if p.starts_with("/api/blob/backup/") => {
-                if !self.is_authenticated(&headers).await {
-                    return Ok(Self::unauthorized());
-                }
-                self.handle_backup_download(p).await
-            }
-
             // Blob upload — local/session use only. Session-authenticated so
             // only the node owner can push attachments into the blob store.
             (Method::POST, "/api/blob") => {
@@ -580,26 +533,6 @@ impl ApiHandler {
                 self.handle_app_catalog_proxy().await
             }
 
-            // Pine node status — public tier (version/uptime/height/sync/peer
-            // counts) is unauthenticated like /bitcoin-status; Lightning
-            // balances + latest mesh message additionally require the bearer
-            // token the pine/HA seeder minted (or a valid session).
-            (Method::GET, "/api/pine/status") => {
-                let bearer = headers
-                    .get(hyper::header::AUTHORIZATION)
-                    .and_then(|v| v.to_str().ok())
-                    .and_then(|v| v.strip_prefix("Bearer "))
-                    .unwrap_or("");
-                let authorized = self.rpc_handler.pine_status_token_ok(bearer).await
-                    || self.is_authenticated(&headers).await;
-                let body = self.rpc_handler.pine_status_json(authorized).await;
-                Ok(build_response(
-                    StatusCode::OK,
-                    "application/json",
-                    hyper::Body::from(serde_json::to_vec(&body).unwrap_or_default()),
-                ))
-            }
-
             // LND connect info — nginx validates session cookie (presence check),
             // backend is bound to 127.0.0.1 so only nginx can reach it.
             // No backend auth check here because the LND UI iframe fetches this

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

@@ -55,20 +55,14 @@ impl RpcHandler {
                 }))
             }
         };
-        let bal = client
-            .balance()
-            .await
-            .unwrap_or_else(|_| serde_json::json!({}));
+        let bal = client.balance().await.unwrap_or_else(|_| serde_json::json!({}));
         let sat = |key: &str| bal.get(key).and_then(|v| v.as_u64()).unwrap_or(0);
         let spendable = sat("spendable_sat");
         let pending = sat("pending_in_round_sat")
             + sat("pending_board_sat")
             + sat("pending_lightning_send_sat")
             + sat("claimable_lightning_receive_sat")
-            + bal
-                .get("pending_exit_sat")
-                .and_then(|v| v.as_u64())
-                .unwrap_or(0);
+            + bal.get("pending_exit_sat").and_then(|v| v.as_u64()).unwrap_or(0);
         let onchain = client
             .onchain_balance()
             .await

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

@@ -9,23 +9,6 @@ impl RpcHandler {
         params: Option<serde_json::Value>,
     ) -> Result<serde_json::Value> {
         let params = params.ok_or_else(|| anyhow::anyhow!("Missing params"))?;
-
-        // Companion device-token login: minted via auth.createDeviceToken and
-        // carried by the pairing QR. Verified here so it shares the login rate
-        // limiter with password attempts.
-        if let Some(token) = params.get("token").and_then(|v| v.as_str()) {
-            return match crate::device_tokens::verify(&self.config.data_dir, token).await {
-                Some(device) => {
-                    tracing::info!("[onboarding] device-token login ({device})");
-                    Ok(serde_json::Value::Null)
-                }
-                None => {
-                    tracing::warn!("[onboarding] device-token login failed");
-                    Err(anyhow::anyhow!("Invalid device token"))
-                }
-            };
-        }
-
         let password = params
             .get("password")
             .and_then(|v| v.as_str())
@@ -49,15 +32,6 @@ impl RpcHandler {
 
         let valid = self.auth_manager.verify_password(password).await?;
         if !valid {
-            // The companion app sends its device token through the password
-            // field (it reuses the whole password auto-login path, including
-            // the WebView form). Accept a valid token here so that path works.
-            if let Some(device) =
-                crate::device_tokens::verify(&self.config.data_dir, password).await
-            {
-                tracing::info!("[onboarding] device-token login via password field ({device})");
-                return Ok(serde_json::Value::Null);
-            }
             tracing::warn!("[onboarding] login failed — wrong password");
             return Err(anyhow::anyhow!("Password Incorrect"));
         }
@@ -99,56 +73,6 @@ impl RpcHandler {
         Ok(serde_json::Value::Null)
     }
 
-    /// Mint a device token for the companion pairing QR. Session-gated by the
-    /// dispatcher (not in UNAUTHENTICATED_METHODS), so only a logged-in web UI
-    /// can mint one. The plaintext token is returned exactly once.
-    pub(super) async fn handle_auth_create_device_token(
-        &self,
-        params: Option<serde_json::Value>,
-    ) -> Result<serde_json::Value> {
-        let mut name = params
-            .as_ref()
-            .and_then(|p| p.get("name"))
-            .and_then(|v| v.as_str())
-            .unwrap_or("companion")
-            .trim()
-            .to_string();
-        if name.is_empty() || name.len() > 64 {
-            return Err(anyhow::anyhow!("Device name must be 1-64 characters"));
-        }
-        // The default name was a single shared slot: every pairing popup
-        // replaced the previous phone's token, silently logging out the
-        // first phone the moment a second one paired. Default-named mints
-        // get a unique suffix so each device keeps its own credential;
-        // explicitly named devices keep replace-in-place semantics.
-        if name == "companion" {
-            name = format!("companion-{}", hex::encode(rand::random::<[u8; 2]>()));
-        }
-        let token = crate::device_tokens::create(&self.config.data_dir, &name).await?;
-        Ok(serde_json::json!({ "name": name, "token": token }))
-    }
-
-    pub(super) async fn handle_auth_list_device_tokens(&self) -> Result<serde_json::Value> {
-        let tokens = crate::device_tokens::list(&self.config.data_dir).await;
-        Ok(serde_json::json!(tokens
-            .iter()
-            .map(|t| serde_json::json!({ "name": t.name, "created": t.created }))
-            .collect::<Vec<_>>()))
-    }
-
-    pub(super) async fn handle_auth_revoke_device_token(
-        &self,
-        params: Option<serde_json::Value>,
-    ) -> Result<serde_json::Value> {
-        let name = params
-            .as_ref()
-            .and_then(|p| p.get("name"))
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| anyhow::anyhow!("Missing name"))?;
-        let removed = crate::device_tokens::remove(&self.config.data_dir, name).await?;
-        Ok(serde_json::json!({ "removed": removed }))
-    }
-
     pub(super) async fn handle_auth_logout(&self) -> Result<serde_json::Value> {
         tracing::info!("[onboarding] logout");
         Ok(serde_json::Value::Null)
@@ -223,15 +147,6 @@ impl RpcHandler {
         self.auth_manager.setup_user(password).await?;
         tracing::info!("[onboarding] user setup complete");
 
-        // The install-time password must also become the OS login for the
-        // archipelago user — otherwise the console/SSH keeps the image default
-        // ("archipelago") after the user has picked a real password (#97).
-        // Best-effort: a failure here must not break onboarding.
-        match crate::auth::change_ssh_password(password).await {
-            Ok(()) => tracing::info!("[onboarding] system login password synced"),
-            Err(e) => tracing::warn!("[onboarding] system login password sync failed: {e}"),
-        }
-
         // Persist the pending onboarding seed as the encrypted backup now that
         // a passphrase (the login password) finally exists — otherwise "Reveal
         // recovery phrase" has nothing to decrypt on this node, ever.

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

@@ -465,7 +465,6 @@ impl RpcHandler {
             signing_key.as_ref().map(|i| i.signing_key()),
             Some(&peer.pubkey),
             data.server_info.name.as_deref(),
-            Some(&self.config.data_dir),
         )
         .await
     }

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

@@ -804,7 +804,7 @@ async fn http_launch_url_reachable(url: &str) -> bool {
     }
 }
 
-pub(in crate::api::rpc) fn port_from_url(url: &str) -> Option<u16> {
+fn port_from_url(url: &str) -> Option<u16> {
     let after_colon = url.rsplit_once(':')?.1;
     let port = after_colon
         .chars()

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

@@ -179,24 +179,7 @@ impl RpcHandler {
                 if price == 0 {
                     return Err(anyhow::anyhow!("Paid content requires price_sats > 0"));
                 }
-                // Optional list of payment methods the sharer accepts.
-                // Absent/empty = all methods (backward compatible).
-                const KNOWN_METHODS: [&str; 4] = ["lightning", "onchain", "ecash", "fedimint"];
-                let accepted: Vec<String> = params
-                    .get("accepted_methods")
-                    .and_then(|v| v.as_array())
-                    .map(|arr| {
-                        arr.iter()
-                            .filter_map(|m| m.as_str())
-                            .filter(|m| KNOWN_METHODS.contains(m))
-                            .map(str::to_string)
-                            .collect()
-                    })
-                    .unwrap_or_default();
-                AccessControl::Paid {
-                    price_sats: price,
-                    accepted,
-                }
+                AccessControl::Paid { price_sats: price }
             }
             _ => return Err(anyhow::anyhow!("Invalid access type: {}", access_type)),
         };
@@ -279,7 +262,6 @@ impl RpcHandler {
                 .service(crate::settings::transport::PeerService::PeerFiles)
                 .header("X-Federation-DID", local_did)
                 .timeout(std::time::Duration::from_secs(120))
-                .fips_timeout(std::time::Duration::from_secs(8))
                 .send_get()
                 .await
                 .context("Failed to connect to peer")?;
@@ -365,11 +347,6 @@ impl RpcHandler {
             crate::fips::dial::PeerRequest::new(fips_npub.as_deref(), onion, "/content")
                 .service(crate::settings::transport::PeerService::PeerFiles)
                 .timeout(std::time::Duration::from_secs(30))
-                // The Cloud page's hottest call: without a fast-fail cap a
-                // cold FIPS path burned ~16.6s before Tor even started,
-                // against the UI's 30s deadline — users saw errors, not
-                // fallback.
-                .fips_timeout(std::time::Duration::from_secs(6))
                 .send_get()
                 .await
                 .context("Failed to connect to peer")?;
@@ -435,51 +412,6 @@ impl RpcHandler {
             return Err(anyhow::anyhow!("Invalid v3 onion address"));
         }
 
-        // NEVER pay twice for content we already own (2026-07-22: a file
-        // shared twice produced two catalog ids for the same bytes and the
-        // buyer paid both). Guard BEFORE any ecash is minted, matching both
-        // by exact (onion, content_id) and by (onion, filename) — the latter
-        // catches duplicate ids pointing at the same file on the same
-        // seller. The owned copy is served from the local cache instead.
-        {
-            let filename = params.get("filename").and_then(|v| v.as_str());
-            let owned = crate::content_owned::list_owned(&self.config.data_dir).await;
-            let already = owned.iter().find(|o| {
-                o.onion == onion
-                    && (o.content_id == content_id
-                        || filename.is_some_and(|f| {
-                            !f.is_empty()
-                                && o.filename.trim_start_matches('/') == f.trim_start_matches('/')
-                        }))
-            });
-            if let Some(o) = already {
-                tracing::info!(
-                    onion,
-                    content_id,
-                    owned_as = %o.content_id,
-                    "paid download: already owned — serving cached copy, NOT paying again"
-                );
-                if let Some((mime, bytes)) =
-                    crate::content_owned::read_owned(&self.config.data_dir, &o.onion, &o.content_id)
-                        .await
-                {
-                    use base64::Engine;
-                    return Ok(serde_json::json!({
-                        "owned": true,
-                        "already_owned": true,
-                        "filename": o.filename,
-                        "mime_type": mime,
-                        "size_bytes": bytes.len(),
-                        "paid_sats": 0,
-                        "data_base64":
-                            base64::engine::general_purpose::STANDARD.encode(&bytes),
-                    }));
-                }
-                // Cache record exists but bytes are gone — fall through and
-                // repurchase rather than stranding the user.
-            }
-        }
-
         // `method` pins the backend the user confirmed in the UI ("cashu" |
         // "fedimint"); absent = auto (Cashu first, then Fedimint). The seller's
         // verify_payment_token accepts either, so a node whose balance lives in
@@ -658,51 +590,6 @@ impl RpcHandler {
             tracing::warn!("paid download: failed to cache purchased content (non-fatal): {e:#}");
         }
 
-        // Auto-file the purchase into the user's Files area (2026-07-22):
-        // Photos for images/video, Music for audio, Documents otherwise —
-        // same buckets the Cloud view uses. The in-app viewer still plays
-        // from the purchase cache; this makes the file ALSO show up where
-        // files live, on every device, without relying on a browser
-        // download. Best-effort: never fail a paid download over it.
-        {
-            let folder = if mime_type.starts_with("image/") || mime_type.starts_with("video/") {
-                "Photos"
-            } else if mime_type.starts_with("audio/") {
-                "Music"
-            } else {
-                "Documents"
-            };
-            let base = std::path::Path::new(&filename)
-                .file_name()
-                .and_then(|n| n.to_str())
-                .unwrap_or("download")
-                .to_string();
-            let dir = self.config.data_dir.join("filebrowser").join(folder);
-            if let Err(e) = tokio::fs::create_dir_all(&dir).await {
-                tracing::warn!("paid download: cannot create {}: {e}", dir.display());
-            } else {
-                // Don't clobber an existing file of the same name: "x.jpg"
-                // → "x (2).jpg" etc.
-                let mut target = dir.join(&base);
-                let (stem, ext) = match base.rsplit_once('.') {
-                    Some((s, e)) if !s.is_empty() => (s.to_string(), format!(".{e}")),
-                    _ => (base.clone(), String::new()),
-                };
-                let mut n = 2;
-                while target.exists() {
-                    target = dir.join(format!("{stem} ({n}){ext}"));
-                    n += 1;
-                }
-                match tokio::fs::write(&target, &bytes).await {
-                    Ok(()) => tracing::info!("paid download: filed into {}", target.display()),
-                    Err(e) => tracing::warn!(
-                        "paid download: filing into {} failed (non-fatal): {e}",
-                        target.display()
-                    ),
-                }
-            }
-        }
-
         use base64::Engine;
         let encoded = base64::engine::general_purpose::STANDARD.encode(&bytes);
 
@@ -1143,7 +1030,6 @@ impl RpcHandler {
             crate::fips::dial::PeerRequest::new(fips_npub.as_deref(), onion, &path)
                 .service(crate::settings::transport::PeerService::PeerFiles)
                 .timeout(std::time::Duration::from_secs(30))
-                .fips_timeout(std::time::Duration::from_secs(6))
                 .send_get()
                 .await
                 .context("Failed to connect to peer for preview")?;

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

@@ -26,9 +26,6 @@ impl RpcHandler {
             "auth.onboardingComplete" => self.handle_auth_onboarding_complete().await,
             "auth.isOnboardingComplete" => self.handle_auth_is_onboarding_complete().await,
             "auth.resetOnboarding" => self.handle_auth_reset_onboarding(params).await,
-            "auth.createDeviceToken" => self.handle_auth_create_device_token(params).await,
-            "auth.listDeviceTokens" => self.handle_auth_list_device_tokens().await,
-            "auth.revokeDeviceToken" => self.handle_auth_revoke_device_token(params).await,
 
             // Seed management (BIP-39 mnemonic)
             "seed.generate" => self.handle_seed_generate().await,
@@ -124,15 +121,12 @@ impl RpcHandler {
             }
             "lnd.getinfo" => self.handle_lnd_getinfo().await,
             "lnd.listchannels" => self.handle_lnd_listchannels().await,
-            "lnd.closedchannels" => self.handle_lnd_closedchannels().await,
             "lnd.openchannel" => self.handle_lnd_openchannel(params).await,
             "lnd.closechannel" => self.handle_lnd_closechannel(params).await,
             "lnd.newaddress" => self.handle_lnd_newaddress().await,
             "lnd.sendcoins" => self.handle_lnd_sendcoins(params).await,
-            "lnd.estimatefee" => self.handle_lnd_estimatefee(params).await,
             "lnd.createinvoice" => self.handle_lnd_createinvoice(params).await,
             "lnd.payinvoice" => self.handle_lnd_payinvoice(params).await,
-            "lnd.paymentstatus" => self.handle_lnd_paymentstatus(params).await,
             "lnd.create-psbt" => self.handle_lnd_create_psbt(params).await,
             "lnd.finalize-psbt" => self.handle_lnd_finalize_psbt(params).await,
             "lnd.create-raw-tx" => self.handle_lnd_create_raw_tx(params).await,
@@ -263,7 +257,6 @@ impl RpcHandler {
             "wallet.fedimint-join" => self.handle_wallet_fedimint_join(params).await,
             "wallet.fedimint-leave" => self.handle_wallet_fedimint_leave(params).await,
             "wallet.fedimint-balance" => self.handle_wallet_fedimint_balance().await,
-            "wallet.fedimint-send" => self.handle_wallet_fedimint_send(params).await,
 
             // Ark protocol (via barkd sidecar)
             "wallet.ark-status" => self.handle_wallet_ark_status().await,
@@ -390,7 +383,6 @@ impl RpcHandler {
 
             // Mesh networking (Meshcore LoRa)
             "mesh.status" => self.handle_mesh_status().await,
-            "mesh.probe-device" => self.handle_mesh_probe_device(params).await,
             "mesh.peers" => self.handle_mesh_peers().await,
             "mesh.messages" => self.handle_mesh_messages(params).await,
             "mesh.debug-dump" => self.handle_mesh_debug_dump().await,
@@ -464,8 +456,6 @@ impl RpcHandler {
             "system.factory-reset" => self.handle_system_factory_reset(params).await,
             "system.settings.get" => self.handle_system_settings_get(params).await,
             "system.settings.set" => self.handle_system_settings_set(params).await,
-            "system.kiosk-display.get" => self.handle_system_kiosk_display_get().await,
-            "system.kiosk-display.set" => self.handle_system_kiosk_display_set(params).await,
 
             // Opt-in anonymous analytics
             "analytics.get-status" => self.handle_analytics_get_status().await,
@@ -494,7 +484,6 @@ impl RpcHandler {
 
             // FIPS mesh transport
             "fips.status" => self.handle_fips_status().await,
-            "fips.pair-info" => self.handle_fips_pair_info().await,
             "fips.check-update" => self.handle_fips_check_update().await,
             "fips.apply-update" => self.handle_fips_apply_update().await,
             "fips.install" => self.handle_fips_install().await,

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

@@ -865,9 +865,7 @@ impl RpcHandler {
                 "/rpc/v1",
             )
             .service(crate::settings::transport::PeerService::Peers)
-            .timeout(std::time::Duration::from_secs(30))
-            .fips_timeout(std::time::Duration::from_secs(6))
-            .record_transport(&self.config.data_dir);
+            .timeout(std::time::Duration::from_secs(30));
 
             match req.send_json(&body).await {
                 Ok((resp, transport)) if resp.status().is_success() => {

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

@@ -118,31 +118,6 @@ impl RpcHandler {
         Ok(serde_json::json!({ "removed": removed }))
     }
 
-    /// `wallet.fedimint-send` — spend ecash notes from any joined federation
-    /// with sufficient balance. Returns the notes token for the recipient
-    /// (rendered as text + QR by the send modal — the wallet's Fedi rail,
-    /// split from Cashu 2026-07-22). The heavy lifting already existed in
-    /// `fedimint_client::spend_from_any`; it was simply never exposed.
-    pub(super) async fn handle_wallet_fedimint_send(
-        &self,
-        params: Option<serde_json::Value>,
-    ) -> Result<serde_json::Value> {
-        let amount_sats = params
-            .as_ref()
-            .and_then(|p| p.get("amount_sats"))
-            .and_then(|v| v.as_u64())
-            .ok_or_else(|| anyhow::anyhow!("Missing amount_sats"))?;
-        anyhow::ensure!(amount_sats > 0, "must be at least 1 sat");
-        let (token, federation_id) =
-            crate::wallet::fedimint_client::spend_from_any(&self.config.data_dir, amount_sats)
-                .await?;
-        Ok(serde_json::json!({
-            "token": token,
-            "federation_id": federation_id,
-            "amount_sats": amount_sats,
-        }))
-    }
-
     /// `wallet.fedimint-balance` — total sats across all joined federations.
     pub(super) async fn handle_wallet_fedimint_balance(&self) -> Result<serde_json::Value> {
         // Soft-fail to zero when clientd isn't installed/running, so the unified

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

@@ -13,63 +13,7 @@ use anyhow::Result;
 impl RpcHandler {
     pub(super) async fn handle_fips_status(&self) -> Result<serde_json::Value> {
         let status = fips::FipsStatus::query(&self.config.data_dir).await;
-        let mut v = serde_json::to_value(status)?;
-        // Dial outcome counters (process-lifetime): how often peer dials
-        // used FIPS vs fell back to Tor, broken down by reason. This is
-        // the observability that makes "FIPS uptime" measurable.
-        if let Some(obj) = v.as_object_mut() {
-            obj.insert("dial_stats".to_string(), fips::telemetry::snapshot());
-        }
-        Ok(v)
-    }
-
-    /// Everything the companion app needs to join this node's mesh, embedded
-    /// in the pairing QR by the web UI: the daemon's npub (identity to dial),
-    /// the fips0 ULA (where the UI is reachable once the phone is meshed),
-    /// and the transport ports on this host. The QR builder supplies the
-    /// host/IP itself — it knows which origin the browser reached the node on.
-    pub(super) async fn handle_fips_pair_info(&self) -> Result<serde_json::Value> {
-        let identity_dir = fips::identity_dir_from(&self.config.data_dir);
-        let npub = crate::identity::fips_npub(&identity_dir)
-            .await?
-            .ok_or_else(|| {
-                anyhow::anyhow!("FIPS identity not provisioned yet — complete onboarding first")
-            })?;
-        let ula = fips::iface::fips0_ula().map(|ip| ip.to_string());
-        // The node's seed anchors ride along so the phone can rendezvous
-        // through the same public mesh points when the node's LAN endpoint
-        // isn't directly dialable (phone away from home, node behind NAT).
-        let mut anchor_list = fips::anchors::load(&self.config.data_dir)
-            .await
-            .unwrap_or_default();
-        // Pairing must always carry a public rendezvous point: without one the
-        // phone is IP-bound to the LAN host it scanned and goes dark the
-        // moment it leaves that network. This is a pairing hint only — the
-        // node's own anchor file is not modified, so an operator's removal of
-        // the default anchors still sticks for the node itself.
-        if !anchor_list
-            .iter()
-            .any(|a| a.npub == fips::anchors::ARCHY_ANCHOR_NPUB)
-        {
-            anchor_list.push(fips::anchors::archy_anchor());
-        }
-        let anchors = anchor_list
-            .into_iter()
-            .map(|a| {
-                serde_json::json!({
-                    "npub": a.npub,
-                    "addr": a.address,
-                    "transport": a.transport,
-                })
-            })
-            .collect::<Vec<_>>();
-        Ok(serde_json::json!({
-            "npub": npub,
-            "ula": ula,
-            "udp_port": fips::PUBLISHED_UDP_PORT,
-            "tcp_port": fips::DEFAULT_TCP_PORT,
-            "anchors": anchors,
-        }))
+        Ok(serde_json::to_value(status)?)
     }
 
     pub(super) async fn handle_fips_check_update(&self) -> Result<serde_json::Value> {
@@ -90,8 +34,7 @@ impl RpcHandler {
     pub(super) async fn handle_fips_install(&self) -> Result<serde_json::Value> {
         let identity_dir = fips::identity_dir_from(&self.config.data_dir);
         fips::config::install(&identity_dir).await?;
-        let unit = fips::service::activation_unit().await;
-        fips::service::activate(unit).await?;
+        fips::service::activate(fips::SERVICE_UNIT).await?;
         let status = fips::FipsStatus::query(&self.config.data_dir).await;
         Ok(serde_json::to_value(status)?)
     }

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

@@ -86,7 +86,7 @@ impl RpcHandler {
             let did = crate::identity::did_key_from_pubkey_hex(&data.server_info.pubkey)
                 .unwrap_or_default();
             let version = data.server_info.version.clone();
-            let relays = self.handshake_relays().await;
+            let relays = self.config.nostr_relays.clone();
             let tor_proxy = self.config.nostr_tor_proxy.clone();
             tokio::spawn(async move {
                 if let Err(e) = nostr_handshake::publish_presence(
@@ -106,17 +106,6 @@ impl RpcHandler {
         Ok(serde_json::json!({ "enabled": enabled }))
     }
 
-    /// The relay set every handshake operation uses: the user-managed relay
-    /// list (Settings → Relays, `nostr_relays.json`) merged with the config
-    /// defaults. Before 2026-07-22 handshake send/poll used ONLY the two
-    /// hardcoded config relays (one of which is defunct) and ignored user
-    /// relay edits entirely — so a sender publishing where the receiver
-    /// never read was a routine, silent way for peer requests to vanish.
-    pub(super) async fn handshake_relays(&self) -> Vec<String> {
-        crate::nostr_relays::merged_relay_list(&self.config.data_dir, &self.config.nostr_relays)
-            .await
-    }
-
     /// Discover discoverable nodes via Nostr presence events.
     /// Returns (nostr_pubkey, npub, DID, version) only — never an onion.
     pub(super) async fn handle_handshake_discover(&self) -> Result<serde_json::Value> {
@@ -124,10 +113,9 @@ impl RpcHandler {
         // to query relays as long as the user is actively browsing — they're
         // an anonymous observer of presence events, not publishing anything.
         let identity_dir = self.config.data_dir.join("identity");
-        let relays = self.handshake_relays().await;
         let nodes = nostr_handshake::discover_nodes(
             &identity_dir,
-            &relays,
+            &self.config.nostr_relays,
             self.config.nostr_tor_proxy.as_deref(),
         )
         .await?;
@@ -173,7 +161,7 @@ impl RpcHandler {
             our_version,
             our_name,
             message,
-            &self.handshake_relays().await,
+            &self.config.nostr_relays,
             self.config.nostr_tor_proxy.as_deref(),
         )
         .await?;
@@ -203,40 +191,6 @@ impl RpcHandler {
     /// - `PeerReject`   → mark matching outbound row as `Rejected`
     ///
     /// Never auto-adds peers, never auto-responds, never sends our onion.
-    /// Background relay poll (2026-07-22): before this, `handshake.poll` ran
-    /// ONLY when a user opened Federation and pressed the Poll button — a
-    /// peer request sat on the relay until the target's operator happened to
-    /// click, i.e. for most nodes forever ("requests never arrive"). Runs the
-    /// same poll+dispatch as the RPC (the disabled gate inside still applies)
-    /// and nudges the websocket revision when anything new lands so open UIs
-    /// refresh immediately.
-    pub async fn background_handshake_poll(self: &std::sync::Arc<Self>) {
-        match self.handle_handshake_poll().await {
-            Ok(res) => {
-                let new = res
-                    .get("new_requests")
-                    .and_then(|v| v.as_array())
-                    .map(|a| a.len())
-                    .unwrap_or(0);
-                let applied = res
-                    .get("applied_invites")
-                    .and_then(|v| v.as_array())
-                    .map(|a| a.len())
-                    .unwrap_or(0);
-                if new > 0 || applied > 0 {
-                    tracing::info!(
-                        new_requests = new,
-                        applied_invites = applied,
-                        "handshake poll: inbound peer activity"
-                    );
-                    let (data, _) = self.state_manager.get_snapshot().await;
-                    self.state_manager.update_data(data).await;
-                }
-            }
-            Err(e) => tracing::debug!("background handshake poll failed: {e:#}"),
-        }
-    }
-
     pub(super) async fn handle_handshake_poll(&self) -> Result<serde_json::Value> {
         // Runtime gate: if the user hasn't enabled discoverability, don't
         // touch the relays. The poll endpoint is a hard no-op until they
@@ -253,10 +207,9 @@ impl RpcHandler {
             }));
         }
         let identity_dir = self.config.data_dir.join("identity");
-        let relays = self.handshake_relays().await;
         let handshakes = nostr_handshake::poll_handshakes(
             &identity_dir,
-            &relays,
+            &self.config.nostr_relays,
             self.config.nostr_tor_proxy.as_deref(),
             None,
         )

core/archipelago/src/api/rpc/lnd/channels.rs

@@ -5,21 +5,6 @@ use tracing::info;
 
 use super::LND_REST_BASE_URL;
 
-/// LND rejects RPCs with "server is still in the process of starting" for a
-/// short window after wallet unlock (p2p/graph subsystems still loading).
-/// Transient by design — match it so callers retry and, if it persists,
-/// surface a calm notice instead of a scary failure. The exact phrase below
-/// is what the frontend keys its softer (non-red) styling on.
-fn lnd_still_starting(msg: &str) -> bool {
-    let m = msg.to_ascii_lowercase();
-    m.contains("in the process of starting") || m.contains("server is still starting")
-}
-
-/// User-facing text for the still-starting state. Deliberately calm: this is
-/// a "wait a moment", not an error.
-const LND_STARTING_MSG: &str = "Your Lightning node is still finishing its startup — this \
-     usually takes a minute or two after the node comes online. Please try again shortly.";
-
 #[derive(Debug, Serialize)]
 struct ChannelInfo {
     chan_id: String,
@@ -30,8 +15,6 @@ struct ChannelInfo {
     active: bool,
     status: String,
     channel_point: String,
-    #[serde(skip_serializing_if = "String::is_empty")]
-    closing_txid: String,
 }
 
 #[derive(Debug, Serialize)]
@@ -60,10 +43,6 @@ struct LndChannel {
 #[derive(Debug, Deserialize, Default)]
 struct LndPendingChannelsResponse {
     pending_open_channels: Option<Vec<LndPendingOpenChannel>>,
-    // Cooperative closes waiting for their closing tx to confirm
-    waiting_close_channels: Option<Vec<LndWaitingCloseChannel>>,
-    // Force closes serving out their timelock
-    pending_force_closing_channels: Option<Vec<LndForceClosingChannel>>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -71,18 +50,6 @@ struct LndPendingOpenChannel {
     channel: Option<LndPendingChannel>,
 }
 
-#[derive(Debug, Deserialize)]
-struct LndWaitingCloseChannel {
-    channel: Option<LndPendingChannel>,
-    closing_txid: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct LndForceClosingChannel {
-    channel: Option<LndPendingChannel>,
-    closing_txid: Option<String>,
-}
-
 #[derive(Debug, Deserialize)]
 struct LndPendingChannel {
     remote_node_pub: Option<String>,
@@ -92,52 +59,6 @@ struct LndPendingChannel {
     channel_point: Option<String>,
 }
 
-impl LndPendingChannel {
-    fn into_channel_info(self, status: &str, closing_txid: Option<String>) -> ChannelInfo {
-        let parse = |s: &Option<String>| s.as_deref().and_then(|v| v.parse().ok()).unwrap_or(0);
-        ChannelInfo {
-            chan_id: String::new(),
-            remote_pubkey: self.remote_node_pub.clone().unwrap_or_default(),
-            capacity: parse(&self.capacity),
-            local_balance: parse(&self.local_balance),
-            remote_balance: parse(&self.remote_balance),
-            active: false,
-            status: status.into(),
-            channel_point: self.channel_point.unwrap_or_default(),
-            closing_txid: closing_txid.unwrap_or_default(),
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Default)]
-struct LndClosedChannelsResponse {
-    channels: Option<Vec<LndClosedChannel>>,
-}
-
-#[derive(Debug, Deserialize)]
-struct LndClosedChannel {
-    chan_id: Option<String>,
-    remote_pubkey: Option<String>,
-    capacity: Option<String>,
-    settled_balance: Option<String>,
-    close_type: Option<String>,
-    closing_tx_hash: Option<String>,
-    channel_point: Option<String>,
-    close_height: Option<i64>,
-}
-
-#[derive(Debug, Serialize)]
-struct ClosedChannelInfo {
-    chan_id: String,
-    remote_pubkey: String,
-    capacity: i64,
-    settled_balance: i64,
-    close_type: String,
-    closing_tx_hash: String,
-    channel_point: String,
-    close_height: i64,
-}
-
 impl RpcHandler {
     pub(in crate::api::rpc) async fn handle_lnd_listchannels(&self) -> Result<serde_json::Value> {
         let (client, macaroon_hex) = self.lnd_client().await?;
@@ -195,7 +116,6 @@ impl RpcHandler {
                         "inactive".into()
                     },
                     channel_point: ch.channel_point.unwrap_or_default(),
-                    closing_txid: String::new(),
                 }
             })
             .collect();
@@ -203,20 +123,31 @@ impl RpcHandler {
         let mut pending_channels: Vec<ChannelInfo> = Vec::new();
         for pch in pending_resp.pending_open_channels.unwrap_or_default() {
             if let Some(ch) = pch.channel {
-                pending_channels.push(ch.into_channel_info("pending_open", None));
-            }
-        }
-        for wch in pending_resp.waiting_close_channels.unwrap_or_default() {
-            if let Some(ch) = wch.channel {
-                pending_channels.push(ch.into_channel_info("closing", wch.closing_txid));
-            }
-        }
-        for fch in pending_resp
-            .pending_force_closing_channels
-            .unwrap_or_default()
-        {
-            if let Some(ch) = fch.channel {
-                pending_channels.push(ch.into_channel_info("force_closing", fch.closing_txid));
+                let capacity: i64 = ch
+                    .capacity
+                    .as_deref()
+                    .and_then(|s| s.parse().ok())
+                    .unwrap_or(0);
+                let local: i64 = ch
+                    .local_balance
+                    .as_deref()
+                    .and_then(|s| s.parse().ok())
+                    .unwrap_or(0);
+                let remote: i64 = ch
+                    .remote_balance
+                    .as_deref()
+                    .and_then(|s| s.parse().ok())
+                    .unwrap_or(0);
+                pending_channels.push(ChannelInfo {
+                    chan_id: String::new(),
+                    remote_pubkey: ch.remote_node_pub.unwrap_or_default(),
+                    capacity,
+                    local_balance: local,
+                    remote_balance: remote,
+                    active: false,
+                    status: "pending_open".into(),
+                    channel_point: ch.channel_point.unwrap_or_default(),
+                });
             }
         }
 
@@ -320,45 +251,25 @@ impl RpcHandler {
                 "perm": false,
                 "timeout": "30"
             });
-            // Right after wallet unlock, LND's RPC answers while its p2p
-            // server is still spinning up, and every connect attempt gets
-            // "server is still in the process of starting". That's a
-            // transient state, not a failure — it clears in seconds — so
-            // retry quietly for ~30s before surfacing a calm, non-scary
-            // notice (the frontend styles LND_STARTING_MSG as info, not red).
-            let mut attempt = 0u32;
-            loop {
-                let connect_resp = client
-                    .post(format!("{LND_REST_BASE_URL}/v1/peers"))
-                    .header("Grpc-Metadata-macaroon", &macaroon_hex)
-                    .json(&connect_body)
-                    .timeout(std::time::Duration::from_secs(35))
-                    .send()
-                    .await
-                    .context("Failed to connect to peer")?;
+            let connect_resp = client
+                .post(format!("{LND_REST_BASE_URL}/v1/peers"))
+                .header("Grpc-Metadata-macaroon", &macaroon_hex)
+                .json(&connect_body)
+                .timeout(std::time::Duration::from_secs(35))
+                .send()
+                .await
+                .context("Failed to connect to peer")?;
 
-                if connect_resp.status().is_success() {
-                    break;
-                }
+            if !connect_resp.status().is_success() {
                 let body: serde_json::Value = connect_resp.json().await.unwrap_or_default();
                 let msg = body
                     .get("message")
                     .and_then(|v| v.as_str())
                     .unwrap_or("Unknown error");
                 // LND returns an error if we already have this peer — that is fine
-                if msg.contains("already connected") {
-                    break;
+                if !msg.contains("already connected") {
+                    return Err(anyhow::anyhow!("Failed to connect to peer: {}", msg));
                 }
-                if lnd_still_starting(msg) && attempt < 5 {
-                    attempt += 1;
-                    info!(attempt, "LND still starting — retrying peer connect in 6s");
-                    tokio::time::sleep(std::time::Duration::from_secs(6)).await;
-                    continue;
-                }
-                if lnd_still_starting(msg) {
-                    return Err(anyhow::anyhow!("{LND_STARTING_MSG}"));
-                }
-                return Err(anyhow::anyhow!("Failed to connect to peer: {}", msg));
             }
         }
 
@@ -394,55 +305,12 @@ impl RpcHandler {
                 .get("message")
                 .and_then(|v| v.as_str())
                 .unwrap_or("Unknown error");
-            if lnd_still_starting(msg) {
-                return Err(anyhow::anyhow!("{LND_STARTING_MSG}"));
-            }
             return Err(anyhow::anyhow!("Failed to open channel: {}", msg));
         }
 
         Ok(body)
     }
 
-    pub(in crate::api::rpc) async fn handle_lnd_closedchannels(&self) -> Result<serde_json::Value> {
-        let (client, macaroon_hex) = self.lnd_client().await?;
-
-        let resp: LndClosedChannelsResponse = client
-            .get(format!("{LND_REST_BASE_URL}/v1/channels/closed"))
-            .header("Grpc-Metadata-macaroon", &macaroon_hex)
-            .send()
-            .await
-            .context("LND REST connection failed")?
-            .json()
-            .await
-            .context("Failed to parse LND closed channels response")?;
-
-        let channels: Vec<ClosedChannelInfo> = resp
-            .channels
-            .unwrap_or_default()
-            .into_iter()
-            .map(|ch| ClosedChannelInfo {
-                chan_id: ch.chan_id.unwrap_or_default(),
-                remote_pubkey: ch.remote_pubkey.unwrap_or_default(),
-                capacity: ch
-                    .capacity
-                    .as_deref()
-                    .and_then(|s| s.parse().ok())
-                    .unwrap_or(0),
-                settled_balance: ch
-                    .settled_balance
-                    .as_deref()
-                    .and_then(|s| s.parse().ok())
-                    .unwrap_or(0),
-                close_type: ch.close_type.unwrap_or_default(),
-                closing_tx_hash: ch.closing_tx_hash.unwrap_or_default(),
-                channel_point: ch.channel_point.unwrap_or_default(),
-                close_height: ch.close_height.unwrap_or(0),
-            })
-            .collect();
-
-        Ok(serde_json::json!({ "channels": channels }))
-    }
-
     pub(in crate::api::rpc) async fn handle_lnd_closechannel(
         &self,
         params: Option<serde_json::Value>,
@@ -483,35 +351,27 @@ impl RpcHandler {
             "Closing Lightning channel"
         );
 
-        let (_, macaroon_hex) = self.lnd_client().await?;
-
-        // The close endpoint is server-streaming: LND holds the connection
-        // open and emits updates until the closing tx CONFIRMS on-chain
-        // (potentially hours). Reading the whole body hangs the RPC even
-        // though the close already went through, and the shared lnd_client's
-        // 15s total timeout would abort the stream mid-read. Use a dedicated
-        // client and return as soon as the first streamed update arrives.
-        let client = reqwest::Client::builder()
-            .no_proxy()
-            .connect_timeout(std::time::Duration::from_secs(10))
-            .danger_accept_invalid_certs(true)
-            .build()
-            .context("Failed to create streaming HTTP client")?;
+        let (client, macaroon_hex) = self.lnd_client().await?;
 
         let url = format!(
             "{LND_REST_BASE_URL}/v1/channels/{}/{}?force={}",
             parts[0], parts[1], force
         );
 
-        let mut resp = client
+        let resp = client
             .delete(&url)
             .header("Grpc-Metadata-macaroon", &macaroon_hex)
             .send()
             .await
             .context("Failed to close channel")?;
 
-        if !resp.status().is_success() {
-            let body: serde_json::Value = resp.json().await.unwrap_or_default();
+        let status = resp.status();
+        let body: serde_json::Value = resp
+            .json()
+            .await
+            .context("Failed to parse close channel response")?;
+
+        if !status.is_success() {
             let msg = body
                 .get("message")
                 .and_then(|v| v.as_str())
@@ -519,56 +379,6 @@ impl RpcHandler {
             return Err(anyhow::anyhow!("Failed to close channel: {}", msg));
         }
 
-        // First streamed line is {"result":{"close_pending":…}} on success or
-        // {"error":…} — the stream reports errors in-band after a 200.
-        let mut buf: Vec<u8> = Vec::new();
-        let first_update = tokio::time::timeout(std::time::Duration::from_secs(25), async {
-            while let Some(chunk) = resp.chunk().await? {
-                buf.extend_from_slice(&chunk);
-                let line = match buf.iter().position(|&b| b == b'\n') {
-                    Some(pos) => &buf[..pos],
-                    None => &buf[..],
-                };
-                if let Ok(v) = serde_json::from_slice::<serde_json::Value>(line) {
-                    return Ok::<_, anyhow::Error>(Some(v));
-                }
-            }
-            Ok(None)
-        })
-        .await;
-
-        match first_update {
-            Ok(Ok(Some(update))) => {
-                if let Some(err) = update.get("error") {
-                    let msg = err
-                        .get("message")
-                        .and_then(|v| v.as_str())
-                        .unwrap_or("Unknown error");
-                    return Err(anyhow::anyhow!("Failed to close channel: {}", msg));
-                }
-                // txid arrives base64-encoded in internal byte order; flip it
-                // into the display order explorers use.
-                use base64::Engine as _;
-                let closing_txid = update
-                    .pointer("/result/close_pending/txid")
-                    .and_then(|v| v.as_str())
-                    .and_then(|b64| base64::engine::general_purpose::STANDARD.decode(b64).ok())
-                    .map(|mut bytes| {
-                        bytes.reverse();
-                        hex::encode(bytes)
-                    })
-                    .unwrap_or_default();
-                info!(channel_point, closing_txid, "Channel close initiated");
-                Ok(serde_json::json!({ "success": true, "closing_txid": closing_txid }))
-            }
-            Ok(Ok(None)) => Err(anyhow::anyhow!(
-                "LND ended the close stream without an update — check the channel list"
-            )),
-            Ok(Err(e)) => Err(e).context("Failed reading close channel response"),
-            // No update inside the window: the close is almost certainly still
-            // negotiating with the peer — report initiated, the channel list
-            // will show it under Closing.
-            Err(_) => Ok(serde_json::json!({ "success": true, "closing_txid": "" })),
-        }
+        Ok(serde_json::json!({ "success": true }))
     }
 }

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

@@ -56,172 +56,6 @@ pub(crate) async fn read_lnd_admin_macaroon() -> Result<Vec<u8>> {
     }
 }
 
-/// Real-time wallet push (user req 2026-07-22): the UI must reflect an
-/// incoming on-chain transaction the moment the node sees it, not on the
-/// next poll. Streams LND's `/v1/transactions/subscribe` — it fires on
-/// 0-conf mempool arrival AND again on each confirmation — and nudges the
-/// shared data-model revision on every event; /ws/db pushes that to every
-/// connected client and the frontend refetches wallet balance/transactions.
-/// Reconnects forever with capped backoff: LND restarting, wallet locked, or
-/// LND not installed yet all just mean "try again shortly".
-pub(crate) fn spawn_lnd_tx_watcher(state_manager: std::sync::Arc<crate::state::StateManager>) {
-    tokio::spawn(async move {
-        let mut delay = std::time::Duration::from_secs(5);
-        loop {
-            match stream_lnd_transactions(&state_manager).await {
-                // Stream ended cleanly (LND shutdown) — resume fast.
-                Ok(()) => delay = std::time::Duration::from_secs(5),
-                Err(e) => {
-                    tracing::debug!("lnd tx watcher: {e:#} — retrying in {delay:?}");
-                }
-            }
-            tokio::time::sleep(delay).await;
-            delay = (delay * 2).min(std::time::Duration::from_secs(120));
-        }
-    });
-}
-
-async fn stream_lnd_transactions(sm: &crate::state::StateManager) -> Result<()> {
-    let macaroon_hex = hex::encode(read_lnd_admin_macaroon().await?);
-    // Dedicated client: the shared lnd_client() carries a 15s total timeout,
-    // which would kill this deliberately long-lived stream.
-    let client = reqwest::Client::builder()
-        .no_proxy()
-        .connect_timeout(std::time::Duration::from_secs(10))
-        .danger_accept_invalid_certs(true)
-        .build()
-        .context("Failed to create streaming HTTP client")?;
-    let mut resp = client
-        .get(format!("{LND_REST_BASE_URL}/v1/transactions/subscribe"))
-        .header("Grpc-Metadata-macaroon", &macaroon_hex)
-        .send()
-        .await
-        .context("subscribe request failed")?;
-    anyhow::ensure!(
-        resp.status().is_success(),
-        "transactions/subscribe returned {}",
-        resp.status()
-    );
-    tracing::info!("lnd tx watcher: streaming wallet transaction events");
-    while let Some(chunk) = resp.chunk().await? {
-        if chunk.is_empty() {
-            continue;
-        }
-        // Any streamed event = wallet activity. Revision bump is the push
-        // contract (same pattern as the mesh-peer bridge in server.rs) — the
-        // clients refetch, so we don't need to parse the event body.
-        let (data, _) = sm.get_snapshot().await;
-        sm.update_data(data).await;
-        tracing::debug!(
-            bytes = chunk.len(),
-            "lnd tx watcher: wallet tx event — nudged ws clients"
-        );
-    }
-    Ok(())
-}
-
-/// LND wedge watchdog (2026-07-22, "100% uptime"): framework-pt's LND sat
-/// for 14 HOURS with its RPC answering but the server never finishing
-/// startup — synced_to_chain=false, zero peers, every channel inactive —
-/// and nothing noticed until a human tried to open a channel. The wedge
-/// signature is precise: RPC healthy while (!synced_to_chain, or zero peers
-/// with channels that need a peer) persists. A restart reliably clears it
-/// (the backend-churn wedge is a known lnd+rpcpolling failure mode), so
-/// after 15 consecutive bad minutes we bounce the container ourselves, with
-/// a 30-minute cooldown so a genuinely broken LND can't restart-loop.
-/// RPC-unreachable and locked-wallet states are deliberately NOT handled
-/// here — container-down is crash-recovery's job, and unlocking needs the
-/// operator.
-pub(crate) fn spawn_lnd_health_watchdog() {
-    tokio::spawn(async move {
-        let mut bad_minutes: u32 = 0;
-        let mut last_restart: Option<tokio::time::Instant> = None;
-        loop {
-            tokio::time::sleep(std::time::Duration::from_secs(60)).await;
-            let Ok(bytes) = read_lnd_admin_macaroon().await else {
-                bad_minutes = 0; // no LND on this node (or not set up yet)
-                continue;
-            };
-            let macaroon_hex = hex::encode(bytes);
-            let Ok(client) = reqwest::Client::builder()
-                .no_proxy()
-                .timeout(std::time::Duration::from_secs(10))
-                .danger_accept_invalid_certs(true)
-                .build()
-            else {
-                continue;
-            };
-            let Ok(resp) = client
-                .get(format!("{LND_REST_BASE_URL}/v1/getinfo"))
-                .header("Grpc-Metadata-macaroon", &macaroon_hex)
-                .send()
-                .await
-            else {
-                bad_minutes = 0; // down/locked — not the wedge signature
-                continue;
-            };
-            let Ok(info) = resp.json::<serde_json::Value>().await else {
-                bad_minutes = 0;
-                continue;
-            };
-            let synced = info
-                .get("synced_to_chain")
-                .and_then(|v| v.as_bool())
-                .unwrap_or(true);
-            let peers = info.get("num_peers").and_then(|v| v.as_u64()).unwrap_or(0);
-            let channels = info
-                .get("num_active_channels")
-                .and_then(|v| v.as_u64())
-                .unwrap_or(0)
-                + info
-                    .get("num_inactive_channels")
-                    .and_then(|v| v.as_u64())
-                    .unwrap_or(0)
-                + info
-                    .get("num_pending_channels")
-                    .and_then(|v| v.as_u64())
-                    .unwrap_or(0);
-            let wedged = !synced || (channels > 0 && peers == 0);
-            if !wedged {
-                bad_minutes = 0;
-                continue;
-            }
-            bad_minutes += 1;
-            if bad_minutes < 15 {
-                continue;
-            }
-            if last_restart
-                .map(|t| t.elapsed() < std::time::Duration::from_secs(1800))
-                .unwrap_or(false)
-            {
-                continue;
-            }
-            tracing::warn!(
-                synced_to_chain = synced,
-                num_peers = peers,
-                channels,
-                "LND wedged for {bad_minutes} minutes (RPC up, server never ready) — restarting the lnd container"
-            );
-            let out = tokio::process::Command::new("podman")
-                .args(["restart", "lnd"])
-                .output()
-                .await;
-            match out {
-                Ok(o) if o.status.success() => {
-                    tracing::info!("LND watchdog restart complete");
-                }
-                Ok(o) => tracing::warn!(
-                    "LND watchdog restart failed: {}",
-                    String::from_utf8_lossy(&o.stderr).trim()
-                ),
-                Err(e) => tracing::warn!("LND watchdog restart failed: {e}"),
-            }
-            last_restart = Some(tokio::time::Instant::now());
-            bad_minutes = 0;
-        }
-    });
-}
-
 impl RpcHandler {
     /// Helper: create an authenticated LND REST client.
     /// Returns an HTTP client configured for LND's self-signed TLS and the

core/archipelago/src/api/rpc/lnd/payments.rs

@@ -28,88 +28,21 @@ impl RpcHandler {
             ));
         }
 
-        // Zero-amount invoices need the amount supplied by the payer; LND's
-        // REST API takes it as an `amt` string alongside the payment request.
-        let amount_sats = params.get("amount_sats").and_then(|v| v.as_u64());
-
         info!("Paying Lightning invoice");
 
         let (client, macaroon_hex) = self.lnd_client().await?;
 
-        // Decode the invoice up front (fast, local) so we know its payment
-        // hash BEFORE handing it to LND. If the payment outlives our wait
-        // below, the hash is what lets the UI keep tracking it instead of
-        // declaring a false failure. Best-effort: a decode hiccup must not
-        // block the payment itself.
-        let (decoded_hash, decoded_amt) = match client
-            .get(format!("{LND_REST_BASE_URL}/v1/payreq/{payment_request}"))
-            .header("Grpc-Metadata-macaroon", &macaroon_hex)
-            .send()
-            .await
-        {
-            Ok(r) => match r.json::<serde_json::Value>().await {
-                Ok(d) => (
-                    d.get("payment_hash")
-                        .and_then(|v| v.as_str())
-                        .unwrap_or("")
-                        .to_string(),
-                    d.get("num_satoshis")
-                        .and_then(|v| v.as_str())
-                        .and_then(|s| s.parse::<i64>().ok())
-                        .unwrap_or(0),
-                ),
-                Err(_) => (String::new(), 0),
-            },
-            Err(_) => (String::new(), 0),
-        };
-
-        let mut pay_body = serde_json::json!({
+        let pay_body = serde_json::json!({
             "payment_request": payment_request,
         });
-        if let Some(amt) = amount_sats {
-            pay_body["amt"] = serde_json::json!(amt.to_string());
-        }
 
-        // `/v1/channels/transactions` is SYNCHRONOUS: it blocks until the
-        // payment settles or definitively fails, and multi-hop routing with
-        // retries routinely takes longer than the shared client's 15s budget.
-        // That 15s abort used to surface as "Payment failed" while LND kept
-        // paying in the background — the payment then succeeded and appeared
-        // in history a minute later. Wait up to 120s on a dedicated client,
-        // and treat a post-connect timeout as IN FLIGHT (status: pending),
-        // never as failure — only LND may declare a payment failed.
-        let pay_client = reqwest::Client::builder()
-            .no_proxy()
-            .connect_timeout(std::time::Duration::from_secs(10))
-            .timeout(std::time::Duration::from_secs(120))
-            .danger_accept_invalid_certs(true)
-            .build()
-            .context("Failed to create HTTP client")?;
-
-        let resp = match pay_client
+        let resp = client
             .post(format!("{LND_REST_BASE_URL}/v1/channels/transactions"))
             .header("Grpc-Metadata-macaroon", &macaroon_hex)
             .json(&pay_body)
             .send()
             .await
-        {
-            Ok(r) => r,
-            Err(e) if e.is_connect() => {
-                // Never reached LND — nothing was sent; this IS a hard error.
-                return Err(anyhow::anyhow!("Could not reach LND to pay: {e}"));
-            }
-            Err(_) => {
-                // Timed out (or lost the connection) AFTER the payment was
-                // handed to LND — it may well still succeed. Report pending
-                // with the hash so the caller can poll lnd.paymentstatus.
-                info!("payinvoice wait elapsed; payment still in flight");
-                return Ok(serde_json::json!({
-                    "status": "pending",
-                    "payment_hash": decoded_hash,
-                    "amount_sats": decoded_amt,
-                }));
-            }
-        };
+            .context("Failed to pay invoice")?;
 
         let status = resp.status();
         let body: serde_json::Value = resp
@@ -122,14 +55,6 @@ impl RpcHandler {
                 .get("message")
                 .and_then(|v| v.as_str())
                 .unwrap_or("Unknown error");
-            // Invoices are short-lived; retrying the same one can never
-            // succeed, so tell the user the way out instead of just the fact.
-            if msg.contains("invoice expired") {
-                return Err(anyhow::anyhow!(
-                    "Payment failed: this invoice has expired ({}). Ask the recipient for a fresh invoice and try again.",
-                    msg.trim_start_matches("invoice expired. ")
-                ));
-            }
             return Err(anyhow::anyhow!("Payment failed: {}", msg));
         }
 
@@ -146,105 +71,20 @@ impl RpcHandler {
             .and_then(|r| r.get("total_amt"))
             .and_then(|v| v.as_str())
             .and_then(|s| s.parse::<i64>().ok())
-            .unwrap_or(decoded_amt);
+            .unwrap_or(0);
 
         let payment_hash = body
             .get("payment_hash")
             .and_then(|v| v.as_str())
-            .filter(|s| !s.is_empty())
-            .map(|s| s.to_string())
-            .unwrap_or(decoded_hash);
+            .unwrap_or("")
+            .to_string();
 
         Ok(serde_json::json!({
-            "status": "succeeded",
             "payment_hash": payment_hash,
             "amount_sats": amount_sat,
         }))
     }
 
-    /// Status of an outgoing Lightning payment by hex payment hash. Lets the
-    /// UI resolve a payinvoice that outlived its synchronous wait (`status:
-    /// "pending"`) to a real terminal state instead of guessing.
-    pub(in crate::api::rpc) async fn handle_lnd_paymentstatus(
-        &self,
-        params: Option<serde_json::Value>,
-    ) -> Result<serde_json::Value> {
-        let params = params.unwrap_or_default();
-        let payment_hash = params
-            .get("payment_hash")
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| anyhow::anyhow!("Missing 'payment_hash' parameter"))?;
-        if payment_hash.len() != 64 || !payment_hash.chars().all(|c| c.is_ascii_hexdigit()) {
-            return Err(anyhow::anyhow!("Invalid payment hash"));
-        }
-
-        let (client, macaroon_hex) = self.lnd_client().await?;
-        let resp = client
-            .get(format!(
-                "{LND_REST_BASE_URL}/v1/payments?include_incomplete=true&max_payments=100&reversed=true"
-            ))
-            .header("Grpc-Metadata-macaroon", &macaroon_hex)
-            .send()
-            .await
-            .context("LND REST connection failed")?;
-        let body: serde_json::Value = resp
-            .json()
-            .await
-            .context("Failed to parse payments response")?;
-
-        let hash_lower = payment_hash.to_lowercase();
-        let found = body
-            .get("payments")
-            .and_then(|v| v.as_array())
-            .and_then(|arr| {
-                arr.iter().find(|p| {
-                    p.get("payment_hash").and_then(|v| v.as_str())
-                        == Some(hash_lower.as_str())
-                })
-            });
-
-        let Some(p) = found else {
-            // Not in the latest window — either very old or LND never saw it.
-            return Ok(serde_json::json!({ "status": "unknown" }));
-        };
-
-        let lnd_status = p.get("status").and_then(|v| v.as_str()).unwrap_or("");
-        let status = match lnd_status {
-            "SUCCEEDED" => "succeeded",
-            "FAILED" => "failed",
-            _ => "in_flight",
-        };
-        let failure_reason = match p
-            .get("failure_reason")
-            .and_then(|v| v.as_str())
-            .unwrap_or("")
-        {
-            "FAILURE_REASON_NO_ROUTE" => "No route to the recipient",
-            "FAILURE_REASON_INSUFFICIENT_BALANCE" => "Insufficient channel balance",
-            "FAILURE_REASON_TIMEOUT" => "Payment timed out in the network",
-            "FAILURE_REASON_INCORRECT_PAYMENT_DETAILS" => {
-                "Recipient rejected the payment (wrong details or expired invoice)"
-            }
-            "FAILURE_REASON_ERROR" => "Payment failed",
-            _ => "",
-        };
-
-        fn amt(p: &serde_json::Value, key: &str) -> i64 {
-            p.get(key)
-                .and_then(|f| f.as_str())
-                .and_then(|s| s.parse().ok())
-                .or_else(|| p.get(key).and_then(|f| f.as_i64()))
-                .unwrap_or(0)
-        }
-
-        Ok(serde_json::json!({
-            "status": status,
-            "failure_reason": failure_reason,
-            "amount_sats": amt(p, "value_sat"),
-            "fee_sats": amt(p, "fee_sat"),
-        }))
-    }
-
     /// List on-chain transactions from LND.
     /// Returns all transactions, with incoming (amount > 0) flagged.
     pub(in crate::api::rpc) async fn handle_lnd_gettransactions(

core/archipelago/src/api/rpc/lnd/wallet.rs

@@ -95,86 +95,33 @@ impl RpcHandler {
             .get("addr")
             .and_then(|v| v.as_str())
             .ok_or_else(|| anyhow::anyhow!("Missing 'addr' parameter"))?;
-        // send_all sweeps the entire confirmed on-chain balance (LND computes
-        // the amount after fees); amount is required otherwise.
-        let send_all = params
-            .get("send_all")
-            .and_then(|v| v.as_bool())
-            .unwrap_or(false);
-        let amount = if send_all {
-            None
-        } else {
-            let amount = params
-                .get("amount")
-                .and_then(|v| v.as_i64())
-                .ok_or_else(|| anyhow::anyhow!("Missing 'amount' parameter (sats)"))?;
-            if amount < 546 {
-                return Err(anyhow::anyhow!(
-                    "Amount must be at least 546 sats (dust limit)"
-                ));
-            }
-            if amount > 21_000_000 * 100_000_000 {
-                return Err(anyhow::anyhow!("Amount exceeds maximum Bitcoin supply"));
-            }
-            Some(amount)
-        };
+        let amount = params
+            .get("amount")
+            .and_then(|v| v.as_i64())
+            .ok_or_else(|| anyhow::anyhow!("Missing 'amount' parameter (sats)"))?;
+
+        if amount < 546 {
+            return Err(anyhow::anyhow!(
+                "Amount must be at least 546 sats (dust limit)"
+            ));
+        }
+        if amount > 21_000_000 * 100_000_000 {
+            return Err(anyhow::anyhow!("Amount exceeds maximum Bitcoin supply"));
+        }
 
         // Validate Bitcoin address format (basic: length and allowed chars)
         if addr.len() < 14 || addr.len() > 90 || !addr.chars().all(|c| c.is_ascii_alphanumeric()) {
             return Err(anyhow::anyhow!("Invalid Bitcoin address format"));
         }
 
-        // Fee control: either a confirmation target or an explicit fee rate
-        let target_conf = params.get("target_conf").and_then(|v| v.as_i64());
-        let sat_per_vbyte = params.get("sat_per_vbyte").and_then(|v| v.as_i64());
-        if target_conf.is_some() && sat_per_vbyte.is_some() {
-            return Err(anyhow::anyhow!(
-                "Invalid fee parameters: specify either target_conf or sat_per_vbyte, not both"
-            ));
-        }
-        if let Some(tc) = target_conf {
-            if !(1..=1008).contains(&tc) {
-                return Err(anyhow::anyhow!(
-                    "Invalid target_conf: must be between 1 and 1008 blocks"
-                ));
-            }
-        }
-        if let Some(rate) = sat_per_vbyte {
-            if !(1..=5000).contains(&rate) {
-                return Err(anyhow::anyhow!(
-                    "Invalid sat_per_vbyte: must be between 1 and 5000"
-                ));
-            }
-        }
-
-        info!(
-            addr = addr,
-            amount = amount,
-            send_all = send_all,
-            target_conf = target_conf,
-            sat_per_vbyte = sat_per_vbyte,
-            "Sending on-chain Bitcoin"
-        );
+        info!(addr = addr, amount = amount, "Sending on-chain Bitcoin");
 
         let (client, macaroon_hex) = self.lnd_client().await?;
 
-        let mut send_body = match amount {
-            Some(amount) => serde_json::json!({
-                "addr": addr,
-                "amount": amount.to_string(),
-            }),
-            None => serde_json::json!({
-                "addr": addr,
-                "send_all": true,
-            }),
-        };
-        if let Some(tc) = target_conf {
-            send_body["target_conf"] = serde_json::json!(tc);
-        }
-        if let Some(rate) = sat_per_vbyte {
-            // LND REST encodes uint64 as a JSON string
-            send_body["sat_per_vbyte"] = serde_json::json!(rate.to_string());
-        }
+        let send_body = serde_json::json!({
+            "addr": addr,
+            "amount": amount.to_string(),
+        });
 
         let resp = client
             .post(format!("{LND_REST_BASE_URL}/v1/transactions"))
@@ -203,82 +150,6 @@ impl RpcHandler {
         Ok(serde_json::json!({ "txid": txid }))
     }
 
-    /// Estimate the on-chain fee for sending `amount` sats to `addr` at a
-    /// confirmation target. Returns `{ fee_sat, sat_per_vbyte }` so the send
-    /// UI can show the cost of each preset before the user confirms.
-    pub(in crate::api::rpc) async fn handle_lnd_estimatefee(
-        &self,
-        params: Option<serde_json::Value>,
-    ) -> Result<serde_json::Value> {
-        let params = params.unwrap_or_default();
-        let addr = params
-            .get("addr")
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| anyhow::anyhow!("Missing 'addr' parameter"))?;
-        if addr.len() < 14 || addr.len() > 90 || !addr.chars().all(|c| c.is_ascii_alphanumeric()) {
-            return Err(anyhow::anyhow!("Invalid Bitcoin address format"));
-        }
-        let amount = params
-            .get("amount")
-            .and_then(|v| v.as_i64())
-            .ok_or_else(|| anyhow::anyhow!("Missing 'amount' parameter (sats)"))?;
-        if !(546..=21_000_000 * 100_000_000).contains(&amount) {
-            return Err(anyhow::anyhow!("Invalid amount"));
-        }
-        let target_conf = params
-            .get("target_conf")
-            .and_then(|v| v.as_i64())
-            .unwrap_or(6);
-        if !(1..=1008).contains(&target_conf) {
-            return Err(anyhow::anyhow!(
-                "Invalid target_conf: must be between 1 and 1008 blocks"
-            ));
-        }
-
-        let (client, macaroon_hex) = self.lnd_client().await?;
-
-        let resp = client
-            .get(format!("{LND_REST_BASE_URL}/v1/transactions/fee"))
-            .query(&[
-                (format!("AddrToAmount[{addr}]"), amount.to_string()),
-                ("target_conf".to_string(), target_conf.to_string()),
-            ])
-            .header("Grpc-Metadata-macaroon", &macaroon_hex)
-            .send()
-            .await
-            .context("Failed to estimate fee")?;
-
-        let status = resp.status();
-        let body: serde_json::Value = resp
-            .json()
-            .await
-            .context("Failed to parse fee estimate response")?;
-
-        if !status.is_success() {
-            let msg = body
-                .get("message")
-                .and_then(|v| v.as_str())
-                .unwrap_or("Unknown error");
-            return Err(anyhow::anyhow!("Failed to estimate fee: {}", msg));
-        }
-
-        // LND REST encodes int64 as JSON strings
-        let fee_sat = body
-            .get("fee_sat")
-            .and_then(|v| v.as_str())
-            .and_then(|s| s.parse::<i64>().ok())
-            .unwrap_or(0);
-        let sat_per_vbyte = body
-            .get("sat_per_vbyte")
-            .and_then(|v| v.as_str())
-            .and_then(|s| s.parse::<i64>().ok())
-            .unwrap_or(0);
-        Ok(serde_json::json!({
-            "fee_sat": fee_sat,
-            "sat_per_vbyte": sat_per_vbyte,
-        }))
-    }
-
     /// Create a Lightning invoice.
     /// Create a Lightning invoice and return `(bolt11, payment_hash_hex)`.
     ///

core/archipelago/src/api/rpc/mesh/messaging.rs

@@ -158,34 +158,6 @@ impl RpcHandler {
                 anyhow::bail!("Unknown LoRa region: {trimmed}");
             }
         }
-        // Meshcore LoRa PHY params (freq/bw/sf/cr, firmware field units — see
-        // mesh::LoraRadioParams). Validated against the firmware's accepted
-        // ranges here so a bad value errors at the API instead of being sent
-        // to the radio and rejected on-device. `null` clears the setting.
-        if let Some(rp) = params.get("lora_radio_params") {
-            if rp.is_null() {
-                config.lora_radio_params = None;
-            } else {
-                let parsed: mesh::LoraRadioParams = serde_json::from_value(rp.clone())
-                    .map_err(|e| anyhow::anyhow!("Invalid lora_radio_params: {e}"))?;
-                anyhow::ensure!(
-                    (150_000..=2_500_000).contains(&parsed.freq_khz),
-                    "freq_khz out of range (150000..=2500000)"
-                );
-                anyhow::ensure!(
-                    (7_000..=500_000).contains(&parsed.bw_hz),
-                    "bw_hz out of range (7000..=500000)"
-                );
-                anyhow::ensure!((5..=12).contains(&parsed.sf), "sf out of range (5..=12)");
-                anyhow::ensure!((5..=8).contains(&parsed.cr), "cr out of range (5..=8)");
-                config.lora_radio_params = Some(parsed);
-            }
-        }
-        // Hot-swap "keep as is": false = never write config to the radio
-        // (region/channel/PHY/advert name) — use it exactly as flashed.
-        if let Some(manage) = params.get("manage_radio").and_then(|v| v.as_bool()) {
-            config.manage_radio = manage;
-        }
         // Firmware pin: probe only the named firmware on the port ("auto"/""
         // clears the pin and restores strict-probe auto-detect).
         if let Some(kind) = params.get("device_kind").and_then(|v| v.as_str()) {

core/archipelago/src/api/rpc/mesh/status.rs

@@ -41,10 +41,6 @@ impl RpcHandler {
             // live radio-reported `region`): the configured LoRa region and
             // the firmware pin ("meshcore"|"meshtastic"|"reticulum"|null=auto).
             obj.insert("lora_region".into(), config.lora_region.clone().into());
-            obj.insert(
-                "lora_radio_params".into(),
-                serde_json::to_value(config.lora_radio_params).unwrap_or_default(),
-            );
             obj.insert(
                 "device_kind".into(),
                 config
@@ -52,9 +48,6 @@ impl RpcHandler {
                     .map(|k| k.to_string().to_lowercase())
                     .into(),
             );
-            // Hot-swap "keep as is" state: false = archipelago never writes
-            // config to the radio (see MeshConfig::manage_radio).
-            obj.insert("manage_radio".into(), config.manage_radio.into());
             // USB identity per detected port so the setup modal can show the
             // actual board (product string on native-USB boards, vid:pid as
             // the fallback for bridge chips).
@@ -81,35 +74,6 @@ impl RpcHandler {
         Ok(value)
     }
 
-    /// mesh.probe-device — Identify the firmware on a detected serial port and
-    /// read its current configuration WITHOUT provisioning it. Powers the
-    /// hot-swap "device detected" modal's current-details view. The path must
-    /// be one of the currently detected candidate ports (no arbitrary device
-    /// paths), and probing the live session's own port is refused.
-    pub(in crate::api::rpc) async fn handle_mesh_probe_device(
-        &self,
-        params: Option<serde_json::Value>,
-    ) -> Result<serde_json::Value> {
-        let path = params
-            .as_ref()
-            .and_then(|p| p.get("path"))
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| anyhow::anyhow!("Missing path"))?
-            .to_string();
-        let detected = mesh::detect_devices().await;
-        anyhow::ensure!(
-            detected.iter().any(|d| d == &path),
-            "{path} is not a detected mesh-radio candidate port"
-        );
-        let service = self.mesh_service.read().await;
-        let probe = match service.as_ref() {
-            Some(svc) => svc.probe_device(&path).await?,
-            // No mesh service yet (radio never enabled) — probe directly.
-            None => mesh::listener::probe_device(&path).await?,
-        };
-        Ok(serde_json::to_value(probe)?)
-    }
-
     /// mesh.peers — List discovered mesh peers.
     pub(in crate::api::rpc) async fn handle_mesh_peers(&self) -> Result<serde_json::Value> {
         let service = self.mesh_service.read().await;

core/archipelago/src/api/rpc/mesh/typed_messages.rs

@@ -820,8 +820,6 @@ impl RpcHandler {
             crate::fips::dial::PeerRequest::new(fips_npub.as_deref(), &onion_bare, &path)
                 .service(crate::settings::transport::PeerService::MeshFileSharing)
                 .timeout(std::time::Duration::from_secs(120))
-                .fips_timeout(std::time::Duration::from_secs(8))
-                .record_transport(&self.config.data_dir)
                 .send_get()
                 .await
                 .map_err(|e| anyhow::anyhow!("Fetch failed: {}", e))?;

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

@@ -73,20 +73,6 @@ pub(super) fn sanitize_error_message(msg: &str) -> String {
         "Mempool requires",
         "Container",
         "Image",
-        // Wallet-actionable errors: masking "Insufficient balance: need 80
-        // sats, have 0 sats" behind "Operation failed. Check server logs."
-        // sent the operator to journalctl for a message that was written for
-        // them in the first place (ecash send, 2026-07-22).
-        "Insufficient balance",
-        "Insufficient funds",
-        // Lightning payment failures carry LND's reason ("invoice expired.
-        // Valid until …", "no route", …) — the user can act on every one of
-        // them, and masking sent the operator to journalctl (invoice-expired
-        // send, 2026-07-23).
-        "Payment failed",
-        "Invalid payment request",
-        "Missing 'payment_request'",
-        "Your Lightning node is still finishing",
         "Bitcoin address",
         "No router",
         "No OpenWrt",
@@ -165,25 +151,6 @@ mod sanitize_tests {
         }
     }
 
-    #[test]
-    fn lightning_payment_errors_pass_through() {
-        // LND's payment-failure reasons are written for the payer — masking
-        // "invoice expired" as "Check server logs" left a user retrying a
-        // dead invoice (framework-pt, 2026-07-23).
-        for msg in [
-            "Payment failed: this invoice has expired (Valid until 2026-07-23 07:41:42 +0000 UTC). Ask the recipient for a fresh invoice and try again.",
-            "Payment failed: unable to find a path to destination",
-            "Invalid payment request: must be a Lightning invoice (lnbc...)",
-            "Missing 'payment_request' parameter",
-        ] {
-            assert_ne!(
-                sanitize_error_message(msg),
-                "Operation failed. Check server logs for details.",
-                "masked: {msg}"
-            );
-        }
-    }
-
     #[test]
     fn internal_errors_stay_generic() {
         assert_eq!(

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

@@ -15,7 +15,7 @@ mod fips;
 mod handshake;
 mod identity;
 mod interfaces;
-pub(crate) mod lnd;
+pub(in crate::api) mod lnd;
 mod marketplace;
 mod mesh;
 mod middleware;
@@ -26,9 +26,7 @@ mod node;
 mod nostr;
 mod openwrt;
 mod package;
-pub(crate) use package::wyoming_satellite_keeper;
 mod peers;
-mod pine_status;
 mod response;
 mod router;
 mod security;
@@ -440,13 +438,7 @@ impl RpcHandler {
                 }
             }
             Err(e) => {
-                // `{:#}` renders the whole anyhow context chain. Logging only the
-                // outermost context threw away the actual cause: a peer-files
-                // failure logged just "Failed to connect to peer", with the real
-                // error (Tor SOCKS failure, FIPS resolve, timeout) discarded — so
-                // the logs couldn't distinguish a dead peer from a slow circuit.
-                // The client-facing message below stays `{}` so internals aren't leaked.
-                error!("RPC error on {}: {:#}", rpc_req.method, e);
+                error!("RPC error on {}: {}", rpc_req.method, e);
                 let user_message = sanitize_error_message(&e.to_string());
                 RpcResponse {
                     result: None,
@@ -533,31 +525,9 @@ impl RpcHandler {
             self.login_rate_limiter.record_failure(client_ip).await;
         }
 
-        // On successful login, check if 2FA is required. Device-token logins
-        // (companion pairing QR) skip the TOTP challenge like remember-me does:
-        // the token was minted from an already-authenticated session, and there
-        // is no password with which to decrypt the TOTP secret anyway.
+        // On successful login, check if 2FA is required
         if method == "auth.login" && rpc_resp.error.is_none() {
-            let password = login_params
-                .as_ref()
-                .and_then(|p| p.get("password"))
-                .and_then(|v| v.as_str());
-            let is_token_login = login_params
-                .as_ref()
-                .and_then(|p| p.get("token"))
-                .and_then(|v| v.as_str())
-                .is_some()
-                || match password {
-                    // Companion device tokens also arrive through the password
-                    // field (see handle_auth_login) — those logins get a full
-                    // session too; there's no password to decrypt TOTP with.
-                    Some(pw) => crate::device_tokens::verify(&self.config.data_dir, pw)
-                        .await
-                        .is_some(),
-                    None => false,
-                };
-            let totp_enabled =
-                !is_token_login && self.auth_manager.is_totp_enabled().await.unwrap_or(false);
+            let totp_enabled = self.auth_manager.is_totp_enabled().await.unwrap_or(false);
             if totp_enabled {
                 let password = login_params
                     .as_ref()

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

@@ -137,7 +137,6 @@ impl RpcHandler {
             None,
             None,
             None,
-            Some(&self.config.data_dir),
         )
         .await?;
 
@@ -226,7 +225,6 @@ impl RpcHandler {
             signing_key.as_ref().map(|i| i.signing_key()),
             Some(&req.from_pubkey),
             data.server_info.name.as_deref(),
-            Some(&self.config.data_dir),
         )
         .await
         {

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

@@ -110,14 +110,6 @@ impl RpcHandler {
                     )
                     .await;
                     handler.clear_install_progress(&package_id_spawn).await;
-                    // Auto-expose the app over Tor (best-effort, detached) —
-                    // every installed app gets its .onion without a manual
-                    // "Add Service" step.
-                    let tor_handler = Arc::clone(&handler);
-                    let tor_app = package_id_spawn.clone();
-                    tokio::spawn(async move {
-                        tor_handler.auto_add_tor_service(&tor_app).await;
-                    });
                 }
                 Err(e) => {
                     error!("package.install {} failed: {:#}", package_id_spawn, e);

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

@@ -496,13 +496,6 @@ pub(super) fn all_container_names(package_id: &str) -> Vec<String> {
             "netbird-dashboard".into(),
             "netbird-server".into(),
         ],
-        // Pine voice-assistant stack: launcher + the two Wyoming engines.
-        "pine" => vec![
-            "pine".into(),
-            "pine-whisper".into(),
-            "pine-piper".into(),
-            "pine-openwakeword".into(),
-        ],
         "nostr-vpn" => vec![
             "nostr-vpn".into(),
             "archy-nostr-vpn".into(),

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

@@ -206,24 +206,19 @@ pub(super) fn check_install_deps(package_id: &str, deps: &RunningDeps) -> Result
             "BTCPay Server requires a running Bitcoin node (Bitcoin Knots). \
              Please install and start Bitcoin Knots first."
         )),
-        "mempool" | "mempool-web" if !deps.has_bitcoin => Err(anyhow::anyhow!(
-            "Mempool requires Bitcoin Knots to be running. \
-             Please install and start Bitcoin Knots first."
-        )),
-        // ElectrumX is deliberately NOT a hard gate for mempool: mempool-api
-        // reconnects to electrum on its own (verified live — it retries
-        // ECONNREFUSED in a loop and comes good when electrum starts
-        // listening), and an ElectrumX mid-resync can be legitimately down
-        // for DAYS. The hard gate here blocked repeated mempool installs on
-        // .116 (2026-07-22) while electrumx was compacting. Block/fee views
-        // work from bitcoind immediately; address lookups light up when
-        // ElectrumX finishes.
-        "mempool" | "mempool-web" if !deps.has_electrumx => {
-            info!(
-                "Mempool installing while ElectrumX is not running — \
-                 mempool-api reconnects automatically once ElectrumX is up"
-            );
-            Ok(())
+        "mempool" | "mempool-web" if !deps.has_bitcoin || !deps.has_electrumx => {
+            let mut missing = vec![];
+            if !deps.has_bitcoin {
+                missing.push("Bitcoin Knots");
+            }
+            if !deps.has_electrumx {
+                missing.push("ElectrumX");
+            }
+            Err(anyhow::anyhow!(
+                "Mempool requires {} to be running. Please install and start {} first.",
+                missing.join(" and "),
+                missing.join(" and ")
+            ))
         }
         "fedimint" if !deps.has_bitcoin => {
             info!("Fedimint installing without local Bitcoin node — configure remote Bitcoin RPC in Fedimint guardian setup");
@@ -251,11 +246,6 @@ pub(super) fn check_install_deps(package_id: &str, deps: &RunningDeps) -> Result
 pub(super) const DEP_WAIT_INTERVAL: std::time::Duration = std::time::Duration::from_secs(5);
 /// 36 × 5s = 3 minutes of bounded waiting.
 pub(super) const DEP_WAIT_MAX_ATTEMPTS: u32 = 36;
-/// Separate, much larger budget while a dependency is still INSTALLING
-/// (image pulling, container not created yet): 360 × 5s = 30 minutes. A
-/// fresh-node Bitcoin pull routinely takes >3 minutes, and rejecting LND
-/// mid-pull was the confirmed "first install fails, second works" failure.
-pub(super) const DEP_INSTALLING_WAIT_MAX_ATTEMPTS: u32 = 360;
 
 /// Marker error: the install was rejected by the dependency gate BEFORE any
 /// resource (container, image, data dir) was created for the package. The
@@ -303,10 +293,9 @@ fn missing_install_deps(package_id: &str, deps: &RunningDeps) -> Vec<MissingDep>
             if !deps.has_bitcoin {
                 missing.push(BITCOIN);
             }
-            // ElectrumX intentionally not required — see check_install_deps:
-            // mempool-api reconnects when electrum comes up, and a resyncing
-            // ElectrumX can be down for days (the 3-minute bounded wait here
-            // would still fail the install for no benefit).
+            if !deps.has_electrumx {
+                missing.push(ELECTRUM);
+            }
         }
         // fedimint deliberately absent: check_install_deps allows it without
         // a local Bitcoin node (remote RPC configured in guardian setup).
@@ -328,12 +317,8 @@ pub(super) struct DepProbe {
     /// Which dependency services are currently Running.
     pub running: RunningDeps,
     /// Container/package names that EXIST in any state — installed, but
-    /// possibly not running yet (`podman ps -a`).
+    /// possibly not running yet (`podman ps -a` ∪ package-state entries).
     pub existing: Vec<String>,
-    /// Package ids currently mid-install (state Installing/Updating) —
-    /// no container exists yet, but one is on the way, so the gate must
-    /// wait for the install to finish instead of failing fast.
-    pub installing: Vec<String>,
 }
 
 /// All container names known to podman in any state (`podman ps -a`).
@@ -381,13 +366,8 @@ where
     LF: std::future::Future<Output = ()>,
 {
     let mut waited_attempts = 0u32;
-    let mut installing_attempts = 0u32;
     loop {
-        let DepProbe {
-            running,
-            existing,
-            installing,
-        } = probe().await?;
+        let DepProbe { running, existing } = probe().await?;
         let missing = missing_install_deps(package_id, &running);
         if missing.is_empty() {
             // Keep behavior in lockstep with the canonical gate (covers any
@@ -397,12 +377,11 @@ where
         }
 
         // Fail fast if any missing dependency has no installed container
-        // under any name variant AND no install in flight — waiting cannot
-        // satisfy it.
+        // under any name variant — waiting cannot satisfy it.
         let some_dep_not_installed = missing.iter().any(|dep| {
             !dep.containers
                 .iter()
-                .any(|c| existing.iter().any(|e| e == c) || installing.iter().any(|i| i == c))
+                .any(|c| existing.iter().any(|e| e == c))
         });
         if some_dep_not_installed {
             let msg = match check_install_deps(package_id, &running) {
@@ -412,38 +391,8 @@ where
             return Err(anyhow::Error::new(DependencyGateError(msg)));
         }
 
-        // A dependency still mid-install (no container yet) gets its own,
-        // much larger budget: a fresh-node image pull can take far longer
-        // than the started-but-not-running window.
-        let some_dep_installing = missing.iter().any(|dep| {
-            dep.containers
-                .iter()
-                .any(|c| installing.iter().any(|i| i == c))
-        });
-
-        let labels = join_dep_labels(&missing);
-        if some_dep_installing {
-            if installing_attempts >= DEP_INSTALLING_WAIT_MAX_ATTEMPTS {
-                return Err(anyhow::Error::new(DependencyGateError(format!(
-                    "{labels} is still installing after {} seconds. Wait for it \
-                     to finish, then install {package_id} again.",
-                    u64::from(DEP_INSTALLING_WAIT_MAX_ATTEMPTS) * interval.as_secs()
-                ))));
-            }
-            installing_attempts += 1;
-            if installing_attempts == 1 {
-                info!(
-                    "Install {package_id}: dependency {labels} is still installing — \
-                     waiting up to {}s for it to finish",
-                    u64::from(DEP_INSTALLING_WAIT_MAX_ATTEMPTS) * interval.as_secs()
-                );
-            }
-            on_waiting(format!("Waiting for {labels} to finish installing…")).await;
-            tokio::time::sleep(interval).await;
-            continue;
-        }
-
         if waited_attempts >= max_attempts {
+            let labels = join_dep_labels(&missing);
             return Err(anyhow::Error::new(DependencyGateError(format!(
                 "{labels} is installed but did not reach the running state within \
                  {} seconds. Start {labels}, then install {package_id} again.",
@@ -452,6 +401,7 @@ where
         }
         waited_attempts += 1;
 
+        let labels = join_dep_labels(&missing);
         if waited_attempts == 1 {
             info!(
                 "Install {package_id}: dependency {labels} installed but not running yet — \
@@ -601,10 +551,6 @@ pub(super) fn needs_archy_net(package_id: &str) -> bool {
             | "nbxplorer"
             | "fedimint"
             | "fedimint-gateway"
-            | "pine"
-            | "pine-whisper"
-            | "pine-piper"
-            | "pine-openwakeword"
     )
 }
 
@@ -636,7 +582,6 @@ pub(super) fn startup_order(package_id: &str) -> &'static [&'static str] {
             &["archy-btcpay-db", "archy-nbxplorer", "btcpay-server"]
         }
         "netbird" => &["netbird-server", "netbird-dashboard", "netbird"],
-        "pine" => &["pine-whisper", "pine-piper", "pine-openwakeword", "pine"],
         "penpot" | "penpot-frontend" => &[
             "penpot-postgres",
             "penpot-valkey",
@@ -929,19 +874,9 @@ mod tests {
         }
 
         fn probe(has_bitcoin: bool, has_electrumx: bool, existing: &[&str]) -> DepProbe {
-            probe_with_installing(has_bitcoin, has_electrumx, existing, &[])
-        }
-
-        fn probe_with_installing(
-            has_bitcoin: bool,
-            has_electrumx: bool,
-            existing: &[&str],
-            installing: &[&str],
-        ) -> DepProbe {
             DepProbe {
                 running: deps(has_bitcoin, has_electrumx),
                 existing: existing.iter().map(|s| s.to_string()).collect(),
-                installing: installing.iter().map(|s| s.to_string()).collect(),
             }
         }
 
@@ -1030,71 +965,6 @@ mod tests {
             assert!(labels.iter().all(|l| l == "Waiting for Bitcoin to start…"));
         }
 
-        #[tokio::test]
-        async fn waits_while_dependency_is_still_installing_then_passes() {
-            // Bitcoin has NO container yet (image still pulling) but its
-            // package state is Installing. Old behavior failed fast here —
-            // the confirmed fresh-node LND "first install fails" bug. The
-            // gate must wait past the normal started-but-not-running budget
-            // (max_attempts=1 below) while the install is in flight.
-            let calls = Arc::new(AtomicU32::new(0));
-            let (labels, sink) = label_sink();
-            let probe_calls = Arc::clone(&calls);
-            let result = wait_for_install_deps(
-                "lnd",
-                move || {
-                    let n = probe_calls.fetch_add(1, Ordering::SeqCst);
-                    async move {
-                        Ok(match n {
-                            // pulling: no container, package Installing
-                            0 | 1 => probe_with_installing(false, false, &[], &["bitcoin-knots"]),
-                            // container created, starting
-                            2 => probe(false, false, &["bitcoin-knots"]),
-                            // running
-                            _ => probe(true, false, &["bitcoin-knots"]),
-                        })
-                    }
-                },
-                sink,
-                1,
-                Duration::ZERO,
-            )
-            .await;
-            assert!(result.is_ok(), "{result:?}");
-            assert_eq!(calls.load(Ordering::SeqCst), 4);
-            let labels = labels.lock().unwrap();
-            assert_eq!(
-                labels.as_slice(),
-                [
-                    "Waiting for Bitcoin to finish installing…",
-                    "Waiting for Bitcoin to finish installing…",
-                    "Waiting for Bitcoin to start…",
-                ]
-            );
-        }
-
-        #[tokio::test]
-        async fn fails_fast_when_dependency_neither_installed_nor_installing() {
-            // installing list has unrelated packages only — no reason to wait.
-            let calls = AtomicU32::new(0);
-            let (labels, sink) = label_sink();
-            let err = wait_for_install_deps(
-                "lnd",
-                || {
-                    calls.fetch_add(1, Ordering::SeqCst);
-                    async { Ok(probe_with_installing(false, false, &[], &["grafana"])) }
-                },
-                sink,
-                36,
-                Duration::ZERO,
-            )
-            .await
-            .unwrap_err();
-            assert_eq!(calls.load(Ordering::SeqCst), 1);
-            assert!(labels.lock().unwrap().is_empty());
-            assert!(err.downcast_ref::<DependencyGateError>().is_some());
-        }
-
         #[tokio::test]
         async fn times_out_when_installed_dependency_never_runs() {
             let (labels, sink) = label_sink();
@@ -1117,11 +987,7 @@ mod tests {
         }
 
         #[tokio::test]
-        async fn mempool_waits_on_bitcoin_only() {
-            // ElectrumX is deliberately NOT gated (2026-07-22): a resyncing
-            // ElectrumX can be down for days and mempool-api reconnects on
-            // its own, so the wait only covers Bitcoin — even when electrumx
-            // is installed and stopped.
+        async fn mempool_waits_on_both_bitcoin_and_electrumx() {
             let calls = Arc::new(AtomicU32::new(0));
             let (labels, sink) = label_sink();
             let probe_calls = Arc::clone(&calls);
@@ -1129,8 +995,8 @@ mod tests {
                 "mempool",
                 move || {
                     let n = probe_calls.fetch_add(1, Ordering::SeqCst);
-                    // Bitcoin comes up on probe 2; electrumx never does.
-                    async move { Ok(probe(n >= 1, false, &["bitcoin-knots", "electrumx"])) }
+                    // Bitcoin comes up on probe 2, electrumx on probe 3.
+                    async move { Ok(probe(n >= 1, n >= 2, &["bitcoin-knots", "electrumx"])) }
                 },
                 sink,
                 36,
@@ -1141,19 +1007,22 @@ mod tests {
             let labels = labels.lock().unwrap();
             assert_eq!(
                 labels.as_slice(),
-                &["Waiting for Bitcoin to start…".to_string()]
+                &[
+                    "Waiting for Bitcoin and ElectrumX to start…".to_string(),
+                    "Waiting for ElectrumX to start…".to_string(),
+                ]
             );
         }
 
         #[tokio::test]
-        async fn mempool_fails_fast_when_bitcoin_is_not_installed() {
-            // Bitcoin isn't installed at all — waiting can never satisfy the
-            // gate, so fail fast with the canonical message. (A missing
-            // ElectrumX no longer blocks anything.)
+        async fn mempool_fails_fast_when_one_dep_is_not_installed() {
+            // Bitcoin is installed (waiting could help) but ElectrumX is not
+            // installed at all — waiting can never satisfy the gate, so fail
+            // fast with the canonical message.
             let (labels, sink) = label_sink();
             let err = wait_for_install_deps(
                 "mempool",
-                || async { Ok(probe(false, false, &["electrumx"])) },
+                || async { Ok(probe(false, false, &["bitcoin-knots"])) },
                 sink,
                 36,
                 Duration::ZERO,

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

@@ -294,9 +294,6 @@ impl RpcHandler {
         if package_id == "netbird" {
             return self.install_netbird_stack().await;
         }
-        if package_id == "pine" {
-            return self.install_pine_stack().await;
-        }
         // Dependency checks. Prefer the scanner's cached package state so a
         // congested Podman API does not turn an already-running dependency into
         // a false install failure. Fall back to a bounded direct Podman probe
@@ -987,24 +984,6 @@ impl RpcHandler {
         }))
     }
 
-    /// Package ids currently mid-install/update per the state manager — used
-    /// by the dependency gate so an app whose dependency is still pulling its
-    /// image (no container yet) waits instead of failing fast.
-    async fn packages_currently_installing(&self) -> Vec<String> {
-        let (data, _) = self.state_manager.get_snapshot().await;
-        data.package_data
-            .iter()
-            .filter(|(_, entry)| {
-                matches!(
-                    entry.state,
-                    crate::data_model::PackageState::Installing
-                        | crate::data_model::PackageState::Updating
-                )
-            })
-            .map(|(id, _)| id.clone())
-            .collect()
-    }
-
     async fn running_deps_for_install(&self, package_id: &str) -> Result<RunningDeps> {
         let (data, _) = self.state_manager.get_snapshot().await;
         let cached = detect_running_deps_from_package_data(&data.package_data);
@@ -1027,7 +1006,6 @@ impl RpcHandler {
                 Ok(DepProbe {
                     running: self.running_deps_for_install(package_id).await?,
                     existing: detect_existing_containers().await,
-                    installing: self.packages_currently_installing().await,
                 })
             },
             |msg| async move { self.set_install_message(package_id, &msg).await },
@@ -1111,96 +1089,46 @@ impl RpcHandler {
             .spawn()
             .context("Failed to start image pull")?;
 
-        // Stall-aware budget instead of a hard wall clock. The old fixed
-        // 300s cap killed slow-but-progressing pulls (LND on fresh-node
-        // WiFi routinely needs longer), which surfaced as "first install
-        // fails, second succeeds" once the layer cache was warm. A pull is
-        // only killed when NOTHING is observably happening — no stderr
-        // output and no byte growth in podman's staging dir — for
-        // PULL_STALL_TIMEOUT_SECS, or at a generous absolute ceiling.
-        // Dead registries still fail fast: no bytes ever land, so the
-        // stall window (3 min) is the effective bound.
-        const PULL_STALL_TIMEOUT_SECS: u64 = 180;
-        const PULL_URL_MAX_SECS: u64 = 1800;
-        const PULL_POLL_INTERVAL_SECS: u64 = 5;
+        // 5-minute per-URL budget. A full install tries each configured mirror
+        // once, so a two-registry setup fails visibly in roughly 10 minutes
+        // instead of staying in Installing for up to an hour.
+        const PULL_URL_TIMEOUT_SECS: u64 = 300;
+        let pull_result = tokio::time::timeout(
+            std::time::Duration::from_secs(PULL_URL_TIMEOUT_SECS),
+            async {
+                if let Some(stderr) = child.stderr.take() {
+                    let reader = BufReader::new(stderr);
+                    let mut lines = reader.lines();
+                    let pkg_id = package_id.to_string();
+                    let state_mgr = self.state_manager.clone();
 
-        let started = std::time::Instant::now();
-        // Seconds-since-start of the last stderr line, updated by the
-        // reader task. u64::MAX sentinel = no line seen yet (treated as
-        // activity at t=0 so the stall window starts at spawn).
-        let last_line_at = std::sync::Arc::new(std::sync::atomic::AtomicU64::new(0));
-        if let Some(stderr) = child.stderr.take() {
-            let reader = BufReader::new(stderr);
-            let mut lines = reader.lines();
-            let pkg_id = package_id.to_string();
-            let state_mgr = self.state_manager.clone();
-            let line_clock = std::sync::Arc::clone(&last_line_at);
-            let started_reader = started;
-            tokio::spawn(async move {
-                while let Ok(Some(line)) = lines.next_line().await {
-                    line_clock.store(
-                        started_reader.elapsed().as_secs(),
-                        std::sync::atomic::Ordering::Relaxed,
-                    );
-                    if let Some((downloaded, total)) = parse_pull_progress(&line) {
-                        Self::update_install_progress(&state_mgr, &pkg_id, downloaded, total).await;
+                    while let Ok(Some(line)) = lines.next_line().await {
+                        if let Some((downloaded, total)) = parse_pull_progress(&line) {
+                            Self::update_install_progress(&state_mgr, &pkg_id, downloaded, total)
+                                .await;
+                        }
                     }
                 }
-            });
-        }
+                child.wait().await
+            },
+        )
+        .await;
 
-        let mut last_staged_bytes = dir_size_bytes(user_tmp);
-        let mut last_staged_change = std::time::Instant::now();
-        loop {
-            match child.try_wait() {
-                Ok(Some(status)) => return Ok(status.success()),
-                Ok(None) => {}
-                Err(e) => {
-                    tracing::warn!("Image pull process error on {}: {}", url, e);
-                    let _ = child.kill().await;
-                    let _ = child.wait().await;
-                    return Ok(false);
-                }
+        match pull_result {
+            Ok(Ok(status)) => Ok(status.success()),
+            Ok(Err(e)) => {
+                tracing::warn!("Image pull process error on {}: {}", url, e);
+                Ok(false)
             }
-
-            tokio::time::sleep(std::time::Duration::from_secs(PULL_POLL_INTERVAL_SECS)).await;
-
-            if started.elapsed() > std::time::Duration::from_secs(PULL_URL_MAX_SECS) {
+            Err(_) => {
                 tracing::warn!(
-                    "Image pull exceeded absolute {}s ceiling: {}",
-                    PULL_URL_MAX_SECS,
+                    "Image pull timed out after {}s: {}",
+                    PULL_URL_TIMEOUT_SECS,
                     url
                 );
                 let _ = child.kill().await;
                 let _ = child.wait().await; // reap zombie
-                return Ok(false);
-            }
-
-            // Activity signal 1: stderr output from podman.
-            let line_age = started
-                .elapsed()
-                .as_secs()
-                .saturating_sub(last_line_at.load(std::sync::atomic::Ordering::Relaxed));
-            // Activity signal 2: podman stages layer downloads in TMPDIR
-            // (user_tmp) — any size change there means bytes are moving.
-            let staged = dir_size_bytes(user_tmp);
-            if staged != last_staged_bytes {
-                last_staged_bytes = staged;
-                last_staged_change = std::time::Instant::now();
-            }
-
-            let stalled = line_age > PULL_STALL_TIMEOUT_SECS
-                && last_staged_change.elapsed()
-                    > std::time::Duration::from_secs(PULL_STALL_TIMEOUT_SECS);
-            if stalled {
-                tracing::warn!(
-                    "Image pull stalled ({}s with no output and no staged bytes): {}",
-                    PULL_STALL_TIMEOUT_SECS,
-                    url
-                );
-                let _ = child.kill().await;
-                let _ = child.wait().await; // reap zombie
-                return Ok(false);
+                Ok(false)
             }
         }
     }
@@ -1563,15 +1491,6 @@ autopilot.active=false\n",
     /// Run post-install hooks (Nextcloud trusted domains, Bitcoin UI container).
     /// Critical hooks (credential setup, config) are awaited; UI container builds are background.
     async fn run_post_install_hooks(&self, package_id: &str) {
-        if matches!(package_id, "homeassistant" | "home-assistant")
-            && super::pine_ha::pine_engines_installed().await
-        {
-            // Pine was installed first: wire HA to its Wyoming engines now,
-            // then restart so the seeded storage is what HA loads.
-            if super::pine_ha::seed_home_assistant_pine_defaults().await {
-                super::pine_ha::restart_home_assistant_if_running().await;
-            }
-        }
         if package_id == "filebrowser" {
             // Generate a random password (32 bytes, hex-encoded)
             let mut buf = [0u8; 32];
@@ -2324,28 +2243,17 @@ async fn cleanup_start_conflict(package_id: &str, stderr: &str) -> bool {
 }
 
 async fn cleanup_stale_pasta_port(port: &str) {
-    // NEVER kill our own process. The daemon holds catalog app ports over
-    // IPv6 (the mesh app-port relay), so a blunt `fuser -k <port>/tcp` would
-    // terminate archipelago itself mid-install — installs failed and apps
-    // vanished on framework-pt 2026-07-27. Kill every listener on the port
-    // EXCEPT our PID (and our process group), leaving the relay/daemon alive.
-    let self_pid = std::process::id();
     let kill_listener = format!(
-        "ss -ltnp 'sport = :{port}' 2>/dev/null | sed -n 's/.*pid=\\([0-9]*\\).*/\\1/p' | \
-         while read p; do [ \"$p\" = \"{self_pid}\" ] || kill \"$p\" 2>/dev/null; done || true",
+        "ss -ltnp 'sport = :{}' 2>/dev/null | sed -n 's/.*pid=\\([0-9]*\\).*/\\1/p' | xargs -r kill 2>/dev/null || true",
+        port
     );
     let _ = tokio::process::Command::new("sh")
         .args(["-c", &kill_listener])
         .output()
         .await;
 
-    // sudo fuser -k, but exclude our own PID: fuser prints the PIDs holding
-    // the port; kill each except self. (`fuser -k` has no exclusion flag.)
-    let fuser_kill = format!(
-        "for p in $(sudo fuser {port}/tcp 2>/dev/null); do [ \"$p\" = \"{self_pid}\" ] || sudo kill \"$p\" 2>/dev/null; done || true",
-    );
-    let _ = tokio::process::Command::new("sh")
-        .args(["-c", &fuser_kill])
+    let _ = tokio::process::Command::new("sudo")
+        .args(["fuser", "-k", &format!("{}/tcp", port)])
         .output()
         .await;
 
@@ -2782,31 +2690,6 @@ async fn persist_install_version_selection(app_id: &str, version: &str) {
     }
 }
 
-/// Total bytes under `path` (bounded recursive walk). Used as a coarse
-/// "bytes are moving" signal for pull stall detection — exact size doesn't
-/// matter, only whether it CHANGES between polls. Errors count as 0.
-fn dir_size_bytes(path: &str) -> u64 {
-    fn walk(dir: &std::path::Path, depth: u32) -> u64 {
-        if depth > 8 {
-            return 0;
-        }
-        let Ok(entries) = std::fs::read_dir(dir) else {
-            return 0;
-        };
-        let mut total = 0u64;
-        for entry in entries.flatten() {
-            let Ok(meta) = entry.metadata() else { continue };
-            if meta.is_dir() {
-                total = total.saturating_add(walk(&entry.path(), depth + 1));
-            } else {
-                total = total.saturating_add(meta.len());
-            }
-        }
-        total
-    }
-    walk(std::path::Path::new(path), 0)
-}
-
 fn should_try_orchestrator_install(package_id: &str, orchestrator_available: bool) -> bool {
     orchestrator_available && uses_orchestrator_install_flow(package_id)
 }

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

@@ -3,8 +3,6 @@ mod config;
 mod dependencies;
 mod install;
 mod lifecycle;
-mod pine_ha;
-pub(crate) use pine_ha::wyoming_satellite_keeper;
 mod progress;
 mod runtime;
 mod set_config;

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

@@ -12,11 +12,7 @@ use tracing::info;
 
 use super::install::{install_log, patch_indeedhub_nostr_provider};
 
-// 45s, not 10s: under heavy disk load (e.g. an ElectrumX resync/compaction
-// hammering the same SSD) a plain `podman ps` was observed taking >10s on
-// .116 (2026-07-22), failing a mempool install at the probe step for no real
-// reason. Podman being slow is not podman being dead.
-const PODMAN_STACK_PROBE_TIMEOUT: Duration = Duration::from_secs(45);
+const PODMAN_STACK_PROBE_TIMEOUT: Duration = Duration::from_secs(10);
 const PODMAN_STACK_LOG_TIMEOUT: Duration = Duration::from_secs(15);
 const PODMAN_STACK_PULL_TIMEOUT: Duration = Duration::from_secs(600);
 const PODMAN_STACK_REMOVE_TIMEOUT: Duration = Duration::from_secs(90);
@@ -625,33 +621,8 @@ async fn install_stack_via_orchestrator(
     ))
     .await;
 
-    // Phase: PullingImage — each member's orchestrator.install covers its
-    // whole pipeline (pull + create + start + health wait), and on a fresh
-    // node the pull dominates wall-clock. The X-of-N counter below is what
-    // the UI interpolates across the PullingImage band (20→70%); without
-    // these updates an orchestrator-installed stack sat at "Preparing… 5%"
-    // for the entire multi-gigabyte pull (indeedhub: 7 images).
-    let total = app_ids.len() as u64;
-    handler
-        .set_install_phase(stack_name, InstallPhase::PullingImage)
-        .await;
-
     let mut installed = 0usize;
-    for (idx, app_id) in app_ids.iter().enumerate() {
-        handler
-            .set_install_progress(stack_name, idx as u64, total)
-            .await;
-        // Message after progress: set_install_progress resets the label,
-        // set_install_message preserves the phase + counters just written.
-        let component = app_id
-            .strip_prefix(&format!("{stack_name}-"))
-            .unwrap_or(app_id);
-        handler
-            .set_install_message(
-                stack_name,
-                &format!("Installing {} ({} of {})…", component, idx + 1, total),
-            )
-            .await;
+    for app_id in app_ids {
         match orchestrator.install(app_id).await {
             Ok(container_name) => {
                 installed += 1;
@@ -701,18 +672,6 @@ async fn install_stack_via_orchestrator(
         }
     }
 
-    // Truthful end-of-install signal, mirroring the legacy stack installers:
-    // the real readiness gate is the scanner's next sweep, this just settles
-    // the bar at 95→100→done instead of leaving it mid-band.
-    handler.set_install_progress(stack_name, total, total).await;
-    handler
-        .set_install_phase(stack_name, InstallPhase::PostInstall)
-        .await;
-    handler
-        .set_install_phase(stack_name, InstallPhase::Done)
-        .await;
-    handler.clear_install_progress(stack_name).await;
-
     install_log(&format!("INSTALL ORCH OK: {} stack", stack_name)).await;
     Ok(Some(serde_json::json!({
         "success": true,
@@ -748,15 +707,6 @@ fn netbird_stack_app_ids() -> &'static [&'static str] {
     &["netbird-server", "netbird-dashboard", "netbird"]
 }
 
-fn pine_stack_app_ids() -> &'static [&'static str] {
-    // Dependency/startup order: the two Wyoming engines (STT + TTS) first — they
-    // own their downloaded model/voice under /data and publish 10300/10200 —
-    // then the user-facing launcher ("pine", the nginx that serves the setup /
-    // status page + is the Open target). Mirrors the pine startup_order in
-    // dependencies.rs + the stack member table in app_ops.rs.
-    &["pine-whisper", "pine-piper", "pine-openwakeword", "pine"]
-}
-
 fn indeedhub_stack_app_ids() -> &'static [&'static str] {
     // Dependency order: backends + their generated secrets first, then the api
     // (owns indeedhub-jwt; reads the db/minio secrets the backends materialised),
@@ -1920,54 +1870,6 @@ impl RpcHandler {
             "netbird manifests not available on this node — the signed catalog must provide apps/netbird-*/manifest.yml (legacy hardcoded installer removed in #20 ph4)"
         )
     }
-
-    /// Install the Pine voice-assistant stack (Whisper STT + Piper TTS + the
-    /// setup/status launcher). Manifest-driven only, like netbird: render the
-    /// 3-member stack from apps/pine-*/manifest.yml via the orchestrator
-    /// (archy-net + network_aliases, published Wyoming ports 10300/10200 so
-    /// Home Assistant reaches the engines via host.containers.internal, the
-    /// launcher's setup page written via `files:`). The manifests use the exact
-    /// live container names, so on an existing node this ADOPTS the running
-    /// stack rather than recreating it (downloaded models/voices preserved).
-    ///
-    /// There is no in-Rust hardcoded fallback: the signed catalog always ships
-    /// apps/pine-*/manifest.yml. If the orchestrator doesn't know these app_ids
-    /// and no running stack exists to adopt, install errors rather than
-    /// silently diverging from the manifest contract.
-    pub(super) async fn install_pine_stack(&self) -> Result<serde_json::Value> {
-        if let Some(orchestrated) =
-            install_stack_via_orchestrator(self, "pine", pine_stack_app_ids()).await?
-        {
-            Self::seed_pine_ha_defaults().await;
-            return Ok(orchestrated);
-        }
-
-        if let Some(adopted) = adopt_stack_if_exists(
-            "pine",
-            "pine",
-            &["pine-whisper", "pine-piper", "pine-openwakeword", "pine"],
-        )
-        .await?
-        {
-            Self::seed_pine_ha_defaults().await;
-            return Ok(adopted);
-        }
-
-        anyhow::bail!(
-            "pine manifests not available on this node — the signed catalog must provide apps/pine-*/manifest.yml"
-        )
-    }
-
-    /// After a Pine install, wire Home Assistant to the new engines when HA is
-    /// on this node (the HA post-install hook covers the reverse order).
-    async fn seed_pine_ha_defaults() {
-        if !super::pine_ha::home_assistant_installed().await {
-            return;
-        }
-        if super::pine_ha::seed_home_assistant_pine_defaults().await {
-            super::pine_ha::restart_home_assistant_if_running().await;
-        }
-    }
 }
 
 #[cfg(test)]

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

@@ -133,7 +133,6 @@ impl RpcHandler {
             Some(node_id.signing_key()),
             recipient_pubkey.as_deref(),
             node_name.as_deref(),
-            Some(&self.config.data_dir),
         )
         .await?;
         Ok(serde_json::json!({ "ok": true, "sent_to": onion }))

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

@@ -1,159 +0,0 @@
-//! Node-status JSON for the Pine voice stack (`GET /api/pine/status`).
-//!
-//! Two tiers in one endpoint:
-//! - **Public** (no credentials): version, uptime, bitcoin height / sync /
-//!   peer count, mesh peer count. Feeds the Pine launcher page's live status
-//!   card — nothing here a LAN visitor couldn't already infer from the
-//!   existing unauthenticated `/bitcoin-status`.
-//! - **Token** (`Authorization: Bearer <pine-status-token>`): adds Lightning
-//!   balances and the most recent received mesh text message. Feeds the
-//!   Home Assistant REST sensors seeded by `package::pine_ha` — the seeder
-//!   mints the token into `data_dir/secrets/pine-status-token` (0600) and
-//!   embeds it in HA's configuration, so only HA (and the node owner) can
-//!   read balances or message text.
-//!
-//! Replaces the interim per-node socat forwarder + bitcoind-RPC-credentials-
-//! in-configuration.yaml stopgap used before this endpoint existed.
-
-use super::RpcHandler;
-use crate::mesh::types::MessageDirection;
-use serde_json::{json, Value};
-
-/// File under `data_dir/secrets/` holding the bearer token that unlocks the
-/// sensitive tier. Written by the pine/HA seeder, read per-request here.
-pub(crate) const PINE_STATUS_TOKEN_FILE: &str = "pine-status-token";
-
-/// Constant-time-ish equality — avoids early-exit timing on the token compare.
-fn token_eq(a: &str, b: &str) -> bool {
-    if a.len() != b.len() {
-        return false;
-    }
-    a.bytes()
-        .zip(b.bytes())
-        .fold(0u8, |acc, (x, y)| acc | (x ^ y))
-        == 0
-}
-
-impl RpcHandler {
-    /// True when `presented` matches the on-disk pine status token. Missing or
-    /// empty token file means the sensitive tier is locked (seeder not run).
-    pub(crate) async fn pine_status_token_ok(&self, presented: &str) -> bool {
-        let path = self
-            .config
-            .data_dir
-            .join("secrets")
-            .join(PINE_STATUS_TOKEN_FILE);
-        match tokio::fs::read_to_string(&path).await {
-            Ok(tok) => {
-                let tok = tok.trim();
-                !tok.is_empty() && token_eq(tok, presented.trim())
-            }
-            Err(_) => false,
-        }
-    }
-
-    /// Assemble the status document. `authorized` selects the token tier.
-    /// Every sub-source is best-effort: a dead bitcoind/LND/mesh never turns
-    /// the endpoint into an error — the field just reports what it can.
-    pub(crate) async fn pine_status_json(&self, authorized: bool) -> Value {
-        let bs = crate::bitcoin_status::get_bitcoin_status().await;
-        let bitcoin = {
-            let info = bs.blockchain_info.as_ref();
-            let height = info.and_then(|i| i.get("blocks")).and_then(Value::as_u64);
-            let progress = info
-                .and_then(|i| i.get("verificationprogress"))
-                .and_then(Value::as_f64);
-            let ibd = info
-                .and_then(|i| i.get("initialblockdownload"))
-                .and_then(Value::as_bool);
-            let peers = bs
-                .network_info
-                .as_ref()
-                .and_then(|n| n.get("connections"))
-                .and_then(Value::as_u64);
-            json!({
-                "ok": bs.ok,
-                "height": height,
-                "sync_percent": progress.map(|p| (p * 10000.0).round() / 100.0),
-                "ibd": ibd,
-                "peers": peers,
-            })
-        };
-
-        let (mesh, mesh_message) = {
-            let guard = self.mesh_service.read().await;
-            match guard.as_ref() {
-                Some(svc) => {
-                    let status = svc.status().await;
-                    let latest = if authorized {
-                        svc.messages(None)
-                            .await
-                            .iter()
-                            .rev()
-                            .find(|m| {
-                                m.direction == MessageDirection::Received
-                                    && m.message_type == "text"
-                            })
-                            .map(|m| {
-                                json!({
-                                    "id": m.id,
-                                    "from": m.peer_name.clone()
-                                        .unwrap_or_else(|| format!("contact {}", m.peer_contact_id)),
-                                    "text": m.plaintext,
-                                    "timestamp": m.timestamp,
-                                })
-                            })
-                    } else {
-                        None
-                    };
-                    (
-                        json!({ "enabled": status.enabled, "peers": status.peer_count }),
-                        latest,
-                    )
-                }
-                None => (json!({ "enabled": false, "peers": 0 }), None),
-            }
-        };
-
-        let lightning = if authorized {
-            match self.handle_lnd_getinfo().await {
-                Ok(info) => json!({
-                    "balance_sats": info.get("balance_sats"),
-                    "channel_balance_sats": info.get("channel_balance_sats"),
-                    "active_channels": info.get("num_active_channels"),
-                    "synced_to_chain": info.get("synced_to_chain"),
-                }),
-                Err(_) => Value::Null,
-            }
-        } else {
-            Value::Null
-        };
-
-        json!({
-            "ok": true,
-            "version": env!("CARGO_PKG_VERSION"),
-            "uptime_seconds": crate::crash_recovery::uptime_seconds(),
-            "bitcoin": bitcoin,
-            "mesh": mesh,
-            "lightning": lightning,
-            // Always an object: HA's REST sensor reads attributes via
-            // json_attributes_path "$.mesh_message", and a null there makes
-            // HA log a "JSON result was not a dictionary" warning every scan.
-            "mesh_message": mesh_message.unwrap_or_else(|| json!({})),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::token_eq;
-
-    #[test]
-    fn token_eq_matches_only_exact() {
-        assert!(token_eq("abc123", "abc123"));
-        assert!(!token_eq("abc123", "abc124"));
-        assert!(!token_eq("abc123", "abc12"));
-        assert!(!token_eq("", "x"));
-        assert!(token_eq("", ""));
-    }
-}

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

@@ -56,12 +56,12 @@ pub(in crate::api::rpc) async fn save_pending_seed_encrypted(
     Ok(true)
 }
 
-/// Best-effort: install fips.yaml + start the available FIPS systemd unit after
-/// seed onboarding has written the fips_key to disk. Runs in a detached task so
-/// the user-facing RPC returns immediately — the systemctl calls can take a few
-/// seconds the first time on slow hardware. Any failure is logged but does not
-/// break onboarding; the user can still hit fips.install manually from the
-/// dashboard as an escape hatch.
+/// Best-effort: install fips.yaml + start archipelago-fips.service after the
+/// seed onboarding has written the fips_key to disk. Runs in a detached task
+/// so the user-facing RPC returns immediately — the systemctl calls can take
+/// a few seconds the first time on slow hardware. Any failure is logged but
+/// does not break onboarding; the user can still hit fips.install manually
+/// from the dashboard as an escape hatch.
 fn spawn_post_onboarding_fips_activate(data_dir: std::path::PathBuf) {
     tokio::spawn(async move {
         let identity_dir = data_dir.join("identity");
@@ -78,12 +78,11 @@ fn spawn_post_onboarding_fips_activate(data_dir: std::path::PathBuf) {
             tracing::warn!("post-onboarding fips config install failed: {}", e);
             return;
         }
-        let unit = crate::fips::service::activation_unit().await;
-        if let Err(e) = crate::fips::service::activate(unit).await {
-            tracing::warn!("post-onboarding FIPS activate failed via {}: {}", unit, e);
+        if let Err(e) = crate::fips::service::activate(crate::fips::SERVICE_UNIT).await {
+            tracing::warn!("post-onboarding archipelago-fips activate failed: {}", e);
             return;
         }
-        tracing::info!("FIPS auto-activated post-onboarding via {}", unit);
+        tracing::info!("archipelago-fips auto-activated post-onboarding");
     });
 }
 
@@ -139,8 +138,8 @@ impl RpcHandler {
         // Initialize identity index at 0.
         crate::seed::save_identity_index(&self.config.data_dir, 0).await?;
 
-        // fips_key is now on disk — auto-activate FIPS so the user doesn't
-        // have to hit a manual Start button. Detached task;
+        // fips_key is now on disk — auto-activate archipelago-fips so the
+        // user doesn't have to hit an "Activate" button. Detached task;
         // the onboarding RPC returns immediately.
         spawn_post_onboarding_fips_activate(self.config.data_dir.clone());
 

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

@@ -53,7 +53,6 @@ impl RpcHandler {
         // hit a hostname-mismatch warning on top of the usual self-signed one
         // the moment a node is renamed.
         if hostname_updated {
-            sync_hostname_side_effects(&hostname).await;
             if let Err(e) = regenerate_tls_cert(&hostname).await {
                 warn!(hostname = %hostname, "TLS cert regen after rename failed: {}", e);
             }
@@ -139,17 +138,9 @@ impl RpcHandler {
             .await
             .map(|s| s.trim().to_string())
             .unwrap_or_else(|_| "archipelago".to_string());
-        // LAN IPv4 rides along for the companion pairing QR: when the
-        // operator's browser reaches this node over Tailscale/VPN or
-        // localhost, that origin is useless to a phone on the LAN — the QR
-        // must advertise an address the phone can actually dial
-        // (2026-07-22: a pairing QR carried a tailnet 100.x IP and the
-        // companion could never connect).
-        let lan_ip = crate::host_ip::primary_host_ipv4().await;
         Ok(serde_json::json!({
             "hostname": hostname,
             "mdns_hostname": format!("{hostname}.local"),
-            "lan_ip": lan_ip,
         }))
     }
 
@@ -384,56 +375,6 @@ pub(super) fn hostname_from_server_name(name: &str) -> String {
     }
 }
 
-/// Post-rename side effects that keep the OS consistent with the new
-/// hostname — all best-effort, the rename itself has already succeeded.
-/// Debian resolves the local hostname via the 127.0.1.1 line in /etc/hosts;
-/// leaving the old name there breaks `sudo` ("unable to resolve host") and
-/// `hostname -f`. And while avahi eventually follows the kernel hostname,
-/// re-announcing immediately makes http(s)://<hostname>.local links work
-/// right after the rename instead of minutes later.
-async fn sync_hostname_side_effects(hostname: &str) {
-    // hostname_from_server_name guarantees [a-z0-9-], safe to interpolate.
-    let script = format!(
-        "if grep -q '^127\\.0\\.1\\.1' /etc/hosts; then sed -i 's/^127\\.0\\.1\\.1.*/127.0.1.1\\t{h}/' /etc/hosts; else printf '127.0.1.1\\t{h}\\n' >> /etc/hosts; fi",
-        h = hostname
-    );
-    match tokio::process::Command::new("/usr/bin/sudo")
-        .args(["-n", "/bin/sh", "-c", &script])
-        .output()
-        .await
-    {
-        Ok(o) if o.status.success() => {}
-        Ok(o) => warn!(
-            "/etc/hosts hostname sync failed: {}",
-            String::from_utf8_lossy(&o.stderr).trim()
-        ),
-        Err(e) => warn!("/etc/hosts hostname sync failed: {}", e),
-    }
-
-    // The kiosk Chromium's profile lock is a symlink encoding <hostname>-<pid>;
-    // after a rename the stale lock reads as "another computer" holding the
-    // profile, Chromium refuses to start (--noerrdialogs hides the dialog), and
-    // the kiosk black-screens on the next boot (#98). Clear it here — Chromium
-    // recreates the files on launch, and the kiosk launcher pkills any running
-    // instance before starting a new one.
-    for f in ["SingletonLock", "SingletonCookie", "SingletonSocket"] {
-        let _ = tokio::fs::remove_file(format!("/var/lib/archipelago/chromium-kiosk/{f}")).await;
-    }
-
-    let republished = tokio::process::Command::new("/usr/bin/sudo")
-        .args(["-n", "/usr/bin/avahi-set-host-name", hostname])
-        .output()
-        .await
-        .map(|o| o.status.success())
-        .unwrap_or(false);
-    if !republished {
-        let _ = tokio::process::Command::new("/usr/bin/sudo")
-            .args(["-n", "/usr/bin/systemctl", "try-restart", "avahi-daemon"])
-            .output()
-            .await;
-    }
-}
-
 async fn set_system_hostname(hostname: &str) -> Result<()> {
     let output = tokio::process::Command::new("/usr/bin/sudo")
         .args(["-n", "/usr/bin/hostnamectl", "set-hostname", hostname])
@@ -727,94 +668,4 @@ impl RpcHandler {
             _ => anyhow::bail!("Unknown setting: {}", key),
         }
     }
-
-    /// system.kiosk-display.get — Current kiosk display preset + whether this
-    /// node has a kiosk at all (no kiosk unit -> the Settings section hides).
-    pub(in crate::api::rpc) async fn handle_system_kiosk_display_get(
-        &self,
-    ) -> Result<serde_json::Value> {
-        let has_kiosk = tokio::fs::metadata("/etc/systemd/system/archipelago-kiosk.service")
-            .await
-            .is_ok();
-        let conf = tokio::fs::read_to_string(KIOSK_DISPLAY_CONF)
-            .await
-            .unwrap_or_default();
-        let preset = if conf.contains("ARCHIPELAGO_KIOSK_SCALE=1") {
-            "native"
-        } else if conf.contains("ARCHIPELAGO_KIOSK_TARGET_CSS_WIDTH=1920") {
-            "balanced"
-        } else if conf.contains("ARCHIPELAGO_KIOSK_TARGET_CSS_WIDTH=1280") {
-            "large"
-        } else {
-            "auto"
-        };
-        Ok(serde_json::json!({ "has_kiosk": has_kiosk, "preset": preset }))
-    }
-
-    /// system.kiosk-display.set — Write the kiosk display preset and restart
-    /// the kiosk (only if it is running) so it takes effect immediately. The
-    /// launcher sources /etc/archipelago/kiosk-display.conf at startup.
-    pub(in crate::api::rpc) async fn handle_system_kiosk_display_set(
-        &self,
-        params: Option<serde_json::Value>,
-    ) -> Result<serde_json::Value> {
-        let params = params.ok_or_else(|| anyhow::anyhow!("Missing params"))?;
-        let preset = params
-            .get("preset")
-            .and_then(|v| v.as_str())
-            .ok_or_else(|| anyhow::anyhow!("Missing preset"))?;
-
-        let conf = match preset {
-            // Resolution-derived default: 4K -> 2.0 (1920-wide layout),
-            // 1080p TV -> 1.5, laptop panels -> 1.0.
-            "auto" => String::new(),
-            // Biggest UI: every panel targets a 1280-wide layout.
-            "large" => "ARCHIPELAGO_KIOSK_TARGET_CSS_WIDTH=1280\n".to_string(),
-            // Full-HD layout on any panel that can carry it.
-            "balanced" => "ARCHIPELAGO_KIOSK_TARGET_CSS_WIDTH=1920\n".to_string(),
-            // No scaling: native CSS viewport, most content, smallest UI.
-            "native" => "ARCHIPELAGO_KIOSK_SCALE=1\n".to_string(),
-            other => anyhow::bail!("Unknown display preset: {other}"),
-        };
-
-        host_sudo(&["/usr/bin/mkdir", "-p", "/etc/archipelago"]).await?;
-        if conf.is_empty() {
-            let _ = host_sudo(&["/usr/bin/rm", "-f", KIOSK_DISPLAY_CONF]).await;
-        } else {
-            // tee via sudo — the backend runs unprivileged and /etc is root's.
-            let mut child = tokio::process::Command::new("/usr/bin/sudo")
-                .args(["-n", "/usr/bin/tee", KIOSK_DISPLAY_CONF])
-                .stdin(std::process::Stdio::piped())
-                .stdout(std::process::Stdio::null())
-                .stderr(std::process::Stdio::piped())
-                .spawn()
-                .context("spawn sudo tee for kiosk display conf")?;
-            use tokio::io::AsyncWriteExt;
-            if let Some(mut stdin) = child.stdin.take() {
-                stdin.write_all(conf.as_bytes()).await?;
-            }
-            let out = child.wait_with_output().await?;
-            if !out.status.success() {
-                anyhow::bail!(
-                    "writing {} failed: {}",
-                    KIOSK_DISPLAY_CONF,
-                    String::from_utf8_lossy(&out.stderr).trim()
-                );
-            }
-        }
-
-        // try-restart: only bounces a kiosk that is actually running, so this
-        // never starts a kiosk an operator disabled.
-        let _ = host_sudo(&[
-            "/usr/bin/systemctl",
-            "try-restart",
-            "archipelago-kiosk.service",
-        ])
-        .await;
-
-        info!(preset, "Kiosk display preset applied");
-        Ok(serde_json::json!({ "preset": preset, "applied": true }))
-    }
 }
-
-const KIOSK_DISPLAY_CONF: &str = "/etc/archipelago/kiosk-display.conf";